diff --git a/_maps/map_files/Campaign maps/jungle_outpost/jungle_outpost.dmm b/_maps/map_files/Campaign maps/jungle_outpost/jungle_outpost.dmm index ca232e19a12df..7aff0f42b44e3 100644 --- a/_maps/map_files/Campaign maps/jungle_outpost/jungle_outpost.dmm +++ b/_maps/map_files/Campaign maps/jungle_outpost/jungle_outpost.dmm @@ -571,18 +571,6 @@ dir = 9 }, /area/campaign/jungle_outpost/outpost/req) -"cO" = ( -/obj{ - name = "---Merge conflict marker---" - }, -/obj/structure/table, -/obj/item/clothing/suit/storage/apron, -/obj/item/clothing/gloves/botanic_leather, -/obj/machinery/light{ - dir = 8 - }, -/turf/open/space/basic, -/area/space) "cP" = ( /obj/effect/landmark/campaign_structure/phoron_crate, /turf/open/floor/tile/green/greentaupe{ @@ -15478,7 +15466,7 @@ ZC ZC ZC ZC -cO +ZC ZC ZC ZC diff --git a/_maps/map_files/Campaign maps/nt_base/nt_base.dmm b/_maps/map_files/Campaign maps/nt_base/nt_base.dmm index e7ac07bb2ed55..81d55444f1649 100644 --- a/_maps/map_files/Campaign maps/nt_base/nt_base.dmm +++ b/_maps/map_files/Campaign maps/nt_base/nt_base.dmm @@ -1511,7 +1511,7 @@ /turf/open/floor/mainship/stripesquare, /area/gelida/cavestructuretwo) "beU" = ( -/turf/closed/mineral/smooth/darkfrostwall, +/turf/closed/mineral/smooth/darkfrostwall/indestructible, /area/gelida/caves/central_caves/garbledradio) "beW" = ( /obj/machinery/atmospherics/pipe/simple/green/hidden{ @@ -19647,7 +19647,7 @@ /area/gelida/landing_zone_2) "owj" = ( /obj/effect/landmark/lv624/fog_blocker/xeno_spawn, -/turf/closed/mineral/smooth/darkfrostwall, +/turf/closed/mineral/smooth/darkfrostwall/indestructible, /area/gelida/caves/central_caves) "owm" = ( /obj/machinery/door/airlock/mainship/medical/glass{ @@ -21581,7 +21581,7 @@ /turf/open/floor/prison/plate, /area/gelida/indoors/a_block/admin) "pLW" = ( -/turf/closed/mineral/smooth/darkfrostwall, +/turf/closed/mineral/smooth/darkfrostwall/indestructible, /area/gelida/powergen) "pMg" = ( /obj/structure/flora/ausbushes/pointybush{ @@ -23346,7 +23346,7 @@ /turf/open/floor/wood, /area/gelida/indoors/a_block/fitness) "raa" = ( -/turf/closed/mineral/smooth/darkfrostwall, +/turf/closed/mineral/smooth/darkfrostwall/indestructible, /area/gelida/caves/west_caves/garbledradio) "raz" = ( /obj/effect/spawner/random/misc/structure/supplycrate/secureweighted, @@ -29176,7 +29176,7 @@ /area/gelida/indoors/a_block/security) "vqi" = ( /obj/effect/landmark/lv624/fog_blocker/xeno_spawn, -/turf/closed/mineral/smooth/darkfrostwall, +/turf/closed/mineral/smooth/darkfrostwall/indestructible, /area/gelida/outdoors/rock) "vqz" = ( /obj/effect/spawner/random/engineering/structure/tank/waterweighted, @@ -32289,9 +32289,6 @@ /obj/effect/turf_decal/warning_stripes/stripedsquare/tile/border, /turf/open/floor/mainship/stripesquare, /area/gelida/indoors/b_block/hydro) -"xIt" = ( -/turf/closed/mineral/smooth/darkfrostwall, -/area/gelida/outdoors/rock) "xIu" = ( /obj/structure/rack/nometal, /obj/item/frame/table{ @@ -33418,87 +33415,87 @@ nsK "} (2,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS rIi rIi rIi @@ -33640,88 +33637,88 @@ nsK "} (3,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS rIi rIi rIi @@ -33862,89 +33859,89 @@ nsK "} (4,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS rIi rIi rIi @@ -34084,88 +34081,88 @@ nsK "} (5,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS yiB yiB -xIt -xIt +cgS +cgS yiB yiB yiB -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS rIi rIi rIi @@ -34306,12 +34303,12 @@ nsK "} (6,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS yiB dII ewI @@ -34319,77 +34316,77 @@ geP gBm gZL yiB -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS rIi rIi rIi @@ -34528,11 +34525,11 @@ nsK "} (7,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS yiB cDx dKf @@ -34542,75 +34539,75 @@ geP aPS gZL yiB -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS rIi rIi rIi @@ -34750,10 +34747,10 @@ nsK "} (8,1,1) = {" cgS -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS yiB yiB cDx @@ -34765,73 +34762,73 @@ bgd hRV yiB yiB -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS wJU wJU -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS uew -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS rIi rIi rIi @@ -34972,9 +34969,9 @@ nsK "} (9,1,1) = {" cgS -xIt -xIt -xIt +cgS +cgS +cgS wpv bem iUh @@ -34988,72 +34985,72 @@ geP iUh sUt jBU -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS wJU wJU agw -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS uew uew uew uew uew uew -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS rIi rIi rIi @@ -35194,8 +35191,8 @@ nsK "} (10,1,1) = {" cgS -xIt -xIt +cgS +cgS wpv wpv bjn @@ -35211,40 +35208,40 @@ iUh sUt jBU jBU -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS bOD wJU wJU @@ -35264,19 +35261,19 @@ uew uew uew uew -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS rIi rIi rIi @@ -35416,8 +35413,8 @@ nsK "} (11,1,1) = {" cgS -xIt -xIt +cgS +cgS wpv wpv bjn @@ -35434,38 +35431,38 @@ jua jBU jBU wpv -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS wJU wJU wJU @@ -35486,19 +35483,19 @@ pLC xvz qFN jFo -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS rIi rIi rIi @@ -35638,8 +35635,8 @@ nsK "} (12,1,1) = {" cgS -xIt -xIt +cgS +cgS wpv wpv bjn @@ -35657,36 +35654,36 @@ dOs jBU dOs wpv -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS cJC -xIt -xIt -xIt +cgS +cgS +cgS wJU wJU wJU @@ -35708,18 +35705,18 @@ kUg pJc abp oqu -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS rIi rIi rIi @@ -35860,7 +35857,7 @@ nsK "} (13,1,1) = {" cgS -xIt +cgS wpv wpv wpv @@ -35881,24 +35878,24 @@ wpv wpv wpv wpv -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS xjB xjB xjB @@ -35930,17 +35927,17 @@ hFv gHC qqv niX -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS uew -xIt -xIt -xIt +cgS +cgS +cgS uew -xIt +cgS rIi rIi rIi @@ -36082,8 +36079,8 @@ nsK "} (14,1,1) = {" cgS -xIt -xIt +cgS +cgS wpv wpv bjn @@ -36105,20 +36102,20 @@ wpv wpv wpv wpv -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS xjB xjB xjB @@ -36153,10 +36150,10 @@ lYx xPd fJd uew -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS uew uew uew @@ -36304,8 +36301,8 @@ nsK "} (15,1,1) = {" cgS -xIt -xIt +cgS +cgS wpv wpv bem @@ -36329,16 +36326,16 @@ wpv wpv wpv wpv -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS xjB xjB xjB @@ -36376,8 +36373,8 @@ xPd uew uew uew -xIt -xIt +cgS +cgS uew uew eue @@ -36526,7 +36523,7 @@ nsK "} (16,1,1) = {" cgS -xIt +cgS wpv wpv wpv @@ -36553,13 +36550,13 @@ wpv wpv wpv wpv -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS xjB xjB xjB @@ -36748,8 +36745,8 @@ nsK "} (17,1,1) = {" cgS -xIt -xIt +cgS +cgS wpv wpv bjn @@ -36776,10 +36773,10 @@ wpv wpv wpv wpv -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS xjB xjB xjB @@ -36792,8 +36789,8 @@ xjB xjB xjB xjB -xIt -xIt +cgS +cgS cJC rfq rfq @@ -36970,10 +36967,10 @@ nsK "} (18,1,1) = {" cgS -xIt -xIt +cgS +cgS wpv -xIt +cgS yiB yiB aPS @@ -36985,7 +36982,7 @@ iUh aPS yiB yiB -xIt +cgS jBU dOs wpv @@ -36999,9 +36996,9 @@ wpv wpv wpv wpv -xIt -xIt -xIt +cgS +cgS +cgS xjB xjB xjB @@ -37011,16 +37008,16 @@ xjB xjB wpv wpv -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS tWN wJU wJU @@ -37192,11 +37189,11 @@ nsK "} (19,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS yiB cQx dUu @@ -37206,8 +37203,8 @@ iUh hgq hRV yiB -xIt -xIt +cgS +cgS jBU wpv dOs @@ -37231,18 +37228,18 @@ xjB xjB xjB mPF -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS otX tWN wJU @@ -37414,11 +37411,11 @@ nsK "} (20,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS yiB yiB yiB @@ -37428,8 +37425,8 @@ gLz yiB yiB yiB -xIt -xIt +cgS +cgS wpv wpv wpv @@ -37450,21 +37447,21 @@ xjB ugu xjB xjB -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS xbv tWN wJU @@ -37636,11 +37633,11 @@ nsK "} (21,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS yiB lmN lUi @@ -37650,8 +37647,8 @@ sWh hsw kuB yiB -xIt -xIt +cgS +cgS wpv wpv wpv @@ -37671,23 +37668,23 @@ xjB xjB xjB xjB -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS otX tWN tWN @@ -37858,8 +37855,8 @@ nsK "} (22,1,1) = {" cgS -xIt -xIt +cgS +cgS yiB yiB yiB @@ -37873,7 +37870,7 @@ wgu fTM yiB yiB -xIt +cgS wpv wpv wpv @@ -37891,30 +37888,30 @@ wpv xjB xjB xjB -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS otX otX tWN -xIt -xIt +cgS +cgS eue tzc eue @@ -37927,8 +37924,8 @@ rIi tzc tzc uew -xIt -xIt +cgS +cgS uew uew uew @@ -38080,7 +38077,7 @@ nsK "} (23,1,1) = {" cgS -xIt +cgS yiB yiB aHZ @@ -38095,7 +38092,7 @@ upW upW sWh yiB -xIt +cgS wpv wpv wpv @@ -38112,37 +38109,37 @@ wpv wpv wpv xjB -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS tWN tWN -xIt -xIt -xIt +cgS +cgS +cgS tzc tzc tzc -xIt -xIt -xIt +cgS +cgS +cgS eue tzc oWT @@ -38150,7 +38147,7 @@ tzc uew uew uew -xIt +cgS uew uew uew @@ -38302,7 +38299,7 @@ nsK "} (24,1,1) = {" cgS -xIt +cgS yiB aeZ aNR @@ -38334,38 +38331,38 @@ wpv wpv wpv xjB -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS tWN otX -xIt -xIt -xIt +cgS +cgS +cgS tzc tzc eue -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS tzc uew uew @@ -38524,8 +38521,8 @@ nsK "} (25,1,1) = {" cgS -xIt -xIt +cgS +cgS sWh cZX upW @@ -38557,36 +38554,36 @@ wpv wpv xjB mPF -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS xjB xjB xjB -xIt +cgS tWN otX tWN tWN -xIt +cgS tzc tzc eue tzc tzc -xIt -xIt +cgS +cgS eue tzc uew @@ -38746,8 +38743,8 @@ nsK "} (26,1,1) = {" cgS -xIt -xIt +cgS +cgS sWh apA bAh @@ -38781,16 +38778,16 @@ xjB xjB xjB wpv -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS xjB xjB xjB @@ -38968,8 +38965,8 @@ nsK "} (27,1,1) = {" cgS -xIt -xIt +cgS +cgS sZZ upW upW @@ -39005,12 +39002,12 @@ xjB xjB xjB xjB -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS xjB xjB xjB @@ -39190,7 +39187,7 @@ nsK "} (28,1,1) = {" cgS -xIt +cgS yiB atX axk @@ -39227,10 +39224,10 @@ xjB xjB xjB xjB -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS xjB xjB xjB @@ -39412,7 +39409,7 @@ nsK "} (29,1,1) = {" cgS -xIt +cgS yiB yiB sWh @@ -39465,8 +39462,8 @@ xjB cJC tWN tWN -xIt -xIt +cgS +cgS eue tzc uew @@ -39634,8 +39631,8 @@ nsK "} (30,1,1) = {" cgS -xIt -xIt +cgS +cgS yiB sWh cLZ @@ -39649,7 +39646,7 @@ dkT kuB yiB yiB -xIt +cgS wpv wpv wpv @@ -39684,11 +39681,11 @@ mPF xjB xjB cJC -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS bPS tzc uew @@ -39856,9 +39853,9 @@ nsK "} (31,1,1) = {" cgS -xIt -xIt -xIt +cgS +cgS +cgS yiB dhv yiB @@ -39870,8 +39867,8 @@ yiB yiB yiB yiB -xIt -xIt +cgS +cgS wpv wpv wpv @@ -39883,8 +39880,8 @@ wpv wpv wpv wpv -xIt -xIt +cgS +cgS wpv wpv xjB @@ -39903,14 +39900,14 @@ xjB xjB xjB xjB -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS tzc eue tzc @@ -40078,23 +40075,23 @@ nsK "} (32,1,1) = {" cgS -xIt -xIt +cgS +cgS jBU wpv njJ jBU -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS wpv dOs wpv @@ -40102,14 +40099,14 @@ wpv wpv wpv wpv -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS wpv xjB xjB @@ -40124,13 +40121,13 @@ xjB xjB xjB xjB -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS tzc tzc tzc @@ -40300,39 +40297,39 @@ nsK "} (33,1,1) = {" cgS -xIt -xIt +cgS +cgS jBU jBU njJ wpv -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS wpv wpv wpv wpv wpv wpv -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS xjB xjB xjB @@ -40343,15 +40340,15 @@ ugu xjB xjB xjB -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS tzc tzc eue @@ -40522,40 +40519,40 @@ nsK "} (34,1,1) = {" cgS -xIt -xIt +cgS +cgS wpv arf njJ -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS wpv wpv wpv wpv wpv wpv -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS xjB xjB dao @@ -40563,17 +40560,17 @@ xjB xjB xjB xjB -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS tzc eue eue @@ -40744,39 +40741,39 @@ nsK "} (35,1,1) = {" cgS -xIt -xIt +cgS +cgS wpv wpv fEZ -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS wpv wpv wpv wpv -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS xjB xjB xjB @@ -40784,17 +40781,17 @@ xjB xjB xjB xjB -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS tzc tzc eue @@ -40966,58 +40963,58 @@ nsK "} (36,1,1) = {" cgS -xIt +cgS wpv wpv wpv eFS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS wpv wpv wpv -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS xjB xjB xjB xjB xjB xjB -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS tzc eue eue @@ -41188,37 +41185,37 @@ nsK "} (37,1,1) = {" cgS -xIt +cgS wpv wpv dOs fEZ -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS wpv wpv wpv -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS xjB xjB xjB @@ -41226,21 +41223,21 @@ xjB xjB xjB xjB -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS tzc eue eue @@ -41410,59 +41407,59 @@ nsK "} (38,1,1) = {" cgS -xIt +cgS wpv wpv wpv fEZ -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS dOs wpv wpv -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS mPF xjB xjB xjB xjB mPF -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS tzc tzc eue @@ -41632,60 +41629,60 @@ nsK "} (39,1,1) = {" cgS -xIt -xIt +cgS +cgS wpv wpv fEZ wpv -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS wpv wpv wpv -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS xjB xjB xjB xjB xjB xjB -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS tzc tzc tzc @@ -41854,60 +41851,60 @@ nsK "} (40,1,1) = {" cgS -xIt -xIt +cgS +cgS wpv wpv fEZ wpv -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS wpv wpv wpv wpv -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS xjB xjB xjB xjB xjB xjB -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS tzc bPS tzc @@ -42076,61 +42073,61 @@ nsK "} (41,1,1) = {" cgS -xIt -xIt +cgS +cgS wpv wpv fEZ wpv wpv -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS wpv wpv wpv wpv wpv -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS xjB xjB xjB xjB xjB -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS tzc tzc uew @@ -42298,61 +42295,61 @@ nsK "} (42,1,1) = {" cgS -xIt -xIt -xIt +cgS +cgS +cgS wpv fEZ wpv wpv wpv -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS wpv wpv wpv wpv wpv wpv -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS raa xjB xjB xjB xjB -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS tzc tzc uew @@ -42520,61 +42517,61 @@ nsK "} (43,1,1) = {" cgS -xIt -xIt -xIt +cgS +cgS +cgS dOs fEZ fEZ fEZ gKU -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS wpv wpv wpv wpv wpv wpv -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS xjB xjB xjB xjB xjB -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS tzc tzc uew @@ -42742,61 +42739,61 @@ nsK "} (44,1,1) = {" cgS -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS wpv wpv wpv fEZ wpv -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS wpv wpv wpv wpv wpv wpv -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS xjB xjB xjB xjB xjB -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS eue uew uew @@ -42964,61 +42961,61 @@ nsK "} (45,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS wpv wpv fEZ wpv wpv -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS dOs wpv dOs wpv wpv wpv -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS xjB xjB xjB xjB xjB -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS uew uew uew @@ -43186,36 +43183,36 @@ nsK "} (46,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS wpv wpv fEZ dOs wpv wpv -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS wpv wpv fyL wpv wpv -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS xjB xjB xjB @@ -43223,24 +43220,24 @@ xjB xjB xjB xjB -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS uew uew esd @@ -43408,36 +43405,36 @@ nsK "} (47,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS wpv gKU wpv wpv wpv -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS uGF uGF uGF uGF uGF -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS ubb kNR ubb @@ -43447,22 +43444,22 @@ ubb ubb ubb tJs -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS tzc uew uew @@ -43630,35 +43627,35 @@ nsK "} (48,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS qzH uGF uGF uGF -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS uGF uGF uGF uGF -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS ubb ubb ubb @@ -43670,22 +43667,22 @@ ubb ubb ubb ubb -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS uew uew uew @@ -43852,40 +43849,40 @@ nsK "} (49,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS qzH uGF uGF uGF -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS uGF uGF uGF uGF uGF -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS ubb ubb ubb ubb -xIt +cgS ubb ubb ubb @@ -43893,21 +43890,21 @@ ubb ubb ubb ubb -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS uew uew uew @@ -44074,41 +44071,41 @@ nsK "} (50,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS qzH uGF uGF uGF -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS uGF uGF uGF uGF uGF -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS ubb ubb ubb ubb ubb -xIt -xIt +cgS +cgS ubb ubb ubb @@ -44116,20 +44113,20 @@ ubb rvq ubb ubb -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS uew iiB uew @@ -44296,62 +44293,62 @@ nsK "} (51,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS uGF qzH uGF uGF uGF -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS xEg uGF uGF xEg -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS ubb ubb ubb ubb ubb -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS ubb ubb ubb ubb ubb ubb -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS uew uew uew @@ -44518,62 +44515,62 @@ nsK "} (52,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS uGF qzH uGF uGF uGF -xIt -xIt -xIt +cgS +cgS +cgS uGF uGF uGF uGF -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS ubb ubb ubb ubb ubb -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS tJs ubb ubb ubb ubb tJs -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS uew uew uew @@ -44740,44 +44737,44 @@ nsK "} (53,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS uGF qzH xEg uGF uGF -xIt -xIt -xIt +cgS +cgS +cgS uGF uGF uGF uGF -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS ubb ubb ubb ubb ubb -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS vqi oHy oHy @@ -44792,10 +44789,10 @@ vqi vqi vqi vqi -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS uew uew uew @@ -44962,44 +44959,44 @@ nsK "} (54,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS qzH uGF uGF uGF -xIt -xIt -xIt +cgS +cgS +cgS uGF uGF uGF uGF -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS tJs ubb rvq tJs -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS vqi ubb ubb @@ -45010,14 +45007,14 @@ ubb ubb ubb ubb -xIt -xIt -xIt +cgS +cgS +cgS vqi -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS uew uew uew @@ -45184,44 +45181,44 @@ nsK "} (55,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS uGF qzH uGF uGF uGF uGF -xIt +cgS uGF uGF uGF uGF -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -ubb -ubb -ubb -ubb -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +ubb +ubb +ubb +ubb +cgS +cgS +cgS +cgS +cgS +cgS vqi ubb ubb @@ -45233,13 +45230,13 @@ ubb ubb ubb ubb -xIt -xIt +cgS +cgS vqi -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS uew uew uew @@ -45406,13 +45403,13 @@ nsK "} (56,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS qzH uGF xEg @@ -45422,28 +45419,28 @@ uGF uGF uGF xEg -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -ubb -ubb -ubb -ubb -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +ubb +ubb +ubb +ubb +cgS +cgS +cgS +cgS +cgS +cgS vqi ubb ubb @@ -45455,13 +45452,13 @@ ubb ubb ubb ubb -xIt -xIt +cgS +cgS vqi -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS uew uew rSi @@ -45628,13 +45625,13 @@ nsK "} (57,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS qzH xEg uGF @@ -45643,31 +45640,31 @@ uGF uGF uGF uGF -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS ubb ubb ubb ubb ubb ubb -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS vqi -xIt +cgS ubb ubb ubb @@ -45678,12 +45675,12 @@ ubb ubb ubb ubb -xIt +cgS vqi -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS uew uew vQm @@ -45850,46 +45847,46 @@ nsK "} (58,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS qzH qzH uGF uGF uGF -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS ubb ubb ubb ubb ubb ubb -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS vqi -xIt +cgS ubb ubb ubb @@ -45900,12 +45897,12 @@ ubb ubb ubb ubb -xIt +cgS vqi -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS uew iiB skK @@ -46072,32 +46069,32 @@ nsK "} (59,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS qzH uGF uGF uGF -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS ubb ubb ubb @@ -46105,13 +46102,13 @@ ubb ubb ubb ubb -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS vqi -xIt +cgS ubb ubb ubb @@ -46122,12 +46119,12 @@ ubb ubb tJs ubb -xIt +cgS vqi -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS uew uew vQm @@ -46294,32 +46291,32 @@ nsK "} (60,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS qzH uGF uGF uGF -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS ubb ubb tJs @@ -46327,14 +46324,14 @@ ubb ubb ubb ubb -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS vqi -xIt -xIt +cgS +cgS ubb ubb ubb @@ -46347,8 +46344,8 @@ ubb ubb oHy ubb -xIt -xIt +cgS +cgS eue tzc uew @@ -46516,18 +46513,18 @@ nsK "} (61,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS uGF qzH uGF uGF uGF -xIt -xIt +cgS +cgS vqi vqi vqi @@ -46542,22 +46539,22 @@ vqi vqi vqi vqi -xIt +cgS ubb ubb ubb ubb ubb ubb -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS vqi -xIt -xIt -xIt +cgS +cgS +cgS ubb ubb ubb @@ -46738,20 +46735,20 @@ nsK "} (62,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS uGF qzH uGF uGF uGF -xIt -xIt +cgS +cgS vqi -xIt +cgS pfm nyC pfm @@ -46761,11 +46758,11 @@ pfm pfm nyC nyC -xIt -xIt +cgS +cgS vqi -xIt -xIt +cgS +cgS ubb ubb ubb @@ -46773,13 +46770,13 @@ ubb ubb ubb ubb -xIt -xIt -xIt +cgS +cgS +cgS vqi -xIt -xIt -xIt +cgS +cgS +cgS ubb ubb ubb @@ -46960,18 +46957,18 @@ nsK "} (63,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS uGF qzH uGF xEg -xIt -xIt -xIt +cgS +cgS +cgS vqi pfm pfm @@ -46986,8 +46983,8 @@ nyC pfm nyC muV -xIt -xIt +cgS +cgS ubb ubb ubb @@ -46996,12 +46993,12 @@ ubb ubb ubb ubb -xIt -xIt +cgS +cgS vqi -xIt -xIt -xIt +cgS +cgS +cgS ubb ubb ubb @@ -47182,17 +47179,17 @@ nsK "} (64,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS uGF qzH xEg uGF -xIt -xIt +cgS +cgS pfm mKk pfm @@ -47221,9 +47218,9 @@ ubb ubb ubb vqi -xIt -xIt -xIt +cgS +cgS +cgS ubb ubb ubb @@ -47232,7 +47229,7 @@ ubb ubb ubb ubb -xIt +cgS oHy ubb ubb @@ -47404,17 +47401,17 @@ nsK "} (65,1,1) = {" cgS -xIt -xIt -xIt +cgS +cgS +cgS xEg uGF uGF fZP uGF -xIt -xIt -xIt +cgS +cgS +cgS pfm muV mJj @@ -47456,8 +47453,8 @@ nue vqi vqi vqi -xIt -xIt +cgS +cgS eue tzc mXU @@ -47626,17 +47623,17 @@ nsK "} (66,1,1) = {" cgS -xIt -xIt -xIt +cgS +cgS +cgS qzH qzH qzH qzH -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS pfm mKk kDZ @@ -47658,8 +47655,8 @@ pxr ubb ubb beU -xIt -xIt +cgS +cgS ubb ubb ubb @@ -47674,12 +47671,12 @@ ubb ubb ubb ubb -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS eue eue tzc @@ -47848,17 +47845,17 @@ nsK "} (67,1,1) = {" cgS -xIt -xIt +cgS +cgS uGF qzH uGF uGF -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS nyC muV pfm @@ -47875,14 +47872,14 @@ mJj nyC mKk pfm -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS ubb ubb ubb @@ -47895,13 +47892,13 @@ tJs ubb ubb ubb -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS eue eue tzc @@ -48070,18 +48067,18 @@ nsK "} (68,1,1) = {" cgS -xIt -xIt +cgS +cgS uGF qzH uGF uGF -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS muV hNx pfm @@ -48098,15 +48095,15 @@ nyC mKk pfm pfm -xIt -xIt +cgS +cgS pfm -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS ubb ubb ubb @@ -48116,14 +48113,14 @@ ubb cQd ubb ubb -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS eue eue eue @@ -48292,17 +48289,17 @@ nsK "} (69,1,1) = {" cgS -xIt -xIt +cgS +cgS uGF qzH uGF -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS iqm igB mKk @@ -48321,15 +48318,15 @@ oBs iqm iqm iqm -xIt +cgS pfm pfm -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS tJs ubb ubb @@ -48338,15 +48335,15 @@ ubb ubb ubb ubb -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS eue eue sWa @@ -48514,17 +48511,17 @@ nsK "} (70,1,1) = {" cgS -xIt -xIt +cgS +cgS uGF qzH uGF -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS iqm rXv pfm @@ -48547,28 +48544,28 @@ rXv pfm nyC pfm -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS ubb ubb ubb ubb ubb ubb -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS eue tzc sWa @@ -48736,16 +48733,16 @@ nsK "} (71,1,1) = {" cgS -xIt -xIt +cgS +cgS uGF qzH uGF uGF -xIt -xIt +cgS +cgS fVm -xIt +cgS nyC iqm nyC @@ -48769,28 +48766,28 @@ nyC fXJ elo pfm -xIt +cgS qaM -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS ubb tJs ubb ubb -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS tzc tzc vaE @@ -48958,14 +48955,14 @@ nsK "} (72,1,1) = {" cgS -xIt -xIt -xIt +cgS +cgS +cgS qzH uGF uGF uGF -xIt +cgS pfm elo nyC @@ -48993,26 +48990,26 @@ pfm pfm pfm qaW -xIt -xIt -xIt -xIt -xIt -ubb -ubb -ubb -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +ubb +ubb +ubb +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS uew tzc vaE @@ -49180,8 +49177,8 @@ nsK "} (73,1,1) = {" cgS -xIt -xIt +cgS +cgS uGF qzH vwm @@ -49215,26 +49212,26 @@ nyC fXJ pfm pfm -xIt +cgS iqm iqm -xIt +cgS ubb ubb ubb -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS uew uew vaE @@ -49402,7 +49399,7 @@ nsK "} (74,1,1) = {" cgS -xIt +cgS uGF uGF ewO @@ -49444,19 +49441,19 @@ nyC ubb ubb tJs -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS uew uew vaE @@ -49624,7 +49621,7 @@ nsK "} (75,1,1) = {" cgS -xIt +cgS uGF uGF qzH @@ -49666,18 +49663,18 @@ lEI pxr ubb ubb -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS uew uew uew @@ -49846,7 +49843,7 @@ nsK "} (76,1,1) = {" cgS -xIt +cgS uGF uGF qzH @@ -49884,21 +49881,21 @@ iqm iqm pfm nyC -xIt -xIt +cgS +cgS pxr ubb -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS uew uew uew @@ -50068,7 +50065,7 @@ nsK "} (77,1,1) = {" cgS -xIt +cgS uGF uGF qzH @@ -50107,19 +50104,19 @@ qih pfm icv iqm -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS uew uew uew @@ -50290,7 +50287,7 @@ nsK "} (78,1,1) = {" cgS -xIt +cgS uGF uGF qzH @@ -50298,7 +50295,7 @@ bVM pfm kDZ eoI -xIt +cgS eqE pfm hNx @@ -50329,21 +50326,21 @@ qkR nyC pfm nyC -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS uew uew uew @@ -50512,15 +50509,15 @@ nsK "} (79,1,1) = {" cgS -xIt +cgS uGF uGF fZP bVQ pfm nyC -xIt -xIt +cgS +cgS bdt kDZ nyC @@ -50551,21 +50548,21 @@ qkR pfm nyC nyC -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS uew uew uew @@ -50734,15 +50731,15 @@ nsK "} (80,1,1) = {" cgS -xIt +cgS uGF uGF qzH xEg pfm -xIt -xIt -xIt +cgS +cgS +cgS nyC nyC nyC @@ -50773,22 +50770,22 @@ eqT pfm nyC nyC -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS uew uew vaE @@ -50963,7 +50960,7 @@ qzH uGF pfm pfm -xIt +cgS rCQ pfm pfm @@ -50995,22 +50992,22 @@ eqT kDZ nyC iqm -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS bcB tzc vaE @@ -51183,11 +51180,11 @@ uGF uGF qzH qzH -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS kDZ iqm nyC @@ -51217,22 +51214,22 @@ pfm pfm icv iqm -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS ubb bcB eZJ @@ -51400,17 +51397,17 @@ nsK "} (83,1,1) = {" cgS -xIt -xIt +cgS +cgS uGF uGF qzH uGF -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS iqm pfm jaz @@ -51439,21 +51436,21 @@ pfm nyC nyC iqm -xIt -xIt -xIt +cgS +cgS +cgS ubb ubb ubb -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS tJs ubb bcB @@ -51622,16 +51619,16 @@ nsK "} (84,1,1) = {" cgS -xIt -xIt +cgS +cgS uGF uGF qzH uGF uGF -xIt -xIt -xIt +cgS +cgS +cgS icv iqm rXv @@ -51661,20 +51658,20 @@ nyC pfm iqm iqm -xIt -xIt +cgS +cgS ubb ubb ubb ubb ubb ubb -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS ubb ubb ubb @@ -51844,16 +51841,16 @@ nsK "} (85,1,1) = {" cgS -xIt -xIt +cgS +cgS uGF vwm ewO uGF uGF -xIt -xIt -xIt +cgS +cgS +cgS nyC iqm pfm @@ -51892,10 +51889,10 @@ tJs ubb ubb ubb -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS ubb ubb ubb @@ -52066,15 +52063,15 @@ nsK "} (86,1,1) = {" cgS -xIt -xIt +cgS +cgS uGF uGF qzH uGF uGF uGF -xIt +cgS nyC gZd iqm @@ -52115,8 +52112,8 @@ tPt tPt tPt ubb -xIt -xIt +cgS +cgS ubb ubb ubb @@ -52288,8 +52285,8 @@ nsK "} (87,1,1) = {" cgS -xIt -xIt +cgS +cgS uGF uGF ewO @@ -52330,8 +52327,8 @@ tPt gpF tPt tPt -xIt -xIt +cgS +cgS tJs ubb ubb @@ -52510,8 +52507,8 @@ nsK "} (88,1,1) = {" cgS -xIt -xIt +cgS +cgS uGF uGF qzH @@ -52552,10 +52549,10 @@ ubb ubb ubb ubb -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS ubb ubb ubb @@ -52732,8 +52729,8 @@ nsK "} (89,1,1) = {" cgS -xIt -xIt +cgS +cgS xEg uGF qzH @@ -52774,11 +52771,11 @@ nyC ubb ubb ubb -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS ubb ubb ubb @@ -52954,7 +52951,7 @@ nsK "} (90,1,1) = {" cgS -xIt +cgS uGF uGF uGF @@ -52994,12 +52991,12 @@ hNx qoT ubb ubb -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS ubb ubb ubb @@ -53007,8 +53004,8 @@ ubb ubb ubb ubb -xIt -xIt +cgS +cgS ubb ubb bcB @@ -53176,7 +53173,7 @@ nsK "} (91,1,1) = {" cgS -xIt +cgS uGF uGF uGF @@ -53213,25 +53210,25 @@ muV pfm nyC nyC -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS ubb ubb ubb ubb ubb ubb -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS ubb bcB bBz @@ -53398,8 +53395,8 @@ nsK "} (92,1,1) = {" cgS -xIt -xIt +cgS +cgS uGF uGF qzH @@ -53433,14 +53430,14 @@ iqm pVA igB iqm -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS tJs ubb ubb @@ -53448,12 +53445,12 @@ ubb ubb tJs ubb -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS ubb bcB ujh @@ -53620,7 +53617,7 @@ nsK "} (93,1,1) = {" cgS -xIt +cgS uGF uGF uGF @@ -53655,13 +53652,13 @@ pfm nyC igB iqm -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS ubb ubb ubb @@ -53669,13 +53666,13 @@ ubb ubb ubb ubb -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS ubb ubb ujh @@ -53842,7 +53839,7 @@ nsK "} (94,1,1) = {" cgS -xIt +cgS uGF uGF uGF @@ -53876,28 +53873,28 @@ iqm pfm pfm igB -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS ubb ubb ubb ubb ubb -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS ubb ubb ujh @@ -54064,13 +54061,13 @@ nsK "} (95,1,1) = {" cgS -xIt -xIt +cgS +cgS uGF xEg uGF uGF -xIt +cgS pfm pfm pfm @@ -54098,29 +54095,29 @@ iqm iqm pVA igB -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -ubb -ubb -ubb -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +ubb +ubb +ubb +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS ubb nwP eZJ @@ -54286,14 +54283,14 @@ nsK "} (96,1,1) = {" cgS -xIt -xIt -xIt +cgS +cgS +cgS uGF uGF -xIt -xIt -xIt +cgS +cgS +cgS eqT pfm nyC @@ -54320,29 +54317,29 @@ iqm iqm pfm igB -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -ubb -ubb -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +ubb +ubb +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS ubb nwP wGX @@ -54508,15 +54505,15 @@ nsK "} (97,1,1) = {" cgS -xIt -xIt -xIt +cgS +cgS +cgS uGF uGF uGF -xIt -xIt -xIt +cgS +cgS +cgS nyC pfm iqm @@ -54542,29 +54539,29 @@ iqm iqm pVA igB -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS ubb ubb ubb ubb -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS ubb ubb -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS ubb nwP wGX @@ -54730,27 +54727,27 @@ nsK "} (98,1,1) = {" cgS -xIt -xIt -xIt +cgS +cgS +cgS uGF uGF uGF uGF -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS nyC iqm -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS vqi vqi igB @@ -54764,30 +54761,30 @@ igB vqi vqi vqi -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS ubb ubb ubb ubb ubb ubb -xIt -xIt -xIt +cgS +cgS +cgS ubb ubb ubb -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS nwP wGX nwP @@ -54952,28 +54949,28 @@ nsK "} (99,1,1) = {" cgS -xIt -xIt -xIt +cgS +cgS +cgS uGF uGF uGF uGF uGF -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS uGF nyC nyC @@ -54983,14 +54980,14 @@ nyC ubb nyC iqm -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS ubb tJs ubb @@ -55004,12 +55001,12 @@ ubb ubb ubb ubb -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS nwP iJc nwP @@ -55174,27 +55171,27 @@ nsK "} (100,1,1) = {" cgS -xIt -xIt -xIt +cgS +cgS +cgS xEg uGF uGF uGF xEg -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS uGF uGF uGF @@ -55206,11 +55203,11 @@ ubb ubb tJs iqm -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS ubb ubb ubb @@ -55227,11 +55224,11 @@ ubb ubb ubb ubb -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS nwP wGX jSq @@ -55396,27 +55393,27 @@ nsK "} (101,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS uGF uGF uGF -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS uGF uGF uGF @@ -55451,9 +55448,9 @@ ubb ubb ubb ubb -xIt -xIt -xIt +cgS +cgS +cgS nwP wGX ujh @@ -55618,26 +55615,26 @@ nsK "} (102,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS uGF uGF uGF uGF -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS uGF uGF vwm @@ -55659,7 +55656,7 @@ ubb ubb ubb ubb -xIt +cgS ubb ubb ubb @@ -55674,8 +55671,8 @@ ubb ubb tJs ubb -xIt -xIt +cgS +cgS nwP wGX ujh @@ -55840,26 +55837,26 @@ nsK "} (103,1,1) = {" cgS -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS uGF uGF uGF uGF uGF uGF -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS uGF uGF uGF @@ -55880,14 +55877,14 @@ ubb ubb ubb ubb -xIt -xIt -xIt +cgS +cgS +cgS ubb ubb -xIt -xIt -xIt +cgS +cgS +cgS ubb ubb ubb @@ -55897,7 +55894,7 @@ ubb ubb ubb ubb -xIt +cgS nwP eZJ bBz @@ -56062,11 +56059,11 @@ nsK "} (104,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS xEg uGF uGF @@ -56078,10 +56075,10 @@ uGF uGF uGF uGF -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS uGF uGF uGF @@ -56101,17 +56098,17 @@ oHy ubb ubb ubb -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS ubb ubb -xIt +cgS ubb ubb ubb @@ -56284,13 +56281,13 @@ nsK "} (105,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS uGF uGF uGF @@ -56301,10 +56298,10 @@ uGF uGF uGF uGF -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS xEg uGF uGF @@ -56321,20 +56318,20 @@ ubb ubb oHy ubb -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS ubb ubb ubb @@ -56506,14 +56503,14 @@ nsK "} (106,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS uGF uGF uGF @@ -56523,12 +56520,12 @@ uGF uGF uGF uGF -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS uGF qTf xEg @@ -56542,21 +56539,21 @@ ubb ubb tJs oHy -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS ubb ubb ubb @@ -56728,14 +56725,14 @@ nsK "} (107,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS uGF xEg uGF @@ -56745,13 +56742,13 @@ xEg uGF uGF xEg -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS vqi uGF uGF @@ -56764,25 +56761,25 @@ ubb ubb ubb vqi -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -ubb -ubb -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +ubb +ubb +cgS bcB bcB bBz @@ -56950,13 +56947,13 @@ nsK "} (108,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS uGF uGF uGF @@ -56968,14 +56965,14 @@ uGF uGF uGF uGF -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS vqi -xIt +cgS uGF ubb ubb @@ -56984,28 +56981,28 @@ ubb ubb ubb ubb -xIt +cgS vqi -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS bBz ujh ujh @@ -57172,13 +57169,13 @@ nsK "} (109,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS uGF uGF uGF @@ -57190,14 +57187,14 @@ uGF uGF uGF uGF -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS vqi -xIt +cgS uGF rvq ubb @@ -57205,31 +57202,31 @@ ubb ubb ubb ubb -xIt -xIt +cgS +cgS vqi -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS vby cZN vby @@ -57394,13 +57391,13 @@ nsK "} (110,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS uGF uGF uGF @@ -57412,14 +57409,14 @@ uGF uGF uGF uGF -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS vqi -xIt +cgS uGF ubb ubb @@ -57427,30 +57424,30 @@ ubb ubb ubb ubb -xIt -xIt +cgS +cgS vqi -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS vby vby nSG @@ -57616,14 +57613,14 @@ nsK "} (111,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS uGF uGF uGF @@ -57634,44 +57631,44 @@ uGF uGF uGF uGF -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS vqi -xIt -xIt +cgS +cgS ubb ubb ubb ubb ubb ubb -xIt -xIt +cgS +cgS vqi -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS vby vby vby @@ -57838,14 +57835,14 @@ nsK "} (112,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS uGF uGF uGF @@ -57857,11 +57854,11 @@ uGF uGF uGF uGF -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS vqi vqi vqi @@ -57874,24 +57871,24 @@ oHy vqi vqi vqi -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS vby vby vby @@ -58060,14 +58057,14 @@ nsK "} (113,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS uGF xEg uGF @@ -58079,39 +58076,39 @@ uGF xEg uGF uGF -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS ubb ubb ubb ubb ubb -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS vby vby vby @@ -58282,14 +58279,14 @@ nsK "} (114,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS uGF uGF uGF @@ -58301,38 +58298,38 @@ uGF uGF uGF uGF -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS ubb tJs ubb ubb -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS vby vby juQ @@ -58504,15 +58501,15 @@ nsK "} (115,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS uGF uGF uGF @@ -58524,35 +58521,35 @@ vwm uGF uGF uGF -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -ubb -ubb -ubb -ubb -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +ubb +ubb +ubb +ubb +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS tyz vby vby @@ -58726,17 +58723,17 @@ nsK "} (116,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS uGF uGF uGF @@ -58747,33 +58744,33 @@ uGF uGF uGF uGF -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -ubb -ubb -ubb -ubb -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +ubb +ubb +ubb +ubb +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS tyz tyz vby @@ -58948,17 +58945,17 @@ nsK "} (117,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS uGF uGF uGF @@ -58969,33 +58966,33 @@ uGF uGF uGF uGF -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -ubb -ubb -ubb -ubb -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +ubb +ubb +ubb +ubb +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS tyz tyz tyz @@ -59170,19 +59167,19 @@ nsK "} (118,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS uGF uGF uGF @@ -59192,32 +59189,32 @@ uGF uGF uGF uGF -xIt -xIt -xIt -xIt -xIt -xIt -ubb -ubb -ubb -ubb -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +ubb +ubb +ubb +ubb +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS jIg tyz tyz @@ -59392,21 +59389,21 @@ nsK "} (119,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS uGF xEg uGF @@ -59414,32 +59411,32 @@ uGF uGF uGF xEg -xIt -xIt -xIt -xIt -xIt -xIt -ubb -ubb -ubb -ubb -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +ubb +ubb +ubb +ubb +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS qHh qHh lyG @@ -59614,22 +59611,22 @@ nsK "} (120,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS uGF uGF uGF @@ -59637,31 +59634,31 @@ uGF uGF uGF uGF -xIt -xIt -xIt -xIt -ubb -ubb -ubb -ubb -ubb -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +ubb +ubb +ubb +ubb +ubb +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS qHh qHh lyG @@ -59836,21 +59833,21 @@ nsK "} (121,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS uGF uGF uGF @@ -59860,31 +59857,31 @@ uGF uGF uGF uGF -xIt -xIt +cgS +cgS ubb tJs ubb ubb tJs -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS lyG uYy uYy @@ -60058,25 +60055,25 @@ nsK "} (122,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS uGF uGF uGF -xIt +cgS uGF uGF uGF @@ -60088,26 +60085,26 @@ uGF ubb ubb ubb -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS uYy uYy uYy @@ -60280,26 +60277,26 @@ nsK "} (123,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS uGF uGF uGF -xIt -xIt +cgS +cgS uGF uGF uGF @@ -60310,27 +60307,27 @@ uGF ubb ubb ubb -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS uYy uYy uYy @@ -60502,27 +60499,27 @@ nsK "} (124,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS uGF uGF uGF -xIt -xIt -xIt +cgS +cgS +cgS xEg uGF uGF @@ -60531,28 +60528,28 @@ uGF uGF xEg ubb -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS uYy uYy uYy @@ -60724,10 +60721,10 @@ nsK "} (125,1,1) = {" cgS -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS vqi vqi vqi @@ -60743,38 +60740,38 @@ qTf qTf vqi vqi -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS uGF uGF uGF uGF uGF uGF -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS uYy uYy uYy @@ -60946,58 +60943,58 @@ nsK "} (126,1,1) = {" cgS -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS vqi -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS vBx vBx vBx vBx uLt -xIt +cgS vqi -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS vBx vBx vBx vBx vBx -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS uYy uYy uYy @@ -61168,15 +61165,15 @@ nsK "} (127,1,1) = {" cgS -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS vqi -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS vBx vBx vBx @@ -61185,41 +61182,41 @@ vBx vBx vBx vBx -xIt +cgS vqi -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS vBx vBx vBx vBx kjD -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS uYy uYy uYy @@ -61390,14 +61387,14 @@ nsK "} (128,1,1) = {" cgS -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS vqi -xIt -xIt -xIt +cgS +cgS +cgS vBx uLt vBx @@ -61407,40 +61404,40 @@ vBx vBx vBx uLt -xIt +cgS vqi -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS vBx uLt vBx kjD nWw -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS uYy uYy uYy @@ -61612,14 +61609,14 @@ nsK "} (129,1,1) = {" cgS -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS vqi -xIt -xIt -xIt +cgS +cgS +cgS vBx vBx vBx @@ -61629,39 +61626,39 @@ vBx vBx vBx vBx -xIt +cgS vqi -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS vBx vBx vBx ihG kjD -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS uYy uYy uYy @@ -61834,13 +61831,13 @@ nsK "} (130,1,1) = {" cgS -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS vqi -xIt -xIt +cgS +cgS vBx vBx vBx @@ -61851,38 +61848,38 @@ vBx vBx vBx vBx -xIt +cgS vqi -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS vBx vBx kjD kjD kjD -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS uYy uYy uYy @@ -62056,13 +62053,13 @@ nsK "} (131,1,1) = {" cgS -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS vqi -xIt -xIt +cgS +cgS vBx vBx vBx @@ -62073,37 +62070,37 @@ vBx vBx vBx vBx -xIt +cgS vqi -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS vBx vBx kjD kjD kjD -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS uYy uYy uYy @@ -62278,14 +62275,14 @@ nsK "} (132,1,1) = {" cgS -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS vqi -xIt -xIt -xIt +cgS +cgS +cgS vBx vBx vBx @@ -62297,35 +62294,35 @@ vBx vBx vBx vqi -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS vBx vBx kjD kjD kjD -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS xKP uYy uYy @@ -62500,13 +62497,13 @@ nsK "} (133,1,1) = {" cgS -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS vqi -xIt -xIt +cgS +cgS vBx vBx vBx @@ -62519,35 +62516,35 @@ vBx vBx vBx qIR -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS vBx vBx kjD kjD kjD -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS uYy uYy pKS @@ -62722,14 +62719,14 @@ nsK "} (134,1,1) = {" cgS -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS vqi -xIt -xIt -xIt +cgS +cgS +cgS vBx uLt oCF @@ -62742,11 +62739,11 @@ uLt vBx qIR vBx -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS vqi vqi vqi @@ -62764,11 +62761,11 @@ vqi vqi vqi vqi -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS uYy uYy uYy @@ -62944,13 +62941,13 @@ nsK "} (135,1,1) = {" cgS -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS vqi -xIt -xIt +cgS +cgS vBx vBx vBx @@ -62964,33 +62961,33 @@ vBx vBx qIR vBx -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS vqi -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS kjD kjD kjD kjD -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS vqi -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS uYy uYy uYy @@ -63166,13 +63163,13 @@ nsK "} (136,1,1) = {" cgS -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS vqi -xIt -xIt +cgS +cgS vBx vBx vBx @@ -63186,33 +63183,33 @@ vBx vBx qIR vBx -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS vqi -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS nWw kjD kjD kjD nWw -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS vqi -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS uYy uYy uYy @@ -63388,10 +63385,10 @@ nsK "} (137,1,1) = {" cgS -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS vqi vqi vqi @@ -63408,33 +63405,33 @@ qIR qIR qIR vBx -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS vqi -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS kjD kjD kjD kjD kjD -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS vqi -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS uYy uYy uYy @@ -63610,15 +63607,15 @@ nsK "} (138,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS vBx vBx vBx @@ -63630,33 +63627,33 @@ vBx vBx vBx vBx -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS vqi -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS kjD kjD kjD kjD kjD kjD -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS vqi -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS uYy uYy uYy @@ -63832,15 +63829,15 @@ nsK "} (139,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS vBx vBx vBx @@ -63852,33 +63849,33 @@ vBx vBx vBx vBx -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS vqi -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS kjD kjD kjD kjD kjD kjD -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS vqi -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS uYy uYy uYy @@ -64054,15 +64051,15 @@ nsK "} (140,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS vBx vBx vBx @@ -64074,17 +64071,17 @@ vBx vBx vBx vBx -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS vqi -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS kjD kjD kjD @@ -64092,9 +64089,9 @@ kjD kjD kjD kjD -xIt -xIt -xIt +cgS +cgS +cgS vqi kjD tzY @@ -64276,16 +64273,16 @@ nsK "} (141,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS vBx vBx vBx @@ -64295,19 +64292,19 @@ vBx vBx vBx vBx -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS vqi -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS kjD kjD kjD @@ -64315,8 +64312,8 @@ kjD ihG kjD kjD -xIt -xIt +cgS +cgS tOc kjD kjD @@ -64498,16 +64495,16 @@ nsK "} (142,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS vBx vBx vBx @@ -64518,18 +64515,18 @@ vBx vBx vBx vBx -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS vqi -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS kjD kjD kjD @@ -64537,7 +64534,7 @@ kjD kjD kjD kjD -xIt +cgS kjD tOc kjD @@ -64720,17 +64717,17 @@ nsK "} (143,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS uLt vBx vBx @@ -64740,18 +64737,18 @@ uLt vBx vBx vBx -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS vqi -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS kjD kjD nWw @@ -64942,37 +64939,37 @@ nsK "} (144,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS vBx vBx vBx vBx vBx vBx -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS vqi -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS vBx kjD kjD @@ -65164,43 +65161,43 @@ nsK "} (145,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS vBx vBx vBx vBx vBx -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS vqi -xIt -xIt -xIt +cgS +cgS +cgS uLt vBx vBx kjD kjD nWw -xIt -xIt +cgS +cgS kjD kjD kjD @@ -65386,51 +65383,51 @@ nsK "} (146,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS vBx vBx -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS vqi -xIt -xIt +cgS +cgS vBx vBx vBx vBx kjD -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS kjD kjD kjD vqi -xIt -xIt -xIt +cgS +cgS +cgS tzY tzY cIQ @@ -65608,31 +65605,31 @@ nsK "} (147,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS vBx vBx vBx vBx -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS vqi vqi qIR @@ -65650,10 +65647,10 @@ vqi tOc vqi vqi -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS tzY cIQ cIQ @@ -65830,52 +65827,52 @@ nsK "} (148,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS vBx vBx vBx vBx -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS vBx vBx vBx vBx vBx -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS tzY cIQ cIQ @@ -66052,52 +66049,52 @@ nsK "} (149,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS vBx vBx vBx vBx vBx -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS vBx vBx vBx vBx vBx -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS cIQ cIQ cIQ @@ -66274,52 +66271,52 @@ nsK "} (150,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS vBx vBx uLt vBx vBx uLt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS vBx vBx vBx vBx -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS tzY tzY cIQ @@ -66496,53 +66493,53 @@ nsK "} (151,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS vBx vBx vBx vBx vBx vBx -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS vBx uLt vBx vBx uLt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS tzY cIQ jIg @@ -66718,53 +66715,53 @@ nsK "} (152,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS vBx vBx vBx vBx vBx vBx -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS vBx vBx vBx vBx -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS tzY cIQ jIg @@ -66940,52 +66937,52 @@ nsK "} (153,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS vBx vBx vBx vBx vBx vBx -xIt -xIt +cgS +cgS vBx vBx vBx vBx -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS tzY tzY cIQ @@ -67162,21 +67159,21 @@ nsK "} (154,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS vBx vBx vBx @@ -67190,24 +67187,24 @@ vBx vBx uLt vBx -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS tzY tzY qDM @@ -67384,9 +67381,9 @@ nsK "} (155,1,1) = {" cgS -xIt -xIt -xIt +cgS +cgS +cgS vqi vqi vqi @@ -67413,24 +67410,24 @@ vBx vBx vBx vBx -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS tzY cIQ jIg @@ -67606,20 +67603,20 @@ nsK "} (156,1,1) = {" cgS -xIt -xIt -xIt +cgS +cgS +cgS vqi -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS vBx oCF vBx @@ -67635,23 +67632,23 @@ vBx vBx vBx vBx -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS kjD kjD -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS tzY tzY cIQ @@ -67828,19 +67825,19 @@ nsK "} (157,1,1) = {" cgS -xIt -xIt -xIt +cgS +cgS +cgS vqi -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS cLI vBx vBx @@ -67849,8 +67846,8 @@ qIR vBx vBx vBx -xIt -xIt +cgS +cgS vBx vBx vBx @@ -67858,21 +67855,21 @@ vBx vBx vBx vBx -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS kjD kjD kjD kjD kjD -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS tzY tzY cIQ @@ -68050,18 +68047,18 @@ nsK "} (158,1,1) = {" cgS -xIt -xIt -xIt +cgS +cgS +cgS vqi -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS vBx vBx vBx @@ -68070,19 +68067,19 @@ vBx qIR vBx vBx -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS vBx vBx vBx vBx vBx -xIt -xIt -xIt +cgS +cgS +cgS vqi vqi vqi @@ -68272,15 +68269,15 @@ nsK "} (159,1,1) = {" cgS -xIt -xIt -xIt +cgS +cgS +cgS vqi -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS csv uLt vBx @@ -68292,22 +68289,22 @@ vBx qIR vBx hix -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS uLt vBx vBx vBx uLt -xIt -xIt +cgS +cgS vqi -xIt -xIt +cgS +cgS nWw kjD kjD @@ -68494,14 +68491,14 @@ nsK "} (160,1,1) = {" cgS -xIt -xIt -xIt +cgS +cgS +cgS vqi -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS vBx vBx vBx @@ -68512,23 +68509,23 @@ vBx vBx vBx qIR -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS vBx vBx vBx vBx vBx vBx -xIt +cgS vqi -xIt +cgS kjD kjD kjD @@ -68716,14 +68713,14 @@ nsK "} (161,1,1) = {" cgS -xIt -xIt -xIt +cgS +cgS +cgS vqi -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS vBx vBx vBx @@ -68734,15 +68731,15 @@ vBx vBx vBx vqi -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS vBx vBx vBx @@ -68938,13 +68935,13 @@ nsK "} (162,1,1) = {" cgS -xIt -xIt -xIt +cgS +cgS +cgS vqi -xIt -xIt -xIt +cgS +cgS +cgS vBx vBx vBx @@ -68953,19 +68950,19 @@ vBx vBx vBx vBx -xIt -xIt +cgS +cgS vqi -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS vBx vBx vBx @@ -69160,12 +69157,12 @@ nsK "} (163,1,1) = {" cgS -xIt -xIt -xIt +cgS +cgS +cgS vqi -xIt -xIt +cgS +cgS vBx vBx vBx @@ -69174,21 +69171,21 @@ vBx vBx vBx vBx -xIt -xIt -xIt +cgS +cgS +cgS vqi -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS vBx uLt vBx @@ -69205,8 +69202,8 @@ kjD cpa ihG kjD -xIt -xIt +cgS +cgS tzY tzY vby @@ -69382,12 +69379,12 @@ nsK "} (164,1,1) = {" cgS -xIt -xIt -xIt +cgS +cgS +cgS vqi -xIt -xIt +cgS +cgS vBx vBx vBx @@ -69396,22 +69393,22 @@ vBx vBx vBx hgN -xIt -xIt -xIt +cgS +cgS +cgS vqi -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS vBx kjD kjD @@ -69426,9 +69423,9 @@ kjD kjD tOc kjD -xIt -xIt -xIt +cgS +cgS +cgS tzY cIQ vby @@ -69604,12 +69601,12 @@ nsK "} (165,1,1) = {" cgS -xIt -xIt -xIt +cgS +cgS +cgS vqi -xIt -xIt +cgS +cgS uLt vBx vBx @@ -69619,22 +69616,22 @@ vBx vBx vBx vBx -xIt -xIt +cgS +cgS vqi -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS kjD kjD tOc @@ -69644,13 +69641,13 @@ kjD kjD kjD kjD -xIt -xIt +cgS +cgS vqi -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS tzY cIQ jIg @@ -69826,13 +69823,13 @@ nsK "} (166,1,1) = {" cgS -xIt -xIt -xIt +cgS +cgS +cgS vqi -xIt -xIt -xIt +cgS +cgS +cgS vBx vBx vBx @@ -69841,38 +69838,38 @@ vBx vBx vBx vBx -xIt -xIt +cgS +cgS vqi -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS kjD tOc kjD kjD kjD -xIt +cgS kjD -xIt -xIt -xIt +cgS +cgS +cgS vqi -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS cIQ tzY jIg @@ -70048,14 +70045,14 @@ nsK "} (167,1,1) = {" cgS -xIt -xIt -xIt +cgS +cgS +cgS vqi -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS vBx pyu uLt @@ -70063,39 +70060,39 @@ vBx vBx uLt vBx -xIt -xIt +cgS +cgS vqi -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS kjD tOc kjD kjD nWw -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS vqi -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS tzY tyz pKS @@ -70270,39 +70267,39 @@ nsK "} (168,1,1) = {" cgS -xIt -xIt -xIt +cgS +cgS +cgS vqi -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS vBx vBx vBx vBx vBx -xIt -xIt -xIt +cgS +cgS +cgS vqi -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS tOc tOc cpa @@ -70313,12 +70310,12 @@ vqi vqi vqi vqi -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS rIi vby pKS @@ -70492,55 +70489,55 @@ nsK "} (169,1,1) = {" cgS -xIt -xIt -xIt +cgS +cgS +cgS vqi -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS vBx vBx vBx -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS vqi -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS rIi rIi pKS @@ -70714,9 +70711,9 @@ nsK "} (170,1,1) = {" cgS -xIt -xIt -xIt +cgS +cgS +cgS vqi vqi vqi @@ -70732,37 +70729,37 @@ vqi vqi vqi vqi -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS rIi pKS pKS @@ -70936,55 +70933,55 @@ nsK "} (171,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS rIi rIi rIi @@ -71158,55 +71155,55 @@ nsK "} (172,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS rIi rIi rIi @@ -71380,55 +71377,55 @@ nsK "} (173,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS rIi rIi rIi @@ -71602,55 +71599,55 @@ nsK "} (174,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS rIi rIi rIi diff --git a/_maps/map_files/Campaign maps/som_raid_base/som_raiding_base.dmm b/_maps/map_files/Campaign maps/som_raid_base/som_raiding_base.dmm new file mode 100644 index 0000000000000..798084c506985 --- /dev/null +++ b/_maps/map_files/Campaign maps/som_raid_base/som_raiding_base.dmm @@ -0,0 +1,32262 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"aa" = ( +/obj/structure/flora/jungle/bush, +/turf/open/floor/plating/ground/dirtgrassborder2, +/area/campaign/som_raiding/ground/jungle/west) +"ac" = ( +/turf/open/floor/plating/ground/mars/random/cave/darker, +/area/campaign/som_raiding/outpost/tunnel) +"ad" = ( +/turf/open/floor/plating/ground/dirtgrassborder2{ + dir = 1 + }, +/area/campaign/som_raiding/ground/jungle/south_east) +"af" = ( +/obj/structure/cable, +/turf/open/floor/plating/ground/concrete/edge, +/area/campaign/som_raiding/outpost/tunnel/west) +"ag" = ( +/obj/structure/table/black, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command/telecom) +"ah" = ( +/obj/machinery/vending/nanomed{ + dir = 4 + }, +/turf/open/floor/tile/dark/blue2{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/command/cic) +"ai" = ( +/turf/open/floor/tile/dark/green2{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/central_corridor) +"aj" = ( +/obj/structure/cable, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/tunnel/west) +"al" = ( +/obj/structure/cable, +/turf/open/floor/tile/brown{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/req/qm) +"am" = ( +/obj/structure/prop/brokenvendor/brokenuniformvendor/specialist, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/security) +"aq" = ( +/obj/structure/monorail, +/obj/item/target/syndicate, +/turf/open/floor/plating/ground/mars/random/cave/darker, +/area/campaign/som_raiding/outpost/firing_range) +"at" = ( +/obj/structure/table/reinforced, +/turf/open/floor/tile/dark/gray, +/area/campaign/som_raiding/outpost/req/qm) +"av" = ( +/turf/open/floor/plating/ground/concrete/edge{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/tunnel) +"ay" = ( +/obj/structure/prop/nt_computer, +/turf/open/floor/mainship/tcomms, +/area/campaign/som_raiding/outpost/command/telecom) +"az" = ( +/turf/open/floor/plating/ground/dirtgrassborder2/corner2{ + dir = 8 + }, +/area/campaign/som_raiding/ground/jungle/north) +"aA" = ( +/obj/machinery/door/airlock/maintenance, +/obj/structure/cable, +/turf/open/floor/plating, +/area/campaign/som_raiding/outpost/tunnel/west) +"aC" = ( +/obj/structure/cable, +/turf/open/floor/tile/dark/blue2{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/command) +"aD" = ( +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/security/south_post) +"aE" = ( +/turf/open/floor/plating, +/area/campaign/som_raiding/outpost/construction) +"aG" = ( +/obj/structure/bed/chair/alt{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/mainship/mono, +/area/campaign/som_raiding/outpost/living/briefing) +"aH" = ( +/turf/open/floor/tile/brown{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/req/qm) +"aI" = ( +/obj/structure/window/framed/mainship/gray, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/living) +"aJ" = ( +/turf/open/floor/plating/ground/concrete/lines{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/req) +"aM" = ( +/obj/structure/prop/mainship/gelida/rails, +/obj/effect/turf_decal/sandedge{ + dir = 4 + }, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle) +"aP" = ( +/obj/structure/largecrate/random/case/double, +/turf/open/floor/tile/brown{ + dir = 9 + }, +/area/campaign/som_raiding/outpost/req/qm) +"aQ" = ( +/turf/open/floor/plating/ground/dirtgrassborder2/corner{ + dir = 8 + }, +/area/campaign/som_raiding/ground/jungle/south) +"aT" = ( +/obj/structure/ship_ammo/cas/bomblet, +/turf/open/floor/tile/dark/brown2{ + dir = 5 + }, +/area/campaign/som_raiding/outpost/req/secure) +"aU" = ( +/obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/cope/predeployed, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/tunnel) +"aW" = ( +/obj/structure/table/mainship, +/obj/item/tool/kitchen/tray, +/obj/effect/spawner/random/food_or_drink/burger, +/obj/effect/spawner/random/food_or_drink/burger, +/turf/open/floor/tile/barber, +/area/campaign/som_raiding/outpost/living/kitchen) +"aY" = ( +/obj/machinery/light, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/security) +"bd" = ( +/obj/structure/cable, +/obj/effect/spawner/random/engineering/tool, +/turf/open/floor/plating, +/area/campaign/som_raiding/outpost/maintenance/med) +"be" = ( +/obj/machinery/light, +/obj/structure/closet/firecloset/full, +/turf/open/floor/tile/brown, +/area/campaign/som_raiding/outpost/req/qm) +"bg" = ( +/obj/structure/platform{ + dir = 4 + }, +/turf/open/floor/tile/dark/gray, +/area/campaign/som_raiding/outpost/req/qm) +"bh" = ( +/obj/structure/largecrate/supply/explosives/mortar_he, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req) +"bi" = ( +/obj/structure/largecrate/random/case/double, +/turf/open/floor/tile/dark/brown2{ + dir = 10 + }, +/area/campaign/som_raiding/outpost/req/secure) +"bk" = ( +/obj/structure/rock/variable/jungle_large, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/north) +"bl" = ( +/turf/open/floor/plating/ground/dirtgrassborder2{ + dir = 4 + }, +/area/campaign/som_raiding/ground/jungle/west) +"bp" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/mainship/mono, +/area/campaign/som_raiding/outpost/central_corridor) +"bq" = ( +/obj/structure/cable, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/security/south_post) +"bs" = ( +/obj/machinery/light/red{ + dir = 8 + }, +/turf/open/floor/tile/dark/blue2{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/command/cic) +"bt" = ( +/obj/structure/rock/variable/jungle, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/south) +"bv" = ( +/obj/structure/bed/chair/office/dark{ + dir = 8 + }, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/security/southeast_post) +"by" = ( +/obj/structure/prop/mainship/gelida/rails{ + dir = 1 + }, +/obj/effect/turf_decal/sandedge{ + dir = 4 + }, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle) +"bz" = ( +/obj/structure/cable, +/turf/open/floor/plating, +/area/campaign/som_raiding/outpost/maintenance) +"bA" = ( +/turf/closed/mineral/smooth, +/area/campaign/som_raiding/outpost/security/cargo_post) +"bB" = ( +/obj/effect/turf_decal/sandedge/corner2{ + dir = 8 + }, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/north) +"bC" = ( +/obj/structure/mine_structure/wooden/support_wall/broken, +/turf/open/floor/plating/ground/mars/random/cave/darker, +/area/campaign/som_raiding/cave/tunnel) +"bD" = ( +/obj/effect/landmark/corpsespawner/marine/regular, +/turf/open/floor/plating/ground/mars/random/cave/darker, +/area/campaign/som_raiding/outpost/construction) +"bE" = ( +/turf/open/floor/plating/dmg3, +/area/campaign/som_raiding/outpost/construction) +"bF" = ( +/turf/closed/gm/dense, +/area/campaign/som_raiding/ground/jungle) +"bH" = ( +/obj/machinery/door/airlock/multi_tile/mainship/blackgeneric/glass, +/turf/open/floor/tile/dark/gray, +/area/campaign/som_raiding/outpost/req/qm) +"bJ" = ( +/obj/structure/rack, +/obj/item/weapon/gun/rifle/standard_carbine, +/obj/item/weapon/gun/rifle/standard_carbine, +/turf/open/floor/tile/dark/brown2/corner{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/req/secure) +"bK" = ( +/obj/machinery/light, +/turf/open/floor/plating/ground/mars/random/cave/darker, +/area/campaign/som_raiding/outpost/firing_range) +"bL" = ( +/obj/effect/spawner/random/misc/structure/closet/welding, +/turf/open/floor/tile/dark/yellow2{ + dir = 6 + }, +/area/campaign/som_raiding/outpost/engineering) +"bM" = ( +/obj/structure/flora/jungle/large_bush, +/turf/open/floor/plating/ground/dirtgrassborder2/corner2{ + dir = 1 + }, +/area/campaign/som_raiding/ground/jungle/south_west) +"bN" = ( +/obj/structure/cable, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/tile/brown{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/req/aux) +"bO" = ( +/obj/effect/landmark/corpsespawner/bridgeofficer/regular, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/plating/ground/mars/random/cave/darker, +/area/campaign/som_raiding/outpost/construction) +"bQ" = ( +/obj/structure/rack, +/turf/open/floor/tile/dark/brown2, +/area/campaign/som_raiding/outpost/req/secure) +"bR" = ( +/obj/effect/decal/cleanable/blood/drip, +/turf/open/floor/plating/ground/mars/random/cave/darker, +/area/campaign/som_raiding/outpost/construction) +"bS" = ( +/obj/structure/cable, +/obj/structure/extinguisher_cabinet{ + dir = 4 + }, +/turf/open/floor/tile/dark/red2{ + dir = 9 + }, +/area/campaign/som_raiding/outpost/security/north_post) +"bU" = ( +/obj/structure/flora/jungle/large_bush, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/west) +"bV" = ( +/turf/open/ground/grass/beach/corner2{ + dir = 8 + }, +/area/campaign/som_raiding/ground/jungle/north) +"bW" = ( +/obj/structure/window/reinforced, +/obj/machinery/computer/som_two{ + dir = 1 + }, +/turf/open/floor/tile/dark/blue2{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/command) +"bX" = ( +/obj/structure/cable, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/living) +"bY" = ( +/obj/structure/filingcabinet, +/obj/machinery/light{ + light_color = "#da2f1b" + }, +/turf/open/floor/tile/dark/red2{ + dir = 10 + }, +/area/campaign/som_raiding/outpost/security/southeast_post) +"cb" = ( +/obj/structure/cable, +/obj/machinery/door/airlock/multi_tile/mainship/blackgeneric/glass, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/security) +"cc" = ( +/obj/structure/rock/variable/jungle/big, +/turf/open/floor/plating/ground/dirtgrassborder2/corner{ + dir = 4 + }, +/area/campaign/som_raiding/ground/jungle/north) +"cd" = ( +/turf/closed/wall/mainship/gray, +/area/campaign/som_raiding/outpost/req/secure) +"ce" = ( +/obj/structure/prop/mainship/gelida/rails{ + dir = 1 + }, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/south_east) +"cg" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/plating, +/area/campaign/som_raiding/outpost/maintenance/cic) +"ch" = ( +/obj/structure/rack, +/turf/open/floor/freezer, +/area/campaign/som_raiding/outpost/living/kitchen) +"ci" = ( +/obj/structure/closet/firecloset/full, +/turf/open/floor/tile/dark/blue2{ + dir = 9 + }, +/area/campaign/som_raiding/outpost/command) +"cj" = ( +/obj/machinery/power/apc{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command/living) +"ck" = ( +/obj/structure/flora/jungle/grass/thin, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/south_east) +"cl" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/tile/dark/green2{ + dir = 5 + }, +/area/campaign/som_raiding/outpost/living) +"co" = ( +/obj/structure/closet/firecloset, +/turf/open/floor/tile/dark/yellow2, +/area/campaign/som_raiding/outpost/engineering) +"cq" = ( +/obj/structure/largecrate/supply/weapons/pistols, +/turf/open/floor/tile/dark/brown2{ + dir = 10 + }, +/area/campaign/som_raiding/outpost/req/secure) +"cr" = ( +/obj/machinery/power/apc, +/obj/structure/cable, +/turf/open/floor/tile/dark/green2{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/living) +"cs" = ( +/obj/structure/largecrate/random/case/double, +/turf/open/floor/tile/dark/brown2{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/req/secure) +"ct" = ( +/turf/open/floor/tile/dark/green2{ + dir = 10 + }, +/area/campaign/som_raiding/outpost/central_corridor) +"cu" = ( +/turf/open/floor/mainship/red{ + dir = 6 + }, +/area/campaign/som_raiding/outpost/living/briefing) +"cv" = ( +/obj/machinery/power/terminal{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/tile/dark/yellow2, +/area/campaign/som_raiding/outpost/engineering) +"cw" = ( +/obj/structure/flora/jungle/grass, +/turf/open/floor/plating/ground/dirtgrassborder2/corner2{ + dir = 8 + }, +/area/campaign/som_raiding/ground/jungle/north) +"cx" = ( +/obj/machinery/door/airlock/mainship/security, +/obj/structure/cable, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/security/cargo_post) +"cA" = ( +/obj/structure/prop/vehicle/crane{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req/north) +"cB" = ( +/obj/structure/bed/chair/office/dark{ + dir = 1 + }, +/turf/open/floor/tile/dark/blue2/corner{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/command/north) +"cC" = ( +/turf/open/floor/plating/ground/dirtgrassborder2/corner2{ + dir = 4 + }, +/area/campaign/som_raiding/ground/jungle/south) +"cD" = ( +/obj/structure/table/mainship, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command/living) +"cF" = ( +/turf/open/floor/plating/dmg2, +/area/campaign/som_raiding/outpost/construction) +"cJ" = ( +/obj/machinery/computer/body_scanconsole, +/obj/structure/cable, +/turf/open/floor/mainship/sterile/dark, +/area/campaign/som_raiding/outpost/medbay) +"cM" = ( +/turf/open/floor/tile/brown{ + dir = 9 + }, +/area/campaign/som_raiding/outpost/req/aux) +"cN" = ( +/obj/structure/platform_decoration, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req) +"cP" = ( +/obj/structure/bed/bunkbed, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/tile/dark/green2{ + dir = 6 + }, +/area/campaign/som_raiding/outpost/living) +"cS" = ( +/obj/effect/turf_decal/sandedge/corner2{ + dir = 1 + }, +/obj/structure/flora/jungle/grass, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/south) +"cT" = ( +/obj/structure/cable, +/turf/open/floor/tile/dark/red2{ + dir = 5 + }, +/area/campaign/som_raiding/outpost/security/south_post) +"cU" = ( +/obj/structure/morgue{ + dir = 2 + }, +/turf/open/floor/freezer, +/area/campaign/som_raiding/outpost/medbay) +"cV" = ( +/obj/structure/bed/chair/office/dark{ + dir = 4 + }, +/obj/machinery/light, +/turf/open/floor/tile/dark/blue2, +/area/campaign/som_raiding/outpost/command/north) +"cW" = ( +/obj/structure/largecrate/supply/ammo/standard_ammo, +/turf/open/floor/tile/dark/brown2{ + dir = 9 + }, +/area/campaign/som_raiding/outpost/req/secure) +"cX" = ( +/obj/structure/cable, +/turf/open/floor/tile/dark/gray, +/area/campaign/som_raiding/outpost/construction) +"cY" = ( +/obj/structure/table/mainship, +/obj/item/tool/kitchen/rollingpin, +/obj/effect/spawner/random/food_or_drink/kitchenknife, +/turf/open/floor/tile/barber, +/area/campaign/som_raiding/outpost/living/kitchen) +"da" = ( +/obj/structure/reagent_dispensers/water_cooler, +/turf/open/floor/tile/dark/blue2{ + dir = 10 + }, +/area/campaign/som_raiding/outpost/command/cic) +"db" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/plating/ground/concrete/lines{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/tunnel) +"dd" = ( +/obj/structure/table/black, +/obj/effect/spawner/random/food_or_drink/donut, +/turf/open/floor/tile/dark/blue2{ + dir = 10 + }, +/area/campaign/som_raiding/outpost/command/north) +"dg" = ( +/turf/open/floor/tile/dark/blue2{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/command/captain) +"dk" = ( +/obj/structure/flora/jungle/grass/thin, +/turf/open/floor/plating/ground/dirtgrassborder2/corner2{ + dir = 4 + }, +/area/campaign/som_raiding/ground/jungle/north) +"dm" = ( +/obj/structure/mine_structure/cart, +/turf/open/floor/plating/ground/mars/random/cave/darker, +/area/campaign/som_raiding/cave/tunnel) +"dn" = ( +/obj/structure/cable, +/obj/machinery/power/apc{ + dir = 8 + }, +/turf/open/floor/tile/brown{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/req/qm) +"dp" = ( +/obj/effect/landmark/patrol_point/som/som_22, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/north) +"dt" = ( +/obj/machinery/vending/snack, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command/living) +"dv" = ( +/obj/effect/turf_decal/sandedge{ + dir = 8 + }, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle) +"dw" = ( +/obj/machinery/vending/nanomed{ + dir = 8 + }, +/turf/open/floor/tile/brown{ + dir = 5 + }, +/area/campaign/som_raiding/outpost/req/qm) +"dy" = ( +/obj/machinery/computer/som, +/turf/open/floor/tile/dark/blue2{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/command/cic) +"dz" = ( +/obj/structure/cable, +/turf/open/floor/tile/dark/yellow2{ + dir = 5 + }, +/area/campaign/som_raiding/outpost/engineering) +"dA" = ( +/obj/machinery/computer/som_two{ + dir = 1 + }, +/turf/open/floor/tile/dark/blue2, +/area/campaign/som_raiding/outpost/command/cic) +"dB" = ( +/obj/structure/table/black, +/obj/item/explosive/grenade/incendiary/som, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/security) +"dC" = ( +/turf/open/floor/plating/ground/dirtgrassborder2{ + dir = 4 + }, +/area/campaign/som_raiding/ground/jungle/south_west) +"dD" = ( +/obj/structure/table/reinforced, +/obj/effect/spawner/random/engineering/tool, +/obj/effect/spawner/random/engineering/tool, +/turf/open/floor/tile/brown{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/req/qm) +"dE" = ( +/obj/machinery/light{ + light_color = "#da2f1b" + }, +/obj/structure/cable, +/turf/open/floor/tile/showroom, +/area/campaign/som_raiding/outpost/living/bathroom) +"dF" = ( +/turf/open/floor/plating, +/area/campaign/som_raiding/outpost/maintenance/req) +"dG" = ( +/obj/effect/spawner/random/engineering/structure/tank_dispenser, +/turf/open/floor/mainship/mono, +/area/campaign/som_raiding/outpost/construction) +"dI" = ( +/obj/structure/flora/jungle/grass, +/turf/open/floor/plating/ground/dirtgrassborder2/corner, +/area/campaign/som_raiding/ground/jungle/south_west) +"dJ" = ( +/obj/machinery/light/red{ + dir = 4 + }, +/turf/open/floor/tile/dark/blue2{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/command/cic) +"dM" = ( +/obj/structure/flora/jungle/bush, +/turf/open/floor/plating/ground/dirtgrassborder2, +/area/campaign/som_raiding/ground/jungle/north) +"dN" = ( +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command/cic) +"dO" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/tile/dark/red2{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/security/south_post) +"dR" = ( +/obj/structure/prop/mainship/gelida/rails{ + dir = 1 + }, +/obj/structure/mine_structure/cart, +/obj/effect/turf_decal/sandedge{ + dir = 4 + }, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/south) +"dT" = ( +/turf/open/floor/plating/ground/dirtgrassborder2/corner{ + dir = 8 + }, +/area/campaign/som_raiding/ground/jungle/south_west) +"dU" = ( +/obj/structure/flora/jungle/bush, +/obj/structure/flora/jungle/grass, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/south_east) +"dV" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/plating, +/area/campaign/som_raiding/outpost/maintenance/engie) +"dW" = ( +/turf/closed/wall/mainship/gray, +/area/campaign/som_raiding/outpost/living) +"dZ" = ( +/obj/structure/prop/mainship/gelida/rails{ + dir = 1 + }, +/turf/open/floor/plating/ground/mars/random/cave, +/area/campaign/som_raiding/outpost/tunnel) +"ea" = ( +/obj/machinery/door/airlock/maintenance{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/security/cargo_post) +"ec" = ( +/turf/open/floor/tile/dark/blue2{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/command) +"ef" = ( +/turf/open/floor/plating, +/area/campaign/som_raiding/outpost/maintenance/med) +"ei" = ( +/obj/structure/reagent_dispensers/fueltank/barrel, +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/turf_decal/box, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req) +"ej" = ( +/turf/closed/mineral/smooth, +/area/campaign/som_raiding/outpost/maintenance/med) +"ek" = ( +/obj/structure/stairs/seamless/platform_vert{ + dir = 8 + }, +/turf/open/floor/tile/dark/gray, +/area/campaign/som_raiding/outpost/req/north) +"em" = ( +/obj/structure/bed/chair/office/dark{ + dir = 8 + }, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/security/south_post) +"eq" = ( +/obj/structure/largecrate/random/case, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req/north) +"er" = ( +/obj/effect/turf_decal/sandedge/corner2{ + dir = 1 + }, +/obj/structure/flora/jungle/grass, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle) +"et" = ( +/obj/structure/bed/bunkbed, +/turf/open/floor/tile/dark/green2{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/living) +"eu" = ( +/obj/structure/prop/brokenvendor/engivend, +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/security) +"ev" = ( +/turf/open/floor/tile/dark/green2{ + dir = 9 + }, +/area/campaign/som_raiding/outpost/central_corridor) +"ew" = ( +/obj/structure/window/framed/mainship/gray, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/central_corridor) +"ex" = ( +/turf/open/floor/plating/ground/dirtgrassborder2/corner{ + dir = 1 + }, +/area/campaign/som_raiding/ground/jungle/south) +"ez" = ( +/obj/structure/cargo_container/ch_red, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req) +"eA" = ( +/obj/machinery/door/airlock/mainship/security/glass/free_access{ + dir = 2 + }, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command/captain) +"eB" = ( +/obj/structure/rock/variable/jungle/big, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/west) +"eC" = ( +/obj/effect/turf_decal/warning_stripes/thick, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command/telecom) +"eD" = ( +/obj/structure/rack, +/obj/effect/spawner/random/misc/earmuffs, +/turf/open/floor/tile/dark/gray, +/area/campaign/som_raiding/outpost/req/aux) +"eE" = ( +/obj/structure/table/black, +/turf/open/floor/plating, +/area/campaign/som_raiding/outpost/firing_range) +"eF" = ( +/obj/structure/bed/chair/office/dark, +/turf/open/floor/tile/dark/gray, +/area/campaign/som_raiding/outpost/req/qm) +"eG" = ( +/obj/structure/cable, +/turf/open/floor/mainship/sterile/dark, +/area/campaign/som_raiding/outpost/medbay) +"eH" = ( +/turf/open/floor/plating/ground/dirtgrassborder2{ + dir = 4 + }, +/area/campaign/som_raiding/ground/jungle/north) +"eJ" = ( +/obj/structure/table/reinforced, +/obj/item/clothing/glasses/hud/health, +/obj/item/clothing/glasses/hud/health, +/obj/item/storage/box/gloves{ + pixel_x = -5; + pixel_y = -5 + }, +/obj/item/storage/box/masks, +/turf/open/floor/mainship/sterile/corner{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/medbay) +"eK" = ( +/obj/machinery/light{ + light_color = "#da2f1b" + }, +/turf/open/floor/tile/brown, +/area/campaign/som_raiding/outpost/req/aux) +"eM" = ( +/obj/structure/largecrate/random/case, +/obj/structure/cable, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req) +"eN" = ( +/obj/effect/turf_decal/sandedge{ + dir = 8 + }, +/turf/open/floor/plating/ground/dirtgrassborder2/corner{ + dir = 4 + }, +/area/campaign/som_raiding/ground/jungle) +"eQ" = ( +/obj/structure/prop/nt_computer/rack, +/turf/open/floor/mainship/tcomms, +/area/campaign/som_raiding/outpost/command/telecom) +"eT" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/tile/showroom, +/area/campaign/som_raiding/outpost/living/bathroom) +"eV" = ( +/obj/effect/turf_decal/sandedge/corner2, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/tunnel/west) +"eW" = ( +/turf/closed/gm/dense, +/area/campaign/som_raiding/ground/jungle/north) +"eX" = ( +/obj/structure/flora/jungle/grass, +/obj/structure/flora/jungle/grass, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle) +"eY" = ( +/obj/structure/flora/grass/tallgrass/autosmooth, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/north) +"fa" = ( +/obj/structure/table/reinforced, +/obj/effect/spawner/random/engineering/tech_supply, +/obj/effect/spawner/random/engineering/metal, +/turf/open/floor/tile/brown{ + dir = 10 + }, +/area/campaign/som_raiding/outpost/req/qm) +"fb" = ( +/obj/structure/largecrate/random/case/double, +/turf/open/floor/mainship/mono, +/area/campaign/som_raiding/outpost/central_corridor) +"fd" = ( +/obj/structure/extinguisher_cabinet{ + dir = 1 + }, +/obj/effect/turf_decal/box, +/obj/structure/reagent_dispensers/fueltank/xfuel, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req) +"fe" = ( +/turf/closed/wall/mainship/gray, +/area/campaign/som_raiding/outpost/req/north) +"fg" = ( +/turf/open/floor/plating/ground/concrete/edge{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/req/north) +"fj" = ( +/turf/open/floor/tile/dark/brown2{ + dir = 6 + }, +/area/campaign/som_raiding/outpost/req/secure) +"fk" = ( +/obj/machinery/door/airlock/hatch{ + dir = 1 + }, +/turf/open/floor/mainship/mono, +/area/campaign/som_raiding/outpost/central_corridor) +"fl" = ( +/obj/structure/flora/jungle/bush, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/west) +"fn" = ( +/obj/structure/table/reinforced, +/obj/item/healthanalyzer, +/obj/effect/spawner/random/medical/medbottle, +/obj/effect/spawner/random/medical/firstaid, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/mainship/sterile/side{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/medbay) +"fo" = ( +/turf/open/floor/plating/ground/dirtgrassborder2{ + dir = 8 + }, +/area/campaign/som_raiding/ground/jungle/north) +"fp" = ( +/obj/structure/cable, +/turf/open/floor/plating, +/area/campaign/som_raiding/outpost/maintenance/operation) +"fq" = ( +/obj/effect/turf_decal/sandedge, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/north) +"fr" = ( +/obj/structure/cable, +/obj/machinery/power/fusion_engine/preset, +/turf/open/floor/tile/dark/yellow2{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/engineering) +"fs" = ( +/obj/machinery/power/apc, +/obj/structure/cable, +/turf/open/floor/tile/neutral/full, +/area/campaign/som_raiding/outpost/living/canteen) +"ft" = ( +/obj/structure/cable, +/turf/open/floor/tile/dark/brown2{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/req/secure) +"fu" = ( +/obj/structure/cable, +/turf/open/floor/mainship/mono, +/area/campaign/som_raiding/outpost/tunnel) +"fv" = ( +/obj/machinery/vending/boozeomat, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command/living) +"fw" = ( +/obj/machinery/vending/coffee, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/tile/brown{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/req/qm) +"fz" = ( +/obj/machinery/vending/snack, +/turf/open/floor/tile/neutral/full, +/area/campaign/som_raiding/outpost/living/canteen) +"fA" = ( +/turf/open/floor/tile/dark/blue2{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/command/cic) +"fC" = ( +/obj/structure/largecrate/random/case/small, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/req/secure) +"fD" = ( +/obj/machinery/light{ + light_color = "#da2f1b" + }, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/engineering) +"fE" = ( +/obj/structure/flora/jungle/grass/thin, +/turf/open/floor/plating/ground/dirtgrassborder2/corner{ + dir = 1 + }, +/area/campaign/som_raiding/ground/jungle/south_west) +"fF" = ( +/obj/structure/prop/brokenvendor/brokenmarinemedvendor, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/security) +"fG" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/structure/largecrate/random/case/double, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req/north) +"fH" = ( +/obj/machinery/door/airlock/maintenance{ + dir = 1 + }, +/turf/open/floor/plating, +/area/campaign/som_raiding/outpost/living/canteen) +"fN" = ( +/turf/closed/gm/dense, +/area/campaign/som_raiding/ground/jungle/west) +"fO" = ( +/obj/machinery/door/airlock/maintenance, +/obj/structure/cable, +/turf/open/floor/plating, +/area/campaign/som_raiding/outpost/req/north) +"fQ" = ( +/obj/structure/largecrate/supply/supplies, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req/north) +"fR" = ( +/turf/open/floor/tile/dark/brown2{ + dir = 9 + }, +/area/campaign/som_raiding/outpost/req/secure) +"fT" = ( +/turf/open/ground/grass/beach{ + dir = 1 + }, +/area/campaign/som_raiding/ground/jungle/north) +"fX" = ( +/obj/structure/tankholder/extinguisher, +/turf/open/floor/tile/dark/brown2, +/area/campaign/som_raiding/outpost/req/secure) +"fY" = ( +/obj/structure/cable, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/plating, +/area/campaign/som_raiding/outpost/tunnel/west) +"fZ" = ( +/obj/structure/flora/jungle/grass/thin, +/obj/effect/landmark/mob_spawner/farwa, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle) +"ga" = ( +/turf/closed/mineral/smooth, +/area/campaign/som_raiding/outpost/req/qm) +"gc" = ( +/obj/structure/closet/crate/internals, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req/north) +"gf" = ( +/obj/machinery/door/airlock/multi_tile/mainship/medidoor{ + dir = 1 + }, +/turf/open/floor/mainship/sterile/dark, +/area/campaign/som_raiding/outpost/medbay) +"gh" = ( +/obj/structure/closet/secure_closet/freezer/fridge, +/obj/item/reagent_containers/food/snacks/grown/potato, +/obj/item/reagent_containers/food/snacks/grown/potato, +/obj/item/reagent_containers/food/snacks/meat/monkey, +/obj/item/reagent_containers/food/snacks/meat/monkey, +/obj/item/reagent_containers/food/snacks/meat/monkey, +/obj/item/reagent_containers/food/snacks/grown/potato, +/obj/item/reagent_containers/food/snacks/grown/potato, +/obj/item/reagent_containers/food/snacks/grown/tomato, +/obj/item/reagent_containers/food/snacks/grown/tomato, +/obj/item/reagent_containers/food/snacks/grown/tomato, +/obj/item/reagent_containers/food/snacks/grown/tomato, +/obj/item/reagent_containers/food/snacks/grown/tomato, +/turf/open/floor/freezer, +/area/campaign/som_raiding/outpost/living/kitchen) +"gi" = ( +/obj/structure/table/reinforced, +/obj/effect/spawner/random/engineering/tool, +/turf/open/floor/tile/brown{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/req/qm) +"gl" = ( +/turf/open/floor/tile/brown{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/req/aux) +"gm" = ( +/turf/open/floor/plating/ground/dirtgrassborder2/corner{ + dir = 1 + }, +/area/campaign/som_raiding/ground/jungle/south_east) +"gn" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command/living) +"go" = ( +/obj/structure/flora/jungle/bush, +/turf/open/floor/plating/ground/dirtgrassborder2, +/area/campaign/som_raiding/ground/jungle/south_west) +"gp" = ( +/obj/structure/largecrate, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/tunnel) +"gr" = ( +/obj/machinery/computer/som_two, +/turf/open/floor/tile/dark/blue2{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/command/north) +"gs" = ( +/turf/open/floor/tile/dark/blue2, +/area/campaign/som_raiding/outpost/command) +"gt" = ( +/turf/open/floor/plating/ground/dirtgrassborder2/corner{ + dir = 8 + }, +/area/campaign/som_raiding/ground/jungle/north) +"gu" = ( +/obj/structure/flora/jungle/grass, +/turf/open/floor/plating/ground/dirtgrassborder2{ + dir = 1 + }, +/area/campaign/som_raiding/ground/jungle/south) +"gw" = ( +/obj/structure/cable, +/turf/open/floor/tile/dark/gray, +/area/campaign/som_raiding/outpost/living/canteen) +"gx" = ( +/turf/open/floor/tile/dark/blue2/corner{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/command/cic) +"gy" = ( +/obj/structure/flora/grass/tallgrass/autosmooth, +/turf/open/floor/plating/ground/dirtgrassborder2/corner, +/area/campaign/som_raiding/ground/jungle) +"gz" = ( +/obj/structure/table/reinforced, +/obj/item/storage/firstaid/adv, +/obj/item/storage/firstaid/adv, +/obj/machinery/light, +/turf/open/floor/mainship/sterile/side, +/area/campaign/som_raiding/outpost/medbay) +"gA" = ( +/turf/open/floor/tile/dark/brown2, +/area/campaign/som_raiding/outpost/req/secure) +"gB" = ( +/obj/structure/rack, +/obj/effect/spawner/random/engineering/tool, +/obj/effect/spawner/random/engineering/tool, +/turf/open/floor/plating, +/area/campaign/som_raiding/outpost/maintenance/req) +"gC" = ( +/obj/structure/table/reinforced, +/obj/effect/spawner/random/engineering/powercell, +/turf/open/floor/tile/brown{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/req/qm) +"gD" = ( +/obj/machinery/computer/som, +/turf/open/floor/tile/dark/blue2{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/command/north) +"gF" = ( +/obj/structure/table/black, +/obj/machinery/computer/emails, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command) +"gG" = ( +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command) +"gH" = ( +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command/telecom) +"gI" = ( +/turf/open/floor/plating/ground/dirtgrassborder2/corner2{ + dir = 8 + }, +/area/campaign/som_raiding/ground/jungle) +"gJ" = ( +/turf/closed/wall/mainship/gray, +/area/campaign/som_raiding/outpost/living/kitchen) +"gK" = ( +/obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/cope/predeployed, +/turf/open/floor/plating/ground/mars/random/cave/darker, +/area/campaign/som_raiding/outpost/tunnel) +"gL" = ( +/obj/structure/prop/brokenvendor/surplusarmor, +/turf/open/floor/tile/dark/red2{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/security/southeast_post) +"gM" = ( +/obj/structure/cable, +/turf/open/floor/plating/ground/concrete/lines{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/tunnel) +"gN" = ( +/obj/structure/flora/jungle/bush, +/turf/open/floor/plating/ground/dirtgrassborder2, +/area/campaign/som_raiding/ground/jungle/south) +"gR" = ( +/obj/structure/table/black, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/firing_range) +"gS" = ( +/obj/structure/bed/chair/office/dark{ + dir = 1 + }, +/turf/open/floor/tile/dark/blue2{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/command) +"gU" = ( +/obj/structure/bed/chair/office/dark{ + dir = 8 + }, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command/telecom) +"gW" = ( +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command/living) +"gX" = ( +/turf/closed/wall/mainship/gray, +/area/campaign/som_raiding/outpost/maintenance/cic) +"gZ" = ( +/obj/structure/largecrate/random/barrel/blue, +/turf/open/floor/tile/dark/brown2{ + dir = 9 + }, +/area/campaign/som_raiding/outpost/req/secure) +"hb" = ( +/obj/effect/turf_decal/sandedge{ + dir = 1 + }, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/tunnel/west) +"hc" = ( +/obj/structure/largecrate/supply/powerloader, +/turf/open/floor/tile/dark/brown2{ + dir = 6 + }, +/area/campaign/som_raiding/outpost/req/secure) +"hd" = ( +/obj/structure/largecrate/random/barrel/green, +/turf/open/floor/tile/dark/brown2{ + dir = 5 + }, +/area/campaign/som_raiding/outpost/req/secure) +"he" = ( +/obj/machinery/door/airlock/maintenance{ + dir = 1 + }, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/security/southeast_post) +"hf" = ( +/turf/closed/wall/mainship/gray, +/area/campaign/som_raiding/outpost/engineering) +"hg" = ( +/obj/machinery/vending/coffee, +/turf/open/floor/tile/dark/green2{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/central_corridor) +"hi" = ( +/turf/open/floor/tile/dark/blue2/corner, +/area/campaign/som_raiding/outpost/command) +"hj" = ( +/obj/effect/turf_decal/sandedge/corner2{ + dir = 8 + }, +/turf/open/floor/plating/ground/mars/random/cave/darker, +/area/campaign/som_raiding/outpost/tunnel) +"hk" = ( +/turf/closed/wall/mainship/gray, +/area/campaign/som_raiding/outpost/security/cargo_post) +"hl" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/plating, +/area/campaign/som_raiding/outpost/maintenance/engie) +"ho" = ( +/obj/structure/bed/chair/alt{ + dir = 8 + }, +/turf/open/floor/tile/dark/green2{ + dir = 6 + }, +/area/campaign/som_raiding/outpost/central_corridor) +"hq" = ( +/obj/structure/closet/toolcloset, +/turf/open/floor/tile/brown{ + dir = 6 + }, +/area/campaign/som_raiding/outpost/req/qm) +"hs" = ( +/obj/effect/landmark/patrol_point/tgmc_23, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/south_west) +"ht" = ( +/obj/effect/turf_decal/sandedge{ + dir = 8 + }, +/turf/open/floor/plating/ground/dirtgrassborder2/corner{ + dir = 4 + }, +/area/campaign/som_raiding/ground/jungle/south) +"hu" = ( +/obj/structure/flora/jungle/bush, +/turf/open/floor/plating/ground/dirtgrassborder2/corner{ + dir = 1 + }, +/area/campaign/som_raiding/ground/jungle/west) +"hv" = ( +/obj/structure/window/framed/mainship/gray, +/turf/open/floor/mainship/mono, +/area/campaign/som_raiding/outpost/security/cargo_post) +"hw" = ( +/turf/open/ground/grass/beach{ + dir = 8 + }, +/area/campaign/som_raiding/ground/jungle/north) +"hx" = ( +/obj/structure/bed/chair/office/dark, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command/cic) +"hz" = ( +/obj/structure/largecrate/random/barrel/green, +/turf/open/floor/tile/brown{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/req/aux) +"hA" = ( +/obj/structure/monorail, +/turf/open/floor/plating/ground/mars/random/cave/darker, +/area/campaign/som_raiding/outpost/firing_range) +"hB" = ( +/obj/effect/turf_decal/warning_stripes/leader, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/security) +"hC" = ( +/obj/structure/closet/emcloset, +/turf/open/floor/tile/dark/green2{ + dir = 6 + }, +/area/campaign/som_raiding/outpost/central_corridor) +"hD" = ( +/obj/structure/cable, +/turf/open/floor/tile/dark/blue2, +/area/campaign/som_raiding/outpost/command) +"hE" = ( +/obj/machinery/power/smes/buildable/empty, +/obj/structure/cable, +/turf/open/floor/tile/dark/yellow2{ + dir = 5 + }, +/area/campaign/som_raiding/outpost/engineering) +"hF" = ( +/obj/structure/flora/grass/tallgrass/autosmooth, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/west) +"hI" = ( +/obj/structure/bed/bunkbed, +/turf/open/floor/tile/dark/green2, +/area/campaign/som_raiding/outpost/living) +"hK" = ( +/obj/effect/turf_decal/sandedge/corner{ + dir = 8 + }, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/tunnel) +"hL" = ( +/obj/machinery/door/airlock/multi_tile/mainship/engineering, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/req/north) +"hM" = ( +/obj/structure/table/black, +/turf/open/floor/tile/dark/blue2{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/command/north) +"hP" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/spawner/random/engineering/structure/gascan, +/turf/open/floor/tile/dark/yellow2{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/engineering) +"hR" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/tile/dark/green2{ + dir = 10 + }, +/area/campaign/som_raiding/outpost/living) +"hS" = ( +/obj/structure/filingcabinet, +/turf/open/floor/tile/brown{ + dir = 10 + }, +/area/campaign/som_raiding/outpost/req/aux) +"hT" = ( +/turf/closed/mineral/smooth, +/area/campaign/som_raiding/outpost/req) +"hU" = ( +/obj/structure/prop/vehicle/truck/destructible, +/turf/open/floor/plating/ground/mars/random/cave/darker, +/area/campaign/som_raiding/outpost/tunnel) +"hW" = ( +/obj/structure/stairs/seamless/platform_vert{ + dir = 8 + }, +/turf/open/floor/tile/dark/blue2, +/area/campaign/som_raiding/outpost/command) +"hZ" = ( +/turf/open/floor/tile/dark/brown2{ + dir = 5 + }, +/area/campaign/som_raiding/outpost/req/secure) +"ia" = ( +/obj/structure/platform_decoration{ + dir = 8 + }, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req) +"ib" = ( +/obj/structure/bed/chair/office/dark{ + dir = 8 + }, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command/cic) +"ic" = ( +/obj/machinery/status_display, +/turf/closed/wall/mainship/gray, +/area/campaign/som_raiding/outpost/living/briefing) +"id" = ( +/obj/effect/decal/cleanable/blood/splatter, +/turf/open/floor/plating/ground/mars/random/cave/darker, +/area/campaign/som_raiding/outpost/construction) +"ie" = ( +/obj/structure/cable, +/turf/open/floor/tile/dark/green2/corner{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/central_corridor) +"ig" = ( +/obj/structure/table/black, +/obj/machinery/computer/emails, +/turf/open/floor/tile/dark/blue2{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/command/north) +"ih" = ( +/obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/cope/predeployed, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/tunnel/west) +"ij" = ( +/turf/open/floor/tile/dark/brown2/corner, +/area/campaign/som_raiding/outpost/req/secure) +"ik" = ( +/obj/machinery/computer/telecomms/server, +/turf/open/floor/tile/dark/blue2{ + dir = 5 + }, +/area/campaign/som_raiding/outpost/command/north) +"il" = ( +/obj/structure/bed/chair/alt{ + dir = 1 + }, +/obj/machinery/light, +/turf/open/floor/mainship/red, +/area/campaign/som_raiding/outpost/living/briefing) +"in" = ( +/turf/open/floor/tile/dark/blue2/corner{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/command) +"io" = ( +/obj/structure/closet/firecloset/full, +/turf/open/floor/tile/dark/red2, +/area/campaign/som_raiding/outpost/security/southeast_post) +"ip" = ( +/obj/effect/turf_decal/sandedge/corner2, +/obj/structure/flora/jungle/grass, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/south) +"iq" = ( +/turf/open/floor/tile/dark/blue2/corner{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/command/north) +"is" = ( +/obj/machinery/power/terminal{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/engineering) +"iu" = ( +/obj/structure/flora/jungle/grass, +/turf/open/floor/plating/ground/dirtgrassborder2/corner{ + dir = 4 + }, +/area/campaign/som_raiding/ground/jungle/south_west) +"iv" = ( +/obj/effect/landmark/mob_spawner/farwa, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/north) +"iy" = ( +/obj/structure/prop/vehicle/truck/truckcargo/destructible{ + dir = 1 + }, +/turf/open/floor/plating/ground/mars/random/cave/darker, +/area/campaign/som_raiding/outpost/tunnel) +"iz" = ( +/obj/structure/bed/chair/alt{ + dir = 1 + }, +/turf/open/floor/mainship/red, +/area/campaign/som_raiding/outpost/living/briefing) +"iA" = ( +/obj/structure/cargo_container/hd, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req) +"iB" = ( +/turf/closed/wall/mainship/gray, +/area/campaign/som_raiding/outpost/central_corridor) +"iC" = ( +/obj/machinery/vending/nanomed{ + dir = 8 + }, +/turf/open/floor/mainship/sterile/corner, +/area/campaign/som_raiding/outpost/medbay) +"iD" = ( +/obj/structure/cable, +/turf/open/floor/mainship/red{ + dir = 5 + }, +/area/campaign/som_raiding/outpost/living/briefing) +"iE" = ( +/obj/structure/cargo_container{ + dir = 4 + }, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req) +"iF" = ( +/obj/structure/cable, +/turf/open/floor/plating, +/area/campaign/som_raiding/outpost/maintenance/engie) +"iG" = ( +/turf/open/floor/tile/dark/red2{ + dir = 10 + }, +/area/campaign/som_raiding/outpost/security/west_post) +"iI" = ( +/turf/open/floor/plating/ground/dirtgrassborder2/corner2{ + dir = 1 + }, +/area/campaign/som_raiding/ground/jungle) +"iJ" = ( +/obj/structure/ship_ammo/cas/minirocket/incendiary, +/turf/open/floor/tile/dark/brown2{ + dir = 5 + }, +/area/campaign/som_raiding/outpost/req/secure) +"iK" = ( +/obj/machinery/door/airlock/multi_tile/mainship/engineering, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/engineering) +"iL" = ( +/obj/structure/largecrate/random/barrel/white, +/turf/open/floor/tile/brown{ + dir = 5 + }, +/area/campaign/som_raiding/outpost/req/qm) +"iM" = ( +/obj/effect/turf_decal/sandedge/corner2{ + dir = 8 + }, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/south) +"iO" = ( +/obj/structure/bed/chair/office/dark, +/turf/open/floor/tile/dark/blue2{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/command) +"iP" = ( +/obj/machinery/door/airlock/hatch, +/turf/open/floor/tile/dark/brown2{ + dir = 10 + }, +/area/campaign/som_raiding/outpost/req/secure) +"iQ" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/tile/dark/brown2{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/req/secure) +"iR" = ( +/obj/machinery/power/apc, +/obj/structure/cable, +/turf/open/floor/tile/dark/red2{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/security/north_post) +"iS" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/plating/ground/mars/random/cave/darker, +/area/campaign/som_raiding/outpost/tunnel/west) +"iT" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/tile/dark/green2{ + dir = 9 + }, +/area/campaign/som_raiding/outpost/living) +"iU" = ( +/obj/structure/extinguisher_cabinet{ + dir = 1 + }, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/firing_range) +"iW" = ( +/obj/machinery/computer/som_two, +/turf/open/floor/tile/dark/blue2{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/command/cic) +"iZ" = ( +/obj/structure/cargo_container/nt, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req/north) +"jb" = ( +/obj/structure/flora/jungle/bush, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/south) +"jd" = ( +/obj/structure/rack, +/obj/effect/spawner/random/engineering/structure/handheld_lighting, +/turf/open/floor/tile/dark/blue2{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/command/north) +"jf" = ( +/turf/open/floor/tile/dark/red2{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/security/southeast_post) +"jh" = ( +/obj/structure/table/mainship, +/turf/open/floor/tile/dark/green2, +/area/campaign/som_raiding/outpost/central_corridor) +"ji" = ( +/obj/structure/cable, +/obj/machinery/power/apc{ + dir = 1 + }, +/turf/open/floor/plating, +/area/campaign/som_raiding/outpost/maintenance) +"jj" = ( +/obj/structure/prop/nt_computer/recorder, +/obj/machinery/light/red{ + dir = 1 + }, +/turf/open/floor/tile/dark/blue2{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/command/cic) +"jk" = ( +/obj/structure/ship_ammo/cas/heavygun/highvelocity, +/turf/open/floor/tile/dark/brown2, +/area/campaign/som_raiding/outpost/req/secure) +"jl" = ( +/obj/structure/cable, +/obj/machinery/door/airlock/hatch, +/turf/open/floor/tile/dark/gray, +/area/campaign/som_raiding/outpost/living/canteen) +"jn" = ( +/obj/machinery/computer/som_two{ + dir = 4 + }, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command/telecom) +"jo" = ( +/obj/effect/landmark/patrol_point/som/som_24, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/north) +"jp" = ( +/obj/structure/flora/grass/tallgrass/autosmooth, +/obj/effect/landmark/mob_spawner/farwa, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle) +"ju" = ( +/obj/structure/rack, +/obj/effect/spawner/random/engineering/structure/handheld_lighting, +/obj/effect/spawner/random/engineering/powercell, +/turf/open/floor/tile/dark/yellow2{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/engineering) +"jv" = ( +/obj/structure/sink{ + dir = 8 + }, +/obj/structure/mirror{ + dir = 8 + }, +/turf/open/floor/tile/showroom, +/area/campaign/som_raiding/outpost/living/bathroom) +"jw" = ( +/obj/structure/flora/jungle/grass/thin, +/turf/open/ground/grass/beach/corner2{ + dir = 4 + }, +/area/campaign/som_raiding/ground/jungle/north) +"jy" = ( +/obj/structure/girder, +/turf/open/floor/mainship/mono, +/area/campaign/som_raiding/outpost/construction) +"jz" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/plating/ground/concrete/lines{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/tunnel/west) +"jA" = ( +/obj/structure/table/reinforced, +/obj/item/bodybag/cryobag, +/turf/open/floor/mainship/sterile/side{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/medbay) +"jB" = ( +/obj/structure/rack, +/obj/item/ammo_magazine/rifle/standard_assaultrifle, +/obj/item/ammo_magazine/rifle/standard_assaultrifle, +/obj/item/ammo_magazine/rifle/standard_assaultrifle, +/obj/item/ammo_magazine/rifle/standard_assaultrifle, +/obj/item/ammo_magazine/rifle/standard_carbine, +/obj/item/ammo_magazine/rifle/standard_carbine, +/turf/open/floor/tile/dark/brown2{ + dir = 9 + }, +/area/campaign/som_raiding/outpost/req/secure) +"jC" = ( +/turf/open/floor/tile/dark/green2/corner, +/area/campaign/som_raiding/outpost/central_corridor) +"jD" = ( +/obj/structure/flora/jungle/bush, +/turf/open/ground/grass/beach{ + dir = 1 + }, +/area/campaign/som_raiding/ground/jungle/north) +"jI" = ( +/obj/effect/turf_decal/sandedge/corner{ + dir = 1 + }, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle) +"jJ" = ( +/turf/closed/mineral/smooth, +/area/campaign/som_raiding/ground/jungle/south) +"jL" = ( +/obj/structure/largecrate/supply/supplies/mre, +/turf/open/floor/tile/dark/brown2{ + dir = 9 + }, +/area/campaign/som_raiding/outpost/req/secure) +"jM" = ( +/obj/structure/largecrate/supply/explosives/mines, +/turf/open/floor/tile/dark/brown2{ + dir = 10 + }, +/area/campaign/som_raiding/outpost/req/secure) +"jN" = ( +/obj/structure/ship_ammo/cas/bomb, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/req/secure) +"jQ" = ( +/turf/open/floor/plating/ground/dirtgrassborder2{ + dir = 4 + }, +/area/campaign/som_raiding/ground/jungle) +"jU" = ( +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/tunnel/west) +"jV" = ( +/turf/open/floor/tile/dark/blue2{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/command/cic) +"jX" = ( +/obj/structure/largecrate/random, +/obj/machinery/light, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req/north) +"jY" = ( +/obj/structure/rock/variable/stalagmite, +/turf/open/floor/plating/ground/mars/random/cave/darker, +/area/campaign/som_raiding/outpost/tunnel) +"jZ" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/structure/sink{ + dir = 8 + }, +/turf/open/floor/mainship/sterile/side{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/medbay) +"kc" = ( +/obj/machinery/door/airlock/maintenance, +/turf/open/floor/plating, +/area/campaign/som_raiding/outpost/construction) +"ke" = ( +/obj/structure/flora/tree/jungle, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/north) +"kf" = ( +/obj/structure/flora/grass/tallgrass/autosmooth, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/south_west) +"kg" = ( +/obj/machinery/power/apc, +/obj/structure/cable, +/turf/open/floor/tile/dark/red2{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/security/west_post) +"kh" = ( +/obj/machinery/vending/medical, +/turf/open/floor/mainship/sterile/side{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/medbay) +"ki" = ( +/obj/structure/bed/chair/alt{ + dir = 1 + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/mainship/red{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/living/briefing) +"kk" = ( +/obj/structure/prop/mainship/gelida/rails, +/obj/structure/prop/mainship/gelida/rails{ + dir = 9 + }, +/obj/effect/turf_decal/sandedge{ + dir = 4 + }, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle) +"km" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/mainship/mono, +/area/campaign/som_raiding/cave/tunnel) +"kn" = ( +/obj/machinery/vending/nanomed{ + dir = 8 + }, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req) +"ko" = ( +/obj/structure/flora/jungle/bush, +/turf/open/floor/plating/ground/dirtgrassborder2, +/area/campaign/som_raiding/ground/jungle) +"kq" = ( +/obj/machinery/bodyscanner, +/turf/open/floor/mainship/sterile/side{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/medbay) +"kr" = ( +/obj/effect/turf_decal/sandedge{ + dir = 8 + }, +/turf/open/floor/plating/ground/dirtgrassborder2/corner{ + dir = 1 + }, +/area/campaign/som_raiding/ground/jungle/south) +"ks" = ( +/obj/effect/spawner/random/engineering/structure/tank, +/turf/open/floor/plating, +/area/campaign/som_raiding/outpost/maintenance/cic) +"kt" = ( +/turf/open/floor/plating/ground/dirtgrassborder2/corner{ + dir = 1 + }, +/area/campaign/som_raiding/ground/jungle/west) +"ku" = ( +/obj/structure/table/black, +/obj/item/explosive/grenade/som, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/security) +"kv" = ( +/turf/closed/mineral/smooth/indestructible, +/area/campaign/som_raiding/cave/tunnel) +"ky" = ( +/obj/structure/prop/brokenvendor/brokenuniformvendor, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/security) +"kz" = ( +/obj/machinery/light, +/turf/open/floor/mainship/sterile/side, +/area/campaign/som_raiding/outpost/medbay) +"kA" = ( +/obj/structure/flora/tree/jungle, +/turf/open/liquid/water, +/area/campaign/som_raiding/ground/jungle/north) +"kB" = ( +/turf/open/floor/plating/ground/concrete/lines, +/area/campaign/som_raiding/outpost/req) +"kC" = ( +/turf/open/ground/grass/beach{ + dir = 4 + }, +/area/campaign/som_raiding/ground/jungle/north) +"kD" = ( +/obj/structure/filingcabinet, +/turf/open/floor/mainship/mono, +/area/campaign/som_raiding/outpost/central_corridor) +"kG" = ( +/obj/structure/bed/chair/office/dark{ + dir = 8 + }, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command/north) +"kI" = ( +/obj/structure/flora/tree/jungle/small, +/obj/structure/flora/jungle/grass/thin, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/north) +"kJ" = ( +/obj/effect/turf_decal/sandedge/corner, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/south) +"kK" = ( +/obj/structure/largecrate/random/case/double, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req/north) +"kL" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/tile/dark/green2{ + dir = 6 + }, +/area/campaign/som_raiding/outpost/central_corridor) +"kM" = ( +/obj/structure/prop/mainship/gelida/railbumper{ + dir = 1 + }, +/obj/effect/turf_decal/sandedge{ + dir = 4 + }, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/south) +"kN" = ( +/obj/structure/cargo_container/nt{ + dir = 1 + }, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req) +"kO" = ( +/obj/structure/prop/oresilo, +/turf/open/floor/tile/dark/brown2{ + dir = 6 + }, +/area/campaign/som_raiding/outpost/req/secure) +"kP" = ( +/turf/open/floor/tile/dark/blue2/corner, +/area/campaign/som_raiding/outpost/command/cic) +"kQ" = ( +/obj/machinery/door/airlock/hatch, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/living) +"kR" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/tile/dark/red2{ + dir = 5 + }, +/area/campaign/som_raiding/outpost/security/cargo_post) +"kT" = ( +/obj/structure/rock/variable/jungle/big, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/south) +"kU" = ( +/obj/machinery/light{ + light_color = "#da2f1b" + }, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req) +"kW" = ( +/turf/open/ground/grass/beach{ + dir = 4 + }, +/area/campaign/som_raiding/ground/jungle/west) +"kX" = ( +/obj/structure/flora/jungle/grass, +/turf/open/floor/plating/ground/dirtgrassborder2{ + dir = 4 + }, +/area/campaign/som_raiding/ground/jungle/south_east) +"lb" = ( +/obj/structure/rack, +/obj/item/weapon/gun/rifle/standard_lmg, +/obj/item/weapon/gun/rifle/standard_lmg, +/turf/open/floor/tile/dark/brown2{ + dir = 5 + }, +/area/campaign/som_raiding/outpost/req/secure) +"lc" = ( +/obj/machinery/smartfridge, +/turf/open/floor/freezer, +/area/campaign/som_raiding/outpost/living/kitchen) +"ld" = ( +/obj/structure/prop/brokenvendor/brokenweaponsrack, +/turf/open/floor/tile/dark/red2{ + dir = 5 + }, +/area/campaign/som_raiding/outpost/security/southeast_post) +"le" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/plating, +/area/campaign/som_raiding/outpost/maintenance/cic) +"lf" = ( +/obj/structure/largecrate/random, +/turf/open/floor/tile/dark/brown2{ + dir = 10 + }, +/area/campaign/som_raiding/outpost/req/secure) +"lg" = ( +/obj/effect/turf_decal/sandedge{ + dir = 4 + }, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/south) +"lh" = ( +/obj/effect/spawner/random/engineering/tool, +/obj/structure/cable, +/turf/open/floor/mainship/mono, +/area/campaign/som_raiding/outpost/construction) +"li" = ( +/obj/machinery/light, +/turf/open/floor/mainship/tcomms, +/area/campaign/som_raiding/outpost/command/telecom) +"lj" = ( +/obj/machinery/vending/coffee, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command/living) +"ln" = ( +/obj/structure/platform, +/turf/closed/wall/mainship/gray, +/area/campaign/som_raiding/outpost/req/north) +"lp" = ( +/obj/effect/landmark/mob_spawner/farwa, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/west) +"lq" = ( +/obj/structure/largecrate/random, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req/north) +"lr" = ( +/obj/structure/rack, +/obj/effect/spawner/random/engineering/extinguisher, +/turf/open/floor/plating, +/area/campaign/som_raiding/outpost/maintenance/req) +"ls" = ( +/turf/closed/mineral/smooth, +/area/campaign/som_raiding/outpost/req/north) +"lt" = ( +/obj/structure/largecrate/supply/ammo/m41a, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/req/secure) +"lu" = ( +/obj/structure/prop/nt_computer, +/turf/open/floor/tile/dark/blue2{ + dir = 9 + }, +/area/campaign/som_raiding/outpost/command/cic) +"lv" = ( +/turf/open/floor/tile/brown{ + dir = 6 + }, +/area/campaign/som_raiding/outpost/req/qm) +"lw" = ( +/turf/open/ground/grass/beach/corner{ + dir = 8 + }, +/area/campaign/som_raiding/ground/jungle/west) +"ly" = ( +/obj/machinery/door/airlock/multi_tile/mainship/blackgeneric/glass, +/turf/open/floor/mainship/mono, +/area/campaign/som_raiding/outpost/req/north) +"lB" = ( +/obj/machinery/door/airlock/multi_tile/mainship/blackgeneric/glass, +/turf/open/floor/mainship/mono, +/area/campaign/som_raiding/outpost/req) +"lC" = ( +/obj/structure/rock/variable/jungle, +/obj/structure/flora/jungle/bush, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/west) +"lD" = ( +/obj/structure/flora/drought/shroom/brain, +/turf/open/floor/plating/ground/mars/random/cave/darker, +/area/campaign/som_raiding/cave/tunnel) +"lE" = ( +/obj/structure/cargo_container/nt{ + dir = 1 + }, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req/north) +"lF" = ( +/obj/structure/reagent_dispensers/fueltank, +/turf/open/floor/plating, +/area/campaign/som_raiding/outpost/maintenance/req) +"lH" = ( +/obj/machinery/door/airlock/hatch, +/turf/open/floor/tile/dark/gray, +/area/campaign/som_raiding/outpost/living/canteen) +"lI" = ( +/turf/open/ground/grass/beach/corner{ + dir = 1 + }, +/area/campaign/som_raiding/ground/jungle/north) +"lL" = ( +/obj/machinery/computer/som_two{ + dir = 4 + }, +/turf/open/floor/tile/dark/red2{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/security/cargo_post) +"lM" = ( +/obj/structure/platform{ + dir = 8 + }, +/turf/closed/wall/mainship/gray, +/area/campaign/som_raiding/outpost/req/north) +"lO" = ( +/obj/effect/turf_decal/sandedge/corner{ + dir = 4 + }, +/turf/open/floor/plating/ground/mars/random/cave/darker, +/area/campaign/som_raiding/outpost/tunnel) +"lP" = ( +/obj/machinery/door/airlock/mainship/security{ + dir = 2 + }, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/security/north_post) +"lQ" = ( +/obj/machinery/computer/som{ + dir = 1 + }, +/turf/open/floor/tile/dark/red2, +/area/campaign/som_raiding/outpost/security/north_post) +"lT" = ( +/obj/structure/extinguisher_cabinet, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command/telecom) +"lU" = ( +/obj/machinery/door/airlock/multi_tile/mainship/blackgeneric/glass, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/security/south_post) +"lV" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/structure/table/reinforced, +/obj/effect/spawner/random/medical/firstaid, +/obj/effect/spawner/random/medical/heal_pack, +/turf/open/floor/mainship/sterile/side{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/medbay) +"lW" = ( +/obj/structure/flora/drought/shroom/lure_weed, +/turf/open/floor/plating/ground/mars/random/cave/darker, +/area/campaign/som_raiding/cave/tunnel) +"lX" = ( +/obj/effect/turf_decal/sandedge/corner{ + dir = 4 + }, +/turf/open/floor/plating/ground/dirtgrassborder2/corner{ + dir = 4 + }, +/area/campaign/som_raiding/ground/jungle/north) +"lY" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/plating, +/area/campaign/som_raiding/outpost/maintenance) +"ma" = ( +/obj/structure/bed/chair/office/dark{ + dir = 1 + }, +/turf/open/floor/tile/dark/blue2{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/command/north) +"mb" = ( +/obj/structure/rack, +/obj/item/weapon/gun/rifle/standard_assaultrifle, +/obj/item/weapon/gun/rifle/standard_assaultrifle, +/turf/open/floor/tile/dark/brown2{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/req/secure) +"md" = ( +/obj/machinery/computer/som_two{ + dir = 1 + }, +/turf/open/floor/tile/dark/red2{ + dir = 10 + }, +/area/campaign/som_raiding/outpost/security/north_post) +"me" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/plating/ground/mars/random/cave/darker, +/area/campaign/som_raiding/outpost/tunnel) +"mf" = ( +/turf/open/floor/tile/dark/brown2{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/req/secure) +"mh" = ( +/obj/structure/cable, +/obj/item/trash/cigbutt, +/obj/item/trash/cigbutt, +/turf/open/floor/tile/dark/yellow2{ + dir = 5 + }, +/area/campaign/som_raiding/outpost/engineering) +"mi" = ( +/obj/structure/cable, +/obj/effect/turf_decal/delivery, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req) +"mj" = ( +/obj/structure/cable, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/req/north) +"mk" = ( +/obj/structure/table/black, +/obj/item/clipboard, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command/captain) +"mm" = ( +/turf/open/floor/plating/ground/concrete/lines{ + dir = 5 + }, +/area/campaign/som_raiding/outpost/tunnel/west) +"mn" = ( +/obj/machinery/power/monitor{ + name = "Main Power Grid Monitoring" + }, +/obj/structure/cable, +/turf/open/floor/tile/dark/yellow2{ + dir = 5 + }, +/area/campaign/som_raiding/outpost/engineering) +"mp" = ( +/obj/structure/table/black, +/turf/open/floor/tile/dark/red2, +/area/campaign/som_raiding/outpost/security/north_post) +"mr" = ( +/obj/structure/window/framed/mainship/gray, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/security/west_post) +"ms" = ( +/obj/structure/reagent_dispensers/fueltank/barrel, +/turf/open/floor/plating/ground/mars/random/cave/darker, +/area/campaign/som_raiding/outpost/tunnel) +"mt" = ( +/obj/structure/flora/jungle/grass, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle) +"my" = ( +/obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/cope/predeployed, +/turf/open/floor/plating/ground/mars/random/cave, +/area/campaign/som_raiding/outpost/tunnel/west) +"mB" = ( +/turf/open/floor/tile/dark/green2{ + dir = 5 + }, +/area/campaign/som_raiding/outpost/central_corridor) +"mC" = ( +/obj/structure/largecrate/random/case/small, +/turf/open/floor/tile/dark/brown2/corner{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/req/secure) +"mD" = ( +/turf/open/floor/mainship/mono, +/area/campaign/som_raiding/outpost/central_corridor) +"mE" = ( +/obj/structure/flora/jungle/grass, +/turf/open/floor/plating/ground/dirtgrassborder2{ + dir = 1 + }, +/area/campaign/som_raiding/ground/jungle/south_west) +"mF" = ( +/obj/structure/flora/jungle/grass/thin, +/turf/open/floor/plating/ground/dirtgrassborder2/corner{ + dir = 4 + }, +/area/campaign/som_raiding/ground/jungle/north) +"mH" = ( +/obj/structure/cable, +/turf/open/floor/tile/dark/red2{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/security/cargo_post) +"mI" = ( +/obj/machinery/door/airlock/hatch, +/turf/open/floor/mainship/mono, +/area/campaign/som_raiding/outpost/tunnel) +"mJ" = ( +/turf/open/floor/mainship/sterile/dark, +/area/campaign/som_raiding/outpost/medbay) +"mN" = ( +/obj/structure/table/black, +/turf/open/floor/tile/dark/blue2{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/command/cic) +"mO" = ( +/turf/open/floor/mainship/sterile/corner{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/medbay) +"mP" = ( +/obj/structure/prop/brokenvendor/surplusclothes, +/turf/open/floor/tile/dark/red2, +/area/campaign/som_raiding/outpost/security/west_post) +"mQ" = ( +/obj/structure/flora/tree/jungle/small, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle) +"mR" = ( +/obj/structure/rock/variable/jungle, +/turf/open/floor/plating/ground/dirtgrassborder2/corner, +/area/campaign/som_raiding/ground/jungle/south_west) +"mT" = ( +/obj/effect/landmark/patrol_point/tgmc_14, +/obj/structure/flora/jungle/bush, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/south_west) +"mU" = ( +/turf/open/floor/plating, +/area/campaign/som_raiding/cave/tunnel) +"mV" = ( +/obj/effect/turf_decal/sandedge/corner2{ + dir = 4 + }, +/turf/open/floor/plating/ground/mars/random/cave/darker, +/area/campaign/som_raiding/outpost/tunnel) +"mW" = ( +/turf/closed/mineral/smooth, +/area/campaign/som_raiding/outpost/living) +"mY" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/plating, +/area/campaign/som_raiding/outpost/tunnel) +"mZ" = ( +/obj/effect/turf_decal/siding/dark{ + dir = 9 + }, +/turf/open/floor/mainship/som/ne, +/area/campaign/som_raiding/outpost/command) +"nb" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/tile/dark/brown2{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/req/secure) +"nc" = ( +/obj/structure/rock/variable/jungle, +/obj/structure/flora/jungle/large_bush, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle) +"nd" = ( +/turf/closed/mineral/smooth, +/area/campaign/som_raiding/outpost/firing_range) +"ne" = ( +/obj/structure/reagent_dispensers/watertank, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req) +"nf" = ( +/obj/structure/window/framed/mainship/gray, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/security/south_post) +"ng" = ( +/obj/structure/table/mainship, +/obj/item/tool/kitchen/tray, +/obj/effect/spawner/random/food_or_drink/burger, +/turf/open/floor/tile/barber, +/area/campaign/som_raiding/outpost/living/kitchen) +"nh" = ( +/obj/structure/rack, +/obj/item/weapon/gun/shotgun/som/standard, +/obj/item/ammo_magazine/shotgun/buckshot, +/turf/open/floor/tile/dark/red2{ + dir = 6 + }, +/area/campaign/som_raiding/outpost/security/south_post) +"nj" = ( +/obj/structure/table/reinforced, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/mainship/sterile/side{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/medbay) +"nm" = ( +/obj/machinery/power/apc{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req) +"no" = ( +/turf/open/floor/plating/ground/dirtgrassborder2, +/area/campaign/som_raiding/ground/jungle) +"nr" = ( +/obj/structure/mine_structure/wooden/plank/alt, +/obj/structure/mine_structure/wooden/support_wall/beams, +/turf/open/floor/plating/ground/mars/random/cave/darker, +/area/campaign/som_raiding/cave/tunnel) +"nt" = ( +/turf/open/floor/tile/dark/green2{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/living) +"nw" = ( +/obj/structure/cable, +/turf/open/floor/tile/dark/green2{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/central_corridor) +"nx" = ( +/obj/machinery/power/apc, +/obj/structure/cable, +/turf/open/floor/tile/dark/yellow2{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/engineering) +"ny" = ( +/obj/structure/closet/crate, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req/north) +"nz" = ( +/obj/structure/largecrate/random/case/double, +/turf/open/floor/tile/brown, +/area/campaign/som_raiding/outpost/req/aux) +"nC" = ( +/obj/structure/reagent_dispensers/fueltank, +/turf/open/floor/tile/dark/gray, +/area/campaign/som_raiding/outpost/req/qm) +"nD" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/mainship/sterile/side{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/medbay) +"nE" = ( +/turf/open/floor/tile/dark/blue2{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/command/north) +"nF" = ( +/turf/closed/wall/mainship/gray, +/area/campaign/som_raiding/outpost/command/cic) +"nI" = ( +/obj/effect/turf_decal/sandedge/corner2{ + dir = 4 + }, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/tunnel/west) +"nJ" = ( +/obj/structure/flora/jungle/large_bush, +/turf/open/floor/plating/ground/dirtgrassborder2/corner{ + dir = 1 + }, +/area/campaign/som_raiding/ground/jungle/north) +"nK" = ( +/turf/open/floor/plating/ground/mars/random/cave/darker, +/area/campaign/som_raiding/outpost/firing_range) +"nM" = ( +/obj/structure/filingcabinet, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command/telecom) +"nN" = ( +/obj/machinery/computer/som_two{ + dir = 4 + }, +/turf/open/floor/tile/dark/red2{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/security/southeast_post) +"nP" = ( +/obj/structure/flora/jungle/grass, +/obj/structure/flora/jungle/grass/thin, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/south_east) +"nQ" = ( +/obj/structure/table/black, +/obj/effect/spawner/random/food_or_drink/drink_cans, +/turf/open/floor/tile/dark/red2, +/area/campaign/som_raiding/outpost/security/north_post) +"nR" = ( +/obj/structure/cable, +/turf/open/floor/tile/brown{ + dir = 5 + }, +/area/campaign/som_raiding/outpost/req/aux) +"nS" = ( +/obj/structure/prop/nt_computer/recorder, +/turf/open/floor/mainship/tcomms, +/area/campaign/som_raiding/outpost/command/telecom) +"nT" = ( +/obj/structure/prop/mainship/protolathe, +/turf/open/floor/tile/dark/blue2{ + dir = 5 + }, +/area/campaign/som_raiding/outpost/command/north) +"nU" = ( +/obj/item/trash/cigbutt, +/turf/open/floor/tile/dark/gray, +/area/campaign/som_raiding/outpost/req/qm) +"nV" = ( +/obj/effect/turf_decal/warning_stripes/box, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/security) +"nX" = ( +/obj/structure/bed/chair/office/dark, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command/north) +"nY" = ( +/obj/machinery/vending/snack, +/turf/open/floor/tile/dark/blue2{ + dir = 10 + }, +/area/campaign/som_raiding/outpost/command/north) +"oa" = ( +/obj/structure/largecrate/supply/weapons/shotgun, +/turf/open/floor/tile/dark/brown2{ + dir = 9 + }, +/area/campaign/som_raiding/outpost/req/secure) +"ob" = ( +/obj/structure/bed/chair/office/dark, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command) +"oc" = ( +/obj/structure/prop/brokenvendor/surplusarmor, +/turf/open/floor/tile/dark/red2{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/security/south_post) +"od" = ( +/turf/open/floor/mainship/sterile/side{ + dir = 9 + }, +/area/campaign/som_raiding/outpost/medbay) +"oe" = ( +/obj/structure/window/framed/mainship/gray, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command/north) +"of" = ( +/obj/structure/cable, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/plating, +/area/campaign/som_raiding/outpost/maintenance/med) +"oh" = ( +/turf/open/floor/tile/dark/red2{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/security/south_post) +"oj" = ( +/obj/structure/flora/jungle/grass/thin, +/turf/open/liquid/water, +/area/campaign/som_raiding/ground/jungle/north) +"ok" = ( +/turf/open/floor/mainship/sterile/side{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/medbay) +"ol" = ( +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/engineering) +"on" = ( +/obj/effect/turf_decal/bot, +/turf/open/floor/tile/dark/brown2{ + dir = 10 + }, +/area/campaign/som_raiding/outpost/req/secure) +"oo" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/tile/dark/green2{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/central_corridor) +"oq" = ( +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/cave) +"ot" = ( +/obj/effect/landmark/corpsespawner/marine/regular, +/obj/effect/decal/cleanable/blood/six, +/turf/open/floor/plating/ground/mars/random/cave/darker, +/area/campaign/som_raiding/outpost/construction) +"ou" = ( +/obj/structure/bed/fancy, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command/living) +"ov" = ( +/obj/structure/prop/mainship/gelida/miner, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle) +"ow" = ( +/obj/machinery/door/airlock/hatch, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/req/secure) +"ox" = ( +/obj/structure/cable, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command/cic) +"oy" = ( +/obj/structure/rock/variable/jungle/big, +/obj/structure/flora/jungle/large_bush, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/south) +"oz" = ( +/obj/structure/prop/vehicle/truck/destructible, +/obj/effect/turf_decal/box, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req/north) +"oA" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/tile/dark/blue2{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/command) +"oB" = ( +/obj/structure/largecrate/random/case/double, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/tunnel) +"oC" = ( +/obj/structure/flora/jungle/bush, +/turf/open/floor/plating/ground/dirtgrassborder2/corner, +/area/campaign/som_raiding/ground/jungle/west) +"oF" = ( +/turf/closed/mineral/smooth, +/area/campaign/som_raiding/outpost/construction) +"oG" = ( +/obj/structure/largecrate/random/barrel/white, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/req/secure) +"oH" = ( +/obj/structure/largecrate/supply/generator, +/turf/open/floor/tile/dark/brown2{ + dir = 5 + }, +/area/campaign/som_raiding/outpost/req/secure) +"oI" = ( +/obj/effect/turf_decal/warning_stripes/thick{ + dir = 8 + }, +/turf/open/floor/tile/dark/blue2{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/command) +"oK" = ( +/obj/machinery/power/smes/buildable/empty, +/obj/structure/cable, +/turf/open/floor/tile/dark/yellow2{ + dir = 6 + }, +/area/campaign/som_raiding/outpost/engineering) +"oL" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/security) +"oM" = ( +/obj/structure/cargo_container/gorg{ + dir = 4 + }, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req) +"oO" = ( +/obj/effect/spawner/random/misc/structure/closet/tool, +/turf/open/floor/tile/brown{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/req/aux) +"oP" = ( +/obj/structure/cable, +/turf/open/floor/mainship/red{ + dir = 10 + }, +/area/campaign/som_raiding/outpost/living/briefing) +"oR" = ( +/turf/open/floor/plating/ground/mars/random/cave/darker, +/area/campaign/som_raiding/cave/tunnel) +"oT" = ( +/obj/structure/closet/secure_closet/medical3/colony, +/turf/open/floor/mainship/sterile/corner{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/medbay) +"oV" = ( +/obj/machinery/door/airlock/maintenance, +/obj/structure/cable, +/turf/open/floor/tile/dark/gray, +/area/campaign/som_raiding/outpost/req/aux) +"oW" = ( +/obj/effect/turf_decal/sandedge{ + dir = 8 + }, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/north) +"oX" = ( +/obj/structure/largecrate/supply/medicine, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req) +"oZ" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/mainship/mono, +/area/campaign/som_raiding/outpost/maintenance) +"pb" = ( +/obj/structure/bed/bunkbed, +/turf/open/floor/tile/dark/green2{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/living) +"pe" = ( +/turf/open/floor/mainship/tcomms, +/area/campaign/som_raiding/outpost/command/telecom) +"pg" = ( +/obj/structure/flora/jungle/grass/thin, +/turf/open/ground/grass/beach, +/area/campaign/som_raiding/ground/jungle/north) +"pj" = ( +/obj/structure/largecrate/supply/ammo/standard_ammo, +/turf/open/floor/tile/brown{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/req/qm) +"pm" = ( +/obj/structure/largecrate/supply/explosives/grenades, +/turf/open/floor/tile/dark/brown2/corner{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/req/secure) +"pn" = ( +/obj/structure/ore_box, +/turf/open/floor/wood/alt_one, +/area/campaign/som_raiding/ground/jungle/south_east) +"pq" = ( +/obj/machinery/door/airlock/multi_tile/mainship/blackgeneric/glass{ + dir = 2 + }, +/obj/structure/cable, +/turf/open/floor/mainship/mono, +/area/campaign/som_raiding/outpost/construction) +"pr" = ( +/obj/structure/flora/tree/jungle/small, +/turf/open/liquid/water, +/area/campaign/som_raiding/ground/jungle/north) +"pt" = ( +/turf/open/floor/tile/brown{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/req/aux) +"pu" = ( +/turf/open/floor/plating, +/area/campaign/som_raiding/outpost/maintenance/operation) +"pv" = ( +/obj/structure/bed/chair, +/turf/open/floor/tile/neutral/full, +/area/campaign/som_raiding/outpost/living/canteen) +"pw" = ( +/obj/machinery/telecomms/relay/preset/telecomms, +/turf/closed/mineral/smooth, +/area/campaign/som_raiding/cave) +"px" = ( +/turf/open/floor/tile/dark/red2{ + dir = 9 + }, +/area/campaign/som_raiding/outpost/security/west_post) +"py" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/structure/stairs/seamless/platform_vert{ + dir = 4 + }, +/turf/open/floor/tile/dark/blue2{ + dir = 6 + }, +/area/campaign/som_raiding/outpost/command) +"pz" = ( +/obj/structure/filingcabinet, +/turf/open/floor/tile/brown{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/req/qm) +"pA" = ( +/turf/open/floor/plating/ground/dirtgrassborder2{ + dir = 4 + }, +/area/campaign/som_raiding/ground/jungle/south_east) +"pD" = ( +/obj/machinery/vending/nanomed{ + dir = 4 + }, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command/living) +"pE" = ( +/obj/structure/rock/variable/jungle/big, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/south_east) +"pH" = ( +/obj/machinery/power/apc{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/tile/brown{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/req/aux) +"pJ" = ( +/obj/structure/table/black, +/obj/machinery/computer/station_alert, +/turf/open/floor/tile/dark/blue2{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/command/north) +"pL" = ( +/turf/closed/wall/mainship/gray, +/area/campaign/som_raiding/outpost/maintenance) +"pM" = ( +/obj/structure/bed/chair/alt{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/mainship/red/corner{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/living/briefing) +"pQ" = ( +/turf/open/floor/plating/ground/concrete/edge{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/tunnel/west) +"pT" = ( +/obj/machinery/door/airlock/multi_tile/mainship/blackgeneric/glass, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command/telecom) +"pU" = ( +/obj/structure/bed/chair/comfy{ + dir = 8 + }, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command/living) +"pV" = ( +/obj/machinery/door/airlock/hatch, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/security/west_post) +"pW" = ( +/obj/machinery/computer/som, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/tile/dark/blue2{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/command/north) +"pX" = ( +/obj/structure/extinguisher_cabinet{ + dir = 4 + }, +/obj/structure/table/reinforced, +/obj/item/defibrillator, +/turf/open/floor/mainship/sterile/corner{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/medbay) +"pZ" = ( +/obj/structure/flora/jungle/grass/thin, +/turf/open/floor/plating/ground/dirtgrassborder2/corner, +/area/campaign/som_raiding/ground/jungle/south_west) +"qa" = ( +/obj/structure/flora/jungle/bush, +/turf/open/floor/plating/ground/dirtgrassborder2/corner{ + dir = 4 + }, +/area/campaign/som_raiding/ground/jungle/north) +"qc" = ( +/turf/closed/mineral/smooth, +/area/campaign/som_raiding/outpost/tunnel/west) +"qe" = ( +/obj/structure/largecrate/random/case/small, +/turf/open/floor/tile/dark/brown2, +/area/campaign/som_raiding/outpost/req/secure) +"qg" = ( +/turf/open/floor/plating/ground/concrete/lines{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/tunnel) +"qh" = ( +/obj/structure/rack, +/obj/effect/spawner/random/engineering/toolbox, +/turf/open/floor/tile/dark/gray, +/area/campaign/som_raiding/outpost/req/aux) +"qj" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/structure/extinguisher_cabinet/mini, +/turf/open/floor/tile/neutral/full, +/area/campaign/som_raiding/outpost/living/canteen) +"qm" = ( +/obj/effect/spawner/random/engineering/engibelt, +/turf/open/floor/plating, +/area/campaign/som_raiding/outpost/maintenance/operation) +"qn" = ( +/obj/structure/bookcase, +/turf/open/floor/tile/dark/blue2{ + dir = 10 + }, +/area/campaign/som_raiding/outpost/command/captain) +"qo" = ( +/obj/structure/sink/kitchen{ + dir = 1 + }, +/turf/open/floor/tile/barber, +/area/campaign/som_raiding/outpost/living/kitchen) +"qp" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/tile/neutral/full, +/area/campaign/som_raiding/outpost/living/canteen) +"qq" = ( +/obj/machinery/door/airlock/hatch, +/turf/open/floor/mainship/mono, +/area/campaign/som_raiding/outpost/living/briefing) +"qr" = ( +/obj/effect/turf_decal/warning_stripes/box, +/turf/closed/wall/mainship/gray, +/area/campaign/som_raiding/outpost/security) +"qs" = ( +/obj/machinery/vending/cigarette, +/turf/open/floor/tile/dark/green2{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/central_corridor) +"qt" = ( +/obj/structure/girder/displaced, +/turf/open/floor/mainship/mono, +/area/campaign/som_raiding/outpost/construction) +"qw" = ( +/obj/structure/stairs/seamless/edge_vert{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req/north) +"qy" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/tile/dark/red2{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/security/north_post) +"qz" = ( +/obj/structure/extinguisher_cabinet{ + dir = 1 + }, +/turf/open/floor/tile/dark/blue2, +/area/campaign/som_raiding/outpost/command) +"qA" = ( +/obj/machinery/computer/som{ + dir = 8 + }, +/turf/open/floor/tile/dark/blue2{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/command/cic) +"qD" = ( +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/tunnel) +"qE" = ( +/turf/open/floor/tile/dark/blue2{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/command/cic) +"qF" = ( +/turf/open/floor/plating/ground/dirtgrassborder2/corner2, +/area/campaign/som_raiding/ground/jungle/south_east) +"qH" = ( +/obj/effect/turf_decal/sandedge/corner, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/tunnel/west) +"qL" = ( +/obj/effect/landmark/patrol_point/som/som_23, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/north) +"qM" = ( +/obj/structure/largecrate/supply/floodlights, +/turf/open/floor/tile/dark/brown2, +/area/campaign/som_raiding/outpost/req/secure) +"qN" = ( +/obj/structure/bed/chair/alt{ + dir = 8 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/tile/dark/blue2{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/command) +"qO" = ( +/obj/structure/cable, +/turf/open/floor/mainship/mono, +/area/campaign/som_raiding/outpost/maintenance) +"qP" = ( +/obj/effect/turf_decal/sandedge/corner{ + dir = 4 + }, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/south) +"qQ" = ( +/obj/structure/platform_decoration{ + dir = 4 + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req/north) +"qT" = ( +/obj/structure/cargo_container/hd{ + dir = 1 + }, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req) +"qU" = ( +/obj/structure/flora/jungle/grass/thin, +/turf/open/floor/plating/ground/dirtgrassborder2{ + dir = 8 + }, +/area/campaign/som_raiding/ground/jungle/north) +"qV" = ( +/obj/structure/reagent_dispensers/fueltank/barrel, +/turf/open/floor/tile/dark/brown2{ + dir = 10 + }, +/area/campaign/som_raiding/outpost/req/secure) +"qZ" = ( +/turf/open/floor/tile/dark/red2{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/security/cargo_post) +"rb" = ( +/turf/open/floor/plating, +/area/campaign/som_raiding/outpost/maintenance) +"rc" = ( +/obj/structure/closet/secure_closet/freezer/fridge, +/obj/item/reagent_containers/food/condiment/enzyme, +/obj/item/reagent_containers/food/condiment/enzyme, +/obj/item/reagent_containers/food/condiment/enzyme, +/obj/item/reagent_containers/food/snacks/chocolatebar, +/obj/item/reagent_containers/food/snacks/chocolatebar, +/obj/item/reagent_containers/food/snacks/chocolatebar, +/turf/open/floor/freezer, +/area/campaign/som_raiding/outpost/living/kitchen) +"rd" = ( +/obj/effect/turf_decal/sandedge/corner2, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle) +"rf" = ( +/obj/structure/filingcabinet, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/tile/brown{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/req/qm) +"rg" = ( +/obj/structure/closet/firecloset, +/turf/open/floor/plating, +/area/campaign/som_raiding/outpost/maintenance) +"rh" = ( +/obj/machinery/light/small, +/turf/open/floor/plating, +/area/campaign/som_raiding/outpost/maintenance/cic) +"rl" = ( +/obj/machinery/door/airlock/mainship/security{ + dir = 2 + }, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/security) +"rn" = ( +/obj/structure/largecrate/supply/weapons/standard_smg, +/turf/open/floor/tile/dark/brown2/corner{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/req/secure) +"ro" = ( +/obj/structure/flora/jungle/bush, +/turf/open/floor/plating/ground/dirtgrassborder2/corner, +/area/campaign/som_raiding/ground/jungle/north) +"rr" = ( +/turf/open/floor/plating/ground/dirtgrassborder2/corner2{ + dir = 4 + }, +/area/campaign/som_raiding/ground/jungle/west) +"rs" = ( +/obj/structure/prop/mainship/gelida/rails{ + dir = 1 + }, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle) +"rt" = ( +/obj/structure/largecrate/supply/explosives/mortar_he, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/req/secure) +"rv" = ( +/obj/machinery/door/airlock/maintenance{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/security/north_post) +"rx" = ( +/obj/structure/largecrate, +/obj/machinery/light{ + light_color = "#da2f1b" + }, +/turf/open/floor/tile/brown, +/area/campaign/som_raiding/outpost/req/qm) +"ry" = ( +/obj/structure/table/black, +/obj/item/explosive/grenade/som, +/turf/open/floor/tile/dark/red2{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/security/west_post) +"rz" = ( +/obj/machinery/light{ + light_color = "#da2f1b" + }, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req/north) +"rA" = ( +/obj/structure/kitchenspike, +/turf/open/floor/freezer, +/area/campaign/som_raiding/outpost/living/kitchen) +"rC" = ( +/turf/closed/mineral/smooth, +/area/campaign/som_raiding/outpost/central_corridor) +"rF" = ( +/obj/structure/largecrate/supply/supplies, +/turf/open/floor/tile/dark/gray, +/area/campaign/som_raiding/outpost/req/aux) +"rG" = ( +/turf/closed/wall/mainship/gray, +/area/campaign/som_raiding/outpost/living/briefing) +"rI" = ( +/obj/structure/cable, +/obj/machinery/door/airlock/mainship/engineering, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/engineering) +"rJ" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/mainship/red{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/living/briefing) +"rK" = ( +/obj/machinery/door/airlock/mainship/medical/free_access{ + dir = 1 + }, +/turf/open/floor/mainship/sterile/dark, +/area/campaign/som_raiding/outpost/medbay) +"rL" = ( +/turf/closed/gm/dense, +/area/campaign/som_raiding/ground/jungle/south_west) +"rM" = ( +/turf/open/floor/mainship/sterile/side{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/medbay) +"rN" = ( +/turf/open/floor/mainship/red{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/living/briefing) +"rO" = ( +/obj/structure/cable, +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/tile/dark/blue2{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/command/north) +"rP" = ( +/obj/machinery/door/airlock/maintenance{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/security/west_post) +"rU" = ( +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle) +"rX" = ( +/turf/closed/mineral/smooth, +/area/campaign/som_raiding/outpost/security) +"rY" = ( +/obj/structure/stairs, +/obj/structure/cable, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/tunnel) +"rZ" = ( +/obj/structure/cable, +/turf/open/floor/tile/dark/blue2/corner{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/command) +"sa" = ( +/turf/open/floor/tile/dark/blue2{ + dir = 10 + }, +/area/campaign/som_raiding/outpost/command) +"sc" = ( +/turf/open/floor/plating/ground/concrete/lines, +/area/campaign/som_raiding/outpost/req/north) +"sd" = ( +/turf/closed/wall/mainship/gray, +/area/campaign/som_raiding/outpost/req/qm) +"sf" = ( +/obj/structure/window/framed/mainship/gray, +/turf/open/floor/mainship/sterile/dark, +/area/campaign/som_raiding/outpost/medbay) +"sg" = ( +/obj/structure/prop/mainship/gelida/rails{ + dir = 1 + }, +/obj/effect/turf_decal/sandedge/corner, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle) +"sh" = ( +/obj/machinery/power/apc{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/mainship/sterile/side{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/medbay) +"si" = ( +/obj/structure/flora/jungle/large_bush, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle) +"sj" = ( +/turf/open/liquid/water, +/area/campaign/som_raiding/ground/jungle/west) +"sk" = ( +/obj/structure/prop/mainship/research/circuit_imprinter, +/turf/open/floor/tile/dark/blue2, +/area/campaign/som_raiding/outpost/command) +"sl" = ( +/turf/closed/mineral/smooth, +/area/campaign/som_raiding/outpost/maintenance/operation) +"sm" = ( +/obj/structure/cable, +/obj/machinery/power/fusion_engine/preset, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/engineering) +"so" = ( +/obj/structure/cable, +/obj/machinery/vending/nanomed{ + dir = 4 + }, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/security) +"sq" = ( +/obj/structure/cable, +/turf/open/floor/plating/ground/concrete/edge, +/area/campaign/som_raiding/outpost/tunnel) +"sr" = ( +/obj/structure/prop/mainship/mapping_computer, +/turf/open/floor/tile/dark/blue2{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/command) +"st" = ( +/turf/closed/mineral/smooth, +/area/campaign/som_raiding/outpost/tunnel) +"sv" = ( +/obj/structure/rock/variable/jungle, +/turf/open/floor/plating/ground/dirtgrassborder2, +/area/campaign/som_raiding/ground/jungle/south_east) +"sx" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command/cic) +"sy" = ( +/turf/open/floor/plating/ground/dirtgrassborder2{ + dir = 8 + }, +/area/campaign/som_raiding/ground/jungle/south_east) +"sB" = ( +/obj/effect/spawner/random/misc/structure/closet/tool, +/turf/open/floor/tile/dark/yellow2, +/area/campaign/som_raiding/outpost/engineering) +"sC" = ( +/obj/structure/rack, +/obj/effect/spawner/random/engineering/tech_supply, +/obj/effect/spawner/random/engineering/tool, +/turf/open/floor/plating, +/area/campaign/som_raiding/outpost/maintenance) +"sD" = ( +/turf/open/floor/tile/dark/red2{ + dir = 10 + }, +/area/campaign/som_raiding/outpost/security/southeast_post) +"sI" = ( +/obj/structure/largecrate/random/barrel/yellow, +/obj/structure/window{ + dir = 4 + }, +/turf/open/floor/mainship/mono, +/area/campaign/som_raiding/outpost/central_corridor) +"sM" = ( +/obj/effect/turf_decal/sandedge/corner2{ + dir = 8 + }, +/turf/open/floor/plating/ground/dirtgrassborder2{ + dir = 1 + }, +/area/campaign/som_raiding/ground/jungle/north) +"sN" = ( +/turf/open/floor/plating/ground/mars/random/cave, +/area/campaign/som_raiding/ground/jungle/north) +"sO" = ( +/obj/structure/window/framed/mainship/gray, +/turf/open/floor/tile/dark/gray, +/area/campaign/som_raiding/outpost/req/qm) +"sP" = ( +/obj/structure/largecrate/guns/russian, +/turf/open/floor/tile/dark/brown2{ + dir = 6 + }, +/area/campaign/som_raiding/outpost/req/secure) +"sQ" = ( +/obj/structure/closet/cabinet, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/tile/dark/blue2{ + dir = 5 + }, +/area/campaign/som_raiding/outpost/command/captain) +"sS" = ( +/turf/open/floor/plating/ground/dirtgrassborder2/corner{ + dir = 8 + }, +/area/campaign/som_raiding/ground/jungle/west) +"sT" = ( +/obj/effect/turf_decal/sandedge/corner{ + dir = 1 + }, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/north) +"sU" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req/north) +"sW" = ( +/obj/structure/mine_structure/wooden/plank/alt, +/turf/open/floor/plating/ground/mars/random/cave/darker, +/area/campaign/som_raiding/cave/tunnel) +"sX" = ( +/obj/structure/flora/tree/jungle/small, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/south_east) +"sZ" = ( +/obj/structure/prop/mainship/gelida/railbumper{ + dir = 1 + }, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/south_east) +"ta" = ( +/turf/open/floor/plating/ground/dirtgrassborder2/corner{ + dir = 1 + }, +/area/campaign/som_raiding/ground/jungle) +"tb" = ( +/obj/machinery/light/red{ + dir = 8 + }, +/obj/machinery/computer/som{ + dir = 8 + }, +/turf/open/floor/tile/dark/blue2{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/command/cic) +"tc" = ( +/turf/open/floor/tile/dark/red2{ + dir = 5 + }, +/area/campaign/som_raiding/outpost/security/west_post) +"tg" = ( +/obj/structure/window/framed/mainship/gray, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command/telecom) +"th" = ( +/obj/structure/flora/grass/tallgrass/autosmooth, +/turf/closed/gm/dense, +/area/campaign/som_raiding/ground/jungle/west) +"tk" = ( +/obj/structure/platform{ + dir = 8 + }, +/turf/closed/wall/mainship/gray, +/area/campaign/som_raiding/outpost/req) +"tl" = ( +/obj/structure/table/black, +/turf/open/floor/tile/dark/blue2, +/area/campaign/som_raiding/outpost/command/cic) +"tm" = ( +/obj/machinery/power/apc{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command/telecom) +"tn" = ( +/obj/structure/tankholder/extinguisher, +/turf/open/floor/tile/dark/brown2{ + dir = 10 + }, +/area/campaign/som_raiding/outpost/req/secure) +"to" = ( +/obj/machinery/door/airlock/maintenance{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/mainship/mono, +/area/campaign/som_raiding/outpost/command/cic) +"tp" = ( +/turf/open/floor/plating/ground/concrete/lines{ + dir = 10 + }, +/area/campaign/som_raiding/outpost/tunnel/west) +"tq" = ( +/obj/effect/spawner/random/medical/medicalcloset, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/mainship/sterile/side{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/medbay) +"tr" = ( +/obj/structure/table/black, +/obj/machinery/computer3/server, +/turf/open/floor/tile/dark/blue2{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/command/north) +"ts" = ( +/obj/structure/largecrate/random/barrel/blue, +/turf/open/floor/tile/dark/brown2/corner, +/area/campaign/som_raiding/outpost/req/secure) +"tt" = ( +/obj/structure/table/reinforced, +/obj/effect/spawner/random/medical/health_analyzer, +/turf/open/floor/mainship/sterile/corner{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/medbay) +"tu" = ( +/obj/structure/cable, +/turf/open/floor/tile/dark/yellow2{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/engineering) +"tv" = ( +/turf/open/floor/tile/brown{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/req/qm) +"tx" = ( +/obj/effect/turf_decal/siding/dark{ + dir = 9 + }, +/turf/open/floor/mainship/som/ne, +/area/campaign/som_raiding/outpost/living/briefing) +"tz" = ( +/obj/structure/platform_decoration{ + dir = 8 + }, +/obj/effect/spawner/random/engineering/structure/tank/waterweighted, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req/north) +"tA" = ( +/obj/structure/table/reinforced, +/obj/effect/spawner/random/engineering/engibelt, +/turf/open/floor/tile/brown{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/req/qm) +"tB" = ( +/obj/structure/table/black, +/obj/machinery/light/red, +/turf/open/floor/tile/dark/blue2, +/area/campaign/som_raiding/outpost/command/cic) +"tC" = ( +/obj/structure/rack, +/obj/effect/spawner/random/engineering/structure/handheld_lighting, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/engineering) +"tD" = ( +/obj/structure/reagent_dispensers/fueltank, +/turf/open/floor/mainship/mono, +/area/campaign/som_raiding/outpost/construction) +"tE" = ( +/obj/structure/prop/mainship/gelida/rails{ + dir = 4 + }, +/turf/open/floor/wood/alt_one, +/area/campaign/som_raiding/ground/jungle/south_east) +"tG" = ( +/obj/structure/flora/jungle/grass, +/turf/open/floor/plating/ground/dirtgrassborder2/corner{ + dir = 8 + }, +/area/campaign/som_raiding/ground/jungle) +"tH" = ( +/obj/structure/bed/chair/office/dark, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command/living) +"tJ" = ( +/obj/effect/turf_decal/sandedge{ + dir = 4 + }, +/obj/structure/flora/jungle/grass, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/south) +"tK" = ( +/obj/structure/bed/chair/alt{ + dir = 1 + }, +/turf/open/floor/mainship/red{ + dir = 10 + }, +/area/campaign/som_raiding/outpost/living/briefing) +"tL" = ( +/obj/structure/largecrate/random/case/double, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/req/secure) +"tM" = ( +/obj/structure/largecrate/random/case/double, +/turf/open/floor/tile/brown, +/area/campaign/som_raiding/outpost/req/qm) +"tO" = ( +/obj/machinery/door/airlock/maintenance, +/obj/structure/cable, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command) +"tP" = ( +/obj/structure/bed/chair/office/dark, +/obj/structure/cable, +/turf/open/floor/tile/dark/red2{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/security/south_post) +"tS" = ( +/obj/structure/flora/jungle/large_bush, +/turf/open/ground/grass/beach, +/area/campaign/som_raiding/ground/jungle/west) +"tV" = ( +/turf/closed/wall/mainship/gray, +/area/campaign/som_raiding/outpost/req/aux) +"tX" = ( +/turf/open/floor/plating/ground/mars/random/cave/darker, +/area/campaign/som_raiding/outpost/security/south_post) +"tZ" = ( +/obj/effect/spawner/random/misc/structure/supplycrate, +/turf/open/floor/tile/dark/yellow2{ + dir = 10 + }, +/area/campaign/som_raiding/outpost/engineering) +"ua" = ( +/obj/structure/rack, +/turf/open/floor/tile/dark/blue2{ + dir = 6 + }, +/area/campaign/som_raiding/outpost/command/north) +"ub" = ( +/obj/structure/bed/chair/office/dark{ + dir = 1 + }, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command/cic) +"ud" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/computer/som_two, +/turf/open/floor/tile/dark/blue2{ + dir = 5 + }, +/area/campaign/som_raiding/outpost/command) +"ue" = ( +/obj/structure/cable, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command) +"uf" = ( +/obj/structure/cable, +/turf/open/floor/mainship/mono, +/area/campaign/som_raiding/outpost/req) +"ug" = ( +/obj/structure/largecrate/random, +/turf/open/floor/tile/dark/gray, +/area/campaign/som_raiding/outpost/req/qm) +"uj" = ( +/turf/open/ground/grass/beach/corner, +/area/campaign/som_raiding/ground/jungle/west) +"ul" = ( +/obj/structure/largecrate/guns/russian, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/tile/dark/brown2{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/req/secure) +"uo" = ( +/obj/machinery/door/airlock/mainship/marine, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/security) +"uq" = ( +/turf/open/floor/tile/brown, +/area/campaign/som_raiding/outpost/req/aux) +"ur" = ( +/obj/structure/cable, +/turf/open/floor/tile/dark/green2{ + dir = 6 + }, +/area/campaign/som_raiding/outpost/central_corridor) +"ut" = ( +/turf/closed/mineral/smooth, +/area/campaign/som_raiding/outpost/security/southeast_post) +"uw" = ( +/obj/structure/table/reinforced, +/turf/open/floor/freezer, +/area/campaign/som_raiding/outpost/medbay) +"ux" = ( +/obj/effect/spawner/random/engineering/engibelt, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req/north) +"uy" = ( +/obj/effect/turf_decal/delivery, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req) +"uz" = ( +/obj/structure/table/mainship, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command/living) +"uB" = ( +/turf/open/floor/freezer, +/area/campaign/som_raiding/outpost/medbay) +"uC" = ( +/turf/open/floor/mainship/sterile/corner{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/medbay) +"uE" = ( +/obj/structure/largecrate/random, +/obj/structure/cable, +/turf/open/floor/tile/dark/gray, +/area/campaign/som_raiding/outpost/req/qm) +"uF" = ( +/turf/open/floor/plating/ground/dirtgrassborder2{ + dir = 1 + }, +/area/campaign/som_raiding/ground/jungle/north) +"uG" = ( +/obj/machinery/door/airlock/multi_tile/mainship/blackgeneric/glass, +/turf/open/floor/tile/dark/gray, +/area/campaign/som_raiding/outpost/req/aux) +"uH" = ( +/obj/structure/stairs/railstairs{ + dir = 1 + }, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/req/qm) +"uI" = ( +/obj/structure/largecrate/random, +/turf/open/floor/tile/dark/brown2{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/req/secure) +"uJ" = ( +/turf/open/floor/plating/ground/dirtgrassborder2/corner2{ + dir = 1 + }, +/area/campaign/som_raiding/ground/jungle/south_west) +"uK" = ( +/turf/open/floor/plating/ground/mars/random/cave/darker, +/area/campaign/som_raiding/outpost/maintenance) +"uL" = ( +/obj/structure/extinguisher_cabinet{ + dir = 4 + }, +/turf/open/floor/tile/dark/yellow2{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/engineering) +"uM" = ( +/turf/open/floor/tile/dark/green2/corner, +/area/campaign/som_raiding/outpost/living) +"uO" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/spawner/random/engineering/structure/gascan, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req/north) +"uQ" = ( +/obj/structure/largecrate, +/obj/machinery/door/window, +/turf/open/floor/mainship/mono, +/area/campaign/som_raiding/outpost/central_corridor) +"uR" = ( +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command/captain) +"uT" = ( +/obj/structure/cable, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/tunnel) +"uU" = ( +/obj/structure/prop/mainship/gelida/railbumper{ + dir = 8 + }, +/turf/open/floor/wood/alt_one, +/area/campaign/som_raiding/ground/jungle/south_east) +"uV" = ( +/obj/structure/bed/chair/alt{ + dir = 1 + }, +/turf/open/floor/mainship/red{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/living/briefing) +"uW" = ( +/obj/effect/landmark/patrol_point/som/som_13, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/living) +"uY" = ( +/obj/structure/window/framed/mainship/gray, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/req/secure) +"uZ" = ( +/obj/structure/table/black, +/obj/machinery/computer/emails, +/obj/structure/window/reinforced, +/turf/open/floor/tile/dark/blue2{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/command) +"va" = ( +/obj/structure/prop/vehicle/truck/truckcargo/destructible, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req/north) +"vb" = ( +/obj/machinery/computer/som_two{ + dir = 4 + }, +/turf/open/floor/tile/dark/red2{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/security/south_post) +"vc" = ( +/obj/structure/largecrate/guns, +/turf/open/floor/tile/dark/brown2{ + dir = 6 + }, +/area/campaign/som_raiding/outpost/req/secure) +"vd" = ( +/turf/open/floor/plating/ground/mars/random/cave, +/area/campaign/som_raiding/ground/jungle/south) +"ve" = ( +/obj/structure/largecrate/guns/merc, +/turf/open/floor/plating/ground/mars/random/cave/darker, +/area/campaign/som_raiding/outpost/tunnel) +"vf" = ( +/obj/structure/largecrate/supply/explosives/mortar_he, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/tile/dark/brown2{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/req/secure) +"vi" = ( +/obj/structure/prop/mainship/gelida/rails, +/turf/open/floor/plating/ground/mars/random/cave, +/area/campaign/som_raiding/ground/jungle) +"vj" = ( +/obj/structure/flora/jungle/bush, +/obj/structure/flora/jungle/grass/thin, +/turf/open/floor/plating/ground/dirtgrassborder2/corner{ + dir = 4 + }, +/area/campaign/som_raiding/ground/jungle) +"vk" = ( +/obj/structure/cable, +/turf/open/floor/tile/dark/blue2/corner{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/command) +"vn" = ( +/obj/structure/cable, +/turf/open/floor/tile/dark/blue2{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/command/cic) +"vo" = ( +/obj/machinery/atmospherics/components/unary/cryo_cell{ + dir = 8 + }, +/turf/open/floor/mainship/sterile/side{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/medbay) +"vp" = ( +/obj/structure/bed/bunkbed, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/mainship/mono, +/area/campaign/som_raiding/outpost/living) +"vq" = ( +/obj/structure/flora/jungle/grass/thin, +/obj/structure/flora/jungle/grass/thin, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle) +"vv" = ( +/obj/structure/largecrate/random/barrel/yellow, +/turf/open/floor/tile/dark/brown2/corner{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/req/secure) +"vw" = ( +/obj/structure/bed/chair{ + dir = 1 + }, +/turf/open/floor/tile/neutral/full, +/area/campaign/som_raiding/outpost/living/canteen) +"vA" = ( +/obj/structure/rock/variable/jungle, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle) +"vB" = ( +/obj/machinery/power/apc, +/obj/structure/cable, +/turf/open/floor/tile/showroom, +/area/campaign/som_raiding/outpost/living/bathroom) +"vC" = ( +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/west) +"vD" = ( +/obj/effect/turf_decal/siding/dark{ + dir = 6 + }, +/turf/open/floor/mainship/som/sw, +/area/campaign/som_raiding/outpost/command) +"vE" = ( +/obj/structure/cable, +/turf/open/floor/tile/dark/red2/corner{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/security/southeast_post) +"vF" = ( +/obj/structure/cargo_container/horizontal, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req) +"vG" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/tile/dark/brown2{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/req/secure) +"vI" = ( +/obj/structure/filingcabinet, +/turf/open/floor/tile/dark/blue2{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/command/captain) +"vL" = ( +/turf/open/floor/plating/ground/dirtgrassborder2, +/area/campaign/som_raiding/ground/jungle/north) +"vM" = ( +/obj/effect/turf_decal/grassdecal/corner{ + dir = 4 + }, +/turf/open/floor/plating/ground/mars/random/cave/darker, +/area/campaign/som_raiding/ground/jungle/south_east) +"vN" = ( +/turf/open/floor/plating/ground/dirtgrassborder2/corner{ + dir = 8 + }, +/area/campaign/som_raiding/ground/jungle) +"vO" = ( +/turf/closed/wall/mainship/gray, +/area/campaign/som_raiding/cave) +"vQ" = ( +/obj/structure/rack, +/obj/effect/spawner/random/engineering/tool, +/obj/effect/spawner/random/engineering/tool, +/turf/open/floor/tile/dark/yellow2{ + dir = 9 + }, +/area/campaign/som_raiding/outpost/engineering) +"vS" = ( +/obj/effect/turf_decal/sandedge/corner2{ + dir = 4 + }, +/obj/effect/turf_decal/sandedge{ + dir = 1 + }, +/obj/structure/prop/mainship/gelida/rails{ + dir = 1 + }, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/tunnel) +"vT" = ( +/turf/closed/wall/mainship/gray, +/area/campaign/som_raiding/outpost/security) +"vV" = ( +/obj/machinery/light{ + light_color = "#da2f1b" + }, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/tunnel) +"vX" = ( +/obj/machinery/microwave, +/obj/structure/table/mainship, +/turf/open/floor/tile/barber, +/area/campaign/som_raiding/outpost/living/kitchen) +"vY" = ( +/obj/structure/flora/grass/tallgrass/autosmooth, +/turf/open/floor/plating/ground/dirtgrassborder2{ + dir = 1 + }, +/area/campaign/som_raiding/ground/jungle/south_east) +"wb" = ( +/obj/machinery/light, +/obj/structure/cable, +/turf/open/floor/freezer, +/area/campaign/som_raiding/outpost/living/kitchen) +"wd" = ( +/obj/structure/xenoautopsy/tank, +/turf/open/floor/tile/dark/brown2/corner{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/req/secure) +"we" = ( +/obj/effect/turf_decal/grassdecal{ + dir = 1 + }, +/obj/structure/flora/jungle/grass, +/turf/open/floor/plating/ground/mars/random/cave/darker, +/area/campaign/som_raiding/ground/jungle/south_east) +"wf" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req) +"wg" = ( +/obj/structure/table/black, +/obj/item/weapon/gun/pistol/som, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/security) +"wh" = ( +/obj/machinery/light, +/obj/structure/cable, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/security) +"wi" = ( +/obj/structure/largecrate/supply/supplies/plasteel, +/turf/open/floor/tile/dark/brown2, +/area/campaign/som_raiding/outpost/req/secure) +"wj" = ( +/obj/structure/prop/mainship/gelida/rails{ + dir = 6 + }, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle) +"wl" = ( +/turf/open/floor/tile/dark/red2{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/security/west_post) +"wn" = ( +/turf/open/floor/tile/dark/green2, +/area/campaign/som_raiding/outpost/central_corridor) +"wo" = ( +/obj/structure/flora/drought/shroom/nara_root, +/turf/open/floor/plating/ground/mars/random/cave/darker, +/area/campaign/som_raiding/cave/tunnel) +"wp" = ( +/obj/structure/table/reinforced, +/obj/item/bodybag/cryobag, +/obj/item/bodybag/cryobag, +/obj/item/bodybag/cryobag, +/obj/machinery/light, +/turf/open/floor/mainship/sterile/side, +/area/campaign/som_raiding/outpost/medbay) +"wq" = ( +/obj/structure/bed/chair/office/dark{ + dir = 1 + }, +/obj/machinery/light, +/turf/open/floor/tile/dark/blue2, +/area/campaign/som_raiding/outpost/command/north) +"wr" = ( +/obj/machinery/door/airlock/mainship/generic{ + dir = 2 + }, +/obj/structure/cable, +/turf/open/floor/freezer, +/area/campaign/som_raiding/outpost/living/kitchen) +"ws" = ( +/obj/machinery/power/apc, +/obj/structure/cable, +/turf/open/floor/plating/ground/concrete/lines{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/tunnel) +"ww" = ( +/turf/open/floor/tile/dark/red2, +/area/campaign/som_raiding/outpost/security/cargo_post) +"wx" = ( +/obj/structure/largecrate/random, +/turf/open/floor/plating/ground/mars/random/cave/darker, +/area/campaign/som_raiding/outpost/req) +"wy" = ( +/obj/structure/largecrate/supply/explosives/grenades, +/turf/open/floor/tile/dark/brown2{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/req/secure) +"wz" = ( +/obj/machinery/door/airlock/multi_tile/mainship/engineering/glass, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/engineering) +"wA" = ( +/obj/structure/stairs/edge{ + dir = 8 + }, +/turf/open/floor/mainship/mono, +/area/campaign/som_raiding/outpost/req) +"wE" = ( +/obj/structure/table/reinforced, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/tile/showroom, +/area/campaign/som_raiding/outpost/living/bathroom) +"wF" = ( +/obj/structure/extinguisher_cabinet{ + dir = 1 + }, +/turf/open/floor/tile/dark/red2{ + dir = 6 + }, +/area/campaign/som_raiding/outpost/security/west_post) +"wI" = ( +/obj/effect/turf_decal/sandedge{ + dir = 1 + }, +/obj/structure/prop/mainship/gelida/rails{ + dir = 1 + }, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/tunnel) +"wJ" = ( +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/central_corridor) +"wK" = ( +/obj/structure/bed/chair/office/dark{ + dir = 1 + }, +/turf/open/floor/tile/dark/blue2/corner{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/command) +"wL" = ( +/obj/machinery/vending/nanomed{ + dir = 1 + }, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req/north) +"wM" = ( +/obj/structure/cable, +/turf/open/floor/mainship/mono, +/area/campaign/som_raiding/outpost/req/north) +"wN" = ( +/turf/open/floor/plating/ground/dirtgrassborder2, +/area/campaign/som_raiding/ground/jungle/south_east) +"wO" = ( +/obj/machinery/door/airlock/maintenance, +/obj/structure/cable, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command/telecom) +"wR" = ( +/obj/structure/flora/tree/jungle, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/south_east) +"wS" = ( +/obj/structure/cable, +/obj/item/trash/barcaridine, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/tile/dark/yellow2{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/engineering) +"wT" = ( +/turf/open/floor/tile/dark/blue2/corner, +/area/campaign/som_raiding/outpost/command/north) +"wU" = ( +/turf/closed/wall/brick, +/area/campaign/som_raiding/ground/jungle/south_east) +"wV" = ( +/obj/structure/table/black, +/turf/open/floor/tile/dark/red2{ + dir = 9 + }, +/area/campaign/som_raiding/outpost/security/west_post) +"wW" = ( +/obj/structure/window/reinforced, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command) +"wY" = ( +/turf/open/floor/tile/dark/green2/corner{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/central_corridor) +"wZ" = ( +/turf/closed/mineral/smooth/indestructible, +/area/campaign/som_raiding/ground/jungle/south_east) +"xc" = ( +/turf/closed/wall/mainship/gray, +/area/campaign/som_raiding/outpost/maintenance/req) +"xd" = ( +/obj/structure/table/reinforced, +/obj/item/bodybag/cryobag, +/obj/item/roller, +/turf/open/floor/mainship/sterile/side{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/medbay) +"xe" = ( +/obj/effect/spawner/random/misc/structure/flavorvending/engivend, +/turf/open/floor/tile/dark/yellow2{ + dir = 9 + }, +/area/campaign/som_raiding/outpost/engineering) +"xf" = ( +/turf/open/floor/plating/ground/concrete/edge{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/tunnel/west) +"xh" = ( +/turf/open/floor/tile/dark/yellow2/corner{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/engineering) +"xi" = ( +/turf/closed/mineral/smooth, +/area/campaign/som_raiding/ground/jungle) +"xj" = ( +/turf/open/floor/plating/dmg2, +/area/campaign/som_raiding/outpost/firing_range) +"xk" = ( +/turf/closed/mineral/smooth/indestructible, +/area/campaign/som_raiding/ground/jungle/north) +"xm" = ( +/obj/structure/largecrate/supply/explosives/grenades, +/turf/open/floor/tile/dark/brown2{ + dir = 6 + }, +/area/campaign/som_raiding/outpost/req/secure) +"xp" = ( +/obj/structure/rack, +/obj/effect/spawner/random/engineering/toolbox, +/turf/open/floor/mainship/mono, +/area/campaign/som_raiding/outpost/construction) +"xq" = ( +/obj/effect/turf_decal/grassdecal/corner{ + dir = 8 + }, +/obj/structure/flora/jungle/grass, +/turf/open/floor/plating/ground/mars/random/cave/darker, +/area/campaign/som_raiding/ground/jungle/south_east) +"xr" = ( +/obj/structure/largecrate/supply/ammo/shotgun, +/turf/open/floor/tile/dark/brown2, +/area/campaign/som_raiding/outpost/req/secure) +"xs" = ( +/obj/structure/table/black, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command/living) +"xt" = ( +/obj/structure/prop/brokenvendor/brokenweaponsrack, +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/tile/dark/red2{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/security/south_post) +"xv" = ( +/obj/structure/rock/variable/jungle_large, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle) +"xw" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/plating, +/area/campaign/som_raiding/outpost/maintenance/operation) +"xx" = ( +/turf/open/floor/plating/ground/dirtgrassborder2/corner2, +/area/campaign/som_raiding/ground/jungle) +"xz" = ( +/turf/open/floor/tile/dark/gray, +/area/campaign/som_raiding/outpost/req/aux) +"xA" = ( +/obj/machinery/vending/nanomed{ + dir = 8 + }, +/turf/open/floor/tile/dark/red2{ + dir = 6 + }, +/area/campaign/som_raiding/outpost/security/cargo_post) +"xB" = ( +/obj/structure/flora/jungle/bush, +/turf/open/floor/plating/ground/dirtgrassborder2{ + dir = 4 + }, +/area/campaign/som_raiding/ground/jungle/west) +"xC" = ( +/turf/open/floor/plating/ground/dirtgrassborder2/corner2, +/area/campaign/som_raiding/ground/jungle/north) +"xE" = ( +/turf/open/floor/mainship/sterile/side{ + dir = 5 + }, +/area/campaign/som_raiding/outpost/medbay) +"xH" = ( +/obj/machinery/processor{ + pixel_y = 5 + }, +/obj/machinery/light, +/turf/open/floor/tile/barber, +/area/campaign/som_raiding/outpost/living/kitchen) +"xI" = ( +/obj/structure/largecrate/random, +/turf/open/floor/tile/dark/brown2{ + dir = 6 + }, +/area/campaign/som_raiding/outpost/req/secure) +"xL" = ( +/obj/structure/cable, +/turf/open/floor/tile/dark/red2, +/area/campaign/som_raiding/outpost/security/cargo_post) +"xO" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/tile/dark/red2{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/security/cargo_post) +"xR" = ( +/obj/structure/window/framed/mainship/gray, +/obj/structure/platform{ + dir = 8 + }, +/turf/open/floor/tile/dark/gray, +/area/campaign/som_raiding/outpost/req/qm) +"xS" = ( +/obj/effect/landmark/patrol_point/som/som_11, +/turf/open/floor/tile/dark/green2{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/living) +"xT" = ( +/obj/structure/cable, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command/telecom) +"xU" = ( +/obj/structure/reagent_dispensers/fueltank/barrel, +/turf/open/floor/tile/dark/brown2{ + dir = 6 + }, +/area/campaign/som_raiding/outpost/req/secure) +"xV" = ( +/obj/effect/landmark/mob_spawner/farwa, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/south_east) +"xW" = ( +/obj/effect/landmark/campaign_structure/drop_blocker, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/south_east) +"xZ" = ( +/obj/structure/prop/mainship/gelida/miner, +/turf/open/floor/plating/ground/mars/random/cave, +/area/campaign/som_raiding/outpost/tunnel) +"ya" = ( +/obj/machinery/light{ + light_color = "#da2f1b" + }, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command/living) +"yb" = ( +/obj/structure/rack, +/obj/effect/spawner/random/engineering/tool, +/obj/effect/spawner/random/engineering/tool, +/turf/open/floor/tile/dark/gray, +/area/campaign/som_raiding/outpost/req/aux) +"ye" = ( +/turf/open/floor/plating/ground/dirtgrassborder2/corner2, +/area/campaign/som_raiding/ground/jungle/west) +"yf" = ( +/obj/structure/cable, +/turf/open/floor/tile/dark/red2{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/security/west_post) +"yg" = ( +/turf/open/floor/tile/dark/yellow2{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/engineering) +"yl" = ( +/obj/structure/girder, +/turf/open/floor/plating/ground/mars/random/cave/darker, +/area/campaign/som_raiding/outpost/security/south_post) +"ym" = ( +/obj/effect/landmark/patrol_point/som/som_14, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/living) +"yo" = ( +/obj/structure/largecrate/supply/ammo/m41a, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/tile/dark/brown2{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/req/secure) +"yq" = ( +/obj/structure/flora/jungle/large_bush, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/north) +"ys" = ( +/turf/open/floor/tile/dark/red2{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/security/north_post) +"yv" = ( +/turf/open/floor/tile/dark/red2{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/security/south_post) +"yx" = ( +/obj/structure/mine_structure/wooden/support_wall/beams, +/turf/open/floor/plating/ground/mars/random/cave/darker, +/area/campaign/som_raiding/cave/tunnel) +"yy" = ( +/turf/open/floor/plating, +/area/campaign/som_raiding/outpost/security/south_post) +"yz" = ( +/turf/closed/mineral/smooth/indestructible, +/area/campaign/som_raiding/cave) +"yC" = ( +/turf/closed/mineral/smooth, +/area/campaign/som_raiding/outpost/engineering) +"yF" = ( +/turf/closed/mineral/smooth, +/area/campaign/som_raiding/outpost/maintenance/cic) +"yG" = ( +/obj/structure/cable, +/turf/open/floor/mainship/sterile/side{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/medbay) +"yH" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/plating, +/area/campaign/som_raiding/outpost/maintenance/med) +"yI" = ( +/turf/closed/wall/mainship/gray, +/area/campaign/som_raiding/outpost/living/canteen) +"yK" = ( +/turf/closed/gm/dense, +/area/campaign/som_raiding/ground/jungle/south_east) +"yL" = ( +/obj/structure/table/reinforced, +/obj/item/roller, +/obj/effect/spawner/random/medical/pillbottle, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/mainship/sterile/side{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/medbay) +"yN" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/freezer, +/area/campaign/som_raiding/outpost/medbay) +"yO" = ( +/obj/structure/ship_ammo/cas/bomb/fourhundred, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/req/secure) +"yP" = ( +/obj/machinery/power/port_gen/pacman/mrs, +/turf/open/floor/tile/dark/yellow2{ + dir = 10 + }, +/area/campaign/som_raiding/outpost/engineering) +"yR" = ( +/obj/machinery/door/airlock/maintenance{ + dir = 1 + }, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command/north) +"yS" = ( +/turf/open/floor/plating/ground/dirtgrassborder2{ + dir = 1 + }, +/area/campaign/som_raiding/ground/jungle/south_west) +"yT" = ( +/obj/structure/cable, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/plating, +/area/campaign/som_raiding/outpost/maintenance/operation) +"yU" = ( +/obj/machinery/door/airlock/hatch, +/obj/structure/cable, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/security/west_post) +"yV" = ( +/obj/structure/prop/brokenvendor/brokenweaponsrack, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/security) +"yX" = ( +/turf/open/floor/tile/dark/blue2{ + dir = 5 + }, +/area/campaign/som_raiding/outpost/command) +"yZ" = ( +/obj/structure/flora/jungle/large_bush, +/turf/open/floor/plating/ground/dirtgrassborder2{ + dir = 1 + }, +/area/campaign/som_raiding/ground/jungle/south) +"za" = ( +/turf/open/floor/tile/dark/brown2/corner{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/req/secure) +"zc" = ( +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/security/southeast_post) +"ze" = ( +/obj/structure/platform{ + dir = 8 + }, +/turf/open/floor/plating, +/area/campaign/som_raiding/outpost/maintenance/req) +"zg" = ( +/obj/structure/prop/mainship/protolathe, +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/tile/dark/blue2{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/command) +"zi" = ( +/obj/structure/largecrate, +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/mainship/mono, +/area/campaign/som_raiding/outpost/central_corridor) +"zj" = ( +/obj/structure/cable, +/turf/open/floor/tile/dark/blue2{ + dir = 10 + }, +/area/campaign/som_raiding/outpost/command) +"zk" = ( +/turf/open/floor/tile/neutral/full, +/area/campaign/som_raiding/outpost/living/canteen) +"zl" = ( +/obj/structure/cable, +/obj/machinery/door/airlock/hatch{ + dir = 1 + }, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/security) +"zm" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/tile/dark/yellow2{ + dir = 6 + }, +/area/campaign/som_raiding/outpost/engineering) +"zo" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/plating, +/area/campaign/som_raiding/outpost/maintenance/operation) +"zq" = ( +/obj/structure/prop/mainship/gelida/rails{ + dir = 1 + }, +/obj/effect/turf_decal/sandedge{ + dir = 4 + }, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/south) +"zt" = ( +/obj/machinery/light{ + light_color = "#da2f1b" + }, +/turf/open/floor/tile/dark/red2, +/area/campaign/som_raiding/outpost/security/west_post) +"zw" = ( +/obj/machinery/door/airlock/mainship/security{ + dir = 2 + }, +/obj/structure/cable, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/security/cargo_post) +"zx" = ( +/obj/structure/filingcabinet, +/turf/open/floor/tile/dark/blue2{ + dir = 6 + }, +/area/campaign/som_raiding/outpost/command/captain) +"zy" = ( +/obj/machinery/door/airlock/maintenance{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/campaign/som_raiding/outpost/req/north) +"zz" = ( +/obj/machinery/door/airlock/multi_tile/mainship/blackgeneric/glass, +/obj/structure/cable, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/security) +"zA" = ( +/obj/structure/cable, +/turf/open/floor/tile/dark/yellow2{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/engineering) +"zB" = ( +/obj/structure/flora/jungle/bush, +/turf/open/floor/plating/ground/dirtgrassborder2/corner{ + dir = 8 + }, +/area/campaign/som_raiding/ground/jungle/north) +"zC" = ( +/obj/machinery/computer/som{ + dir = 1 + }, +/turf/open/floor/tile/dark/blue2, +/area/campaign/som_raiding/outpost/command/north) +"zD" = ( +/obj/structure/prop/mainship/halfbuilt_mech, +/obj/machinery/light, +/turf/open/floor/tile/dark/brown2, +/area/campaign/som_raiding/outpost/req/secure) +"zE" = ( +/obj/structure/rack, +/obj/effect/spawner/random/misc/greytide, +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/tile/brown{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/req/aux) +"zF" = ( +/obj/structure/table/black, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/security) +"zG" = ( +/obj/structure/cable, +/turf/open/floor/tile/dark/blue2{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/command/north) +"zI" = ( +/obj/structure/rack, +/obj/effect/spawner/random/food_or_drink/drink_cans, +/turf/open/floor/plating, +/area/campaign/som_raiding/outpost/maintenance) +"zJ" = ( +/turf/open/floor/tile/dark/brown2{ + dir = 10 + }, +/area/campaign/som_raiding/outpost/req/secure) +"zL" = ( +/obj/machinery/door/airlock/hatch, +/obj/structure/cable, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/living) +"zN" = ( +/turf/closed/wall/mainship/gray, +/area/campaign/som_raiding/outpost/command/living) +"zP" = ( +/turf/open/floor/plating/ground/concrete/lines{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/tunnel/west) +"zQ" = ( +/obj/structure/toilet{ + dir = 1 + }, +/obj/machinery/door/window{ + dir = 1 + }, +/turf/open/floor/tile/showroom, +/area/campaign/som_raiding/outpost/living/bathroom) +"zR" = ( +/obj/machinery/door/airlock/hatch, +/turf/open/floor/mainship/mono, +/area/campaign/som_raiding/outpost/command/telecom) +"zS" = ( +/obj/structure/rock/variable/jungle_large, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/south_east) +"zT" = ( +/turf/closed/mineral/smooth, +/area/campaign/som_raiding/outpost/command/telecom) +"zY" = ( +/obj/structure/cable, +/turf/open/floor/mainship/mono, +/area/campaign/som_raiding/outpost/construction) +"zZ" = ( +/obj/structure/largecrate/supply/weapons/hpr, +/turf/open/floor/tile/dark/brown2{ + dir = 5 + }, +/area/campaign/som_raiding/outpost/req/secure) +"Aa" = ( +/obj/structure/cable, +/turf/open/floor/plating, +/area/campaign/som_raiding/outpost/maintenance/req) +"Ab" = ( +/obj/structure/cable, +/turf/open/floor/plating, +/area/campaign/som_raiding/outpost/maintenance/med) +"Ac" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/plating, +/area/campaign/som_raiding/outpost/maintenance/med) +"Ad" = ( +/turf/closed/wall/mainship/gray, +/area/campaign/som_raiding/outpost/command/north) +"Ag" = ( +/obj/structure/reagent_dispensers/fueltank/barrel, +/turf/open/floor/tile/dark/brown2{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/req/secure) +"Ah" = ( +/obj/machinery/computer/som_two, +/turf/open/floor/tile/dark/blue2{ + dir = 9 + }, +/area/campaign/som_raiding/outpost/command) +"Ak" = ( +/obj/structure/bed/chair/alt{ + dir = 4 + }, +/turf/open/floor/tile/dark/green2{ + dir = 10 + }, +/area/campaign/som_raiding/outpost/central_corridor) +"Al" = ( +/turf/open/floor/mainship/red{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/living/briefing) +"An" = ( +/obj/structure/cable, +/turf/open/floor/tile/showroom, +/area/campaign/som_raiding/outpost/living/bathroom) +"Ap" = ( +/obj/structure/urinal, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/tile/showroom, +/area/campaign/som_raiding/outpost/living/bathroom) +"As" = ( +/obj/structure/cable, +/turf/open/floor/plating/ground/concrete/edge, +/area/campaign/som_raiding/outpost/req) +"Av" = ( +/obj/structure/rack, +/obj/effect/spawner/random/engineering/radio, +/obj/effect/spawner/random/engineering/cable, +/turf/open/floor/plating, +/area/campaign/som_raiding/outpost/tunnel) +"Aw" = ( +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req/north) +"Ay" = ( +/turf/open/floor/tile/dark/blue2{ + dir = 6 + }, +/area/campaign/som_raiding/outpost/command) +"Az" = ( +/obj/machinery/computer/som{ + dir = 4 + }, +/turf/open/floor/tile/dark/blue2{ + dir = 9 + }, +/area/campaign/som_raiding/outpost/command) +"AA" = ( +/obj/machinery/vending/snack, +/turf/open/floor/tile/dark/green2{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/central_corridor) +"AB" = ( +/obj/structure/largecrate/supply/medicine/iv, +/turf/open/floor/tile/brown{ + dir = 5 + }, +/area/campaign/som_raiding/outpost/req/aux) +"AC" = ( +/obj/structure/prop/mainship/gelida/rails, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle) +"AE" = ( +/obj/structure/flora/jungle/large_bush, +/turf/open/floor/plating/ground/dirtgrassborder2, +/area/campaign/som_raiding/ground/jungle/south) +"AI" = ( +/obj/structure/flora/jungle/grass/thin, +/turf/open/floor/plating/ground/dirtgrassborder2, +/area/campaign/som_raiding/ground/jungle/north) +"AJ" = ( +/turf/open/floor/tile/dark/blue2, +/area/campaign/som_raiding/outpost/command/captain) +"AO" = ( +/obj/structure/platform_decoration, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req/north) +"AS" = ( +/obj/machinery/light{ + light_color = "#da2f1b" + }, +/turf/open/floor/tile/dark/blue2, +/area/campaign/som_raiding/outpost/command) +"AT" = ( +/obj/structure/reagent_dispensers/fueltank/barrel, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/req/secure) +"AU" = ( +/obj/structure/flora/jungle/grass/thin, +/turf/open/floor/plating/ground/dirtgrassborder2{ + dir = 4 + }, +/area/campaign/som_raiding/ground/jungle/south_west) +"AV" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/tile/brown{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/req/aux) +"AW" = ( +/obj/structure/largecrate/supply/ammo/m41a_box, +/obj/machinery/light, +/turf/open/floor/tile/dark/brown2, +/area/campaign/som_raiding/outpost/req/secure) +"AY" = ( +/obj/structure/largecrate/supply/floodlights, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/tile/dark/brown2{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/req/secure) +"Ba" = ( +/turf/open/floor/plating/ground/concrete/edge{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/req) +"Bd" = ( +/obj/machinery/computer/som_two{ + dir = 8 + }, +/turf/open/floor/tile/dark/red2{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/security/north_post) +"Be" = ( +/obj/structure/window/framed/mainship/gray, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command) +"Bg" = ( +/obj/structure/cable, +/turf/open/floor/tile/brown/corner{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/req/aux) +"Bh" = ( +/obj/structure/rack, +/obj/effect/spawner/random/engineering/tool, +/turf/open/floor/tile/dark/gray, +/area/campaign/som_raiding/outpost/req/aux) +"Bj" = ( +/obj/structure/reagent_dispensers/watertank, +/turf/open/floor/plating/ground/mars/random/cave/darker, +/area/campaign/som_raiding/outpost/req) +"Bk" = ( +/obj/machinery/power/apc, +/obj/structure/cable, +/turf/open/floor/tile/dark/red2{ + dir = 9 + }, +/area/campaign/som_raiding/outpost/security/cargo_post) +"Bm" = ( +/obj/effect/turf_decal/sandedge{ + dir = 4 + }, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/tunnel/west) +"Bn" = ( +/obj/structure/table/mainship, +/obj/effect/spawner/random/food_or_drink/burger, +/turf/open/floor/tile/neutral/full, +/area/campaign/som_raiding/outpost/living/canteen) +"Bq" = ( +/obj/effect/turf_decal/siding/dark{ + dir = 1 + }, +/turf/open/floor/mainship/som, +/area/campaign/som_raiding/outpost/living/briefing) +"Bt" = ( +/obj/structure/bed/chair/office/dark{ + dir = 1 + }, +/turf/open/floor/tile/dark/gray, +/area/campaign/som_raiding/outpost/req/qm) +"Bv" = ( +/obj/effect/turf_decal/sandedge/corner{ + dir = 8 + }, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/south) +"Bw" = ( +/obj/structure/window/framed/mainship/gray, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/engineering) +"Bx" = ( +/obj/structure/largecrate/random/case/double, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req) +"By" = ( +/obj/structure/largecrate/supply/explosives/mortar_he, +/turf/open/floor/tile/dark/brown2{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/req/secure) +"Bz" = ( +/obj/structure/cargo_container/ch_green{ + dir = 4 + }, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req) +"BA" = ( +/obj/structure/platform{ + dir = 9 + }, +/turf/closed/wall/mainship/gray, +/area/campaign/som_raiding/outpost/maintenance/req) +"BB" = ( +/obj/machinery/door/airlock/multi_tile/mainship/blackgeneric/glass{ + dir = 2 + }, +/obj/structure/cable, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command/north) +"BC" = ( +/obj/structure/table/mainship, +/obj/item/trash/barcaridine, +/turf/open/floor/tile/neutral/full, +/area/campaign/som_raiding/outpost/living/canteen) +"BD" = ( +/obj/structure/prop/mainship/gelida/rails{ + dir = 8 + }, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle) +"BE" = ( +/turf/open/floor/tile/dark/gray, +/area/campaign/som_raiding/outpost/req/qm) +"BF" = ( +/obj/structure/mine_structure/cart, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle) +"BG" = ( +/obj/structure/cable, +/turf/open/floor/tile/dark/green2{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/central_corridor) +"BH" = ( +/obj/structure/cable, +/obj/effect/turf_decal/delivery, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req/north) +"BI" = ( +/obj/structure/cable, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/engineering) +"BJ" = ( +/obj/structure/extinguisher_cabinet{ + dir = 8 + }, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/security) +"BK" = ( +/obj/machinery/gibber, +/turf/open/floor/freezer, +/area/campaign/som_raiding/outpost/living/kitchen) +"BL" = ( +/turf/open/floor/tile/dark/red2, +/area/campaign/som_raiding/outpost/security/southeast_post) +"BM" = ( +/turf/closed/wall/mainship/gray, +/area/campaign/som_raiding/outpost/command/telecom) +"BO" = ( +/obj/structure/largecrate/supply/explosives/grenades, +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/tile/dark/brown2{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/req/secure) +"BP" = ( +/obj/structure/bed/chair/office/dark{ + dir = 8 + }, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/security/cargo_post) +"BQ" = ( +/obj/effect/spawner/random/engineering/structure/tank/fuelweighted, +/turf/open/floor/plating, +/area/campaign/som_raiding/outpost/maintenance) +"BS" = ( +/obj/structure/cable, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/security/southeast_post) +"BU" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command/telecom) +"BV" = ( +/turf/closed/mineral/smooth, +/area/campaign/som_raiding/ground/jungle/south_west) +"BY" = ( +/obj/machinery/status_display, +/turf/closed/wall/mainship/gray, +/area/campaign/som_raiding/outpost/security) +"Ca" = ( +/obj/structure/largecrate, +/turf/open/floor/tile/brown{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/req/aux) +"Cb" = ( +/obj/structure/cable, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/security/west_post) +"Cd" = ( +/obj/machinery/door/airlock/maintenance{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/campaign/som_raiding/outpost/req/secure) +"Cf" = ( +/turf/open/floor/plating/ground/concrete/lines{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/req/north) +"Ch" = ( +/turf/open/floor/plating/ground/dirtgrassborder2/corner2{ + dir = 1 + }, +/area/campaign/som_raiding/ground/jungle/south_east) +"Cj" = ( +/obj/structure/bed/chair/office/dark{ + dir = 4 + }, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/security/north_post) +"Ck" = ( +/obj/effect/turf_decal/siding/dark{ + dir = 5 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/mainship/som/nw, +/area/campaign/som_raiding/outpost/living/briefing) +"Cl" = ( +/turf/open/floor/tile/dark/blue2/corner{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/command) +"Cm" = ( +/obj/structure/cable, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/security/cargo_post) +"Cn" = ( +/obj/structure/flora/jungle/bush, +/turf/open/floor/plating/ground/dirtgrassborder2{ + dir = 8 + }, +/area/campaign/som_raiding/ground/jungle/north) +"Co" = ( +/obj/structure/ship_ammo/cas/minirocket, +/turf/open/floor/tile/dark/brown2{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/req/secure) +"Cp" = ( +/turf/open/floor/plating/ground/concrete/lines, +/area/campaign/som_raiding/outpost/tunnel/west) +"Cq" = ( +/turf/closed/mineral/smooth, +/area/campaign/som_raiding/outpost/living/briefing) +"Ct" = ( +/obj/structure/flora/tree/jungle/small, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/south_west) +"Cu" = ( +/obj/structure/bed/bunkbed, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/living) +"Cz" = ( +/turf/open/floor/plating/ground/concrete/lines{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/req) +"CA" = ( +/obj/machinery/light{ + light_color = "#da2f1b" + }, +/obj/effect/turf_decal/box, +/obj/effect/spawner/random/engineering/structure/tank/waterweighted, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req) +"CB" = ( +/obj/structure/filingcabinet, +/turf/open/floor/tile/brown, +/area/campaign/som_raiding/outpost/req/aux) +"CD" = ( +/turf/open/floor/mainship/mono, +/area/campaign/som_raiding/outpost/living/briefing) +"CE" = ( +/obj/structure/prop/brokenvendor/surplusclothes, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/security) +"CF" = ( +/obj/machinery/door/airlock/mainship/generic, +/turf/open/floor/tile/barber, +/area/campaign/som_raiding/outpost/living/kitchen) +"CI" = ( +/obj/structure/extinguisher_cabinet, +/turf/open/floor/tile/brown{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/req/qm) +"CJ" = ( +/obj/effect/turf_decal/sandedge/corner2{ + dir = 4 + }, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/tunnel) +"CK" = ( +/obj/machinery/power/apc, +/obj/structure/cable, +/turf/open/floor/mainship/red{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/living/briefing) +"CL" = ( +/turf/closed/wall/mainship/gray, +/area/campaign/som_raiding/outpost/command/captain) +"CM" = ( +/turf/open/floor/plating/dmg1, +/area/campaign/som_raiding/outpost/construction) +"CN" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/security) +"CO" = ( +/obj/structure/largecrate/supply/supplies/sandbags, +/turf/open/floor/tile/dark/brown2{ + dir = 9 + }, +/area/campaign/som_raiding/outpost/req/secure) +"CP" = ( +/obj/machinery/door/airlock/maintenance, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/central_corridor) +"CR" = ( +/obj/structure/cable, +/turf/open/floor/plating, +/area/campaign/som_raiding/outpost/tunnel/west) +"CS" = ( +/obj/structure/cable, +/turf/open/floor/tile/dark/red2{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/security/cargo_post) +"CU" = ( +/obj/structure/ship_ammo/cas/heavygun, +/turf/open/floor/tile/dark/brown2{ + dir = 10 + }, +/area/campaign/som_raiding/outpost/req/secure) +"CW" = ( +/turf/open/floor/tile/dark/yellow2{ + dir = 10 + }, +/area/campaign/som_raiding/outpost/engineering) +"CZ" = ( +/obj/machinery/light, +/turf/open/floor/tile/dark/green2, +/area/campaign/som_raiding/outpost/central_corridor) +"Da" = ( +/obj/machinery/door/airlock/hatch{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/central_corridor) +"Dd" = ( +/turf/open/floor/tile/barber, +/area/campaign/som_raiding/outpost/living/kitchen) +"De" = ( +/obj/effect/turf_decal/sandedge/corner{ + dir = 8 + }, +/turf/open/floor/plating/ground/mars/random/cave/darker, +/area/campaign/som_raiding/outpost/tunnel) +"Df" = ( +/obj/structure/flora/jungle/grass/thin, +/turf/open/ground/grass/beach{ + dir = 1 + }, +/area/campaign/som_raiding/ground/jungle/north) +"Dg" = ( +/obj/structure/flora/jungle/grass, +/turf/open/floor/plating/ground/dirtgrassborder2/corner{ + dir = 4 + }, +/area/campaign/som_raiding/ground/jungle/south_east) +"Dk" = ( +/obj/structure/largecrate/supply/supplies/flares, +/turf/open/floor/tile/dark/brown2, +/area/campaign/som_raiding/outpost/req/secure) +"Dl" = ( +/obj/effect/turf_decal/sandedge/corner2{ + dir = 1 + }, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle) +"Dm" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/structure/bed/chair/comfy{ + dir = 8 + }, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command/living) +"Dq" = ( +/obj/structure/extinguisher_cabinet{ + dir = 1 + }, +/turf/open/floor/tile/dark/blue2, +/area/campaign/som_raiding/outpost/command/cic) +"Dr" = ( +/obj/structure/table/black, +/obj/item/weapon/gun/rifle/mpi_km/black/magharness, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/security) +"Ds" = ( +/obj/machinery/door/airlock/hatch, +/obj/structure/cable, +/turf/open/floor/mainship/mono, +/area/campaign/som_raiding/outpost/living/briefing) +"Dt" = ( +/obj/structure/largecrate, +/turf/open/floor/wood/alt_one, +/area/campaign/som_raiding/ground/jungle/south_east) +"Du" = ( +/obj/machinery/status_display, +/turf/closed/wall/mainship/gray, +/area/campaign/som_raiding/outpost/command/living) +"Dv" = ( +/obj/structure/bed/chair/comfy{ + dir = 4 + }, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command/living) +"Dy" = ( +/obj/structure/cargo_container/nt{ + dir = 4 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req) +"Dz" = ( +/turf/closed/mineral/smooth, +/area/campaign/som_raiding/cave/tunnel) +"DC" = ( +/obj/machinery/door/airlock/maintenance, +/turf/open/floor/mainship/mono, +/area/campaign/som_raiding/outpost/req) +"DD" = ( +/obj/structure/cable, +/turf/open/floor/tile/dark/red2{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/security/west_post) +"DE" = ( +/obj/machinery/computer/som, +/turf/open/floor/tile/dark/red2{ + dir = 5 + }, +/area/campaign/som_raiding/outpost/security/west_post) +"DF" = ( +/turf/open/floor/tile/dark/yellow2{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/engineering) +"DG" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/freezer, +/area/campaign/som_raiding/outpost/medbay) +"DH" = ( +/obj/machinery/door/airlock/mainship/medical/free_access, +/turf/open/floor/mainship/sterile/dark, +/area/campaign/som_raiding/outpost/medbay) +"DI" = ( +/obj/machinery/door/airlock/hatch, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/security) +"DJ" = ( +/obj/structure/flora/jungle/grass/thin, +/turf/open/floor/plating/ground/dirtgrassborder2/corner{ + dir = 1 + }, +/area/campaign/som_raiding/ground/jungle) +"DK" = ( +/obj/structure/bed/chair/comfy{ + dir = 8 + }, +/turf/open/floor/tile/dark/blue2{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/command/captain) +"DL" = ( +/obj/effect/turf_decal/sandedge{ + dir = 1 + }, +/turf/open/floor/plating/ground/mars/random/cave/darker, +/area/campaign/som_raiding/outpost/tunnel) +"DM" = ( +/obj/structure/cargo_container/ch_red{ + dir = 4 + }, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req) +"DO" = ( +/obj/structure/cable, +/obj/structure/stairs/edge, +/turf/open/floor/plating, +/area/campaign/som_raiding/outpost/maintenance/req) +"DP" = ( +/turf/open/floor/tile/dark/yellow2{ + dir = 9 + }, +/area/campaign/som_raiding/outpost/engineering) +"DQ" = ( +/turf/open/floor/plating/ground/dirtgrassborder2, +/area/campaign/som_raiding/ground/jungle/west) +"DR" = ( +/turf/open/floor/plating/ground/dirtgrassborder2/corner2{ + dir = 8 + }, +/area/campaign/som_raiding/ground/jungle/west) +"DS" = ( +/turf/open/floor/tile/dark/yellow2{ + dir = 6 + }, +/area/campaign/som_raiding/outpost/engineering) +"DT" = ( +/turf/open/floor/plating/ground/dirtgrassborder2/corner{ + dir = 4 + }, +/area/campaign/som_raiding/ground/jungle) +"DU" = ( +/obj/effect/turf_decal/siding/dark{ + dir = 1 + }, +/turf/open/floor/mainship/som, +/area/campaign/som_raiding/outpost/command) +"DW" = ( +/obj/structure/rock/variable/jungle/big, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/north) +"DX" = ( +/obj/structure/reagent_dispensers/water_cooler, +/turf/open/floor/tile/dark/blue2{ + dir = 9 + }, +/area/campaign/som_raiding/outpost/command/north) +"Ea" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/tile/dark/blue2{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/command) +"Eb" = ( +/obj/structure/table/black, +/turf/open/floor/tile/dark/blue2{ + dir = 5 + }, +/area/campaign/som_raiding/outpost/command/cic) +"Ec" = ( +/obj/effect/spawner/random/engineering/structure/tank/fuelweighted, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req/north) +"Ef" = ( +/obj/structure/cable, +/turf/open/floor/tile/dark/green2, +/area/campaign/som_raiding/outpost/central_corridor) +"Eg" = ( +/turf/open/floor/wood/alt_one, +/area/campaign/som_raiding/ground/jungle/south_east) +"Ei" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/turf_decal/warning_stripes/box, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/security) +"Ej" = ( +/obj/structure/table/reinforced, +/obj/item/defibrillator, +/turf/open/floor/mainship/sterile/corner{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/medbay) +"El" = ( +/obj/structure/stairs/seamless/platform{ + dir = 4 + }, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/req/north) +"Em" = ( +/obj/effect/landmark/patrol_point/tgmc_24, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/south_west) +"En" = ( +/turf/open/floor/plating/ground/concrete/edge, +/area/campaign/som_raiding/outpost/tunnel) +"Eo" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/tile/dark/yellow2{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/engineering) +"Ep" = ( +/obj/structure/ship_ammo/cas/rocket/monarch, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/req/secure) +"Eq" = ( +/obj/machinery/door/airlock/mainship/marine{ + dir = 2 + }, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/security) +"Er" = ( +/turf/open/floor/plating, +/area/campaign/som_raiding/outpost/tunnel) +"Et" = ( +/turf/open/floor/mainship/red{ + dir = 5 + }, +/area/campaign/som_raiding/outpost/living/briefing) +"Eu" = ( +/turf/open/floor/mainship/red/corner{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/living/briefing) +"Ev" = ( +/obj/structure/largecrate/machine, +/turf/open/floor/wood/alt_one, +/area/campaign/som_raiding/ground/jungle/south_east) +"Ew" = ( +/obj/structure/flora/jungle/grass, +/turf/open/floor/plating/ground/dirtgrassborder2, +/area/campaign/som_raiding/ground/jungle/south_west) +"Ex" = ( +/obj/structure/flora/grass/tallgrass/autosmooth, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/south_east) +"Ey" = ( +/turf/open/floor/tile/dark/green2/corner{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/central_corridor) +"Ez" = ( +/turf/closed/wall/mainship/gray, +/area/campaign/som_raiding/outpost/security/south_post) +"EA" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/security/north_post) +"EB" = ( +/obj/structure/flora/tree/jungle, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/south) +"ED" = ( +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req) +"EF" = ( +/obj/structure/flora/jungle/large_bush, +/obj/structure/flora/jungle/bush, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/west) +"EG" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/tile/dark/blue2{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/command/north) +"EI" = ( +/obj/machinery/light{ + light_color = "#da2f1b" + }, +/turf/open/floor/tile/dark/green2, +/area/campaign/som_raiding/outpost/central_corridor) +"EJ" = ( +/turf/open/floor/plating/ground/concrete/edge{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/req/north) +"EK" = ( +/obj/structure/table/black, +/obj/machinery/vending/nanomed{ + dir = 4 + }, +/turf/open/floor/tile/dark/red2{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/security/west_post) +"EL" = ( +/obj/structure/reagent_dispensers/fueltank/barrel, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/tunnel) +"EO" = ( +/turf/open/floor/plating/ground/dirtgrassborder2/corner2{ + dir = 8 + }, +/area/campaign/som_raiding/ground/jungle/south_east) +"EP" = ( +/obj/structure/flora/jungle/bush, +/turf/closed/gm/dense, +/area/campaign/som_raiding/ground/jungle/west) +"EQ" = ( +/obj/effect/turf_decal/siding/dark{ + dir = 10 + }, +/obj/structure/bed/chair/alt, +/turf/open/floor/mainship/som/se, +/area/campaign/som_raiding/outpost/living/briefing) +"ER" = ( +/turf/open/floor/plating/ground/concrete/lines, +/area/campaign/som_raiding/outpost/tunnel) +"ES" = ( +/obj/machinery/door/airlock/maintenance, +/obj/structure/cable, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/central_corridor) +"ET" = ( +/obj/effect/decal/cleanable/blood/drip, +/turf/open/floor/mainship/mono, +/area/campaign/som_raiding/outpost/construction) +"EV" = ( +/obj/structure/flora/drought/shroom, +/turf/open/floor/plating/ground/mars/random/cave/darker, +/area/campaign/som_raiding/cave/tunnel) +"EY" = ( +/turf/closed/wall/mainship/gray, +/area/campaign/som_raiding/outpost/security/north_post) +"Fa" = ( +/obj/effect/turf_decal/siding/dark, +/obj/structure/bed/chair/alt, +/turf/open/floor/mainship/som/s, +/area/campaign/som_raiding/outpost/living/briefing) +"Fc" = ( +/obj/machinery/cic_maptable/no_flags, +/turf/open/floor/tile/dark/red2{ + dir = 10 + }, +/area/campaign/som_raiding/outpost/security/south_post) +"Ff" = ( +/obj/structure/extinguisher_cabinet{ + dir = 8 + }, +/obj/structure/table/reinforced, +/obj/item/roller, +/obj/effect/spawner/random/medical/pillbottle, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/mainship/sterile/side{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/medbay) +"Fi" = ( +/obj/machinery/vending/nanomed{ + dir = 1 + }, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/firing_range) +"Fj" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/tile/dark/blue2{ + dir = 9 + }, +/area/campaign/som_raiding/outpost/command/captain) +"Fl" = ( +/obj/structure/bed/chair/alt{ + dir = 1 + }, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/security) +"Fn" = ( +/turf/open/ground/grass/beach/corner{ + dir = 4 + }, +/area/campaign/som_raiding/ground/jungle/north) +"Fo" = ( +/turf/open/floor/tile/dark/yellow2/corner{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/engineering) +"Fq" = ( +/obj/structure/bed/bunkbed, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/tile/dark/green2{ + dir = 5 + }, +/area/campaign/som_raiding/outpost/living) +"Fs" = ( +/turf/open/floor/tile/dark/red2{ + dir = 6 + }, +/area/campaign/som_raiding/outpost/security/south_post) +"Fv" = ( +/obj/structure/reagent_dispensers/fueltank, +/turf/open/floor/tile/brown{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/req/aux) +"Fw" = ( +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/south_west) +"Fx" = ( +/obj/structure/cable, +/turf/open/floor/tile/dark/red2{ + dir = 9 + }, +/area/campaign/som_raiding/outpost/security/southeast_post) +"Fy" = ( +/turf/open/floor/plating/ground/dirtgrassborder2/corner2, +/area/campaign/som_raiding/ground/jungle/south_west) +"Fz" = ( +/turf/open/floor/plating/ground/dirtgrassborder2/corner2{ + dir = 1 + }, +/area/campaign/som_raiding/ground/jungle/north) +"FA" = ( +/obj/structure/cable, +/obj/machinery/light{ + light_color = "#da2f1b" + }, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/construction) +"FB" = ( +/obj/structure/cargo_container/nt, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req) +"FC" = ( +/obj/structure/prop/mainship/mission_planning_system, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command/telecom) +"FF" = ( +/turf/open/floor/plating/ground/dirtgrassborder2{ + dir = 8 + }, +/area/campaign/som_raiding/ground/jungle/south_west) +"FG" = ( +/obj/structure/stairs/seamless/platform_vert{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/tile/dark/gray, +/area/campaign/som_raiding/outpost/req/north) +"FH" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/tile/dark/green2{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/central_corridor) +"FJ" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/computer/som_two, +/turf/open/floor/tile/dark/blue2{ + dir = 9 + }, +/area/campaign/som_raiding/outpost/command) +"FK" = ( +/obj/structure/bed/fancy, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command/living) +"FL" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command/telecom) +"FN" = ( +/obj/structure/bed/chair/office/dark, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command/telecom) +"FQ" = ( +/turf/open/floor/plating, +/area/campaign/som_raiding/outpost/maintenance/cic) +"FR" = ( +/obj/machinery/door/airlock/multi_tile/mainship/blackgeneric, +/turf/open/floor/tile/showroom, +/area/campaign/som_raiding/outpost/living/bathroom) +"FS" = ( +/turf/open/floor/tile/dark/red2{ + dir = 5 + }, +/area/campaign/som_raiding/outpost/security/cargo_post) +"FT" = ( +/obj/machinery/shower{ + dir = 1 + }, +/turf/open/floor/tile/showroom, +/area/campaign/som_raiding/outpost/living/bathroom) +"FU" = ( +/turf/open/floor/tile/dark/brown2/corner{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/req/secure) +"FV" = ( +/obj/machinery/light, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/firing_range) +"FZ" = ( +/obj/effect/turf_decal/grassdecal{ + dir = 1 + }, +/turf/open/floor/plating/ground/mars/random/cave/darker, +/area/campaign/som_raiding/ground/jungle/south_east) +"Ga" = ( +/obj/structure/prop/mainship/gelida/rails, +/obj/effect/turf_decal/sandedge{ + dir = 4 + }, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/south) +"Gc" = ( +/obj/machinery/vending/coffee, +/turf/open/floor/tile/dark/blue2{ + dir = 6 + }, +/area/campaign/som_raiding/outpost/command/north) +"Ge" = ( +/obj/effect/turf_decal/sandedge/corner2{ + dir = 8 + }, +/obj/structure/flora/jungle/large_bush, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/south) +"Gf" = ( +/obj/machinery/vending/nanomed{ + dir = 8 + }, +/turf/open/floor/tile/dark/red2{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/security/southeast_post) +"Gg" = ( +/obj/structure/rock/variable/jungle, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/south_east) +"Gh" = ( +/obj/structure/platform_decoration{ + dir = 8 + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req/north) +"Gj" = ( +/obj/structure/flora/jungle/large_bush, +/turf/open/floor/plating/ground/dirtgrassborder2{ + dir = 8 + }, +/area/campaign/som_raiding/ground/jungle/north) +"Gk" = ( +/obj/structure/rock/variable/jungle/big, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/south_west) +"Gm" = ( +/obj/structure/ship_ammo/cas/rocket/fatty, +/turf/open/floor/tile/dark/brown2{ + dir = 10 + }, +/area/campaign/som_raiding/outpost/req/secure) +"Go" = ( +/obj/structure/flora/jungle/grass/thin, +/turf/open/liquid/water, +/area/campaign/som_raiding/ground/jungle/west) +"Gp" = ( +/obj/structure/largecrate/random/barrel/green, +/turf/open/floor/plating/ground/mars/random/cave, +/area/campaign/som_raiding/outpost/tunnel) +"Gq" = ( +/obj/structure/bed/bunkbed, +/turf/open/floor/tile/dark/green2{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/living) +"Gs" = ( +/obj/structure/prop/brokenvendor/brokenweaponsrack, +/turf/open/floor/tile/dark/red2{ + dir = 6 + }, +/area/campaign/som_raiding/outpost/security/west_post) +"Gt" = ( +/obj/machinery/power/apc, +/obj/structure/cable, +/turf/open/floor/tile/dark/blue2{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/command/cic) +"Gu" = ( +/obj/effect/turf_decal/sandedge/corner, +/obj/structure/flora/jungle/grass/thin, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/south) +"Gx" = ( +/obj/effect/turf_decal/sandedge/corner{ + dir = 8 + }, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/tunnel/west) +"GA" = ( +/obj/structure/table/black, +/obj/machinery/computer/emails, +/turf/open/floor/tile/dark/blue2{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/command) +"GC" = ( +/obj/structure/stairs/seamless/platform, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/req/north) +"GD" = ( +/turf/open/floor/plating/ground/dirtgrassborder2/corner{ + dir = 4 + }, +/area/campaign/som_raiding/ground/jungle/south_east) +"GF" = ( +/obj/machinery/door/airlock/hatch{ + dir = 1 + }, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/req/secure) +"GG" = ( +/obj/structure/table/reinforced, +/obj/machinery/light{ + light_color = "#da2f1b" + }, +/turf/open/floor/tile/brown{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/req/qm) +"GI" = ( +/obj/structure/rack, +/obj/effect/spawner/random/engineering/powercell, +/turf/open/floor/mainship/mono, +/area/campaign/som_raiding/outpost/central_corridor) +"GK" = ( +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/south_east) +"GL" = ( +/obj/item/trash/cigbutt, +/obj/item/trash/cigbutt, +/obj/structure/table/reinforced, +/obj/item/clipboard, +/obj/item/paper, +/obj/item/paper, +/obj/item/tool/pen/blue, +/obj/machinery/light, +/turf/open/floor/tile/brown, +/area/campaign/som_raiding/outpost/req/qm) +"GM" = ( +/obj/effect/turf_decal/siding/dark{ + dir = 6 + }, +/obj/structure/bed/chair/alt, +/turf/open/floor/mainship/som/sw, +/area/campaign/som_raiding/outpost/living/briefing) +"GN" = ( +/obj/effect/turf_decal/sandedge/corner, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle) +"GP" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/tile/dark/red2{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/security/southeast_post) +"GR" = ( +/obj/structure/flora/jungle/grass/thin, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/south) +"GS" = ( +/obj/structure/flora/grass/tallgrass/autosmooth, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/south) +"GU" = ( +/turf/open/floor/tile/dark/green2{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/living) +"GV" = ( +/obj/structure/bed/chair/alt{ + dir = 8 + }, +/turf/open/floor/tile/dark/blue2{ + dir = 5 + }, +/area/campaign/som_raiding/outpost/command) +"GW" = ( +/turf/open/floor/plating/ground/concrete/lines{ + dir = 10 + }, +/area/campaign/som_raiding/outpost/tunnel) +"GX" = ( +/turf/open/floor/plating/ground/concrete/edge{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/req/north) +"Hc" = ( +/obj/structure/flora/jungle/grass, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/south_east) +"Hd" = ( +/turf/open/floor/tile/dark/blue2{ + dir = 5 + }, +/area/campaign/som_raiding/outpost/command/north) +"Hi" = ( +/obj/structure/cargo_container/hd_blue, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req) +"Hj" = ( +/obj/structure/reagent_dispensers/fueltank, +/turf/open/floor/tile/dark/brown2{ + dir = 9 + }, +/area/campaign/som_raiding/outpost/req/secure) +"Hk" = ( +/turf/open/floor/tile/dark/blue2{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/command) +"Hl" = ( +/turf/open/floor/plating/ground/dirtgrassborder2/corner2{ + dir = 4 + }, +/area/campaign/som_raiding/ground/jungle/south_west) +"Hm" = ( +/obj/structure/largecrate/random/barrel/green, +/turf/open/floor/tile/dark/brown2/corner{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/req/secure) +"Hn" = ( +/obj/structure/cable, +/turf/open/floor/tile/dark/blue2/corner{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/command) +"Ho" = ( +/turf/closed/mineral/smooth/indestructible, +/area/campaign/som_raiding/ground/jungle/south) +"Hq" = ( +/obj/structure/cable, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req) +"Hr" = ( +/obj/structure/cable, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req) +"Hu" = ( +/turf/closed/wall/mainship/gray, +/area/campaign/som_raiding/outpost/tunnel/west) +"Hw" = ( +/obj/structure/table/black, +/obj/item/explosive/grenade/som, +/turf/open/floor/tile/dark/red2{ + dir = 5 + }, +/area/campaign/som_raiding/outpost/security/north_post) +"Hx" = ( +/obj/structure/bed/chair/office/dark{ + dir = 1 + }, +/turf/open/floor/tile/dark/blue2, +/area/campaign/som_raiding/outpost/command/north) +"Hy" = ( +/obj/machinery/power/apc, +/obj/structure/cable, +/obj/effect/turf_decal/box, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req/north) +"HA" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/plating, +/area/campaign/som_raiding/outpost/maintenance/req) +"HB" = ( +/obj/structure/cable, +/turf/open/floor/tile/brown{ + dir = 9 + }, +/area/campaign/som_raiding/outpost/req/qm) +"HC" = ( +/obj/item/ammo_casing/shell, +/obj/item/ammo_casing/shell, +/obj/item/trash/cigbutt, +/turf/open/floor/mainship/mono, +/area/campaign/som_raiding/outpost/construction) +"HD" = ( +/turf/open/ground/grass/beach, +/area/campaign/som_raiding/ground/jungle/north) +"HE" = ( +/obj/structure/table/black, +/turf/open/floor/tile/dark/red2{ + dir = 6 + }, +/area/campaign/som_raiding/outpost/security/north_post) +"HF" = ( +/obj/structure/table/black, +/obj/effect/spawner/random/engineering/radio, +/turf/open/floor/tile/dark/red2{ + dir = 9 + }, +/area/campaign/som_raiding/outpost/security/south_post) +"HG" = ( +/obj/machinery/status_display, +/turf/closed/wall/mainship/gray, +/area/campaign/som_raiding/outpost/command/captain) +"HI" = ( +/obj/machinery/door/airlock/maintenance, +/turf/open/floor/plating, +/area/campaign/som_raiding/outpost/engineering) +"HJ" = ( +/turf/open/floor/plating/ground/concrete/lines{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/tunnel) +"HK" = ( +/obj/machinery/computer/som_two{ + dir = 4 + }, +/turf/open/floor/tile/brown{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/req/qm) +"HL" = ( +/turf/open/floor/mainship/sterile/side, +/area/campaign/som_raiding/outpost/medbay) +"HN" = ( +/turf/closed/mineral/smooth, +/area/campaign/som_raiding/outpost/command/north) +"HO" = ( +/turf/closed/wall/mainship/gray, +/area/campaign/som_raiding/outpost/construction) +"HQ" = ( +/obj/effect/spawner/random/misc/structure/closet/tool, +/turf/open/floor/tile/dark/yellow2{ + dir = 10 + }, +/area/campaign/som_raiding/outpost/engineering) +"HS" = ( +/obj/machinery/door/airlock/mainship/engineering, +/obj/structure/cable, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/central_corridor) +"HV" = ( +/obj/structure/prop/brokenvendor/brokenspecialistvendor/corpsman, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/security) +"HX" = ( +/obj/machinery/door/airlock/maintenance{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/central_corridor) +"HY" = ( +/obj/structure/prop/brokenvendor/brokenweaponsrack, +/turf/open/floor/tile/dark/red2{ + dir = 10 + }, +/area/campaign/som_raiding/outpost/security/cargo_post) +"HZ" = ( +/turf/open/floor/plating/ground/dirtgrassborder2, +/area/campaign/som_raiding/ground/jungle/south_west) +"Ia" = ( +/turf/open/ground/grass/beach/corner2{ + dir = 4 + }, +/area/campaign/som_raiding/ground/jungle/north) +"Ic" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/plating/ground/concrete/lines{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/tunnel) +"Ie" = ( +/obj/structure/cable, +/turf/open/floor/mainship/red, +/area/campaign/som_raiding/outpost/living/briefing) +"If" = ( +/turf/open/floor/tile/dark/green2{ + dir = 9 + }, +/area/campaign/som_raiding/outpost/living) +"Ig" = ( +/obj/machinery/light{ + light_color = "#da2f1b" + }, +/turf/open/floor/mainship/mono, +/area/campaign/som_raiding/outpost/construction) +"Ii" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/power/apc{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/tile/dark/blue2{ + dir = 5 + }, +/area/campaign/som_raiding/outpost/command) +"Ij" = ( +/turf/open/floor/plating/ground/concrete/edge{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/req) +"Ik" = ( +/obj/effect/turf_decal/sandedge{ + dir = 8 + }, +/obj/structure/flora/jungle/grass/thin, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/north) +"Il" = ( +/turf/closed/mineral/smooth, +/area/campaign/som_raiding/outpost/security/south_post) +"Im" = ( +/obj/effect/turf_decal/bot, +/turf/open/floor/tile/dark/brown2{ + dir = 9 + }, +/area/campaign/som_raiding/outpost/req/secure) +"In" = ( +/turf/open/floor/plating/ground/dirtgrassborder2{ + dir = 1 + }, +/area/campaign/som_raiding/ground/jungle) +"Io" = ( +/obj/structure/flora/jungle/grass/thin, +/obj/effect/landmark/mob_spawner/farwa, +/turf/open/floor/plating/ground/dirtgrassborder2{ + dir = 4 + }, +/area/campaign/som_raiding/ground/jungle/north) +"It" = ( +/obj/effect/spawner/random/engineering/assemblies, +/turf/open/floor/plating, +/area/campaign/som_raiding/outpost/maintenance/med) +"Iw" = ( +/turf/open/floor/tile/dark/green2{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/central_corridor) +"IA" = ( +/obj/structure/largecrate, +/turf/open/floor/tile/brown{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/req/aux) +"IB" = ( +/turf/open/floor/plating/ground/mars/random/cave/darker, +/area/campaign/som_raiding/outpost/tunnel/west) +"IC" = ( +/obj/machinery/door/airlock/mainship/security, +/obj/structure/cable, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/security/south_post) +"ID" = ( +/obj/item/weapon/gun/energy/lasgun/lasrifle/volkite/cope/predeployed, +/turf/open/floor/plating/ground/mars/random/cave, +/area/campaign/som_raiding/ground/jungle) +"IE" = ( +/obj/effect/landmark/mob_spawner/farwa, +/turf/open/floor/plating/ground/mars/random/cave/darker, +/area/campaign/som_raiding/cave/tunnel) +"IF" = ( +/obj/effect/landmark/patrol_point/tgmc_21, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/south_west) +"IH" = ( +/obj/structure/cargo_container/red{ + dir = 1 + }, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req) +"II" = ( +/turf/open/floor/plating/ground/mars/random/cave, +/area/campaign/som_raiding/outpost/tunnel) +"IK" = ( +/obj/effect/turf_decal/sandedge, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle) +"IL" = ( +/obj/structure/cable, +/turf/open/floor/tile/dark/green2/corner{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/central_corridor) +"IN" = ( +/obj/machinery/door/airlock/mainship/medical/free_access{ + dir = 1 + }, +/turf/open/floor/freezer, +/area/campaign/som_raiding/outpost/medbay) +"IP" = ( +/turf/open/floor/plating/ground/dirtgrassborder2{ + dir = 1 + }, +/area/campaign/som_raiding/ground/jungle/south) +"IQ" = ( +/obj/structure/flora/jungle/grass, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/south_west) +"IR" = ( +/obj/structure/cargo_container/hd_blue{ + dir = 1 + }, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req) +"IS" = ( +/turf/open/floor/plating/ground/concrete/lines{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/tunnel) +"IT" = ( +/turf/open/floor/tile/dark/green2, +/area/campaign/som_raiding/outpost/living) +"IW" = ( +/obj/structure/ship_ammo/cas/rocket/swansong, +/turf/open/floor/tile/dark/brown2{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/req/secure) +"IX" = ( +/obj/structure/table/mainship, +/turf/open/floor/tile/dark/blue2{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/command) +"IZ" = ( +/obj/structure/rack, +/obj/effect/spawner/random/misc/clipboard, +/turf/open/floor/tile/brown{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/req/aux) +"Ja" = ( +/obj/structure/flora/jungle/grass, +/turf/open/floor/plating/ground/dirtgrassborder2, +/area/campaign/som_raiding/ground/jungle/south) +"Jd" = ( +/obj/machinery/door/airlock/multi_tile/mainship/engineering/glass{ + dir = 1 + }, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/engineering) +"Jf" = ( +/obj/structure/largecrate/random/barrel/yellow, +/turf/open/floor/wood/alt_one, +/area/campaign/som_raiding/ground/jungle/south_east) +"Jk" = ( +/obj/structure/flora/grass/tallgrass/autosmooth, +/obj/structure/flora/jungle/bush, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/west) +"Jl" = ( +/obj/structure/extinguisher_cabinet, +/turf/open/floor/mainship/sterile/side{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/medbay) +"Jn" = ( +/obj/structure/table/reinforced, +/turf/open/floor/tile/brown{ + dir = 10 + }, +/area/campaign/som_raiding/outpost/req/qm) +"Jo" = ( +/obj/structure/reagent_dispensers/fueltank/barrel, +/turf/open/floor/tile/dark/brown2/corner, +/area/campaign/som_raiding/outpost/req/secure) +"Jp" = ( +/obj/structure/rack, +/obj/effect/spawner/random/engineering/toolbox, +/obj/effect/spawner/random/engineering/structure/handheld_lighting, +/turf/open/floor/plating, +/area/campaign/som_raiding/outpost/maintenance/cic) +"Jq" = ( +/turf/open/floor/tile/dark/green2{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/central_corridor) +"Jt" = ( +/obj/structure/flora/jungle/bush, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle) +"Ju" = ( +/obj/structure/cargo_container/ch_green, +/obj/effect/turf_decal/box, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req) +"Jw" = ( +/turf/open/floor/mainship/red{ + dir = 9 + }, +/area/campaign/som_raiding/outpost/living/briefing) +"Jx" = ( +/obj/machinery/bioprinter, +/turf/open/floor/mainship/sterile/corner{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/medbay) +"Jy" = ( +/obj/structure/cable, +/turf/open/floor/tile/brown, +/area/campaign/som_raiding/outpost/req/aux) +"Jz" = ( +/obj/structure/flora/jungle/grass, +/turf/open/floor/plating/ground/dirtgrassborder2{ + dir = 1 + }, +/area/campaign/som_raiding/ground/jungle) +"JA" = ( +/obj/structure/sink/bathroom, +/turf/open/floor/mainship/mono, +/area/campaign/som_raiding/outpost/central_corridor) +"JB" = ( +/turf/open/floor/tile/dark/green2/corner{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/living) +"JC" = ( +/turf/open/floor/plating/ground/mars/random/cave, +/area/campaign/som_raiding/ground/jungle) +"JE" = ( +/obj/structure/flora/jungle/large_bush, +/turf/open/floor/plating/ground/dirtgrassborder2{ + dir = 1 + }, +/area/campaign/som_raiding/ground/jungle) +"JF" = ( +/obj/structure/table/black, +/obj/item/phone, +/turf/open/floor/tile/dark/blue2{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/command/captain) +"JH" = ( +/obj/structure/cable, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req/north) +"JM" = ( +/obj/machinery/power/apc, +/obj/structure/cable, +/turf/open/floor/tile/dark/red2{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/security/southeast_post) +"JN" = ( +/obj/structure/flora/jungle/grass/thin, +/turf/open/floor/plating/ground/dirtgrassborder2, +/area/campaign/som_raiding/ground/jungle/south) +"JO" = ( +/obj/structure/rack, +/obj/item/weapon/gun/rifle/standard_autoshotgun, +/obj/item/weapon/gun/rifle/standard_autoshotgun, +/turf/open/floor/tile/dark/brown2{ + dir = 5 + }, +/area/campaign/som_raiding/outpost/req/secure) +"JP" = ( +/obj/structure/bed/chair/alt, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/security) +"JU" = ( +/obj/structure/cable, +/turf/open/floor/tile/dark/red2, +/area/campaign/som_raiding/outpost/security/west_post) +"JV" = ( +/obj/structure/cable, +/turf/open/floor/plating/ground/concrete/edge{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/tunnel) +"JW" = ( +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/north) +"JX" = ( +/obj/structure/cable, +/turf/open/floor/tile/dark/gray, +/area/campaign/som_raiding/outpost/req/aux) +"JY" = ( +/obj/structure/cable, +/turf/open/floor/mainship/red/corner{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/living/briefing) +"JZ" = ( +/obj/structure/cable, +/turf/open/floor/tile/dark/yellow2{ + dir = 9 + }, +/area/campaign/som_raiding/outpost/engineering) +"Kb" = ( +/obj/structure/flora/jungle/grass/thin, +/turf/open/floor/plating/ground/dirtgrassborder2{ + dir = 1 + }, +/area/campaign/som_raiding/ground/jungle/north) +"Kc" = ( +/obj/structure/xenoautopsy/tank, +/turf/open/floor/tile/dark/brown2{ + dir = 10 + }, +/area/campaign/som_raiding/outpost/req/secure) +"Kd" = ( +/turf/open/floor/tile/dark/blue2{ + dir = 10 + }, +/area/campaign/som_raiding/outpost/command/cic) +"Ke" = ( +/obj/structure/table/black, +/obj/structure/window/reinforced, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command) +"Kh" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/tile/neutral/full, +/area/campaign/som_raiding/outpost/living/canteen) +"Kk" = ( +/obj/structure/cable, +/turf/open/floor/tile/barber, +/area/campaign/som_raiding/outpost/living/kitchen) +"Kl" = ( +/turf/open/floor/plating/dmg1, +/area/campaign/som_raiding/outpost/firing_range) +"Ko" = ( +/obj/structure/extinguisher_cabinet{ + dir = 1 + }, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req/north) +"Kp" = ( +/obj/structure/table/black, +/obj/machinery/faxmachine, +/obj/item/paper, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command/telecom) +"Kq" = ( +/obj/effect/landmark/patrol_point/tgmc_12, +/turf/open/floor/plating/ground/dirtgrassborder2/corner, +/area/campaign/som_raiding/ground/jungle/south_west) +"Ks" = ( +/turf/open/floor/tile/dark/green2{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/living) +"Ku" = ( +/obj/structure/flora/jungle/large_bush, +/obj/structure/flora/jungle/grass/thin, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/north) +"Kx" = ( +/obj/structure/largecrate/random/barrel/white, +/turf/open/floor/tile/dark/brown2{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/req/secure) +"Kz" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/plating, +/area/campaign/som_raiding/outpost/maintenance) +"KB" = ( +/turf/open/floor/tile/dark/red2{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/security/cargo_post) +"KD" = ( +/obj/effect/landmark/mob_spawner/farwa, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/south_west) +"KE" = ( +/obj/structure/table/mainship, +/obj/structure/extinguisher_cabinet/mini{ + dir = 4 + }, +/turf/open/floor/tile/barber, +/area/campaign/som_raiding/outpost/living/kitchen) +"KF" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req/north) +"KG" = ( +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/security/north_post) +"KH" = ( +/turf/open/floor/plating/ground/concrete/lines{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/req/north) +"KI" = ( +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/firing_range) +"KJ" = ( +/turf/open/floor/plating/ground/concrete/edge{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/tunnel) +"KK" = ( +/obj/structure/prop/mainship/gelida/railbumper{ + dir = 8 + }, +/obj/structure/reagent_dispensers/fueltank/barrel, +/turf/open/floor/wood/alt_one, +/area/campaign/som_raiding/ground/jungle/south_east) +"KM" = ( +/obj/structure/cable, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/plating, +/area/campaign/som_raiding/outpost/maintenance/engie) +"KN" = ( +/obj/structure/flora/jungle/grass/thin, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/west) +"KO" = ( +/obj/structure/table/reinforced, +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/fire, +/obj/effect/spawner/random/medical/bloodpack, +/obj/effect/spawner/random/medical/bloodpack, +/obj/effect/spawner/random/medical/bloodpack, +/turf/open/floor/mainship/sterile/corner{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/medbay) +"KU" = ( +/obj/machinery/vending/nanomed{ + dir = 1 + }, +/turf/open/floor/tile/dark/red2, +/area/campaign/som_raiding/outpost/security/south_post) +"KV" = ( +/obj/structure/prop/mainship/protolathe/security, +/turf/open/floor/tile/dark/blue2{ + dir = 10 + }, +/area/campaign/som_raiding/outpost/command) +"KW" = ( +/turf/closed/mineral/smooth/indestructible, +/area/campaign/som_raiding/outpost/living) +"La" = ( +/obj/structure/table/reinforced, +/obj/item/roller, +/obj/item/roller, +/obj/item/roller, +/turf/open/floor/mainship/sterile/side, +/area/campaign/som_raiding/outpost/medbay) +"Lb" = ( +/obj/structure/cable, +/turf/open/floor/tile/neutral/full, +/area/campaign/som_raiding/outpost/living/canteen) +"Lc" = ( +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/security/west_post) +"Le" = ( +/obj/structure/cable, +/turf/open/floor/plating/ground/concrete/edge{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/tunnel/west) +"Lf" = ( +/obj/machinery/iv_drip, +/turf/open/floor/mainship/sterile/corner{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/medbay) +"Lg" = ( +/obj/structure/largecrate/guns, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/tunnel) +"Li" = ( +/obj/machinery/door/airlock/maintenance{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/mainship/mono, +/area/campaign/som_raiding/outpost/tunnel) +"Lk" = ( +/turf/open/floor/tile/dark/yellow2{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/engineering) +"Ll" = ( +/obj/structure/cable, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command/living) +"Lo" = ( +/turf/open/ground/grass/beach/corner{ + dir = 8 + }, +/area/campaign/som_raiding/ground/jungle/north) +"Lp" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/tile/dark/green2{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/central_corridor) +"Lu" = ( +/obj/structure/bed/chair/office/dark{ + dir = 4 + }, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command/cic) +"Lv" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req/north) +"Lw" = ( +/obj/structure/flora/jungle/grass, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/south) +"Lx" = ( +/obj/structure/platform_decoration{ + dir = 4 + }, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req/north) +"Ly" = ( +/turf/open/floor/plating/ground/dirtgrassborder2/corner{ + dir = 4 + }, +/area/campaign/som_raiding/ground/jungle/north) +"LA" = ( +/turf/closed/wall/mainship/gray, +/area/campaign/som_raiding/outpost/living/bathroom) +"LB" = ( +/obj/structure/mine_structure/wooden/support_wall, +/turf/open/floor/plating/ground/mars/random/cave/darker, +/area/campaign/som_raiding/cave/tunnel) +"LC" = ( +/obj/structure/cable, +/turf/open/floor/tile/dark/gray, +/area/campaign/som_raiding/outpost/req/qm) +"LD" = ( +/obj/structure/table/black, +/obj/machinery/light{ + light_color = "#da2f1b" + }, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command/living) +"LE" = ( +/obj/machinery/door/airlock/multi_tile/mainship/blackgeneric/glass{ + dir = 2 + }, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command/telecom) +"LG" = ( +/turf/closed/wall/mainship/gray, +/area/campaign/som_raiding/outpost/medbay) +"LH" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command/living) +"LI" = ( +/obj/structure/flora/jungle/grass/thin, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle) +"LJ" = ( +/obj/structure/flora/jungle/large_bush, +/turf/open/liquid/water, +/area/campaign/som_raiding/ground/jungle/north) +"LK" = ( +/turf/open/ground/grass/beach/corner2, +/area/campaign/som_raiding/ground/jungle/west) +"LM" = ( +/obj/machinery/computer3/server/rack, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command/telecom) +"LN" = ( +/obj/structure/cable, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/security) +"LO" = ( +/obj/machinery/door/airlock/multi_tile/mainship/blackgeneric/glass{ + dir = 2 + }, +/obj/structure/cable, +/turf/open/floor/tile/dark/gray, +/area/campaign/som_raiding/outpost/living/canteen) +"LP" = ( +/turf/closed/mineral/smooth, +/area/campaign/som_raiding/ground/jungle/south_east) +"LQ" = ( +/obj/structure/flora/jungle/bush, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/north) +"LR" = ( +/obj/structure/cable, +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/tile/dark/green2{ + dir = 9 + }, +/area/campaign/som_raiding/outpost/central_corridor) +"LT" = ( +/turf/closed/mineral/smooth, +/area/campaign/som_raiding/outpost/maintenance/req) +"LU" = ( +/turf/closed/mineral/smooth, +/area/campaign/som_raiding/ground/jungle/west) +"LV" = ( +/obj/machinery/computer/som_two{ + dir = 8 + }, +/turf/open/floor/tile/dark/blue2{ + dir = 5 + }, +/area/campaign/som_raiding/outpost/command) +"LW" = ( +/obj/machinery/door/airlock/multi_tile/mainship/blackgeneric{ + dir = 1 + }, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command/cic) +"LX" = ( +/obj/structure/table/mainship, +/obj/item/clothing/suit/storage/chef/classic, +/obj/item/clothing/head/chefhat, +/obj/item/clothing/gloves/latex, +/turf/open/floor/tile/barber, +/area/campaign/som_raiding/outpost/living/kitchen) +"LY" = ( +/obj/structure/window/framed/mainship/gray, +/turf/open/floor/mainship/mono, +/area/campaign/som_raiding/outpost/command/north) +"LZ" = ( +/obj/effect/turf_decal/delivery, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req/north) +"Ma" = ( +/obj/machinery/vending/nanomed{ + dir = 1 + }, +/turf/open/floor/mainship/sterile/side, +/area/campaign/som_raiding/outpost/medbay) +"Mb" = ( +/obj/structure/cable, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/construction) +"Me" = ( +/obj/structure/cable, +/turf/open/floor/freezer, +/area/campaign/som_raiding/outpost/living/kitchen) +"Mf" = ( +/obj/structure/table/black, +/obj/effect/spawner/random/engineering/cable, +/turf/open/floor/tile/dark/red2{ + dir = 10 + }, +/area/campaign/som_raiding/outpost/security/cargo_post) +"Mg" = ( +/obj/structure/closet/secure_closet/freezer/fridge, +/obj/item/reagent_containers/food/snacks/flour, +/obj/item/reagent_containers/food/snacks/flour, +/obj/item/reagent_containers/food/snacks/flour, +/obj/item/reagent_containers/food/snacks/flour, +/obj/item/reagent_containers/food/snacks/flour, +/turf/open/floor/freezer, +/area/campaign/som_raiding/outpost/living/kitchen) +"Ml" = ( +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/req/secure) +"Mm" = ( +/obj/structure/table/black, +/obj/item/weapon/gun/pistol/som/standard, +/turf/open/floor/tile/dark/red2{ + dir = 9 + }, +/area/campaign/som_raiding/outpost/security/southeast_post) +"Mn" = ( +/obj/effect/landmark/patrol_point/tgmc_22, +/turf/open/floor/plating/ground/dirtgrassborder2/corner{ + dir = 8 + }, +/area/campaign/som_raiding/ground/jungle/south_west) +"Mo" = ( +/obj/structure/cable, +/turf/open/floor/tile/dark/blue2{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/command) +"Mp" = ( +/obj/structure/cargo_container/hd_blue{ + dir = 4 + }, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req) +"Mq" = ( +/obj/structure/largecrate/guns/russian, +/turf/open/floor/tile/dark/brown2/corner, +/area/campaign/som_raiding/outpost/req/secure) +"Mr" = ( +/turf/open/floor/mainship/red/corner{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/living/briefing) +"Ms" = ( +/obj/machinery/power/apc{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/tile/dark/blue2, +/area/campaign/som_raiding/outpost/command/north) +"Mt" = ( +/obj/effect/landmark/patrol_point/som/som_21, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/north) +"Mv" = ( +/obj/structure/table/reinforced, +/obj/item/storage/firstaid/adv{ + pixel_x = 6; + pixel_y = -2 + }, +/obj/item/storage/box/gloves{ + pixel_x = -5; + pixel_y = -5 + }, +/obj/machinery/light, +/turf/open/floor/mainship/sterile/side, +/area/campaign/som_raiding/outpost/medbay) +"My" = ( +/obj/item/ammo_casing/bullet, +/turf/open/floor/plating/dmg1, +/area/campaign/som_raiding/outpost/construction) +"MC" = ( +/obj/structure/cable, +/turf/open/floor/tile/dark/green2{ + dir = 10 + }, +/area/campaign/som_raiding/outpost/central_corridor) +"MD" = ( +/obj/effect/spawner/random/engineering/structure/tank/fuelweighted, +/turf/open/floor/plating, +/area/campaign/som_raiding/outpost/tunnel) +"ME" = ( +/turf/open/floor/plating/ground/dirtgrassborder2/corner{ + dir = 1 + }, +/area/campaign/som_raiding/ground/jungle/south_west) +"MF" = ( +/obj/machinery/door/airlock/hatch, +/obj/structure/cable, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command/living) +"MG" = ( +/obj/structure/prop/brokenvendor/surplusarmor, +/turf/open/floor/tile/dark/red2{ + dir = 6 + }, +/area/campaign/som_raiding/outpost/security/cargo_post) +"MH" = ( +/obj/structure/rack, +/obj/effect/spawner/random/engineering/tool, +/obj/effect/spawner/random/engineering/tool, +/turf/open/floor/plating, +/area/campaign/som_raiding/outpost/maintenance/engie) +"MI" = ( +/obj/effect/turf_decal/sandedge{ + dir = 8 + }, +/obj/structure/flora/jungle/grass, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle) +"MK" = ( +/obj/machinery/door/airlock/maintenance, +/obj/structure/cable, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/security/south_post) +"ML" = ( +/obj/machinery/computer/som_two{ + dir = 8 + }, +/turf/open/floor/tile/dark/blue2{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/command/cic) +"MM" = ( +/obj/structure/table/reinforced, +/obj/item/clothing/head/hardhat/orange, +/turf/open/floor/tile/dark/yellow2, +/area/campaign/som_raiding/outpost/engineering) +"MN" = ( +/obj/effect/spawner/random/engineering/tool, +/turf/open/floor/mainship/mono, +/area/campaign/som_raiding/outpost/construction) +"MP" = ( +/obj/structure/largecrate/supply/supplies/coifs, +/turf/open/floor/tile/dark/brown2{ + dir = 10 + }, +/area/campaign/som_raiding/outpost/req/secure) +"MT" = ( +/obj/machinery/light{ + light_color = "#da2f1b" + }, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command/telecom) +"MV" = ( +/obj/structure/prop/mainship/gelida/rails{ + dir = 8 + }, +/obj/structure/closet/crate/miningcar, +/turf/open/floor/wood/alt_one, +/area/campaign/som_raiding/ground/jungle/south_east) +"MW" = ( +/obj/structure/table/black, +/obj/effect/spawner/random/engineering/radio, +/turf/open/floor/tile/dark/red2{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/security/cargo_post) +"MX" = ( +/obj/structure/table/black, +/obj/machinery/conveyor_switch, +/turf/open/floor/tile/dark/blue2, +/area/campaign/som_raiding/outpost/command/north) +"MY" = ( +/turf/open/floor/tile/dark/yellow2/corner{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/engineering) +"MZ" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req) +"Nc" = ( +/obj/machinery/optable, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/mainship/sterile/side{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/medbay) +"Nd" = ( +/turf/open/floor/plating/ground/dirtgrassborder2/corner, +/area/campaign/som_raiding/ground/jungle/north) +"Ne" = ( +/obj/structure/cable, +/obj/machinery/door/airlock/multi_tile/mainship/engineering, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/engineering) +"Nf" = ( +/obj/machinery/vending/nanomed{ + dir = 1 + }, +/turf/open/floor/tile/dark/blue2{ + dir = 10 + }, +/area/campaign/som_raiding/outpost/command) +"Ng" = ( +/turf/open/floor/plating/ground/concrete/edge{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/tunnel) +"Nh" = ( +/obj/structure/rock/variable/jungle_large, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/south) +"Nj" = ( +/obj/structure/cable, +/turf/open/floor/tile/dark/green2{ + dir = 9 + }, +/area/campaign/som_raiding/outpost/central_corridor) +"Nk" = ( +/obj/structure/table/reinforced, +/turf/open/floor/tile/showroom, +/area/campaign/som_raiding/outpost/living/bathroom) +"Nl" = ( +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/req/qm) +"Nn" = ( +/turf/open/floor/mainship/sterile/side{ + dir = 6 + }, +/area/campaign/som_raiding/outpost/medbay) +"No" = ( +/obj/machinery/door/airlock/hatch{ + dir = 1 + }, +/turf/open/floor/mainship/mono, +/area/campaign/som_raiding/outpost/command/telecom) +"Np" = ( +/obj/structure/window/framed/mainship/gray, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/security) +"Nq" = ( +/turf/open/floor/plating/ground/dirtgrassborder2/corner{ + dir = 4 + }, +/area/campaign/som_raiding/ground/jungle/west) +"Nr" = ( +/turf/open/floor/plating/ground/dirtgrassborder2/corner{ + dir = 8 + }, +/area/campaign/som_raiding/ground/jungle/south_east) +"Nt" = ( +/obj/structure/cargo_container/ch_red{ + dir = 1 + }, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req) +"Nu" = ( +/obj/structure/reagent_dispensers/beerkeg, +/turf/open/floor/tile/dark/brown2{ + dir = 5 + }, +/area/campaign/som_raiding/outpost/req/secure) +"Nw" = ( +/obj/structure/platform_decoration, +/obj/effect/turf_decal/delivery, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req/north) +"Nx" = ( +/obj/machinery/computer/som, +/turf/open/floor/tile/dark/red2{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/security/south_post) +"Ny" = ( +/obj/machinery/power/apc{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/freezer, +/area/campaign/som_raiding/outpost/living/kitchen) +"Nz" = ( +/obj/structure/table/reinforced, +/turf/open/floor/tile/brown, +/area/campaign/som_raiding/outpost/req/qm) +"NA" = ( +/obj/structure/flora/jungle/grass/thin, +/turf/open/floor/plating/ground/dirtgrassborder2, +/area/campaign/som_raiding/ground/jungle) +"ND" = ( +/obj/structure/rock/variable/jungle_large, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/west) +"NE" = ( +/obj/structure/cargo_container, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req) +"NF" = ( +/turf/open/floor/mainship/mono, +/area/campaign/som_raiding/outpost/req) +"NG" = ( +/obj/machinery/door/airlock/hatch, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command/north) +"NI" = ( +/obj/structure/bed/chair/alt{ + dir = 4 + }, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/security) +"NJ" = ( +/obj/machinery/door/airlock/hatch, +/turf/open/floor/tile/dark/brown2{ + dir = 9 + }, +/area/campaign/som_raiding/outpost/req/secure) +"NK" = ( +/obj/structure/bed/chair/office/dark{ + dir = 8 + }, +/turf/open/floor/tile/dark/gray, +/area/campaign/som_raiding/outpost/req/qm) +"NL" = ( +/obj/effect/landmark/patrol_point/tgmc_13, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/south_west) +"NO" = ( +/obj/structure/window/framed/mainship/gray, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command/captain) +"NP" = ( +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/south) +"NQ" = ( +/obj/structure/largecrate/supply/explosives/mortar_incend, +/turf/open/floor/tile/dark/brown2{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/req/secure) +"NT" = ( +/obj/structure/stairs/railstairs, +/turf/open/floor/mainship/mono, +/area/campaign/som_raiding/outpost/req) +"NU" = ( +/obj/machinery/power/apc{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/tunnel/west) +"NV" = ( +/obj/structure/prop/nt_computer, +/turf/open/floor/tile/dark/red2{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/security/north_post) +"NZ" = ( +/obj/structure/flora/tree/jungle, +/obj/structure/flora/jungle/grass, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/south_west) +"Oa" = ( +/obj/structure/largecrate, +/turf/open/floor/tile/dark/gray, +/area/campaign/som_raiding/outpost/req/aux) +"Oc" = ( +/turf/open/floor/plating/ground/dirtgrassborder2/corner2{ + dir = 8 + }, +/area/campaign/som_raiding/ground/jungle/south) +"Od" = ( +/obj/structure/largecrate/supply/medicine, +/turf/open/floor/tile/dark/brown2/corner{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/req/secure) +"Oe" = ( +/obj/machinery/door/airlock/maintenance{ + dir = 1 + }, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/construction) +"Of" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/plating, +/area/campaign/som_raiding/outpost/maintenance/engie) +"Oh" = ( +/obj/structure/filingcabinet, +/turf/open/floor/tile/brown, +/area/campaign/som_raiding/outpost/req/qm) +"Oi" = ( +/obj/structure/ship_ammo/cas/heavygun, +/turf/open/floor/tile/dark/brown2/corner{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/req/secure) +"Oj" = ( +/turf/open/floor/mainship/sterile/side{ + dir = 10 + }, +/area/campaign/som_raiding/outpost/medbay) +"Ol" = ( +/turf/open/floor/tile/dark/green2{ + dir = 10 + }, +/area/campaign/som_raiding/outpost/living) +"On" = ( +/obj/structure/cargo_container/horizontal{ + dir = 8 + }, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req) +"Oo" = ( +/turf/closed/mineral/smooth, +/area/campaign/som_raiding/outpost/security/north_post) +"Op" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/tile/showroom, +/area/campaign/som_raiding/outpost/living/bathroom) +"Oq" = ( +/obj/structure/prop/brokenvendor/brokenspecialistvendor/leader, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/security) +"Os" = ( +/obj/structure/window/framed/mainship/gray, +/turf/open/floor/tile/dark/gray, +/area/campaign/som_raiding/outpost/living/canteen) +"Ov" = ( +/obj/structure/flora/jungle/bush, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/south_west) +"Ow" = ( +/obj/structure/cable, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/central_corridor) +"Ox" = ( +/obj/structure/largecrate/supply/weapons/flamers, +/turf/open/floor/tile/dark/brown2{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/req/secure) +"OB" = ( +/turf/open/floor/mainship/red{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/living/briefing) +"OD" = ( +/obj/structure/table/reinforced, +/obj/item/storage/surgical_tray, +/obj/item/reagent_containers/spray/cleaner, +/turf/open/floor/mainship/sterile/corner{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/medbay) +"OF" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/mainship/red{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/living/briefing) +"OG" = ( +/obj/structure/flora/jungle/grass, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/north) +"OH" = ( +/obj/structure/largecrate/random/barrel/yellow, +/turf/open/floor/tile/brown{ + dir = 6 + }, +/area/campaign/som_raiding/outpost/req/aux) +"OI" = ( +/obj/machinery/power/smes/buildable/empty, +/obj/structure/cable, +/turf/open/floor/tile/dark/yellow2{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/engineering) +"OJ" = ( +/obj/structure/prop/mainship/protolathe, +/turf/open/floor/tile/dark/blue2{ + dir = 10 + }, +/area/campaign/som_raiding/outpost/command) +"OK" = ( +/turf/open/floor/plating/ground/dirtgrassborder2{ + dir = 8 + }, +/area/campaign/som_raiding/ground/jungle) +"OL" = ( +/obj/structure/table/black, +/obj/machinery/computer/secure_data, +/turf/open/floor/tile/dark/blue2{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/command/north) +"OM" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req) +"ON" = ( +/obj/structure/flora/jungle/grass/thin, +/turf/open/floor/plating/ground/dirtgrassborder2, +/area/campaign/som_raiding/ground/jungle/south_west) +"OO" = ( +/obj/structure/largecrate/supply/powerloader, +/turf/open/floor/tile/dark/brown2, +/area/campaign/som_raiding/outpost/req/secure) +"OS" = ( +/obj/structure/cable, +/turf/open/floor/tile/dark/yellow2, +/area/campaign/som_raiding/outpost/engineering) +"OT" = ( +/obj/structure/largecrate/supply/ammo, +/turf/open/floor/tile/dark/brown2{ + dir = 6 + }, +/area/campaign/som_raiding/outpost/req/secure) +"OV" = ( +/obj/machinery/door/airlock/hatch, +/turf/open/floor/tile/dark/gray, +/area/campaign/som_raiding/outpost/req/qm) +"OW" = ( +/turf/closed/mineral/smooth, +/area/campaign/som_raiding/cave) +"OY" = ( +/obj/effect/spawner/random/engineering/extinguisher, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req) +"OZ" = ( +/obj/effect/spawner/random/engineering/structure/gascan, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req/north) +"Pa" = ( +/obj/effect/landmark/corpsespawner/marine/corpsman, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/plating/ground/mars/random/cave/darker, +/area/campaign/som_raiding/outpost/construction) +"Pc" = ( +/obj/structure/flora/jungle/grass/thin, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/north) +"Pd" = ( +/turf/closed/wall/mainship/gray, +/area/campaign/som_raiding/outpost/tunnel) +"Pf" = ( +/obj/structure/window/framed/mainship/gray, +/turf/open/floor/mainship/mono, +/area/campaign/som_raiding/outpost/living/briefing) +"Pg" = ( +/obj/structure/largecrate/packed, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/tunnel) +"Ph" = ( +/obj/structure/stairs/railstairs{ + dir = 8 + }, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/req/qm) +"Pi" = ( +/obj/structure/table/black, +/obj/machinery/computer/emails, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command/telecom) +"Pk" = ( +/obj/machinery/door/airlock/maintenance, +/obj/structure/cable, +/turf/open/floor/mainship/sterile/dark, +/area/campaign/som_raiding/outpost/medbay) +"Pl" = ( +/obj/structure/cable, +/turf/open/floor/plating, +/area/campaign/som_raiding/outpost/firing_range) +"Pm" = ( +/obj/structure/table/black, +/turf/open/floor/tile/dark/blue2{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/command) +"Pn" = ( +/obj/structure/table/black, +/obj/item/weapon/gun/rifle/som/standard, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/security) +"Pr" = ( +/turf/open/floor/tile/dark/green2/corner{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/living) +"Ps" = ( +/obj/effect/turf_decal/sandedge/corner, +/obj/structure/flora/jungle/grass, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/south) +"Pt" = ( +/turf/open/floor/plating/ground/dirtgrassborder2/corner, +/area/campaign/som_raiding/ground/jungle/south_east) +"Pu" = ( +/obj/structure/extinguisher_cabinet{ + dir = 8 + }, +/turf/open/floor/tile/dark/blue2{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/command) +"Pw" = ( +/turf/open/floor/tile/dark/blue2/corner{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/command/cic) +"Px" = ( +/obj/structure/flora/jungle/bush, +/turf/open/ground/grass/beach/corner{ + dir = 8 + }, +/area/campaign/som_raiding/ground/jungle/north) +"Py" = ( +/obj/structure/extinguisher_cabinet{ + dir = 4 + }, +/turf/open/floor/mainship/sterile/side{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/medbay) +"Pz" = ( +/turf/open/floor/tile/dark/brown2/corner{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/req/secure) +"PC" = ( +/obj/structure/reagent_dispensers/fueltank/barrel, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req) +"PD" = ( +/obj/structure/largecrate/supply/medicine/iv, +/turf/open/floor/tile/brown{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/req/aux) +"PE" = ( +/obj/item/ammo_casing/shell, +/turf/open/floor/mainship/mono, +/area/campaign/som_raiding/outpost/construction) +"PF" = ( +/obj/effect/turf_decal/sandedge/corner2{ + dir = 1 + }, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/north) +"PG" = ( +/obj/structure/prop/mainship/gelida/rails{ + dir = 8 + }, +/turf/open/floor/wood/alt_one, +/area/campaign/som_raiding/ground/jungle/south_east) +"PI" = ( +/turf/open/floor/plating/ground/dirtgrassborder2{ + dir = 1 + }, +/area/campaign/som_raiding/ground/jungle/west) +"PM" = ( +/turf/closed/gm/dense, +/area/campaign/som_raiding/ground/jungle/south) +"PO" = ( +/obj/machinery/computer/som_two, +/turf/open/floor/tile/dark/red2{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/security/west_post) +"PP" = ( +/turf/open/floor/plating/ground/dirtgrassborder2/corner, +/area/campaign/som_raiding/ground/jungle/west) +"PQ" = ( +/obj/structure/window/framed/mainship/gray, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/security/north_post) +"PS" = ( +/obj/structure/prop/mainship/protolathe/sci, +/turf/open/floor/tile/dark/blue2{ + dir = 9 + }, +/area/campaign/som_raiding/outpost/command/north) +"PT" = ( +/turf/open/floor/plating/ground/concrete/edge{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/req) +"PU" = ( +/obj/structure/flora/jungle/bush, +/turf/open/floor/plating/ground/dirtgrassborder2/corner{ + dir = 4 + }, +/area/campaign/som_raiding/ground/jungle/west) +"PV" = ( +/obj/structure/prop/mainship/gelida/rails{ + dir = 1 + }, +/obj/structure/prop/mainship/gelida/rails{ + dir = 9 + }, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle) +"PX" = ( +/turf/open/floor/plating, +/area/campaign/som_raiding/outpost/maintenance/engie) +"PY" = ( +/obj/structure/cargo_container/red, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req) +"Qa" = ( +/turf/open/floor/mainship/mono, +/area/campaign/som_raiding/outpost/construction) +"Qb" = ( +/obj/structure/flora/grass/tallgrass/autosmooth, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle) +"Qc" = ( +/obj/structure/reagent_dispensers/fueltank, +/turf/open/floor/tile/dark/brown2{ + dir = 10 + }, +/area/campaign/som_raiding/outpost/req/secure) +"Qd" = ( +/obj/effect/landmark/mob_spawner/farwa, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/south) +"Qe" = ( +/obj/machinery/computer/som_two{ + dir = 4 + }, +/turf/open/floor/tile/dark/blue2{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/command/north) +"Qf" = ( +/obj/machinery/light, +/turf/open/floor/tile/dark/brown2, +/area/campaign/som_raiding/outpost/req/secure) +"Qh" = ( +/turf/open/floor/plating/ground/concrete/edge, +/area/campaign/som_raiding/outpost/req/north) +"Qi" = ( +/obj/item/ammo_casing/bullet, +/turf/open/floor/mainship/mono, +/area/campaign/som_raiding/outpost/construction) +"Qj" = ( +/obj/structure/flora/jungle/grass/thin, +/turf/open/floor/plating/ground/dirtgrassborder2{ + dir = 4 + }, +/area/campaign/som_raiding/ground/jungle/north) +"Qk" = ( +/obj/structure/prop/nt_computer, +/obj/machinery/light, +/turf/open/floor/mainship/tcomms, +/area/campaign/som_raiding/outpost/command/telecom) +"Ql" = ( +/obj/structure/flora/jungle/grass, +/turf/open/floor/plating/ground/dirtgrassborder2{ + dir = 8 + }, +/area/campaign/som_raiding/ground/jungle) +"Qm" = ( +/turf/open/floor/plating/ground/dirtgrassborder2/corner2{ + dir = 4 + }, +/area/campaign/som_raiding/ground/jungle/north) +"Qn" = ( +/turf/open/floor/tile/dark/blue2/corner{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/command/north) +"Qq" = ( +/obj/structure/table/black, +/turf/open/floor/tile/dark/blue2{ + dir = 6 + }, +/area/campaign/som_raiding/outpost/command/cic) +"Qr" = ( +/obj/structure/largecrate/random, +/turf/open/floor/tile/dark/brown2{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/req/secure) +"Qs" = ( +/obj/structure/rock/variable/jungle, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/north) +"Qu" = ( +/obj/structure/platform_decoration{ + dir = 8 + }, +/obj/structure/reagent_dispensers/watertank, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req/north) +"Qw" = ( +/turf/closed/wall/mainship/gray, +/area/campaign/som_raiding/outpost/req) +"Qx" = ( +/obj/structure/reagent_dispensers/fueltank/xfuel, +/obj/effect/turf_decal/bot, +/turf/open/floor/tile/dark/brown2{ + dir = 10 + }, +/area/campaign/som_raiding/outpost/req/secure) +"Qy" = ( +/obj/structure/table/mainship, +/turf/open/floor/tile/dark/blue2{ + dir = 5 + }, +/area/campaign/som_raiding/outpost/command) +"Qz" = ( +/obj/effect/turf_decal/sandedge/corner{ + dir = 1 + }, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/south) +"QD" = ( +/turf/open/floor/plating/ground/dirt2, +/area/campaign/som_raiding/ground/jungle/south_east) +"QE" = ( +/turf/open/floor/tile/dark/blue2{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/command) +"QF" = ( +/obj/structure/flora/tree/jungle/small, +/turf/open/floor/plating/ground/dirtgrassborder2, +/area/campaign/som_raiding/ground/jungle/south) +"QH" = ( +/obj/structure/urinal, +/turf/open/floor/tile/showroom, +/area/campaign/som_raiding/outpost/living/bathroom) +"QI" = ( +/obj/effect/spawner/random/misc/structure/closet/welding, +/obj/machinery/light{ + light_color = "#da2f1b" + }, +/turf/open/floor/tile/dark/yellow2, +/area/campaign/som_raiding/outpost/engineering) +"QK" = ( +/obj/structure/reagent_dispensers/fueltank/barrel, +/turf/open/floor/tile/dark/brown2/corner{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/req/secure) +"QL" = ( +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command/north) +"QM" = ( +/obj/structure/rack, +/obj/item/weapon/gun/rifle/standard_skirmishrifle, +/obj/item/weapon/gun/rifle/standard_skirmishrifle, +/turf/open/floor/tile/dark/brown2{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/req/secure) +"QO" = ( +/obj/structure/table/reinforced, +/obj/item/storage/firstaid/o2, +/obj/item/storage/firstaid/rad, +/obj/item/bodybag/cryobag, +/obj/item/bodybag/cryobag, +/turf/open/floor/mainship/sterile/side{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/medbay) +"QP" = ( +/obj/structure/rack, +/turf/open/floor/tile/dark/brown2{ + dir = 6 + }, +/area/campaign/som_raiding/outpost/req/secure) +"QQ" = ( +/turf/open/floor/tile/dark/red2, +/area/campaign/som_raiding/outpost/security/west_post) +"QR" = ( +/obj/structure/flora/drought/shroom/glow, +/turf/open/floor/plating/ground/mars/random/cave/darker, +/area/campaign/som_raiding/cave/tunnel) +"QS" = ( +/obj/structure/cable, +/turf/open/floor/tile/brown{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/req/aux) +"QU" = ( +/turf/open/floor/plating/ground/concrete/lines{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/req/north) +"QV" = ( +/obj/effect/turf_decal/siding/dark{ + dir = 5 + }, +/turf/open/floor/mainship/som/nw, +/area/campaign/som_raiding/outpost/command) +"QY" = ( +/obj/structure/bed/chair/office/dark{ + dir = 1 + }, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command/north) +"QZ" = ( +/obj/machinery/door/airlock/maintenance{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/campaign/som_raiding/outpost/living/kitchen) +"Rd" = ( +/turf/closed/mineral/smooth/indestructible, +/area/campaign/som_raiding/ground/jungle/south_west) +"Rh" = ( +/obj/structure/cable, +/turf/open/floor/tile/dark/red2{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/security/cargo_post) +"Rn" = ( +/obj/structure/prop/mainship/gelida/rails{ + dir = 4 + }, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle) +"Ro" = ( +/obj/structure/extinguisher_cabinet{ + dir = 4 + }, +/turf/open/floor/tile/dark/red2{ + dir = 9 + }, +/area/campaign/som_raiding/outpost/security/cargo_post) +"Rr" = ( +/obj/machinery/door/airlock/multi_tile/mainship/blackgeneric/glass{ + dir = 2 + }, +/obj/structure/cable, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/firing_range) +"Rs" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/structure/prop/mainship/telecomms/processor, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command/telecom) +"Rt" = ( +/obj/structure/cable, +/obj/structure/platform_decoration{ + dir = 8 + }, +/turf/open/floor/plating, +/area/campaign/som_raiding/outpost/maintenance/req) +"Ru" = ( +/obj/machinery/computer/som{ + dir = 4 + }, +/turf/open/floor/tile/dark/blue2{ + dir = 6 + }, +/area/campaign/som_raiding/outpost/command/north) +"Rw" = ( +/obj/machinery/shower{ + dir = 1 + }, +/obj/machinery/light{ + light_color = "#da2f1b" + }, +/turf/open/floor/tile/showroom, +/area/campaign/som_raiding/outpost/living/bathroom) +"Rx" = ( +/obj/machinery/shower{ + pixel_y = 15 + }, +/turf/open/floor/tile/showroom, +/area/campaign/som_raiding/outpost/living/bathroom) +"Ry" = ( +/obj/structure/flora/jungle/grass/thin, +/obj/effect/landmark/mob_spawner/farwa, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/south) +"Rz" = ( +/turf/open/ground/grass/beach/corner, +/area/campaign/som_raiding/ground/jungle/north) +"RA" = ( +/obj/structure/largecrate/supply/explosives/mortar_flare, +/turf/open/floor/tile/dark/brown2{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/req/secure) +"RB" = ( +/obj/machinery/door/airlock/hatch, +/obj/structure/cable, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/central_corridor) +"RC" = ( +/obj/structure/flora/jungle/grass/thin, +/turf/closed/gm/dense, +/area/campaign/som_raiding/ground/jungle) +"RD" = ( +/obj/machinery/door/airlock/maintenance, +/obj/structure/cable, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/engineering) +"RG" = ( +/obj/machinery/door/airlock/hatch{ + dir = 1 + }, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command) +"RH" = ( +/obj/structure/largecrate/supply/weapons/standard_carbine, +/turf/open/floor/tile/dark/brown2, +/area/campaign/som_raiding/outpost/req/secure) +"RI" = ( +/turf/closed/wall/mainship/gray, +/area/campaign/som_raiding/outpost/command) +"RJ" = ( +/turf/closed/mineral/smooth, +/area/campaign/som_raiding/outpost/maintenance/engie) +"RM" = ( +/turf/closed/wall/mainship/gray, +/area/campaign/som_raiding/outpost/firing_range) +"RN" = ( +/obj/structure/rock/variable/stalagmite, +/turf/open/floor/plating/ground/mars/random/cave/darker, +/area/campaign/som_raiding/cave/tunnel) +"RQ" = ( +/obj/structure/flora/jungle/grass/thin, +/turf/open/floor/plating/ground/dirtgrassborder2/corner2{ + dir = 8 + }, +/area/campaign/som_raiding/ground/jungle/north) +"RR" = ( +/turf/open/floor/mainship/red/corner, +/area/campaign/som_raiding/outpost/living/briefing) +"RS" = ( +/turf/open/floor/tile/dark/blue2, +/area/campaign/som_raiding/outpost/command/north) +"RT" = ( +/obj/structure/cable, +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/tile/brown{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/req/qm) +"RU" = ( +/obj/effect/turf_decal/grassdecal/corner{ + dir = 8 + }, +/turf/open/floor/plating/ground/mars/random/cave/darker, +/area/campaign/som_raiding/ground/jungle/south_east) +"RX" = ( +/obj/structure/table/reinforced, +/obj/item/storage/belt/lifesaver/som/quick, +/obj/effect/spawner/random/medical/pillbottle, +/turf/open/floor/mainship/sterile/side{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/medbay) +"RY" = ( +/obj/effect/spawner/random/engineering/shovel, +/turf/open/floor/plating/ground/mars/random/cave/darker, +/area/campaign/som_raiding/outpost/construction) +"RZ" = ( +/obj/structure/largecrate/supply/supplies/flares, +/turf/open/floor/tile/dark/brown2{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/req/secure) +"Sa" = ( +/obj/effect/turf_decal/box, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req/north) +"Sb" = ( +/obj/structure/flora/jungle/grass/thin, +/turf/open/floor/plating/ground/dirtgrassborder2/corner{ + dir = 1 + }, +/area/campaign/som_raiding/ground/jungle/south) +"Sc" = ( +/obj/machinery/door/airlock/mainship/engineering, +/obj/structure/cable, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/engineering) +"Se" = ( +/obj/structure/flora/jungle/large_bush, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/south_east) +"Sf" = ( +/obj/structure/flora/jungle/bush, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/south_east) +"Sg" = ( +/obj/structure/bed/bunkbed, +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/tile/dark/green2{ + dir = 10 + }, +/area/campaign/som_raiding/outpost/living) +"Si" = ( +/turf/open/floor/mainship/sterile/side{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/medbay) +"Sl" = ( +/obj/structure/cable, +/turf/open/floor/tile/brown{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/req/qm) +"Sm" = ( +/obj/machinery/vending/dinnerware, +/turf/open/floor/tile/barber, +/area/campaign/som_raiding/outpost/living/kitchen) +"Sn" = ( +/obj/structure/window/framed/mainship/gray, +/obj/structure/platform, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/req/north) +"So" = ( +/obj/structure/largecrate/random, +/obj/effect/turf_decal/box, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req) +"Sp" = ( +/obj/machinery/light/small, +/turf/open/floor/plating/ground/mars/random/cave/darker, +/area/campaign/som_raiding/outpost/maintenance) +"Sq" = ( +/obj/structure/flora/grass/tallgrass/autosmooth, +/turf/open/floor/plating/ground/dirtgrassborder2{ + dir = 4 + }, +/area/campaign/som_raiding/ground/jungle/south_east) +"Sr" = ( +/obj/structure/rock/variable/jungle, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/west) +"St" = ( +/obj/structure/stairs/seamless/edge_vert{ + dir = 8 + }, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req/north) +"Su" = ( +/obj/structure/largecrate/supply/supplies/mre, +/turf/open/floor/tile/dark/brown2{ + dir = 6 + }, +/area/campaign/som_raiding/outpost/req/secure) +"Sv" = ( +/obj/machinery/door/airlock/maintenance{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/campaign/som_raiding/outpost/medbay) +"Sx" = ( +/obj/structure/largecrate/supply/supplies, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req) +"Sy" = ( +/obj/machinery/door/airlock/maintenance, +/obj/structure/cable, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/security) +"Sz" = ( +/obj/effect/spawner/random/engineering/structure/tank, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req/north) +"SA" = ( +/obj/structure/cable, +/turf/open/floor/tile/dark/green2/corner{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/central_corridor) +"SB" = ( +/obj/machinery/light{ + light_color = "#da2f1b" + }, +/turf/open/floor/plating/ground/mars/random/cave/darker, +/area/campaign/som_raiding/outpost/tunnel/west) +"SC" = ( +/obj/structure/flora/jungle/large_bush, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/south) +"SF" = ( +/obj/machinery/computer/emails, +/obj/structure/table/black, +/obj/structure/window/reinforced, +/turf/open/floor/tile/dark/blue2{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/command) +"SG" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/tunnel) +"SH" = ( +/obj/structure/prop/mainship/gelida/rails, +/turf/open/floor/plating/ground/mars/random/cave, +/area/campaign/som_raiding/outpost/tunnel) +"SI" = ( +/obj/structure/cable, +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/tile/dark/green2{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/central_corridor) +"SJ" = ( +/obj/structure/cargo_container/gorg, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req) +"SK" = ( +/obj/machinery/vending/cigarette, +/turf/open/floor/tile/dark/blue2{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/command) +"SL" = ( +/obj/structure/largecrate/random/barrel/yellow, +/turf/open/floor/tile/dark/brown2/corner, +/area/campaign/som_raiding/outpost/req/secure) +"SN" = ( +/obj/effect/spawner/random/engineering/structure/handheld_lighting, +/turf/open/floor/mainship/mono, +/area/campaign/som_raiding/outpost/construction) +"SQ" = ( +/turf/open/floor/tile/showroom, +/area/campaign/som_raiding/outpost/living/bathroom) +"SR" = ( +/obj/structure/bed/chair/office/dark{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/security/west_post) +"SS" = ( +/obj/machinery/cic_maptable/drawable/big/som{ + pixel_x = -3 + }, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command/cic) +"ST" = ( +/turf/closed/mineral/smooth/indestructible, +/area/campaign/som_raiding/ground/jungle/west) +"SV" = ( +/obj/machinery/door/airlock/maintenance, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/security/southeast_post) +"SW" = ( +/turf/open/floor/tile/brown{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/req/qm) +"Tc" = ( +/obj/machinery/door/airlock/mainship/security, +/obj/structure/cable, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/security/southeast_post) +"Td" = ( +/obj/machinery/computer/som_two{ + dir = 4 + }, +/turf/open/floor/tile/dark/red2{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/security/west_post) +"Te" = ( +/obj/structure/cable, +/turf/open/floor/mainship/sterile/side{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/medbay) +"Tf" = ( +/turf/open/ground/grass/beach, +/area/campaign/som_raiding/ground/jungle/west) +"Th" = ( +/obj/structure/reagent_dispensers/fueltank, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/engineering) +"Ti" = ( +/obj/structure/cargo_container/nt{ + dir = 4 + }, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req/north) +"Tj" = ( +/turf/open/floor/mainship/mono, +/area/campaign/som_raiding/outpost/maintenance) +"Tk" = ( +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/construction) +"Tl" = ( +/obj/machinery/door/airlock/multi_tile/mainship/blackgeneric/glass, +/turf/open/floor/tile/dark/gray, +/area/campaign/som_raiding/outpost/construction) +"Tn" = ( +/obj/structure/table/black, +/turf/open/floor/mainship/mono, +/area/campaign/som_raiding/outpost/living/briefing) +"Ts" = ( +/obj/structure/prop/brokenvendor/brokencorpsmanvendor, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/security) +"Tu" = ( +/obj/structure/cable, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/tile/dark/yellow2{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/engineering) +"Tw" = ( +/turf/open/floor/tile/brown/corner{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/req/qm) +"Tx" = ( +/obj/structure/flora/jungle/grass, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/west) +"Tz" = ( +/obj/structure/reagent_dispensers/fueltank, +/turf/open/floor/tile/dark/yellow2{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/engineering) +"TA" = ( +/obj/structure/flora/jungle/bush, +/turf/open/floor/plating/ground/dirtgrassborder2{ + dir = 1 + }, +/area/campaign/som_raiding/ground/jungle/south) +"TB" = ( +/obj/machinery/camera/autoname/mainship/somship, +/obj/machinery/computer/som_two, +/turf/open/floor/tile/dark/blue2{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/command/cic) +"TD" = ( +/obj/structure/table/black, +/obj/machinery/computer3/server, +/turf/open/floor/tile/dark/blue2, +/area/campaign/som_raiding/outpost/command/north) +"TF" = ( +/obj/structure/bed/chair/office/dark{ + dir = 4 + }, +/turf/open/floor/tile/dark/blue2, +/area/campaign/som_raiding/outpost/command/north) +"TJ" = ( +/turf/open/floor/plating/ground/dirtgrassborder2/corner, +/area/campaign/som_raiding/ground/jungle) +"TK" = ( +/obj/machinery/light, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command/cic) +"TL" = ( +/turf/open/floor/plating/ground/dirtgrassborder2/corner{ + dir = 1 + }, +/area/campaign/som_raiding/ground/jungle/north) +"TO" = ( +/obj/structure/ship_ammo/cas/rocket/keeper, +/turf/open/floor/tile/dark/brown2{ + dir = 9 + }, +/area/campaign/som_raiding/outpost/req/secure) +"TP" = ( +/obj/structure/largecrate/supply/explosives/mortar_he, +/turf/open/floor/tile/dark/brown2{ + dir = 6 + }, +/area/campaign/som_raiding/outpost/req/secure) +"TQ" = ( +/obj/structure/flora/tree/jungle/small, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/west) +"TR" = ( +/obj/structure/prop/brokenvendor/surplusarmor, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/security) +"TT" = ( +/obj/structure/cable, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/firing_range) +"TU" = ( +/turf/open/floor/tile/dark/green2/corner{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/living) +"TX" = ( +/obj/structure/stairs/seamless/platform, +/obj/structure/cable, +/turf/open/floor/plating, +/area/campaign/som_raiding/outpost/maintenance/req) +"Ua" = ( +/obj/machinery/power/apc, +/obj/structure/cable, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/security) +"Uc" = ( +/obj/structure/bed/chair/office/dark{ + dir = 4 + }, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command) +"Ue" = ( +/obj/structure/window/framed/mainship/gray, +/turf/open/floor/mainship/mono, +/area/campaign/som_raiding/outpost/security/southeast_post) +"Uf" = ( +/turf/open/floor/plating/ground/dirtgrassborder2/corner, +/area/campaign/som_raiding/ground/jungle/south_west) +"Ug" = ( +/obj/effect/turf_decal/sandedge/corner2{ + dir = 8 + }, +/turf/open/floor/plating/ground/dirtgrassborder2/corner{ + dir = 1 + }, +/area/campaign/som_raiding/ground/jungle/north) +"Uk" = ( +/obj/machinery/light, +/turf/open/floor/tile/neutral/full, +/area/campaign/som_raiding/outpost/living/canteen) +"Um" = ( +/turf/open/floor/tile/dark/blue2{ + dir = 10 + }, +/area/campaign/som_raiding/outpost/command/north) +"Un" = ( +/obj/structure/rock/variable/jungle_large, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/south_west) +"Uo" = ( +/obj/structure/bed/chair/office/dark{ + dir = 1 + }, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command) +"Up" = ( +/obj/structure/rock/variable/jungle, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/south_west) +"Uq" = ( +/obj/machinery/vending/cola, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command/living) +"Ur" = ( +/obj/structure/prop/mainship/mission_planning_system, +/turf/open/floor/tile/dark/blue2{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/command) +"Us" = ( +/obj/effect/spawner/random/misc/structure/closet/electrical, +/obj/machinery/light{ + light_color = "#da2f1b" + }, +/turf/open/floor/tile/dark/yellow2, +/area/campaign/som_raiding/outpost/engineering) +"Uw" = ( +/obj/structure/cable, +/obj/machinery/power/fusion_engine/preset, +/turf/open/floor/tile/dark/yellow2{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/engineering) +"Uy" = ( +/obj/machinery/door/airlock/maintenance{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command/cic) +"Uz" = ( +/obj/structure/flora/jungle/grass, +/turf/open/floor/plating/ground/dirtgrassborder2, +/area/campaign/som_raiding/ground/jungle) +"UA" = ( +/turf/open/floor/plating/ground/concrete/lines{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/tunnel/west) +"UB" = ( +/obj/structure/flora/jungle/grass/thin, +/turf/open/floor/plating/ground/dirtgrassborder2/corner{ + dir = 8 + }, +/area/campaign/som_raiding/ground/jungle/south) +"UC" = ( +/obj/structure/largecrate/supply/supplies, +/obj/effect/turf_decal/box, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req) +"UD" = ( +/obj/machinery/power/apc, +/obj/structure/cable, +/turf/open/floor/tile/dark/green2{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/central_corridor) +"UE" = ( +/obj/structure/flora/jungle/grass/thin, +/turf/open/floor/plating/ground/dirtgrassborder2{ + dir = 8 + }, +/area/campaign/som_raiding/ground/jungle/west) +"UF" = ( +/obj/structure/flora/jungle/large_bush, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/south_west) +"UH" = ( +/obj/machinery/door/airlock/maintenance{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/campaign/som_raiding/outpost/maintenance) +"UI" = ( +/obj/structure/flora/tree/jungle/small, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/north) +"UJ" = ( +/obj/structure/closet/secure_closet/medical2, +/turf/open/floor/mainship/sterile/corner, +/area/campaign/som_raiding/outpost/medbay) +"UK" = ( +/obj/structure/table/black, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/security) +"UL" = ( +/obj/effect/turf_decal/sandedge/corner2, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/south) +"UM" = ( +/obj/effect/turf_decal/bot, +/turf/open/floor/tile/dark/brown2{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/req/secure) +"UN" = ( +/turf/open/floor/tile/dark/brown2{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/req/secure) +"UO" = ( +/obj/structure/flora/jungle/grass/thin, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/south_west) +"UP" = ( +/turf/open/floor/plating/ground/dirtgrassborder2/corner2{ + dir = 4 + }, +/area/campaign/som_raiding/ground/jungle) +"UQ" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/plating, +/area/campaign/som_raiding/outpost/maintenance/req) +"US" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/security) +"UT" = ( +/obj/structure/cable, +/turf/open/floor/tile/dark/yellow2{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/engineering) +"UU" = ( +/obj/structure/closet/firecloset/full, +/turf/open/floor/mainship/mono, +/area/campaign/som_raiding/outpost/central_corridor) +"UV" = ( +/obj/structure/table/reinforced, +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/tile/showroom, +/area/campaign/som_raiding/outpost/living/bathroom) +"UX" = ( +/turf/open/floor/tile/dark/brown2{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/req/secure) +"UY" = ( +/obj/structure/table/black, +/obj/effect/spawner/random/engineering/radio, +/turf/open/floor/tile/dark/red2{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/security/southeast_post) +"UZ" = ( +/obj/machinery/door/airlock/mainship/security{ + dir = 2 + }, +/obj/structure/cable, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/security/west_post) +"Va" = ( +/obj/structure/closet/firecloset/full, +/turf/open/floor/tile/dark/green2{ + dir = 10 + }, +/area/campaign/som_raiding/outpost/central_corridor) +"Vb" = ( +/obj/structure/bed/chair/office/dark{ + dir = 8 + }, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command/living) +"Vc" = ( +/turf/open/floor/tile/dark/blue2{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/command/north) +"Ve" = ( +/turf/open/floor/tile/dark/red2{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/security/west_post) +"Vf" = ( +/obj/structure/cable, +/turf/open/floor/tile/brown, +/area/campaign/som_raiding/outpost/req/qm) +"Vg" = ( +/obj/structure/ship_ammo/cas/laser_battery, +/turf/open/floor/tile/dark/brown2{ + dir = 10 + }, +/area/campaign/som_raiding/outpost/req/secure) +"Vh" = ( +/obj/machinery/vending/coffee, +/turf/open/floor/tile/dark/blue2{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/command) +"Vi" = ( +/obj/structure/ship_ammo/cas/bomb/moab, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/req/secure) +"Vj" = ( +/obj/machinery/computer/som, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command/telecom) +"Vk" = ( +/obj/effect/turf_decal/warning_stripes/engineer, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/security) +"Vm" = ( +/obj/structure/rack, +/obj/effect/vendor_bundle/xenonauten_light, +/obj/effect/vendor_bundle/xenonauten_light, +/turf/open/floor/tile/dark/brown2{ + dir = 9 + }, +/area/campaign/som_raiding/outpost/req/secure) +"Vn" = ( +/turf/open/ground/grass/beach/corner2{ + dir = 1 + }, +/area/campaign/som_raiding/ground/jungle/north) +"Vo" = ( +/obj/structure/platform, +/turf/closed/wall/mainship/gray, +/area/campaign/som_raiding/outpost/tunnel) +"Vp" = ( +/obj/structure/cable, +/turf/open/floor/plating/ground/concrete/lines{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/req) +"Vq" = ( +/obj/machinery/cic_maptable/no_flags, +/turf/open/floor/tile/dark/blue2{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/command) +"Vr" = ( +/obj/structure/cable, +/obj/machinery/light, +/turf/open/floor/tile/dark/blue2, +/area/campaign/som_raiding/outpost/command) +"Vs" = ( +/obj/structure/largecrate/random/barrel/white, +/turf/open/floor/plating/ground/mars/random/cave, +/area/campaign/som_raiding/outpost/tunnel) +"Vt" = ( +/obj/effect/turf_decal/sandedge{ + dir = 8 + }, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/south) +"Vu" = ( +/obj/structure/largecrate/random, +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/turf_decal/box, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req) +"Vw" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/tile/showroom, +/area/campaign/som_raiding/outpost/living/bathroom) +"Vx" = ( +/turf/open/floor/plating/ground/dirtgrassborder2/corner2{ + dir = 1 + }, +/area/campaign/som_raiding/ground/jungle/west) +"Vy" = ( +/turf/closed/wall/mainship/gray, +/area/campaign/som_raiding/outpost/security/west_post) +"VA" = ( +/obj/machinery/door/airlock/maintenance{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/tile/dark/gray, +/area/campaign/som_raiding/outpost/req/qm) +"VC" = ( +/turf/open/floor/tile/dark/blue2/corner{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/command/cic) +"VD" = ( +/obj/machinery/door/airlock/hatch{ + dir = 1 + }, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/central_corridor) +"VF" = ( +/obj/structure/reagent_dispensers/fueltank, +/turf/open/floor/tile/brown{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/req/aux) +"VG" = ( +/obj/machinery/power/apc, +/obj/structure/cable, +/turf/open/floor/tile/dark/red2{ + dir = 9 + }, +/area/campaign/som_raiding/outpost/security/south_post) +"VH" = ( +/obj/structure/cable, +/turf/open/floor/tile/dark/blue2/corner{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/command/north) +"VK" = ( +/turf/closed/mineral/smooth, +/area/campaign/som_raiding/ground/jungle/north) +"VM" = ( +/turf/open/floor/plating/ground/concrete/lines{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/req) +"VP" = ( +/obj/structure/reagent_dispensers/watertank, +/turf/open/floor/tile/dark/yellow2{ + dir = 9 + }, +/area/campaign/som_raiding/outpost/engineering) +"VQ" = ( +/turf/open/floor/plating/ground/concrete/lines{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/tunnel/west) +"VR" = ( +/obj/machinery/door/window, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command) +"VS" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/tile/dark/blue2{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/command/north) +"VU" = ( +/obj/structure/cargo_container/hd{ + dir = 4 + }, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req) +"VW" = ( +/obj/structure/rack, +/obj/effect/spawner/random/engineering/tool, +/obj/effect/spawner/random/engineering/plasteel, +/turf/open/floor/mainship/mono, +/area/campaign/som_raiding/outpost/construction) +"VY" = ( +/obj/item/ammo_casing/shell, +/obj/item/ammo_casing/shell, +/turf/open/floor/mainship/mono, +/area/campaign/som_raiding/outpost/construction) +"Wc" = ( +/turf/open/floor/tile/dark/green2{ + dir = 6 + }, +/area/campaign/som_raiding/outpost/central_corridor) +"Wd" = ( +/obj/structure/prop/brokenvendor/surplusclothes, +/turf/open/floor/tile/dark/red2{ + dir = 10 + }, +/area/campaign/som_raiding/outpost/security/south_post) +"We" = ( +/obj/structure/cable, +/obj/machinery/cic_maptable/no_flags, +/turf/open/floor/mainship/mono, +/area/campaign/som_raiding/outpost/living/briefing) +"Wf" = ( +/obj/effect/turf_decal/sandedge/corner2{ + dir = 4 + }, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/south) +"Wg" = ( +/obj/structure/cable, +/obj/structure/platform_decoration{ + dir = 8 + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req/north) +"Wh" = ( +/obj/structure/table/reinforced, +/obj/effect/spawner/random/engineering/tool, +/obj/effect/spawner/random/engineering/tool, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/tile/dark/yellow2{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/engineering) +"Wi" = ( +/obj/structure/bed/stool, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/engineering) +"Wj" = ( +/obj/structure/cable, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/security/north_post) +"Wl" = ( +/obj/structure/bed/chair/comfy, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command/living) +"Wm" = ( +/turf/open/floor/tile/dark/red2, +/area/campaign/som_raiding/outpost/security/south_post) +"Wn" = ( +/obj/effect/spawner/random/engineering/tool, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req) +"Wo" = ( +/obj/machinery/vending/sovietsoda, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command/living) +"Wp" = ( +/turf/open/liquid/water, +/area/campaign/som_raiding/ground/jungle/north) +"Wq" = ( +/obj/structure/prop/mainship/gelida/rails, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/south_east) +"Wu" = ( +/obj/structure/bed/chair/alt{ + dir = 4 + }, +/turf/open/floor/tile/dark/blue2{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/command/captain) +"Wx" = ( +/obj/structure/bed/chair/office/dark, +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/tile/dark/blue2{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/command) +"Wy" = ( +/obj/structure/prop/mainship/gelida/railbumper{ + dir = 1 + }, +/turf/open/floor/plating/ground/mars/random/cave, +/area/campaign/som_raiding/ground/jungle) +"WA" = ( +/obj/structure/morgue{ + dir = 1 + }, +/turf/open/floor/freezer, +/area/campaign/som_raiding/outpost/medbay) +"WD" = ( +/obj/structure/stairs/seamless, +/turf/open/floor/tile/dark/blue2, +/area/campaign/som_raiding/outpost/command) +"WE" = ( +/obj/structure/table/mainship, +/obj/effect/spawner/random/food_or_drink/bread, +/obj/effect/spawner/random/food_or_drink/cheesewedge, +/turf/open/floor/tile/barber, +/area/campaign/som_raiding/outpost/living/kitchen) +"WF" = ( +/obj/structure/cable, +/turf/open/floor/tile/dark/green2{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/living) +"WG" = ( +/obj/machinery/computer3/server/rack, +/turf/open/floor/tile/dark/blue2{ + dir = 5 + }, +/area/campaign/som_raiding/outpost/command/north) +"WI" = ( +/turf/open/floor/plating/ground/mars/random/cave/darker, +/area/campaign/som_raiding/outpost/construction) +"WJ" = ( +/turf/open/floor/tile/dark/red2{ + dir = 6 + }, +/area/campaign/som_raiding/outpost/security/southeast_post) +"WK" = ( +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/security) +"WM" = ( +/obj/structure/cable, +/obj/effect/turf_decal/delivery, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/tunnel/west) +"WO" = ( +/obj/structure/cable, +/obj/effect/spawner/random/engineering/structure/tank/waterweighted, +/turf/open/floor/plating, +/area/campaign/som_raiding/outpost/maintenance) +"WQ" = ( +/obj/structure/bed/chair/comfy{ + dir = 1 + }, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command/living) +"WR" = ( +/obj/structure/cable, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/mainship/mono, +/area/campaign/som_raiding/outpost/tunnel) +"WT" = ( +/obj/structure/largecrate/random/case/small, +/turf/open/floor/tile/brown{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/req/qm) +"WU" = ( +/obj/structure/cable, +/turf/open/floor/tile/dark/red2{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/security/south_post) +"WV" = ( +/obj/structure/bed/chair/alt{ + dir = 1 + }, +/turf/open/floor/mainship/mono, +/area/campaign/som_raiding/outpost/living/briefing) +"WW" = ( +/obj/structure/mine_structure/wooden/support_wall/t_bar, +/turf/open/floor/plating/ground/mars/random/cave/darker, +/area/campaign/som_raiding/cave/tunnel) +"WX" = ( +/turf/closed/mineral/smooth, +/area/campaign/som_raiding/outpost/req/secure) +"Xb" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/tile/dark/green2{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/living) +"Xc" = ( +/obj/structure/largecrate/random/case/double, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/tunnel) +"Xd" = ( +/obj/structure/table/mainship, +/obj/machinery/griddle, +/obj/structure/cable, +/turf/open/floor/tile/barber, +/area/campaign/som_raiding/outpost/living/kitchen) +"Xe" = ( +/obj/machinery/vending/nanomed{ + dir = 8 + }, +/turf/open/floor/tile/dark/yellow2{ + dir = 6 + }, +/area/campaign/som_raiding/outpost/engineering) +"Xg" = ( +/obj/effect/turf_decal/siding/dark{ + dir = 10 + }, +/turf/open/floor/mainship/som/se, +/area/campaign/som_raiding/outpost/command) +"Xm" = ( +/obj/structure/flora/tree/jungle/small, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/south) +"Xn" = ( +/obj/machinery/power/port_gen/pacman/mrs, +/turf/open/floor/tile/dark/yellow2, +/area/campaign/som_raiding/outpost/engineering) +"Xp" = ( +/obj/structure/ship_ammo/cas/minirocket, +/turf/open/floor/tile/dark/brown2{ + dir = 9 + }, +/area/campaign/som_raiding/outpost/req/secure) +"Xr" = ( +/turf/closed/mineral/smooth, +/area/campaign/som_raiding/outpost/maintenance) +"Xt" = ( +/obj/structure/largecrate/supply/supplies/metal, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/req/secure) +"Xu" = ( +/obj/structure/platform{ + dir = 8 + }, +/turf/closed/wall/mainship/gray, +/area/campaign/som_raiding/outpost/req/qm) +"Xv" = ( +/obj/machinery/door/airlock/hatch{ + dir = 1 + }, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/security) +"Xw" = ( +/obj/structure/toilet{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/machinery/door/window{ + dir = 1 + }, +/turf/open/floor/tile/showroom, +/area/campaign/som_raiding/outpost/living/bathroom) +"Xy" = ( +/turf/open/floor/tile/dark/blue2, +/area/campaign/som_raiding/outpost/command/cic) +"Xz" = ( +/obj/machinery/door/airlock/multi_tile/mainship/blackgeneric/glass{ + dir = 2 + }, +/turf/open/floor/tile/dark/gray, +/area/campaign/som_raiding/outpost/req/qm) +"XA" = ( +/turf/open/floor/plating/ground/dirtgrassborder2/corner{ + dir = 4 + }, +/area/campaign/som_raiding/ground/jungle/south_west) +"XB" = ( +/obj/structure/prop/brokenvendor/brokenuniformvendor, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/security) +"XD" = ( +/obj/effect/turf_decal/sandedge/corner{ + dir = 4 + }, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/north) +"XE" = ( +/obj/structure/rack, +/obj/item/weapon/gun/rifle/standard_br/standard, +/obj/item/weapon/gun/rifle/standard_br/standard, +/turf/open/floor/tile/dark/brown2{ + dir = 9 + }, +/area/campaign/som_raiding/outpost/req/secure) +"XF" = ( +/obj/structure/cargo_container{ + dir = 1 + }, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req) +"XG" = ( +/obj/structure/cable, +/turf/open/floor/mainship/mono, +/area/campaign/som_raiding/outpost/living/briefing) +"XH" = ( +/obj/machinery/door/airlock/hatch, +/turf/open/floor/plating, +/area/campaign/som_raiding/outpost/medbay) +"XI" = ( +/obj/structure/closet/crate/radiation, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req/north) +"XK" = ( +/obj/structure/cable, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/construction) +"XL" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/mainship/mono, +/area/campaign/som_raiding/outpost/construction) +"XM" = ( +/obj/machinery/cic_maptable/no_flags, +/turf/open/floor/tile/dark/blue2{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/command/north) +"XN" = ( +/obj/structure/closet/firecloset, +/turf/open/floor/plating, +/area/campaign/som_raiding/outpost/maintenance/engie) +"XO" = ( +/turf/open/floor/plating/ground/dirtgrassborder2/corner2{ + dir = 8 + }, +/area/campaign/som_raiding/ground/jungle/south_west) +"XP" = ( +/turf/closed/mineral/smooth, +/area/campaign/som_raiding/outpost/req/aux) +"XS" = ( +/obj/effect/landmark/patrol_point/tgmc_11, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/south_west) +"XT" = ( +/obj/structure/bed/chair/office/dark{ + dir = 1 + }, +/obj/structure/window/reinforced, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command) +"XV" = ( +/obj/machinery/door/airlock/multi_tile/mainship/blackgeneric/glass, +/obj/structure/cable, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/central_corridor) +"XW" = ( +/obj/structure/table/mainship, +/obj/machinery/reagentgrinder{ + pixel_y = 5 + }, +/turf/open/floor/tile/barber, +/area/campaign/som_raiding/outpost/living/kitchen) +"XX" = ( +/obj/structure/bed/chair/office/dark, +/obj/structure/cable, +/obj/machinery/vending/nanomed{ + dir = 4 + }, +/turf/open/floor/tile/dark/red2{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/security/north_post) +"XY" = ( +/turf/open/floor/tile/brown/corner{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/req/aux) +"Ya" = ( +/obj/structure/filingcabinet, +/turf/open/floor/tile/brown{ + dir = 5 + }, +/area/campaign/som_raiding/outpost/req/qm) +"Yb" = ( +/obj/machinery/power/apc, +/obj/structure/cable, +/turf/open/floor/tile/dark/brown2{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/req/secure) +"Ye" = ( +/obj/structure/table/reinforced, +/obj/effect/spawner/random/engineering/toolbox, +/turf/open/floor/tile/dark/yellow2{ + dir = 5 + }, +/area/campaign/som_raiding/outpost/engineering) +"Yg" = ( +/obj/structure/prop/mainship/gelida/rails{ + dir = 1 + }, +/turf/open/floor/plating/ground/mars/random/cave, +/area/campaign/som_raiding/ground/jungle) +"Yh" = ( +/obj/structure/table/mainship, +/turf/open/floor/tile/neutral/full, +/area/campaign/som_raiding/outpost/living/canteen) +"Yi" = ( +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/living) +"Yj" = ( +/obj/effect/turf_decal/siding/dark, +/turf/open/floor/mainship/som/s, +/area/campaign/som_raiding/outpost/command) +"Yk" = ( +/obj/effect/landmark/mob_spawner/farwa, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle) +"Yn" = ( +/obj/structure/closet/fireaxecabinet, +/turf/closed/wall/mainship/gray, +/area/campaign/som_raiding/outpost/req/qm) +"Yp" = ( +/turf/open/floor/mainship/mono, +/area/campaign/som_raiding/outpost/tunnel) +"Yq" = ( +/obj/structure/largecrate/supply/medicine/medkits, +/turf/open/floor/tile/dark/brown2{ + dir = 9 + }, +/area/campaign/som_raiding/outpost/req/secure) +"Ys" = ( +/obj/structure/rack, +/obj/item/ammo_magazine/rifle/standard_br, +/obj/item/ammo_magazine/rifle/standard_br, +/obj/item/ammo_magazine/rifle/standard_br, +/obj/item/ammo_magazine/rifle/standard_skirmishrifle, +/obj/item/ammo_magazine/rifle/standard_skirmishrifle, +/turf/open/floor/tile/dark/brown2{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/req/secure) +"Yu" = ( +/obj/structure/flora/jungle/grass, +/turf/open/floor/plating/ground/dirtgrassborder2{ + dir = 8 + }, +/area/campaign/som_raiding/ground/jungle/north) +"Yv" = ( +/obj/effect/turf_decal/sandedge{ + dir = 8 + }, +/turf/open/floor/plating/ground/dirtgrassborder2/corner{ + dir = 1 + }, +/area/campaign/som_raiding/ground/jungle) +"Yy" = ( +/obj/structure/flora/tree/jungle, +/obj/structure/flora/jungle/grass/thin, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/north) +"YA" = ( +/obj/structure/cargo_container/red{ + dir = 4 + }, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req) +"YC" = ( +/turf/open/floor/plating/ground/dirtgrassborder2{ + dir = 8 + }, +/area/campaign/som_raiding/ground/jungle/west) +"YF" = ( +/obj/structure/largecrate/random/barrel/white, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req) +"YG" = ( +/turf/open/floor/tile/dark/blue2{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/command/north) +"YH" = ( +/obj/machinery/power/terminal{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/tile/dark/yellow2{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/engineering) +"YJ" = ( +/turf/open/floor/plating/ground/mars/random/cave/darker, +/area/campaign/som_raiding/outpost/req) +"YK" = ( +/obj/structure/cargo_container/ch_green{ + dir = 1 + }, +/obj/machinery/light{ + light_color = "#da2f1b" + }, +/obj/effect/turf_decal/box, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req) +"YN" = ( +/obj/structure/flora/grass/tallgrass/autosmooth, +/turf/open/floor/plating/ground/dirtgrassborder2/corner{ + dir = 8 + }, +/area/campaign/som_raiding/ground/jungle/south_east) +"YP" = ( +/obj/structure/rack, +/obj/effect/spawner/random/engineering/toolbox, +/turf/open/floor/tile/dark/yellow2{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/engineering) +"YR" = ( +/obj/structure/flora/tree/jungle, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/south_west) +"YT" = ( +/obj/structure/flora/tree/jungle, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle) +"YX" = ( +/turf/open/floor/plating/ground/dirtgrassborder2, +/area/campaign/som_raiding/ground/jungle/south) +"YY" = ( +/turf/open/floor/tile/dark/red2{ + dir = 5 + }, +/area/campaign/som_raiding/outpost/security/south_post) +"YZ" = ( +/obj/structure/flora/jungle/grass/thin, +/turf/open/floor/plating/ground/dirtgrassborder2{ + dir = 1 + }, +/area/campaign/som_raiding/ground/jungle/south_west) +"Zb" = ( +/obj/structure/prop/mainship/gelida/rails{ + dir = 8 + }, +/obj/structure/closet/crate/miningcar/stripe, +/turf/open/floor/wood/alt_one, +/area/campaign/som_raiding/ground/jungle/south_east) +"Zc" = ( +/obj/structure/ship_ammo/cas/minirocket/incendiary, +/turf/open/floor/tile/dark/brown2/corner{ + dir = 4 + }, +/area/campaign/som_raiding/outpost/req/secure) +"Ze" = ( +/turf/open/floor/plating/dmg3, +/area/campaign/som_raiding/outpost/firing_range) +"Zg" = ( +/obj/structure/largecrate/mule, +/turf/open/floor/tile/dark/gray, +/area/campaign/som_raiding/outpost/req/qm) +"Zh" = ( +/obj/effect/turf_decal/sandedge/corner2{ + dir = 8 + }, +/obj/structure/flora/tree/jungle/small, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/south) +"Zi" = ( +/turf/closed/wall/mainship/gray, +/area/campaign/som_raiding/outpost/security/southeast_post) +"Zj" = ( +/obj/machinery/door/airlock/hatch, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/central_corridor) +"Zk" = ( +/obj/effect/spawner/random/misc/structure/closet/tool, +/obj/machinery/light{ + light_color = "#da2f1b" + }, +/turf/open/floor/tile/dark/yellow2, +/area/campaign/som_raiding/outpost/engineering) +"Zl" = ( +/obj/structure/table/black, +/obj/structure/extinguisher_cabinet{ + dir = 1 + }, +/turf/open/floor/tile/dark/red2, +/area/campaign/som_raiding/outpost/security/south_post) +"Zm" = ( +/obj/machinery/power/apc{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/firing_range) +"Zo" = ( +/turf/open/floor/tile/brown, +/area/campaign/som_raiding/outpost/req/qm) +"Zq" = ( +/obj/structure/window/framed/mainship/gray, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/security/cargo_post) +"Zr" = ( +/obj/structure/bed/chair/office/dark{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/security/west_post) +"Zt" = ( +/turf/open/floor/plating/ground/mars/random/cave, +/area/campaign/som_raiding/outpost/tunnel/west) +"Zu" = ( +/obj/machinery/vending/medical, +/turf/open/floor/mainship/sterile/corner, +/area/campaign/som_raiding/outpost/medbay) +"Zw" = ( +/obj/effect/landmark/patrol_point/som/som_12, +/turf/open/floor/tile/dark/green2{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/living) +"Zx" = ( +/turf/open/floor/tile/dark/yellow2/corner, +/area/campaign/som_raiding/outpost/engineering) +"Zy" = ( +/obj/structure/largecrate/random, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req) +"Zz" = ( +/obj/structure/cargo_container/horizontal{ + dir = 1 + }, +/turf/open/floor/plating/ground/concrete, +/area/campaign/som_raiding/outpost/req) +"ZA" = ( +/obj/machinery/power/apc{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/mainship/mono, +/area/campaign/som_raiding/outpost/construction) +"ZB" = ( +/obj/effect/spawner/random/engineering/structure/powergenerator, +/turf/open/floor/mainship/mono, +/area/campaign/som_raiding/outpost/construction) +"ZC" = ( +/obj/structure/largecrate/supply/explosives/mortar_he, +/turf/open/floor/tile/dark/brown2{ + dir = 5 + }, +/area/campaign/som_raiding/outpost/req/secure) +"ZD" = ( +/obj/structure/rock/variable/jungle/big, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle) +"ZF" = ( +/turf/open/floor/tile/dark/yellow2, +/area/campaign/som_raiding/outpost/engineering) +"ZH" = ( +/obj/structure/largecrate/random/barrel/yellow, +/obj/machinery/light, +/turf/open/floor/tile/dark/brown2, +/area/campaign/som_raiding/outpost/req/secure) +"ZI" = ( +/obj/structure/rack, +/obj/effect/vendor_bundle/xenonauten_medium, +/obj/effect/vendor_bundle/xenonauten_medium, +/turf/open/floor/tile/dark/brown2{ + dir = 1 + }, +/area/campaign/som_raiding/outpost/req/secure) +"ZJ" = ( +/obj/machinery/door/airlock/hatch, +/turf/open/floor/tile/dark, +/area/campaign/som_raiding/outpost/command/living) +"ZK" = ( +/turf/closed/mineral/smooth, +/area/campaign/som_raiding/outpost/security/west_post) +"ZM" = ( +/turf/open/floor/tile/dark/red2/corner{ + dir = 8 + }, +/area/campaign/som_raiding/outpost/security/southeast_post) +"ZN" = ( +/obj/structure/flora/tree/jungle, +/turf/open/ground/grass/weedable, +/area/campaign/som_raiding/ground/jungle/west) +"ZQ" = ( +/obj/structure/cable, +/turf/open/floor/plating, +/area/campaign/som_raiding/outpost/maintenance/cic) +"ZT" = ( +/obj/structure/reagent_dispensers/fueltank, +/turf/open/floor/tile/dark/yellow2{ + dir = 10 + }, +/area/campaign/som_raiding/outpost/engineering) +"ZW" = ( +/turf/open/ground/grass/beach/corner{ + dir = 1 + }, +/area/campaign/som_raiding/ground/jungle/west) +"ZZ" = ( +/turf/open/floor/tile/dark/blue2{ + dir = 9 + }, +/area/campaign/som_raiding/outpost/command/cic) + +(1,1,1) = {" +xk +xk +xk +xk +xk +xk +xk +xk +xk +xk +xk +xk +xk +xk +xk +xk +xk +xk +xk +xk +xk +xk +xk +xk +xk +xk +xk +xk +xk +xk +xk +xk +xk +xk +xk +xk +xk +xk +xk +xk +xk +xk +xk +xk +xk +xk +xk +xk +xk +xk +xk +xk +xk +xk +xk +xk +xk +xk +xk +xk +xk +xk +xk +xk +xk +xk +xk +xk +xk +xk +xk +ST +ST +ST +ST +ST +ST +ST +ST +ST +ST +ST +ST +ST +ST +ST +ST +ST +ST +ST +ST +ST +ST +ST +ST +ST +ST +ST +ST +ST +ST +ST +ST +ST +ST +Rd +Rd +Rd +Rd +Rd +Rd +Rd +Rd +Rd +Rd +Rd +Rd +Rd +Rd +Rd +Rd +Rd +Rd +Rd +Rd +Rd +Rd +Rd +Rd +Rd +Rd +Rd +Rd +Rd +Rd +Rd +Rd +Rd +Rd +Rd +Rd +Rd +Rd +Rd +Rd +Rd +Rd +Rd +Rd +Rd +"} +(2,1,1) = {" +xk +eW +eW +eW +eW +eW +eW +eW +eW +eW +eW +eW +eW +eW +eW +eW +eW +eW +eW +eW +eW +eW +eW +eW +eW +eW +eW +eW +eW +eW +eW +eW +eW +eW +eW +eW +eW +eW +eW +eW +eW +eW +eW +eW +eW +eW +eW +eW +eW +eW +eW +eW +eW +eW +eW +eW +eW +eW +eW +eW +eW +eW +eW +eW +eW +eW +eW +eW +eW +eW +eW +fN +fN +fN +fN +fN +fN +fN +fN +fN +fN +fN +fN +fN +fN +fN +fN +fN +fN +fN +fN +fN +fN +fN +fN +fN +fN +fN +fN +fN +fN +fN +fN +fN +fN +rL +rL +rL +rL +Fw +Fw +IQ +Fw +IQ +Fw +Fw +Fw +rL +rL +rL +rL +rL +rL +rL +rL +rL +rL +rL +rL +rL +rL +rL +rL +rL +rL +rL +rL +rL +rL +rL +rL +rL +rL +rL +rL +rL +rL +rL +rL +Rd +"} +(3,1,1) = {" +xk +eW +eW +eW +eW +eW +eW +JW +LQ +eW +eW +eW +eW +JW +yq +eY +eY +JW +eW +eW +eW +JW +JW +eY +eW +eW +eW +eW +eW +eW +eW +eW +eW +Wp +Wp +Wp +Wp +fT +ke +JW +JW +eW +eW +eW +JW +DW +JW +Pc +JW +JW +Pc +eW +eW +eW +eW +eW +eW +eW +eW +eW +JW +JW +JW +JW +JW +eW +eW +eW +JW +JW +JW +vC +vC +fl +vC +vC +vC +TQ +hF +fN +fN +TQ +KN +vC +Tx +vC +vC +KN +fN +fN +fN +fN +fN +fN +ZN +KN +vC +vC +vC +vC +vC +vC +Tx +vC +vC +rL +rL +rL +rL +rL +UO +Fw +Fw +Fw +Fw +Fw +rL +rL +rL +rL +rL +rL +rL +rL +rL +rL +rL +Fw +kf +kf +kf +kf +kf +kf +kf +rL +rL +rL +rL +rL +rL +rL +rL +rL +rL +rL +rL +rL +rL +Rd +"} +(4,1,1) = {" +xk +eW +eW +eW +ke +JW +Pc +jo +JW +JW +eW +eW +eW +JW +eY +eY +eY +JW +ke +JW +eW +eW +UI +eY +eY +eW +eW +eW +eW +eW +oj +Wp +Wp +Wp +Wp +Vn +hw +Fn +JW +JW +eW +eW +JW +LQ +JW +JW +JW +JW +JW +OG +JW +yq +JW +JW +eW +eW +eW +ke +JW +JW +JW +OG +eY +eY +eW +eW +eW +eW +JW +JW +yq +vC +vC +vC +vC +vC +vC +hF +fN +fN +hF +hF +vC +vC +vC +vC +fN +fN +fN +fN +fN +vC +vC +vC +vC +vC +vC +vC +fl +vC +vC +lp +vC +eB +vC +Fw +Fw +rL +rL +Fw +Fw +Fw +Fw +Fw +Fw +rL +rL +rL +rL +rL +rL +rL +rL +rL +Fw +NL +Fw +Fw +Fw +Fw +kf +kf +kf +kf +Fw +Fw +Fw +Fw +IQ +rL +rL +rL +rL +rL +rL +rL +rL +rL +rL +Rd +"} +(5,1,1) = {" +xk +eW +eW +JW +OG +Mt +JW +JW +JW +ke +eW +eW +eW +eW +eW +eY +JW +JW +JW +OG +LQ +JW +Pc +JW +eY +eY +eW +eW +Wp +Wp +Wp +Wp +Wp +Wp +Wp +bV +Lo +JW +Qs +JW +JW +JW +yq +JW +JW +eW +eW +eW +UI +JW +JW +JW +JW +JW +JW +JW +JW +JW +JW +JW +eY +eY +eY +eW +eW +eW +JW +JW +JW +JW +JW +vC +vC +vC +vC +fl +vC +hF +hF +hF +hF +hF +vC +vC +Sr +vC +fN +fN +fN +fN +Tx +vC +vC +vC +vC +vC +hF +hF +vC +vC +vC +TQ +vC +vC +vC +Fw +Fw +IQ +Fw +Fw +Fw +Fw +Ct +Fw +UO +rL +rL +rL +rL +rL +rL +Fw +Fw +Fw +Fw +Fw +Fw +Fw +Fw +UO +Fw +kf +kf +Fw +Fw +Fw +UO +IQ +Fw +rL +rL +rL +rL +rL +rL +rL +rL +rL +rL +Rd +"} +(6,1,1) = {" +xk +eW +ke +DW +LQ +JW +JW +JW +JW +Pc +JW +JW +eW +eW +eW +ro +eH +eH +Io +eH +eH +eH +gt +JW +JW +JW +ke +lI +hw +jw +Wp +Wp +eW +eW +Wp +Wp +fT +JW +OG +JW +JW +JW +JW +JW +JW +JW +eW +eW +eW +eW +JW +JW +JW +JW +JW +JW +JW +JW +iv +JW +eY +eY +eY +eW +eW +JW +JW +JW +DW +JW +JW +vC +fN +fN +vC +vC +vC +vC +hF +hF +vC +vC +KN +bU +vC +vC +fN +fN +fN +fN +KN +vC +fl +vC +vC +vC +hF +hF +vC +vC +vC +vC +fl +vC +vC +Fw +UO +Fw +Fw +UF +Fw +Fw +Fw +Fw +UO +Fw +Fw +Fw +rL +rL +rL +Fw +XS +Fw +Ov +Fw +IQ +mT +Fw +Fw +Fw +Fw +Fw +Fw +Fw +Fw +NZ +Fw +Fw +rL +rL +rL +rL +rL +rL +rL +rL +rL +rL +Rd +"} +(7,1,1) = {" +xk +eW +eY +JW +iv +yq +JW +JW +JW +JW +Ku +Pc +JW +JW +Nd +xC +Fz +fo +fo +fo +fo +Qm +az +eH +gt +JW +JW +JW +JW +lI +hw +hw +eW +eW +eW +Wp +jD +JW +JW +JW +JW +UI +eY +eY +Pc +JW +JW +JW +eW +eW +eW +JW +JW +JW +JW +bk +JW +JW +OG +JW +JW +eY +eY +eW +eW +JW +JW +JW +JW +JW +Qs +fN +fN +fN +ZN +vC +vC +vC +vC +vC +vC +vC +vC +vC +vC +fN +fN +fN +fN +fN +vC +vC +Tx +fN +fN +hF +hF +hF +vC +vC +vC +Tx +vC +vC +vC +Fw +Fw +Fw +Fw +Fw +Fw +Fw +Fw +Fw +Fw +UO +Fw +Fw +rL +rL +Fw +Fw +Fw +Fw +Up +Fw +Fw +Fw +Fw +IQ +Fw +UF +Fw +Fw +Fw +Fw +Fw +Fw +Fw +IQ +Fw +Fw +rL +rL +rL +rL +rL +rL +rL +Rd +"} +(8,1,1) = {" +yz +OW +eY +dp +JW +JW +JW +ro +eH +eH +eH +eH +eH +eH +xC +Fz +Ly +eW +eW +eW +JW +TL +fo +Qm +az +gt +JW +yq +JW +LQ +JW +JW +JW +eW +eW +hw +Fn +DW +JW +VK +VK +eY +eY +eY +eY +JW +LQ +JW +eW +eW +eW +Pc +LQ +JW +JW +JW +JW +JW +JW +UI +JW +JW +eY +eW +eW +eW +JW +JW +yq +JW +JW +fN +th +hF +vC +vC +vC +eB +bU +vC +uj +kW +lw +vC +fN +fN +fN +fN +fN +fN +fN +vC +fN +fN +fN +hF +hF +vC +vC +Sr +eB +vC +vC +vC +vC +Fw +YR +kf +kf +kf +Fw +IQ +Fw +Up +IQ +Fw +Fw +rL +rL +rL +Ct +Fw +UO +Fw +Fw +Fw +UO +Fw +Fw +Fw +Fw +Fw +Fw +Fw +IQ +Fw +Ov +Fw +Fw +Fw +KD +Fw +rL +rL +rL +rL +rL +rL +rL +Rd +"} +(9,1,1) = {" +yz +OW +eY +JW +JW +Pc +OG +TL +qU +fo +fo +fo +fo +fo +fo +qa +eW +eW +eW +ke +JW +JW +yq +TL +Qm +cw +eH +eH +eH +eH +Qj +gt +JW +eW +eW +ke +JW +JW +JW +VK +VK +VK +VK +eY +eY +JW +JW +JW +JW +JW +JW +JW +JW +JW +JW +JW +yq +JW +JW +JW +JW +JW +JW +JW +eW +eW +JW +JW +JW +JW +JW +hF +hF +hF +vC +vC +vC +Sr +vC +uj +LK +Go +fN +fN +fN +fN +vC +vC +vC +fN +fN +fN +fN +fN +fN +hF +ZN +vC +vC +vC +eB +vC +vC +vC +vC +rL +rL +rL +kf +kf +kf +kf +Fw +IQ +KD +Fw +rL +rL +rL +Fw +Fw +Fw +Fw +Fw +Kq +dT +Fw +Fw +Up +Fw +Fw +Fw +IQ +Fw +Gk +Fw +Fw +Fw +kf +kf +Fw +Fw +Fw +kf +rL +rL +rL +rL +rL +Rd +"} +(10,1,1) = {" +yz +OW +OW +eY +qL +JW +JW +Pc +JW +eW +eW +JW +JW +JW +JW +JW +eW +eW +JW +JW +JW +OG +JW +JW +TL +fo +fo +fo +fo +Yu +Qm +az +eH +gt +JW +JW +JW +yq +JW +JW +VK +VK +VK +VK +VK +JW +JW +JW +UI +JW +JW +JW +JW +JW +JW +JW +JW +JW +JW +JW +yq +JW +JW +OG +JW +JW +JW +JW +JW +JW +eY +hF +hF +vC +vC +vC +fl +vC +uj +LK +sj +sj +sj +fN +fN +vC +Sr +vC +hF +hF +fN +fN +fN +hF +hF +hF +vC +vC +vC +bU +vC +vC +vC +fN +fN +rL +rL +kf +kf +kf +kf +kf +kf +Fw +Fw +Fw +rL +rL +Fw +Fw +Fw +dI +dC +dC +Fy +yS +UF +Fw +Fw +Fw +UO +Fw +Fw +UO +Fw +Fw +kf +kf +kf +kf +Fw +UF +Fw +kf +rL +rL +rL +rL +rL +Rd +"} +(11,1,1) = {" +yz +OW +OW +eY +eY +LQ +JW +JW +JW +eW +eW +eW +JW +ke +JW +OG +JW +JW +JW +Pc +JW +LQ +JW +eW +eW +eW +JW +LQ +JW +JW +TL +fo +Qm +az +gt +JW +JW +JW +JW +JW +JW +VK +VK +VK +VK +JW +JW +JW +JW +JW +JW +JW +JW +JW +JW +ke +JW +JW +JW +JW +JW +JW +JW +JW +JW +JW +JW +JW +JW +eY +eY +hF +vC +vC +vC +vC +vC +vC +tS +sj +sj +sj +fN +fN +fN +fN +hF +hF +hF +hF +hF +hF +vC +vC +vC +vC +vC +Tx +vC +vC +fl +vC +vC +vC +fN +rL +rL +kf +kf +Fw +Fw +kf +kf +Fw +Fw +Fw +Fw +Fw +Fw +IQ +Fw +HZ +uJ +FF +FF +XA +Fw +Fw +Fw +Fw +Gk +Fw +Fw +Fw +Up +Fw +rL +rL +kf +kf +Fw +Up +Fw +kf +rL +rL +rL +rL +rL +Rd +"} +(12,1,1) = {" +yz +OW +OW +OW +eY +eY +JW +JW +JW +ke +eW +eW +eY +eY +JW +JW +JW +yq +JW +JW +eY +eY +eW +eW +eW +JW +JW +ke +JW +JW +JW +JW +nJ +Qm +az +eH +eH +eH +gt +UI +VK +VK +VK +VK +JW +JW +LQ +JW +JW +yq +JW +LQ +JW +JW +JW +JW +JW +JW +JW +eW +eW +eY +eY +eY +JW +JW +JW +UI +JW +eY +eY +hF +vC +vC +vC +TQ +vC +vC +Tf +sj +fN +fN +fN +ZN +fN +fN +fN +hF +hF +hF +hF +vC +PP +bl +xB +bl +bl +bl +bl +bl +bl +sS +vC +vC +vC +rL +rL +rL +kf +Fw +Uf +dC +dC +dC +dC +dC +dC +dC +dC +dC +dC +Fy +XO +dT +Fw +IQ +Fw +Fw +IQ +rL +rL +Fw +Ov +Fw +IQ +rL +rL +rL +kf +Fw +IQ +UO +Fw +kf +kf +kf +rL +rL +rL +Rd +"} +(13,1,1) = {" +yz +OW +OW +OW +OW +OW +JW +JW +JW +JW +JW +eY +eY +eY +eY +Qs +JW +JW +DW +eY +eY +OW +OW +OW +OW +OW +OW +OW +OW +eY +JW +LQ +JW +TL +fo +fo +fo +Qm +uF +JW +VK +VK +LQ +Pc +Pc +JW +JW +OG +JW +Qs +JW +JW +JW +JW +JW +JW +eW +eW +JW +eW +eW +eW +eW +eY +eY +JW +JW +JW +JW +JW +JW +vC +vC +vC +vC +vC +vC +vC +ZW +fN +fN +fN +vC +vC +vC +fN +fN +vC +TQ +vC +vC +Sr +DQ +Vx +YC +YC +YC +YC +YC +YC +rr +DR +sS +bU +vC +Fw +rL +rL +Fw +Uf +Fy +uJ +FF +FF +FF +FF +FF +FF +FF +FF +FF +FF +Hl +yS +Fw +IQ +Fw +Fw +Fw +rL +rL +rL +rL +rL +Fw +rL +rL +kf +kf +Fw +Fw +Fw +Fw +Fw +kf +kf +kf +rL +rL +Rd +"} +(14,1,1) = {" +yz +OW +OW +OW +OW +OW +kI +Pc +yq +Pc +JW +eY +eY +eY +eY +JW +JW +eY +eY +eY +eY +OW +OW +OW +OW +OW +OW +OW +OW +eY +eY +JW +Pc +JW +VK +JW +JW +vL +uF +JW +JW +DW +JW +JW +JW +JW +UI +JW +JW +LQ +JW +JW +JW +yq +JW +eW +eW +eW +eW +eW +eW +eW +eW +eY +eY +eY +JW +JW +OG +JW +JW +vC +vC +vC +vC +vC +Tx +vC +vC +fN +fN +ZN +vC +vC +vC +vC +KN +vC +vC +vC +vC +PP +ye +PI +vC +vC +vC +vC +vC +vC +hu +rr +DR +bl +bl +dC +dC +dC +dC +Fy +uJ +XA +Fw +Fw +UF +Fw +Fw +Fw +IQ +Fw +Fw +Fw +HZ +yS +Fw +Fw +Fw +Fw +Fw +YR +rL +rL +rL +rL +rL +rL +rL +Fw +Gk +Fw +Fw +Fw +Fw +Fw +Fw +kf +kf +rL +rL +Rd +"} +(15,1,1) = {" +yz +OW +OW +OW +OW +OW +JW +JW +JW +JW +LQ +JW +eY +eW +eW +LQ +JW +eY +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +LQ +JW +OW +VK +eY +Pc +vL +uF +JW +JW +JW +yq +JW +JW +JW +eW +eW +Rz +kC +kC +kC +Lo +JW +JW +eW +eW +eW +eW +eW +eW +eW +eY +eY +eY +eY +JW +JW +OG +JW +JW +Sr +vC +Tx +vC +vC +fl +vC +vC +vC +vC +vC +vC +Tx +vC +PP +bl +bl +bl +bl +bl +ye +Vx +PU +Tx +vC +vC +vC +fN +fN +fN +kt +YC +YC +YC +FF +FF +FF +FF +FF +XA +Fw +Fw +Fw +Fw +Up +Fw +Fw +Fw +Fw +Fw +Fw +HZ +XO +dC +dC +dT +Fw +Fw +Fw +Fw +Fw +rL +rL +rL +rL +KD +Fw +Fw +Fw +Fw +Fw +Ov +Fw +YR +Fw +kf +rL +rL +Rd +"} +(16,1,1) = {" +yz +OW +OW +OW +OW +OW +Yy +Pc +OG +Pc +JW +JW +eW +eW +eW +JW +JW +eY +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +VK +eY +JW +vL +az +gt +JW +OG +JW +eW +eW +eW +eW +eW +HD +Wp +Wp +Wp +fT +JW +JW +JW +JW +JW +eW +eW +eW +eW +eY +eY +eY +JW +JW +JW +JW +JW +JW +vC +vC +vC +PP +bl +bl +bl +bl +bl +bl +bl +bl +bl +bl +ye +Vx +YC +YC +YC +YC +UE +Nq +vC +vC +vC +vC +fN +fN +fN +vC +vC +vC +vC +vC +IQ +Fw +Fw +Fw +Fw +Fw +YR +Fw +Fw +Fw +Fw +Fw +rL +rL +rL +YR +Fw +fE +FF +FF +Hl +yS +Ov +Fw +UF +Fw +Fw +kf +kf +rL +rL +Fw +Fw +UO +Fw +Up +Fw +Fw +Fw +Fw +Fw +Fw +rL +rL +Rd +"} +(17,1,1) = {" +yz +OW +OW +OW +OW +OW +OW +OW +OW +DW +JW +JW +eW +eW +ke +Pc +JW +LQ +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +eY +eY +JW +TL +dk +uF +Pc +JW +JW +JW +eW +eW +eW +JW +pg +Wp +Wp +Wp +bV +Lo +LQ +DW +JW +JW +JW +eW +eW +eW +eW +eY +eY +Rz +kC +kC +Lo +JW +UI +vC +vC +vC +DQ +Vx +YC +YC +YC +YC +YC +YC +YC +YC +YC +YC +Nq +vC +vC +vC +vC +vC +vC +vC +vC +Tx +fN +fN +fN +fN +vC +vC +bU +fl +vC +Fw +Fw +Fw +Fw +Fw +rL +rL +Fw +kf +kf +Fw +Fw +rL +rL +rL +rL +rL +Fw +Fw +IQ +HZ +yS +Fw +Fw +Fw +Up +kf +kf +rL +rL +rL +Fw +Fw +Ct +Fw +Fw +Fw +IQ +Fw +Fw +Gk +Fw +Fw +rL +Rd +"} +(18,1,1) = {" +yz +OW +OW +OW +OW +OW +OW +OW +OW +JW +JW +eW +eW +eW +JW +JW +JW +JW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +ke +JW +JW +JW +JW +JW +JW +vL +az +gt +JW +JW +JW +JW +eW +eW +eW +lI +Ia +Wp +pr +Wp +fT +JW +JW +JW +JW +JW +JW +UI +eW +eW +eY +JW +HD +Wp +Wp +fT +JW +JW +vC +vC +vC +aa +PI +vC +vC +hF +hF +hF +KN +vC +vC +vC +vC +vC +vC +bU +vC +Tx +vC +vC +fN +fN +fN +fN +fN +fN +vC +ZN +vC +vC +vC +vC +Fw +Fw +Fw +Fw +UO +rL +rL +rL +rL +kf +kf +Fw +UO +Fw +rL +rL +rL +Fw +Fw +IQ +HZ +yS +Fw +Fw +UO +Fw +kf +kf +rL +rL +kf +Fw +Fw +Fw +Fw +Fw +Fw +Fw +Fw +Fw +Fw +Fw +Fw +rL +Rd +"} +(19,1,1) = {" +yz +OW +OW +OW +OW +OW +OW +OW +OW +LQ +JW +eW +eW +JW +Pc +JW +JW +UI +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +eY +JW +JW +OG +JW +LQ +JW +JW +JW +TL +Qm +uF +JW +JW +JW +ke +eW +eW +eW +eW +HD +Wp +Wp +Wp +bV +Lo +JW +JW +yq +JW +JW +JW +JW +JW +JW +JW +eW +eW +Wp +bV +Lo +JW +vC +Tx +oC +ye +PI +fN +fN +fN +hF +hF +hF +hF +vC +vC +vC +TQ +vC +Sr +vC +vC +Sr +fN +fN +fN +fN +fN +vC +vC +vC +vC +KN +vC +vC +fN +rL +Fw +IQ +Fw +Fw +Fw +rL +rL +rL +rL +kf +Fw +Fw +Fw +Fw +Fw +Fw +Ov +Fw +Fw +HZ +mE +Fw +Fw +Ct +Fw +rL +kf +kf +kf +kf +Fw +Fw +Fw +Ov +Fw +Fw +Fw +Fw +UF +IQ +Fw +kf +rL +Rd +"} +(20,1,1) = {" +yz +OW +OW +OW +OW +OW +OW +OW +OW +eY +JW +JW +JW +yq +OG +JW +JW +JW +OW +OW +OW +OW +OW +OW +OW +OW +OW +eY +eY +eY +yq +JW +eY +eY +eY +eW +eW +eW +iv +vL +uF +JW +JW +JW +JW +eY +eY +eW +eW +lI +Ia +Wp +Wp +Wp +fT +JW +JW +JW +OG +JW +JW +JW +JW +eW +eW +eW +eW +Wp +Wp +bV +Lo +vC +vC +DQ +Vx +Nq +fN +fN +fN +fN +fN +hF +hF +hF +vC +vC +vC +vC +fl +vC +vC +fN +fN +fN +fN +fN +fN +fN +vC +vC +vC +vC +vC +fN +fN +rL +rL +Fw +UF +Fw +Fw +Fw +Fw +kf +kf +kf +kf +Fw +Fw +Up +Fw +Fw +Fw +UF +Fw +HZ +yS +Fw +Fw +Fw +rL +rL +rL +rL +kf +kf +Fw +Fw +Ov +Fw +UF +Fw +Fw +Fw +rL +rL +Fw +kf +rL +Rd +"} +(21,1,1) = {" +yz +OW +OW +OW +OW +OW +OW +OW +OW +eY +eY +eY +JW +JW +iv +JW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +eY +eY +JW +JW +eY +eY +eW +eW +eW +eW +eW +JW +vL +uF +JW +JW +JW +JW +eY +eY +eY +eY +JW +lI +Ia +Wp +Wp +fT +JW +JW +JW +JW +JW +JW +JW +OG +eW +eW +eW +eW +kA +Wp +LJ +fT +vC +vC +DQ +PI +vC +vC +vC +fN +fN +fN +fN +hF +hF +vC +vC +vC +vC +vC +vC +fN +fN +fN +vC +vC +fN +fN +fN +vC +vC +Sr +vC +eB +fN +fN +rL +kf +Fw +Fw +Gk +Fw +IQ +Fw +IQ +kf +kf +kf +Fw +Fw +Ov +Fw +Fw +Gk +Fw +Fw +Ew +yS +Fw +Fw +rL +rL +rL +rL +kf +kf +Fw +Fw +Fw +Fw +Up +Fw +Gk +Fw +Fw +rL +rL +Fw +kf +kf +Rd +"} +(22,1,1) = {" +yz +OW +OW +OW +OW +OW +OW +OW +OW +eY +eY +eY +eY +JW +LQ +JW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +eY +JW +JW +eW +eW +eY +eY +eW +eW +eW +ke +JW +vL +uF +yq +JW +JW +JW +JW +eY +eY +JW +LQ +JW +lI +hw +hw +Fn +JW +UI +JW +JW +JW +OG +JW +JW +JW +eW +eW +Wp +Wp +Wp +Wp +fT +PP +bl +ye +PI +vC +EF +vC +vC +fN +fN +fN +fN +hF +vC +vC +bU +vC +vC +fN +fN +fN +vC +KN +vC +fN +fN +vC +vC +Tx +vC +vC +vC +hF +Jk +kf +kf +kf +Fw +Fw +Fw +Fw +Fw +Fw +Fw +Fw +Fw +Fw +Fw +Fw +Fw +IQ +Fw +Fw +Uf +Fy +yS +Fw +Fw +rL +rL +rL +Fw +Fw +UO +Fw +Fw +UO +Fw +Fw +Fw +UO +Fw +rL +rL +rL +Fw +Fw +kf +Rd +"} +(23,1,1) = {" +yz +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +JW +JW +ke +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +eY +eY +Pc +JW +eW +eW +eW +eY +eY +eW +eW +JW +Nd +xC +uF +JW +JW +Qs +JW +OG +JW +JW +LQ +JW +JW +JW +yq +JW +JW +JW +JW +JW +JW +JW +JW +UI +JW +JW +JW +lI +Ia +Wp +Wp +Vn +Fn +DQ +Vx +YC +Nq +vC +vC +vC +KN +EP +fN +fN +fN +vC +vC +vC +vC +vC +hF +fN +fN +fN +vC +vC +vC +bU +vC +Tx +vC +vC +Tx +vC +Tx +vC +hF +kf +kf +kf +Fw +Fw +UO +Fw +Fw +Ct +Fw +Fw +Fw +Fw +kf +kf +Fw +Ct +Fw +Fw +HZ +uJ +iu +Fw +Fw +Fw +rL +rL +rL +Fw +Fw +Fw +UF +Fw +Fw +Fw +Fw +Fw +Fw +rL +rL +Fw +Fw +IQ +kf +Rd +"} +(24,1,1) = {" +yz +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +JW +JW +Pc +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +JW +JW +LQ +JW +JW +eW +eW +UI +eY +eY +Nd +eH +xC +Fz +cc +JW +LQ +JW +JW +JW +bk +JW +LQ +JW +JW +JW +JW +JW +JW +JW +JW +yq +JW +JW +JW +JW +JW +yq +JW +JW +lI +hw +hw +Fn +Nd +ye +PI +vC +hF +hF +hF +vC +vC +vC +vC +vC +vC +vC +vC +ZN +vC +hF +hF +hF +fN +vC +vC +vC +vC +vC +vC +vC +vC +vC +KN +vC +vC +vC +vC +kf +kf +Fw +BV +YR +Fw +Fw +Fw +Fw +Fw +Ov +Fw +kf +kf +kf +Fw +Fw +Fw +Fw +Ew +yS +IQ +Ov +Fw +Fw +YR +rL +rL +Ct +Fw +Uf +dC +dC +dC +dC +dC +Mn +Fw +Fw +Fw +Em +Fw +UO +rL +Rd +"} +(25,1,1) = {" +yz +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +Pc +Pc +OG +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +UI +JW +JW +JW +yq +JW +JW +OG +JW +JW +vL +Fz +fo +mF +JW +eW +eW +JW +JW +JW +JW +JW +JW +JW +JW +eW +eW +JW +JW +JW +JW +JW +VK +JW +JW +Pc +JW +JW +OG +JW +JW +LQ +JW +JW +vL +Vx +Nq +fN +fN +hF +hF +vC +vC +eB +vC +vC +vC +vC +vC +vC +vC +hF +hF +hF +hF +vC +vC +ZN +vC +vC +vC +vC +vC +vC +vC +vC +vC +fl +vC +kf +BV +BV +BV +BV +Fw +Fw +Fw +BV +BV +UF +UO +kf +kf +kf +kf +Fw +IQ +UO +HZ +yS +Fw +Fw +Fw +Fw +Fw +Gk +Fw +Fw +Fw +HZ +uJ +FF +FF +FF +FF +XA +Fw +Fw +IQ +Fw +Fw +Fw +rL +Rd +"} +(26,1,1) = {" +yz +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +JW +LQ +Pc +JW +JW +JW +JW +JW +JW +JW +dM +uF +JW +JW +eW +eW +eW +eY +JW +JW +JW +JW +JW +UI +eW +eW +eW +JW +JW +JW +ke +VK +VK +eY +OG +JW +Nd +eH +eH +eH +eH +eH +eH +eH +xC +PI +fN +fN +fN +hF +hF +ZN +vC +vC +vC +vC +vC +vC +Tx +vC +vC +hF +hF +vC +vC +vC +vC +vC +vC +vC +vC +vC +vC +vC +ZN +vC +vC +vC +vC +Fw +BV +BV +BV +BV +BV +UF +BV +BV +BV +Fw +Fw +Fw +kf +BV +BV +Gk +Fw +Fw +HZ +yS +Fw +Fw +Fw +Fw +Fw +Fw +Fw +pZ +dC +Fy +yS +Fw +Fw +YR +Fw +Fw +Fw +Fw +UO +Ov +Up +Fw +rL +Rd +"} +(27,1,1) = {" +yz +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +JW +JW +JW +JW +OG +JW +JW +Pc +Qs +JW +dM +Kb +eW +eW +eW +eW +eY +eY +JW +LQ +JW +JW +JW +JW +eW +eW +JW +JW +JW +JW +VK +VK +eY +eY +JW +JW +vL +Fz +fo +fo +fo +fo +fo +fo +fo +Nq +fN +fN +hF +hF +KN +vC +vC +vC +vC +bU +vC +fl +vC +vC +lp +vC +vC +KN +vC +vC +vC +vC +bU +Sr +vC +vC +vC +LU +LU +vC +vC +TQ +vC +UO +Ov +BV +BV +BV +BV +Fw +BV +BV +Fw +Fw +UO +Fw +BV +BV +BV +Fw +Fw +Up +HZ +mE +Fw +UO +Fw +Fw +UF +Fw +Fw +HZ +uJ +FF +XA +Fw +Fw +Fw +Fw +Fw +UO +IF +Fw +hs +rL +rL +rL +Rd +"} +(28,1,1) = {" +yz +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +ke +JW +OW +OW +JW +JW +JW +vL +uF +eW +eW +eW +JW +eY +JW +JW +JW +JW +JW +eW +eW +eW +eW +yq +JW +JW +VK +VK +VK +eY +JW +JW +JW +AI +uF +DW +JW +JW +LQ +JW +JW +eW +fN +fN +fN +hF +hF +vC +vC +vC +Tx +vC +fN +fN +vC +vC +vC +vC +vC +vC +vC +Tx +vC +vC +vC +vC +vC +vC +vC +LU +LU +LU +LU +hF +hF +vC +Fw +Fw +Fw +BV +BV +BV +BV +BV +BV +Fw +Up +IQ +BV +BV +BV +BV +Fw +UF +Fw +HZ +yS +Gk +Fw +UF +Fw +Fw +Fw +IQ +HZ +yS +Fw +Fw +Ov +Fw +Fw +Fw +IQ +Fw +IQ +Fw +Fw +rL +rL +rL +Rd +"} +(29,1,1) = {" +yz +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +JW +JW +DW +vL +uF +eW +eW +eW +ke +JW +JW +UI +OG +Pc +JW +eW +eW +eW +JW +JW +OG +VK +VK +VK +JW +JW +JW +JW +ke +vL +Kb +JW +Qs +OG +JW +JW +eW +eW +fN +fN +vC +vC +vC +vC +vC +vC +vC +vC +fN +fN +fN +vC +vC +TQ +vC +fl +vC +vC +vC +vC +Tx +Tx +vC +vC +vC +vC +KN +LU +LU +hF +hF +Tx +Fw +Fw +BV +BV +BV +BV +BV +BV +Fw +IQ +Fw +BV +BV +BV +BV +YR +Fw +Uf +dC +Fy +XO +dC +dT +Fw +Fw +mR +dC +dC +Fy +mE +Fw +Fw +Fw +Fw +Fw +UF +kf +kf +kf +Fw +rL +rL +rL +rL +Rd +"} +(30,1,1) = {" +yz +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +JW +JW +JW +JW +vL +uF +JW +eW +eW +eW +JW +JW +JW +JW +JW +eW +eW +eW +JW +JW +LQ +JW +JW +VK +JW +Nd +eH +eH +eH +eH +xC +uF +JW +JW +JW +JW +eW +eW +eW +fN +fN +vC +KN +vC +vC +vC +TQ +vC +vC +vC +fN +fN +vC +fN +fN +fN +vC +vC +vC +TQ +vC +vC +eB +vC +fl +vC +KN +LU +LU +LU +hF +hF +vC +Fw +Fw +BV +BV +BV +BV +BV +BV +BV +BV +IQ +BV +BV +BV +Fw +Fw +Fw +HZ +uJ +FF +FF +Hl +yS +Fw +Fw +HZ +bM +FF +FF +XA +Fw +Fw +Fw +IQ +Fw +kf +kf +kf +rL +rL +rL +rL +rL +rL +Rd +"} +(31,1,1) = {" +yz +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +JW +yq +JW +JW +JW +JW +vL +RQ +gt +JW +eW +eW +JW +JW +JW +JW +JW +eW +eW +Nd +eH +eH +eH +eH +eH +eH +eH +xC +Fz +fo +Cn +fo +fo +Ly +JW +yq +JW +JW +eW +eW +eW +fN +fN +fN +fN +vC +vC +vC +vC +fl +vC +Tx +vC +fN +fN +fN +fN +fN +vC +KN +vC +vC +ND +vC +vC +vC +vC +vC +vC +LU +LU +hF +hF +vC +vC +Ov +IQ +Fw +Fw +BV +BV +BV +BV +BV +BV +BV +BV +BV +BV +Fw +Fw +Fw +HZ +yS +Fw +Fw +HZ +XO +dC +dC +Fy +yS +Fw +Fw +Fw +Fw +Fw +Fw +Fw +Fw +kf +rL +rL +rL +rL +rL +rL +rL +rL +Rd +"} +(32,1,1) = {" +yz +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +ke +JW +JW +JW +OG +JW +JW +TL +Qm +az +gt +JW +JW +JW +OG +JW +JW +JW +ke +JW +vL +Fz +fo +fo +fo +fo +fo +fo +fo +Ly +Pc +JW +JW +LQ +JW +JW +JW +JW +JW +JW +ke +JW +vC +fN +fN +fN +Tx +vC +vC +bU +vC +hF +fN +fN +fN +fN +fN +vC +vC +vC +vC +vC +vC +vC +vC +vC +vC +vC +bU +vC +vC +hF +hF +hF +vC +lp +Fw +Fw +Fw +UO +BV +BV +BV +BV +BV +BV +BV +BV +Fw +Fw +Uf +dC +dC +Fy +yS +Fw +Fw +ME +FF +FF +Hl +uJ +XA +IQ +Fw +Fw +Up +Fw +Fw +Ct +Ct +kf +rL +rL +rL +rL +rL +rL +rL +rL +Rd +"} +(33,1,1) = {" +yz +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +JW +JW +iv +JW +LQ +eY +eY +eY +ke +TL +Qm +az +eH +zB +JW +JW +JW +JW +JW +JW +JW +vL +uF +JW +VK +VK +kC +Px +JW +OG +JW +eW +eW +JW +JW +eW +eW +JW +JW +JW +JW +JW +JW +Tx +vC +KN +vC +vC +vC +vC +vC +vC +hF +fN +fN +fN +vC +vC +vC +vC +vC +vC +vC +fl +Tx +vC +vC +vC +vC +vC +vC +KN +vC +vC +vC +vC +Tx +Fw +Fw +Fw +BV +BV +BV +BV +BV +UF +Fw +Fw +Fw +UF +Fw +HZ +uJ +FF +FF +XA +rL +rL +Fw +Fw +Fw +HZ +mE +Fw +Fw +Fw +UO +Fw +Fw +Fw +Fw +Fw +Fw +Fw +Fw +rL +rL +rL +rL +rL +rL +Rd +"} +(34,1,1) = {" +yz +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +JW +OG +JW +JW +eY +eY +eW +eW +eW +JW +TL +Gj +Qm +uF +JW +yq +Nd +eH +eH +eH +eH +xC +uF +VK +VK +VK +Wp +fT +JW +JW +JW +eW +eW +eW +eW +eW +eW +JW +JW +Pc +JW +JW +JW +vC +vC +vC +vC +vC +lC +vC +vC +vC +hF +hF +hF +hF +vC +vC +vC +ZN +vC +vC +vC +vC +vC +vC +KN +vC +vC +vC +ZN +vC +vC +bU +vC +vC +vC +Fw +Ct +kf +BV +BV +BV +BV +Fw +Fw +Up +Fw +Fw +Fw +Fw +ON +yS +Fw +Fw +Fw +rL +rL +Fw +Fw +Fw +HZ +yS +rL +rL +rL +Fw +Fw +Ov +Fw +Fw +UF +Fw +Fw +Fw +rL +rL +rL +rL +rL +rL +Rd +"} +(35,1,1) = {" +yz +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +LQ +JW +JW +JW +eY +eY +eW +eW +eW +JW +JW +JW +vL +uF +JW +JW +vL +Fz +fo +fo +fo +fo +Ly +VK +VK +VK +Wp +fT +JW +JW +JW +JW +eW +eW +eW +eW +eY +JW +JW +JW +yq +JW +JW +vC +vC +TQ +Tx +vC +vC +vC +vC +vC +vC +hF +hF +vC +vC +vC +vC +vC +vC +bU +vC +vC +OW +OW +OW +vC +vC +vC +vC +vC +vC +vC +Sr +vC +vC +Fw +Fw +kf +kf +kf +BV +BV +BV +Fw +Fw +Gk +Ov +Uf +dC +Fy +yS +UO +rL +rL +rL +rL +YR +Fw +Ov +Ew +yS +rL +rL +rL +rL +rL +Fw +Fw +UO +Fw +Fw +Up +Fw +Fw +Fw +rL +rL +rL +rL +Rd +"} +(36,1,1) = {" +yz +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +JW +JW +JW +UI +eY +eY +eY +eW +eW +eW +JW +LQ +vL +uF +JW +JW +vL +uF +JW +JW +JW +JW +VK +VK +VK +oj +Wp +Df +JW +JW +JW +UI +eW +eW +eW +eY +eY +eY +JW +JW +JW +JW +JW +vC +vC +vC +vC +vC +vC +vC +vC +vC +vC +bU +vC +vC +vC +vC +Tx +vC +vC +vC +OW +OW +OW +OW +OW +OW +OW +OW +vC +vC +Tx +vC +fl +vC +vC +UO +Fw +IQ +kf +kf +BV +BV +BV +BV +Fw +Fw +Uf +Fy +uJ +FF +XA +Fw +rL +rL +rL +kf +Fw +Fw +Fw +HZ +yS +Fw +Fw +rL +rL +rL +rL +Fw +Fw +IQ +Fw +Fw +UO +Fw +Fw +rL +rL +rL +rL +Rd +"} +(37,1,1) = {" +yz +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +Pc +JW +JW +JW +Pc +eY +eY +eW +eW +eW +JW +JW +vL +uF +Nd +eH +xC +uF +JW +JW +JW +VK +VK +VK +kA +Wp +Vn +Fn +JW +JW +JW +JW +JW +eY +eY +eY +eY +eY +JW +JW +JW +Qs +JW +vC +vC +vC +vC +vC +vC +vC +vC +ZN +vC +vC +Sr +vC +vC +vC +vC +vC +vC +vC +OW +OW +OW +OW +OW +OW +OW +OW +vC +vC +OW +OW +vC +KN +vC +Fw +Fw +Fw +kf +kf +kf +kf +BV +BV +YR +Fw +HZ +uJ +XA +Fw +Fw +rL +rL +rL +rL +kf +kf +Fw +Fw +Ew +yS +Fw +Fw +Fw +rL +rL +rL +Fw +Fw +Fw +Fw +Ov +Fw +Fw +Ct +Fw +rL +rL +rL +Rd +"} +(38,1,1) = {" +yz +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +Pc +JW +JW +JW +JW +JW +JW +JW +JW +eW +eW +JW +vL +az +xC +Fz +fo +Ly +JW +JW +VK +VK +VK +Wp +Wp +Wp +fT +LQ +JW +yq +JW +JW +DW +JW +eY +eY +eY +JW +JW +JW +JW +JW +JW +Tx +vC +vC +lp +vC +OW +OW +vC +vC +Tx +vC +vC +vC +fl +vC +vC +OW +OW +KN +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +vC +Ov +Up +Fw +kf +kf +kf +kf +Fw +Fw +Fw +Fw +HZ +yS +UO +rL +rL +rL +rL +kf +kf +kf +kf +kf +UF +HZ +yS +Fw +Fw +YR +rL +rL +rL +rL +rL +rL +YR +Fw +Fw +Fw +Fw +Fw +rL +rL +rL +Rd +"} +(39,1,1) = {" +yz +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +JW +yq +JW +JW +bk +LQ +JW +eW +eW +JW +vL +Fz +fo +Ly +JW +JW +OG +LQ +VK +VK +VK +Wp +Wp +Vn +Fn +JW +JW +JW +JW +OG +JW +yq +JW +JW +JW +JW +JW +ke +JW +OG +JW +vC +vC +vC +fl +vC +OW +OW +OW +vC +vC +vC +eB +vC +vC +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +Fw +Fw +Fw +Fw +kf +kf +Fw +Fw +Uf +dC +dC +Fy +yS +Fw +rL +rL +rL +kf +kf +kf +kf +rL +rL +rL +HZ +yS +Fw +Fw +Fw +Fw +Fw +rL +rL +rL +rL +Fw +Fw +Fw +Fw +Up +Fw +Fw +rL +rL +Rd +"} +(40,1,1) = {" +yz +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +JW +JW +JW +JW +JW +JW +JW +JW +JW +JW +vL +uF +JW +JW +JW +Pc +JW +JW +JW +VK +Wp +Wp +Vn +Fn +JW +JW +JW +JW +JW +JW +JW +iv +JW +JW +Pc +JW +JW +JW +JW +JW +JW +OW +OW +bU +vC +vC +vC +OW +OW +OW +vC +vC +vC +Tx +vC +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +Ct +IQ +IQ +Uf +dC +dC +dC +AU +Fy +uJ +FF +FF +XA +Fw +Fw +Fw +Fw +Fw +Fw +kf +kf +rL +rL +rL +HZ +yS +Fw +UF +Fw +rL +rL +rL +rL +rL +rL +rL +Fw +Fw +Fw +Up +Fw +UF +rL +rL +Rd +"} +(41,1,1) = {" +yz +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +JW +JW +JW +JW +JW +JW +JW +JW +JW +JW +vL +uF +LQ +JW +JW +iv +JW +JW +JW +lI +hw +hw +Fn +eY +eY +eY +ke +JW +eY +eY +JW +JW +JW +JW +JW +JW +JW +JW +JW +JW +JW +OW +OW +OW +vC +vC +KN +OW +OW +OW +OW +OW +vC +vC +KN +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +UF +Fw +Fw +HZ +uJ +FF +FF +FF +FF +XA +Fw +Fw +Ov +Fw +Fw +Un +Fw +Fw +UO +kf +rL +rL +rL +rL +HZ +yS +Fw +Fw +Fw +rL +rL +rL +Fw +rL +rL +rL +Gk +Fw +Fw +Fw +UO +Fw +rL +rL +Rd +"} +(42,1,1) = {" +yz +OW +pw +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +ke +OG +JW +JW +UI +JW +yq +JW +vL +uF +JW +JW +JW +JW +JW +JW +JW +JW +JW +JW +eY +eY +eY +eW +eW +eY +eY +eW +eW +JW +JW +JW +JW +JW +OG +JW +JW +JW +JW +yq +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +Fw +Ov +Uf +Fy +yS +UO +Fw +Fw +Fw +Fw +UO +Fw +Fw +Fw +Fw +Fw +Fw +Fw +IQ +Fw +rL +rL +Fw +Fw +HZ +yS +Up +rL +rL +rL +rL +rL +Fw +rL +rL +rL +Fw +IQ +Fw +Fw +Fw +rL +rL +rL +Rd +"} +(43,1,1) = {" +yz +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +JW +JW +JW +JW +JW +JW +JW +JW +vL +uF +JW +OG +Qs +JW +JW +JW +JW +UI +JW +JW +eY +eW +eW +eW +eW +eY +eY +eW +eW +eW +eW +JW +ke +JW +JW +JW +JW +bk +JW +JW +JW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +Fw +Uf +dC +Fy +uJ +XA +Fw +Ov +UF +Fw +Fw +Fw +KD +Up +Fw +Ov +Fw +Fw +Fw +Fw +Fw +rL +rL +Fw +Fw +HZ +yS +Fw +rL +rL +rL +Fw +Fw +Fw +Fw +IQ +Fw +Fw +Fw +Fw +rL +rL +rL +rL +rL +Rd +"} +(44,1,1) = {" +yz +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +PF +JW +JW +JW +OG +JW +JW +JW +vL +uF +JW +JW +JW +JW +DW +JW +JW +JW +JW +LQ +eY +eW +eW +eW +eY +eY +eY +eW +eW +eW +eW +eW +eW +eW +eW +JW +JW +JW +JW +OG +JW +JW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +UF +HZ +uJ +FF +XA +Fw +Fw +rL +rL +Fw +Fw +Fw +Fw +Fw +Fw +Fw +Fw +Fw +Ct +Fw +Fw +Up +Fw +Fw +IQ +HZ +yS +Fw +rL +rL +rL +rL +rL +Fw +Fw +Fw +Ov +Up +Fw +Fw +rL +rL +rL +rL +rL +Rd +"} +(45,1,1) = {" +yz +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +sT +oW +oW +PF +DW +JW +JW +LQ +vL +uF +JW +JW +JW +JW +JW +JW +JW +JW +JW +JW +JW +eW +eW +eW +eY +eY +JW +JW +eW +eW +eW +eW +eW +eW +JW +JW +JW +JW +JW +JW +JW +JW +Pc +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +Fw +Fw +Fw +Fw +HZ +YZ +Fw +Fw +Up +rL +rL +rL +Fw +Fw +Fw +Fw +YR +Fw +Fw +Fw +Fw +Fw +Fw +Fw +IQ +Fw +Fw +Fw +HZ +yS +Fw +YR +rL +rL +rL +rL +Fw +Fw +Ct +Fw +Fw +Fw +rL +rL +rL +Fw +rL +rL +Rd +"} +(46,1,1) = {" +yz +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +sT +PF +JW +JW +JW +vL +uF +JW +JW +yq +JW +JW +JW +OW +JW +JW +JW +JW +JW +JW +eY +eY +JW +JW +OG +OG +JW +eW +eW +UI +eY +JW +Pc +JW +JW +JW +UI +JW +DW +JW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +Fw +Fw +Fw +Gk +Fw +HZ +yS +Fw +Fw +UF +rL +rL +rL +rL +Fw +Fw +Fw +rL +rL +rL +rL +Fw +IQ +Fw +Fw +Fw +kf +kf +Fw +HZ +XO +dT +Fw +rL +rL +Fw +Fw +Fw +Fw +Fw +Fw +Fw +rL +rL +rL +Fw +Fw +Fw +rL +Rd +"} +(47,1,1) = {" +yz +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +sN +fq +JW +JW +OG +vL +uF +Pc +JW +bB +Ik +OW +OW +OW +UI +Pc +JW +OG +JW +LQ +JW +JW +JW +JW +LQ +JW +JW +eY +eY +eY +eY +JW +JW +JW +JW +JW +JW +JW +JW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +Fw +Fw +YR +Fw +Fw +ON +yS +Fw +Fw +Fw +Fw +rL +rL +rL +rL +Fw +rL +rL +rL +rL +rL +rL +Fw +Fw +Fw +kf +kf +kf +kf +ME +Hl +yS +Fw +Fw +IQ +UO +Fw +kf +kf +Fw +IQ +Fw +rL +rL +YR +Fw +Fw +Fw +rL +Rd +"} +(48,1,1) = {" +yz +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +qc +qc +Zt +sT +PF +JW +JW +vL +sM +oW +oW +XD +OW +OW +OW +OW +OW +Pc +JW +JW +JW +JW +JW +JW +DW +JW +JW +JW +eY +eY +eY +eY +eY +eY +JW +JW +JW +JW +JW +Pc +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +Fw +Fw +Fw +Uf +dC +Fy +yS +Fw +Fw +Fw +Fw +rL +rL +rL +rL +rL +rL +rL +Fw +Fw +rL +rL +rL +Fw +kf +kf +kf +kf +kf +Fw +HZ +yS +Fw +Fw +UF +Fw +kf +kf +kf +kf +Fw +Fw +Fw +Fw +Fw +Fw +Fw +IQ +rL +Rd +"} +(49,1,1) = {" +yz +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +qc +Zt +Zt +Zt +sT +PF +JW +Ug +lX +sN +OW +OW +OW +OW +OW +OW +OW +OW +JW +JW +JW +JW +ke +JW +Pc +JW +OW +OW +OW +OW +OW +OW +OW +OW +OW +Pc +OW +OW +JW +JW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +Fw +Fw +Up +Fw +Fw +go +bM +FF +XA +Fw +Fw +YR +rL +rL +rL +rL +rL +rL +rL +Fw +Fw +Fw +Fw +rL +rL +Fw +kf +kf +kf +Fw +Fw +Fw +Ew +XO +dT +Fw +Fw +kf +kf +kf +kf +kf +Fw +Fw +Fw +Fw +Fw +Fw +Fw +Fw +rL +Rd +"} +(50,1,1) = {" +yz +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +my +Zt +Zt +Zt +Zt +sT +oW +XD +Zt +qc +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +JW +JW +JW +JW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OG +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +UF +Fw +Fw +pZ +dC +Fy +yS +Fw +Fw +Fw +rL +rL +rL +rL +rL +rL +rL +rL +Fw +Fw +Fw +Ov +Fw +Fw +Fw +Fw +Fw +kf +kf +Gk +Fw +Fw +ME +Hl +yS +Fw +Fw +rL +rL +kf +kf +Fw +Fw +UF +Fw +Fw +Fw +Fw +Fw +Fw +YR +Rd +"} +(51,1,1) = {" +yz +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +Zt +Zt +Zt +Zt +Zt +Zt +Zt +Zt +my +qc +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +Fw +Fw +Fw +HZ +uJ +FF +XA +IQ +Fw +rL +rL +rL +rL +rL +Fw +Fw +rL +rL +rL +Fw +Fw +Fw +Fw +Fw +Fw +Fw +Fw +Fw +Fw +Ct +Fw +Fw +Ov +HZ +yS +Fw +Fw +rL +rL +rL +Fw +Fw +Fw +Fw +Fw +Fw +Ov +Fw +Fw +Fw +Fw +Rd +"} +(52,1,1) = {" +yz +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +qc +Zt +Zt +Zt +Zt +Zt +Zt +Zt +qc +qc +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +mQ +si +rU +rU +Ov +HZ +yS +Fw +Fw +rL +rL +rL +rL +rL +rL +Fw +Fw +UO +Fw +rL +rL +rL +YR +Fw +Fw +Fw +Fw +Fw +YR +Fw +Fw +Fw +Fw +Fw +Fw +HZ +yS +UF +Fw +Fw +rL +rL +Fw +Fw +rL +rL +rL +Fw +Fw +Fw +Fw +Fw +Fw +Rd +"} +(53,1,1) = {" +yz +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +qc +qc +qc +Zt +Zt +Zt +Zt +Zt +Zt +qc +qc +qc +qc +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +rU +rU +TJ +jQ +jQ +xx +In +rU +bF +bF +bF +bF +bF +bF +bF +bF +Jt +rU +rU +rU +bF +bF +rU +rU +NP +NP +NP +NP +NP +bt +NP +SC +NP +NP +NP +YX +IP +GR +NP +NP +PM +PM +PM +PM +PM +PM +PM +PM +GR +NP +NP +GR +NP +Ho +"} +(54,1,1) = {" +yz +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +qc +qc +qc +qc +Zt +Zt +Zt +Zt +Zt +IB +qc +qc +qc +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +rU +rU +no +iI +OK +OK +DT +si +jp +Qb +bF +Qb +bF +bF +bF +bF +rU +rU +si +rU +rU +rU +rU +rU +NP +NP +NP +NP +NP +NP +NP +NP +PM +PM +NP +YX +IP +NP +NP +NP +PM +PM +PM +PM +PM +NP +NP +NP +NP +NP +Lw +NP +jb +Ho +"} +(55,1,1) = {" +yz +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +qc +IB +qc +qc +Zt +qH +Bm +Gx +Zt +IB +IB +IB +IB +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +YT +mt +no +In +rU +rU +rU +Qb +Qb +Qb +Qb +Qb +bF +bF +Qb +rU +mt +ZD +rU +rU +rU +rU +rU +vA +NP +NP +NP +NP +NP +PM +PM +PM +PM +PM +EB +YX +IP +NP +NP +PM +PM +PM +PM +NP +NP +Lw +NP +bt +NP +NP +NP +NP +NP +Ho +"} +(56,1,1) = {" +yz +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +qc +IB +IB +qc +Bm +eV +jU +hb +Zt +IB +IB +IB +qc +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +rU +rU +NA +In +vA +rU +rU +Qb +Qb +bF +bF +Qb +bF +bF +Qb +Qb +rU +mt +rU +rU +rU +rU +rU +rU +NP +NP +NP +Qd +NP +PM +PM +PM +PM +NP +NP +YX +IP +NP +PM +PM +PM +NP +NP +NP +Lw +NP +NP +NP +NP +GR +bt +NP +NP +Ho +"} +(57,1,1) = {" +yz +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +qc +IB +IB +IB +jU +jU +jU +nI +Bm +qc +qc +ZK +ZK +Vy +ZK +ZK +ZK +Vy +Vy +Vy +OW +OW +uK +uK +OW +OW +OW +OW +OW +OW +Xr +uK +Xr +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +rU +rU +rU +vA +rU +no +In +rU +rU +mt +Qb +bF +bF +bF +Qb +Qb +Qb +Qb +bF +rU +rU +rU +rU +Jt +Qb +Qb +Qb +NP +NP +NP +NP +NP +PM +PM +PM +PM +NP +NP +YX +IP +NP +PM +PM +NP +Xm +NP +NP +NP +NP +NP +NP +PM +NP +Lw +NP +NP +Ho +"} +(58,1,1) = {" +yz +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +qc +qc +IB +IB +jU +jU +jU +jU +jU +qc +qc +ZK +wV +EK +Td +iG +Vy +px +iG +Vy +Xr +uK +uK +uK +OW +OW +OW +OW +OW +OW +Xr +uK +uK +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +rU +rU +rU +Jt +rU +ko +JE +bF +bF +bF +Qb +bF +bF +Qb +Qb +Qb +bF +bF +bF +bF +mQ +mt +rU +Qb +Qb +Qb +Qb +NP +NP +kT +NP +PM +PM +PM +PM +PM +Lw +NP +AE +Oc +aQ +NP +NP +NP +NP +NP +NP +NP +NP +NP +NP +PM +PM +NP +NP +PM +Ho +"} +(59,1,1) = {" +yz +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +qc +qc +qc +qc +jU +VQ +jU +Cp +jU +IB +qc +ZK +Ve +Cb +Zr +JU +UZ +yf +JU +rP +qO +bz +rb +Xr +Xr +Xr +bz +bz +bz +bz +bz +uK +Xr +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +Qb +Qb +rU +mt +no +In +bF +bF +bF +bF +bF +bF +Qb +Qb +Qb +bF +bF +bF +bF +rU +rU +rU +Qb +bF +Qb +Qb +NP +NP +SC +NP +PM +PM +PM +PM +NP +NP +NP +ex +cC +Oc +aQ +NP +NP +NP +NP +NP +NP +NP +EB +PM +PM +PM +NP +PM +PM +Ho +"} +(60,1,1) = {" +yz +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +qc +qc +qc +qc +IB +VQ +jU +Cp +IB +IB +qc +ZK +ry +Cb +Lc +QQ +mr +yf +zt +Vy +oZ +bz +rb +Xr +Xr +Xr +bz +rb +Xr +Xr +bz +uK +Xr +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +mt +rU +OW +OW +OW +Qb +Qb +Qb +TJ +xx +In +rU +bF +bF +RC +bF +rU +rU +rU +Qb +Qb +bF +bF +bF +bF +rU +rU +Qb +bF +bF +mQ +NP +NP +NP +NP +PM +PM +PM +PM +PM +PM +Lw +NP +Sb +cC +Oc +UB +NP +bt +NP +NP +NP +NP +PM +PM +PM +PM +NP +PM +PM +Ho +"} +(61,1,1) = {" +yz +OW +OW +OW +OW +OW +OW +OW +OW +OW +oF +oF +oF +oF +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +qc +qc +qc +qc +iS +VQ +jU +Cp +SB +qc +qc +Vy +PO +SR +Lc +zt +Vy +kg +mP +ZK +Xr +bz +bz +bz +qO +bz +bz +Tj +Xr +Xr +bz +rb +Xr +pL +pL +Xr +Xr +OW +OW +Xr +Xr +Xr +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +rU +LI +OW +OW +OW +OW +Qb +Qb +no +iI +DT +rU +rU +rU +rU +mt +rU +rU +rU +rU +rU +bF +bF +bF +bF +rU +rU +rU +bF +bF +YT +NP +NP +PM +PM +PM +PM +PM +PM +PM +PM +NP +NP +NP +ex +cC +IP +NP +NP +NP +GS +GS +PM +PM +PM +PM +PM +NP +PM +PM +Ho +"} +(62,1,1) = {" +yz +OW +OW +OW +OW +OW +OW +OW +OW +OW +oF +WI +WI +oF +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +qc +qc +qc +IB +IB +VQ +jU +Cp +IB +qc +qc +Vy +DE +DD +wl +wF +Vy +tc +Gs +ZK +Xr +BQ +rb +qc +qc +qc +qc +Hu +Hu +Xr +bz +rb +Sp +pL +Kz +rb +rb +Xr +Xr +Xr +uK +Xr +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +Jt +rU +rU +rU +OW +OW +Qb +gy +xx +In +rU +rU +rU +mQ +rU +rU +rU +rU +LI +rU +rU +rU +bF +bF +bF +LI +rU +rU +rU +bF +bF +NP +NP +PM +PM +PM +PM +PM +PM +GR +NP +NP +NP +NP +NP +YX +IP +NP +NP +GS +GS +PM +PM +PM +PM +PM +NP +NP +PM +PM +Ho +"} +(63,1,1) = {" +yz +OW +OW +OW +OW +OW +OW +OW +OW +oF +oF +WI +oF +oF +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +qc +qc +qc +qc +qc +VQ +jU +Cp +qc +qc +qc +Vy +Vy +yU +mr +pV +Vy +ZK +ZK +ZK +Hu +Hu +qc +qc +IB +IB +IB +IB +Hu +qc +WO +bz +bz +UH +bz +bz +rb +Xr +Xr +uK +uK +Xr +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +rU +rU +si +LI +rU +Qb +Qb +no +iI +DT +Jt +rU +rU +rU +rU +rU +LI +rU +Qb +Qb +rU +rU +rU +bF +rU +rU +rU +rU +rU +bF +bF +PM +NP +PM +PM +PM +PM +PM +NP +Lw +NP +NP +NP +NP +NP +QF +IP +NP +Lw +GS +GS +PM +PM +PM +NP +NP +GR +NP +Xm +PM +Ho +"} +(64,1,1) = {" +yz +OW +OW +OW +OW +OW +OW +OW +OW +oF +WI +WI +oF +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +qc +qc +jU +VQ +jU +pQ +UA +UA +UA +jz +UA +Le +jU +pQ +UA +UA +jz +UA +UA +UA +UA +jz +UA +UA +UA +tp +IB +qc +Xr +rb +rb +pL +Xr +bz +bz +bz +bz +bz +bz +Xr +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +ZD +rU +TJ +jQ +jQ +jQ +jQ +xx +In +rU +rU +rU +rU +mt +rU +rU +rU +Qb +Qb +Qb +Qb +rU +rU +LI +si +vA +rU +rU +rU +bF +bF +PM +PM +PM +PM +PM +PM +PM +NP +NP +PM +NP +bt +NP +NP +YX +IP +NP +NP +GS +GS +GS +PM +GS +NP +NP +NP +NP +NP +PM +Ho +"} +(65,1,1) = {" +yz +OW +OW +OW +OW +OW +OW +OW +OW +oF +WI +WI +WI +oF +oF +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +qc +ih +jU +VQ +jU +jU +jU +jU +jU +jU +jU +aj +jU +jU +jU +jU +jU +jU +jU +jU +jU +jU +jU +jU +jU +Cp +IB +IB +Xr +rb +rb +Xr +Xr +rb +rb +rb +rb +rb +bz +Xr +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +rU +rU +OW +OW +rU +rU +TJ +xx +iI +OK +OK +OK +OK +DT +rU +mt +rU +rU +rU +si +rU +mt +Qb +Qb +bF +Qb +Qb +rU +rU +rU +rU +rU +mt +rU +rU +bF +PM +PM +PM +PM +PM +PM +PM +PM +PM +PM +EB +NP +NP +NP +YX +IP +NP +NP +NP +GS +GS +GS +GS +NP +NP +Lw +NP +NP +PM +Ho +"} +(66,1,1) = {" +yz +OW +OW +OW +OW +OW +OW +OW +OW +oF +oF +oF +WI +bO +oF +oF +oF +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +qc +qc +jU +mm +zP +zP +zP +zP +zP +xf +aj +af +zP +zP +zP +zP +zP +zP +zP +zP +zP +zP +zP +xf +jU +Cp +SB +qc +Xr +Tj +rb +Xr +Xr +Xr +uK +pL +pL +Kz +bz +Xr +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +rU +rU +rU +OW +YT +rU +no +iI +vj +rU +rU +rU +rU +rU +rU +rU +rU +bF +bF +bF +rU +rU +rU +bF +bF +bF +Qb +rU +rU +rU +rU +rU +rU +rU +rU +bF +PM +PM +PM +PM +PM +PM +PM +PM +PM +NP +NP +NP +NP +NP +JN +IP +NP +NP +NP +EB +GS +GS +NP +NP +Lw +NP +NP +PM +PM +Ho +"} +(67,1,1) = {" +yz +OW +OW +OW +OW +OW +OW +OW +OW +oF +oF +bD +WI +bR +WI +WI +oF +oF +oF +oF +oF +oF +oF +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +qc +qc +qc +IB +IB +IB +IB +qc +qc +NU +WM +ih +IB +IB +qc +qc +IB +IB +IB +IB +IB +IB +qc +VQ +jU +Cp +IB +qc +Xr +Tj +rb +OW +OW +OW +Xr +Xr +Xr +rb +bz +pL +OW +OW +OW +OW +OW +OW +OW +rU +LI +rU +rU +rU +rU +rU +rU +rU +vq +no +In +rU +rU +rU +rU +rU +YT +rU +rU +Qb +bF +bF +bF +bF +bF +mt +bF +bF +bF +YT +rU +rU +rU +rU +mQ +rU +mt +rU +rU +PM +PM +PM +PM +PM +PM +PM +PM +PM +PM +PM +NP +NP +NP +YX +IP +NP +NP +NP +NP +NP +NP +NP +NP +NP +NP +PM +PM +PM +Ho +"} +(68,1,1) = {" +yz +OW +OW +OW +OW +OW +OW +OW +OW +oF +WI +id +WI +Qa +aE +RY +WI +WI +Qa +Qa +Qa +bE +oF +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +qc +qc +qc +qc +qc +qc +qc +qc +Hu +Hu +aA +Hu +Hu +qc +qc +qc +IB +qc +qc +IB +qc +qc +qc +VQ +jU +Cp +Hu +qc +Tj +rb +rb +OW +OW +OW +OW +OW +pL +rb +ji +pL +pL +pL +OW +OW +OW +rU +rU +rU +rU +rU +rU +vA +rU +TJ +jQ +jQ +jQ +xx +Jz +rU +rU +rU +rU +rU +rU +rU +Qb +Qb +jp +bF +bF +bF +bF +bF +bF +bF +rU +rU +rU +rU +rU +rU +rU +rU +vA +rU +bF +PM +PM +PM +PM +PM +PM +PM +PM +PM +PM +PM +PM +EB +NP +YX +IP +NP +NP +NP +NP +Lw +NP +Ry +PM +PM +PM +PM +PM +PM +Ho +"} +(69,1,1) = {" +yz +OW +OW +OW +OW +OW +OW +OW +OW +oF +ot +Qa +Qa +Qa +PE +jy +Qa +bE +aE +Qa +Qa +Qa +oF +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +Hu +fY +CR +Hu +qc +qc +qc +qc +qc +qc +qc +qc +qc +qc +Hu +VQ +jU +Cp +Hu +Xr +rb +sC +rg +OW +OW +OW +OW +OW +pL +rb +bz +bz +bz +pL +OW +OW +OW +rU +mt +rU +Jt +LI +rU +rU +rU +Uz +iI +OK +OK +OK +DT +rU +xi +xi +rU +rU +rU +xi +xi +xi +Qb +bF +rU +bF +bF +bF +bF +rU +rU +rU +rU +rU +rU +rU +rU +rU +rU +bF +bF +PM +PM +PM +PM +PM +PM +PM +NP +PM +PM +PM +PM +PM +GS +YX +yZ +jb +NP +NP +NP +NP +NP +NP +NP +PM +PM +PM +PM +PM +Ho +"} +(70,1,1) = {" +yz +OW +OW +OW +OW +OW +OW +oF +oF +Pa +bR +aE +ET +My +HC +Qa +Qa +Qa +Qa +cF +Qa +Qa +oF +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +fe +fe +fe +fe +ls +ls +ls +fe +fe +fO +fe +fe +fe +ls +ls +ls +hT +hT +hT +hT +Qw +Qw +Qw +aJ +ED +kB +Qw +Qw +DC +Qw +hT +hT +hT +Qw +Qw +Qw +hT +zI +rb +rb +bz +Xr +OW +OW +OW +OW +OW +OW +rU +rU +rU +rU +rU +no +In +rU +rU +rU +rU +rU +xi +xi +rU +xi +xi +xi +xi +xi +Qb +bF +rU +rU +bF +bF +rU +rU +rU +mt +rU +rU +rU +rU +si +rU +rU +bF +bF +PM +PM +PM +PM +NP +Lw +NP +GR +NP +GS +PM +PM +PM +GS +YX +IP +NP +Lw +NP +NP +NP +NP +Xm +PM +PM +PM +NP +NP +PM +Ho +"} +(71,1,1) = {" +yz +OW +OW +OW +OW +OW +oF +oF +WI +WI +WI +Qi +qt +Qa +aE +tD +Qa +MN +Qa +Qa +Qa +VW +oF +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +fe +lq +fG +Aw +Aw +Aw +Aw +KF +Aw +BH +Aw +Aw +Aw +KF +Aw +ls +hT +hT +ED +ED +Sx +Bx +MZ +Ba +ED +PT +MZ +ED +uy +ED +ED +ED +ED +MZ +ED +Qw +hT +Xr +Xr +rb +bz +Xr +OW +OW +OW +OW +OW +OW +OW +OW +OW +mt +TJ +xx +In +rU +si +rU +rU +xi +xi +xi +xi +xi +xi +xi +xi +Qb +Qb +bF +Qb +rU +rU +rU +YT +rU +rU +rU +rU +Qb +Qb +Qb +bF +bF +bF +bF +bF +NP +NP +NP +NP +Xm +NP +SC +NP +NP +GS +GS +GS +GS +GS +YX +IP +NP +NP +NP +NP +NP +NP +PM +PM +PM +PM +NP +NP +PM +Ho +"} +(72,1,1) = {" +yz +OW +OW +OW +OW +oF +oF +WI +WI +WI +aE +jy +SN +Qa +Qa +Qa +Qa +Qa +Qa +Qa +Qa +xp +oF +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +ls +eq +Aw +Aw +Aw +Aw +Aw +Aw +Aw +JH +Aw +Aw +Aw +Aw +eq +ls +hT +Qw +FB +ED +ED +ED +ED +ED +ED +ED +ED +ED +ED +ED +ED +ED +Zy +bh +ED +YJ +hT +Xr +Xr +rb +bz +uK +OW +OW +OW +OW +OW +OW +OW +OW +rU +rU +no +iI +DT +rU +rU +rU +mt +xi +xi +xi +xi +xi +xi +xi +xi +Qb +Qb +Qb +Qb +rU +rU +rU +rU +si +rU +rU +Qb +Qb +Qb +bF +bF +bF +bF +bF +bF +EB +NP +NP +NP +NP +NP +NP +NP +Lw +NP +NP +GS +GS +NP +gN +IP +NP +PM +PM +NP +NP +NP +NP +PM +PM +NP +NP +NP +PM +Ho +"} +(73,1,1) = {" +yz +OW +OW +OW +oF +WI +WI +WI +WI +oF +aE +VY +Qa +Qa +Qa +Qa +dG +Qa +Qa +Qa +Qa +Qa +HO +XP +XP +XP +XP +XP +XP +XP +XP +XP +XP +ls +Qu +Aw +Aw +Aw +iZ +Aw +Aw +iZ +JH +Aw +Aw +Aw +Aw +fQ +ls +hT +Qw +kN +ED +ED +ED +ED +ED +ED +ED +ED +ED +ED +ED +kn +ED +PC +Zy +ED +YJ +hT +OW +Xr +rb +bz +uK +OW +OW +OW +OW +OW +OW +OW +rU +rU +rU +no +In +rU +rU +xi +xi +xi +xi +xi +xi +xi +xi +mt +mt +Qb +Qb +Qb +rU +rU +mt +rU +rU +ZD +rU +rU +Qb +Qb +Qb +rU +YT +bF +bF +bF +bF +rU +NP +NP +NP +NP +NP +NP +NP +NP +NP +NP +NP +NP +NP +NP +YX +IP +PM +PM +PM +NP +NP +NP +NP +NP +NP +NP +Lw +kT +PM +Ho +"} +(74,1,1) = {" +yz +OW +OW +oF +oF +WI +oF +WI +WI +oF +aE +aE +Qa +MN +Qa +Qa +ZB +Qa +Qa +Qa +Qa +Ig +HO +XP +cM +gl +IZ +zE +Ca +gl +VF +hS +XP +ln +Aw +Aw +Aw +Aw +lE +Aw +Aw +lE +JH +Aw +Aw +Aw +Aw +rz +ls +Qw +Qw +Dy +ED +ED +Wn +Qw +So +ED +ED +ED +ED +ED +Ju +Qw +Wn +ED +ED +ED +ED +wx +OW +Xr +rb +bz +Xr +Xr +OW +OW +OW +OW +OW +rU +rU +rU +Jt +no +In +rU +rU +xi +xi +xi +xi +xi +xi +xi +xi +xi +rU +Qb +Qb +rU +rU +rU +rU +rU +rU +rU +rU +rU +Qb +Qb +Qb +Qb +rU +rU +rU +rU +rU +rU +SC +NP +Qd +NP +SC +GR +NP +NP +NP +NP +NP +NP +NP +kT +YX +IP +PM +PM +EB +NP +jb +NP +oy +NP +NP +NP +NP +Lw +PM +Ho +"} +(75,1,1) = {" +yz +OW +OW +oF +WI +WI +oF +oF +WI +oF +aE +bE +Qa +Qa +Qa +Qa +Qa +Qa +Qa +Qa +Qa +Qa +HO +XP +pt +xz +qh +eD +Oa +xz +xz +CB +XP +ln +Aw +Aw +Aw +Aw +Ti +Aw +Aw +Ti +JH +Aw +Aw +Aw +Aw +GX +KH +Cz +Cz +Ba +ED +ED +Qw +Qw +ei +ED +ED +ED +ED +ED +YK +Qw +Qw +ED +ED +ED +ED +YJ +OW +Xr +rb +bz +Xr +uK +Xr +Xr +Xr +OW +LI +rU +vA +rU +rU +no +In +rU +rU +xi +xi +xi +xi +rU +rU +xi +xi +xi +rU +rU +rU +rU +mt +rU +rU +rU +mt +rU +Jt +rU +rU +Qb +Qb +rU +LI +rU +rU +rU +xv +LI +NP +NP +NP +kT +NP +NP +jb +NP +NP +NP +EB +NP +NP +NP +YX +IP +NP +NP +NP +NP +bt +Lw +NP +NP +GR +GR +NP +NP +PM +Ho +"} +(76,1,1) = {" +yz +OW +OW +oF +WI +oF +OW +OW +oF +oF +CM +Qa +Qa +Qa +Qa +Qa +Qa +Qa +Qa +Qa +Qa +Qa +Tl +cM +XY +xz +yb +Bh +xz +xz +xz +eK +XP +ln +Lv +Aw +Aw +gc +ny +Aw +Aw +XI +JH +Aw +Aw +Aw +Aw +Aw +Aw +ED +ED +ED +ED +ED +ED +MZ +ED +ED +ED +ED +ED +ED +Bz +MZ +NE +ED +ED +ED +YJ +Bj +OW +Xr +rb +bz +rb +rb +rb +uK +Xr +OW +rU +rU +rU +si +rU +no +In +rU +rU +YT +xi +xi +rU +rU +xi +xi +xi +xi +rU +rU +mt +rU +rU +Jt +bF +bF +bF +bF +bF +rU +rU +rU +rU +rU +si +Jt +rU +rU +rU +rU +NP +jb +GR +NP +Lw +NP +NP +PM +PM +NP +NP +NP +jb +NP +YX +Oc +aQ +NP +NP +GR +NP +NP +NP +NP +NP +NP +NP +Lw +PM +Ho +"} +(77,1,1) = {" +yz +OW +OW +oF +WI +oF +OW +OW +OW +oF +Qa +Qa +Qa +zY +zY +zY +zY +zY +zY +lh +zY +zY +cX +nR +Bg +xz +xz +rF +xz +xz +xz +uq +uG +ek +qQ +Aw +Aw +Aw +ny +Aw +Aw +Aw +JH +Aw +Aw +Aw +Aw +Aw +Aw +ED +ED +ED +ED +ED +ED +PY +ED +ED +ED +ED +ED +ED +OY +ED +XF +ED +ED +ED +PC +hT +OW +Xr +BQ +bz +bz +bz +bz +bz +Xr +OW +rU +mt +rU +rU +rU +no +In +rU +rU +Qb +Qb +Qb +Qb +rU +xi +xi +xi +rU +mQ +rU +si +rU +rU +bF +bF +bF +bF +bF +bF +bF +rU +rU +rU +rU +rU +rU +rU +LI +rU +rU +NP +NP +NP +NP +NP +NP +PM +PM +PM +PM +PM +PM +NP +NP +ex +cC +IP +NP +NP +NP +NP +NP +GR +NP +NP +NP +EB +NP +PM +Ho +"} +(78,1,1) = {" +yz +OW +OW +oF +oF +OW +OW +OW +OW +oF +Qa +Qa +Qa +zY +Qa +Qa +zY +Qa +Qa +Qa +Qa +Qa +HO +XP +bN +JX +JX +JX +JX +JX +JX +Jy +JX +FG +Wg +JH +JH +JH +JH +JH +JH +JH +JH +Aw +Aw +Aw +Aw +Aw +Aw +ED +ED +ED +ED +ED +ED +IH +ED +ED +ED +ED +ED +ED +ED +ED +iE +ED +ED +ED +hT +hT +OW +Xr +Xr +Xr +Xr +Xr +rb +bz +Xr +OW +rU +rU +si +rU +rU +no +gI +jQ +vN +rU +Qb +Qb +Qb +rU +rU +xi +rU +rU +rU +rU +rU +bF +bF +bF +bF +rU +bF +bF +bF +bF +YT +rU +rU +rU +rU +rU +rU +rU +rU +rU +NP +NP +NP +Lw +NP +PM +PM +PM +PM +PM +PM +PM +PM +NP +NP +YX +IP +NP +NP +NP +Lw +NP +NP +NP +NP +NP +NP +NP +PM +Ho +"} +(79,1,1) = {" +yz +OW +OW +OW +OW +OW +OW +OW +OW +oF +Qa +Qa +Qa +zY +XL +Qa +ZA +Qa +Qa +Qa +Qa +Qa +HO +XP +Fv +xz +xz +xz +JX +xz +xz +uq +XP +ln +Lv +Aw +Aw +Aw +Aw +Aw +Aw +Aw +Aw +Aw +Aw +Aw +Aw +Qh +Cf +VM +VM +Ij +ED +ED +ED +YA +ED +ED +ED +ED +ED +ED +ED +ED +ED +ED +ED +ED +Qw +OW +OW +OW +OW +OW +OW +Xr +lY +bz +Xr +OW +OW +OW +OW +oq +rU +ta +OK +UP +In +rU +Qb +Qb +Qb +mQ +rU +rU +rU +rU +rU +rU +bF +bF +bF +bF +rU +rU +rU +bF +bF +rU +rU +rU +Jt +rU +rU +rU +rU +rU +YT +rU +NP +NP +NP +NP +EB +PM +PM +PM +PM +Lw +PM +PM +PM +Lw +NP +gN +IP +Xm +PM +PM +PM +PM +NP +NP +PM +NP +NP +NP +PM +Ho +"} +(80,1,1) = {" +yz +OW +OW +OW +OW +OW +OW +OW +OW +oF +HO +HO +Qa +pq +HO +HO +HO +HO +kc +HO +HO +HO +HO +XP +oO +xz +xz +xz +JX +xz +xz +nz +XP +ln +Aw +Aw +Aw +Aw +Aw +Aw +Aw +Aw +Aw +Aw +Aw +Aw +Aw +rz +ls +hT +hT +wf +ED +ED +ED +ED +ED +Wn +ED +iA +ED +ED +ED +ED +ED +ED +ED +ED +Qw +OW +OW +OW +ac +ac +Ez +Ez +Ez +MK +Ez +Ez +OW +OW +OW +OW +rU +rU +rU +no +In +mt +rU +Qb +Qb +Qb +rU +rU +rU +rU +rU +rU +bF +bF +mQ +rU +LI +rU +rU +rU +rU +LI +rU +rU +rU +rU +Qb +Qb +Qb +rU +bF +rU +NP +NP +NP +NP +PM +PM +PM +PM +NP +NP +NP +PM +PM +NP +NP +YX +IP +NP +PM +PM +PM +PM +NP +PM +PM +PM +NP +SC +PM +Ho +"} +(81,1,1) = {" +yz +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +HO +Tk +XK +HO +RJ +RJ +PX +PX +hl +RJ +RJ +RJ +XP +AB +PD +IA +pH +QS +AV +hz +OH +tV +ls +Lx +Aw +Aw +Aw +Aw +Aw +Aw +Aw +Aw +Aw +Aw +Aw +Aw +OZ +ls +hT +hT +ED +ED +ED +ED +ED +ED +ED +ED +qT +ED +ED +Hi +ED +ED +ED +ED +kU +Qw +Pd +ac +ac +ac +ac +Ez +HF +vb +tP +Fc +Ez +OW +OW +OW +OW +OW +YT +rU +Uz +In +rU +Qb +Qb +Qb +Qb +Qb +rU +rU +ZD +rU +Jt +rU +rU +rU +rU +rU +rU +mt +rU +rU +rU +rU +si +LI +Qb +Qb +Qb +bF +bF +bF +rU +SC +NP +NP +NP +PM +PM +PM +PM +NP +SC +NP +NP +NP +NP +NP +YX +IP +NP +NP +PM +PM +PM +PM +PM +PM +Lw +NP +bt +PM +Ho +"} +(82,1,1) = {" +yz +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +oF +Tk +XK +oF +PX +PX +PX +PX +PX +PX +PX +PX +XP +XP +tV +tV +tV +oV +tV +tV +tV +tV +ls +Sa +Aw +Sa +Aw +Aw +Aw +Aw +Aw +Aw +Aw +Aw +oz +Aw +oz +ls +ED +ED +ED +ED +ED +ED +ED +ED +ED +ED +VU +ED +ED +IR +ED +ED +ED +ED +PT +Cz +IS +IS +IS +GW +qD +nf +Nx +em +bq +Zl +Ez +OW +OW +OW +rU +rU +rU +rU +no +In +rU +Qb +bF +bF +Qb +Qb +rU +rU +rU +rU +rU +rU +rU +rU +rU +mt +LI +rU +rU +rU +rU +rU +rU +Qb +Qb +Qb +bF +bF +bF +rU +rU +NP +NP +NP +PM +PM +PM +NP +NP +NP +NP +NP +NP +NP +NP +EB +YX +IP +NP +NP +SC +NP +PM +PM +PM +PM +NP +NP +NP +PM +Ho +"} +(83,1,1) = {" +yz +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +oF +Tk +XK +HO +dV +RJ +MH +XN +PX +RJ +RJ +PX +PX +PX +PX +iF +KM +iF +PX +PX +PX +RJ +fe +Sa +sU +Sa +fg +Aw +Qh +Sz +sU +fg +Aw +Qh +Sa +uO +Sa +fe +hT +oX +ED +ED +ED +Zz +On +vF +ED +ne +Bx +ED +ED +Mp +ED +ED +ED +ED +ED +ED +qD +qD +qD +Ng +qD +lU +yv +bq +bq +KU +Ez +OW +OW +rU +rU +LI +rU +vA +no +In +bF +bF +bF +bF +rU +rU +rU +rU +si +rU +rU +rU +rU +Qb +Qb +rU +rU +rU +rU +rU +rU +rU +rU +Qb +Qb +xi +xi +bF +bF +rU +rU +Lw +NP +PM +PM +PM +GS +GS +GS +GS +NP +NP +NP +NP +NP +NP +YX +gu +NP +PM +PM +PM +PM +PM +PM +PM +PM +GR +NP +PM +Ho +"} +(84,1,1) = {" +yz +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +oF +Tk +XK +Oe +PX +hf +hf +hf +hf +yC +yC +yC +yC +hf +hf +RD +hf +hf +yC +yC +PX +PX +fe +fe +fe +fe +QU +Aw +sc +fe +fe +QU +Aw +sc +fe +fe +fe +fe +hT +Zy +Sx +ED +ED +ED +OM +ED +ED +Hr +eM +Hr +Hr +Hr +Hq +Hr +Hr +Hr +As +Vp +gM +JV +uT +sq +uT +bq +cT +WU +dO +nh +Ez +OW +OW +OW +OW +Jt +rU +rU +no +In +rU +bF +bF +bF +bF +rU +bF +bF +rU +rU +rU +Qb +Qb +Qb +Qb +rU +rU +rU +rU +rU +YT +rU +Qb +Qb +xi +xi +xi +bF +rU +mt +ZD +NP +PM +PM +PM +PM +PM +GS +GS +GS +NP +Lw +bt +NP +NP +Lw +YX +IP +NP +PM +PM +PM +PM +PM +NP +NP +PM +NP +NP +PM +Ho +"} +(85,1,1) = {" +yz +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +oF +Tk +FA +HO +HO +hf +vQ +tZ +hf +xe +ju +Eo +yP +hf +VP +UT +yg +Tz +ZT +yC +PX +PX +fe +Sa +KF +Sa +EJ +Aw +GX +KF +Aw +EJ +Aw +GX +Aw +KF +Ko +fe +hT +hT +YF +ED +ED +Qw +Qw +Vu +ED +Hr +ED +ED +ED +CA +Qw +Qw +ED +ez +kU +Qw +Pd +qg +uT +ER +vV +Ez +IC +nf +Ez +Ez +Ez +OW +OW +OW +OW +rU +ZD +rU +no +In +rU +rU +YT +bF +bF +bF +bF +bF +rU +vA +rU +Qb +Qb +Qb +rU +rU +rU +rU +rU +rU +rU +rU +Qb +xi +xi +xi +rU +rU +rU +rU +rU +NP +PM +PM +NP +PM +PM +GS +GS +GR +NP +NP +NP +NP +GR +NP +YX +IP +PM +PM +PM +PM +NP +NP +NP +GR +NP +NP +NP +PM +Ho +"} +(86,1,1) = {" +yz +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +oF +Tk +XK +Tk +Tk +iK +Lk +Fo +uL +MY +ol +ol +ZF +wz +Lk +BI +ol +ol +Xn +yC +Of +PX +fe +Hy +JH +Sa +Aw +Aw +Aw +Aw +Aw +Aw +Aw +Aw +Aw +Aw +wL +fe +hT +Qw +wf +ED +Wn +ED +Qw +UC +ED +Hr +ED +ED +ED +fd +Qw +SJ +ED +Nt +ED +Qw +ac +qg +uT +ER +ac +Ez +VG +oc +xt +Wd +Ez +OW +OW +OW +OW +rU +rU +rU +no +gI +jQ +jQ +jQ +vN +bF +bF +rU +rU +rU +rU +rU +Qb +rU +bF +bF +YT +rU +rU +rU +rU +rU +xi +xi +xi +xi +xi +rU +YT +rU +rU +Jt +NP +NP +Lw +NP +GS +GS +GS +NP +NP +NP +jb +NP +NP +SC +NP +YX +IP +PM +PM +NP +NP +SC +NP +NP +NP +NP +NP +Xm +PM +Ho +"} +(87,1,1) = {" +yz +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +oF +Tk +XK +XK +XK +BI +tu +Zx +DF +xh +BI +BI +OS +BI +tu +BI +BI +ol +Zk +hf +hf +HI +fe +Aw +JH +Aw +Aw +Aw +Aw +Aw +Aw +Aw +ux +Aw +Aw +Aw +LZ +ly +NF +lB +uy +ED +ED +ED +ED +ED +ED +Hr +ED +ED +ED +Wn +ED +oM +ED +DM +ED +hT +ac +qg +uT +ER +ac +Il +yv +aD +aD +Wm +Ez +OW +OW +rU +rU +rU +mQ +Jt +ta +OK +OK +OK +UP +In +rU +rU +rU +rU +rU +rU +rU +bF +bF +bF +bF +rU +LI +rU +rU +rU +xi +xi +xi +xi +xi +rU +rU +rU +rU +rU +rU +NP +NP +NP +NP +Lw +NP +NP +NP +Lw +PM +PM +PM +NP +NP +NP +YX +Oc +aQ +PM +PM +NP +NP +NP +jb +NP +NP +NP +NP +PM +Ho +"} +(88,1,1) = {" +yz +OW +OW +OW +OW +OW +oF +oF +oF +oF +oF +oF +Tk +XK +oF +oF +hf +dz +zm +hf +mn +zA +DF +Xe +hf +nx +ol +BI +ol +sB +hf +Lk +ol +ls +Ec +JH +JH +JH +JH +JH +JH +JH +JH +cA +JH +cA +JH +BH +wM +uf +uf +mi +Hr +Hr +Hr +Hr +Hr +Hr +Hr +ED +ED +ED +ED +ED +ED +ED +ED +ED +hT +ac +qg +uT +ER +st +Il +YY +oh +yy +Fs +Il +OW +OW +OW +rU +rU +rU +rU +rU +rU +rU +rU +no +In +rU +rU +mQ +rU +rU +mt +bF +bF +bF +bF +rU +rU +rU +rU +rU +xi +xi +xi +xi +LI +rU +rU +mt +rU +si +rU +rU +NP +NP +NP +NP +GR +NP +NP +NP +NP +PM +PM +PM +PM +NP +Lw +ex +cC +IP +PM +PM +NP +NP +GR +NP +bt +NP +NP +NP +PM +Ho +"} +(89,1,1) = {" +yz +OW +OW +OW +OW +OW +oF +Tk +Tk +Tk +Tk +Tk +Tk +XK +oF +oF +hf +rI +hf +hf +hf +BI +Jd +hf +hf +Wh +Wi +BI +BI +OS +Ne +tu +ol +ls +tz +JH +Aw +Aw +Aw +Aw +Aw +Aw +Aw +Aw +Aw +Aw +Aw +Aw +fe +hT +Qw +ED +ED +ED +cN +nm +ED +OM +ia +ED +ED +ED +ED +ED +OM +ED +ED +ED +hT +st +qg +uT +ER +st +Il +Il +yl +tX +tX +Il +OW +OW +OW +OW +OW +mt +LI +OW +OW +si +rU +no +In +rU +rU +Yk +rU +rU +rU +bF +bF +bF +rU +rU +rU +vA +rU +rU +rU +xi +xi +xi +rU +LI +rU +rU +rU +vA +bF +bF +PM +NP +NP +NP +NP +NP +jb +NP +NP +NP +PM +PM +PM +PM +GS +NP +YX +IP +NP +NP +NP +NP +NP +NP +NP +NP +NP +PM +PM +Ho +"} +(90,1,1) = {" +yz +OW +OW +OW +OW +OW +oF +Tk +XK +Mb +XK +XK +XK +XK +oF +oF +hf +JZ +Uw +Uw +Uw +UT +yg +HQ +hf +Ye +DF +zA +DF +DS +ol +tu +fD +Sn +Aw +JH +Aw +Aw +Aw +Ec +Ec +sU +Aw +Aw +Aw +Aw +Aw +rz +fe +hT +Qw +Qw +hT +hT +hT +tk +tk +tk +NT +NF +wA +ED +ED +ED +hT +hT +hT +hT +hT +st +qg +uT +ER +st +st +st +st +st +st +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +rU +rU +Uz +gI +vN +rU +rU +LI +rU +LI +rU +rU +si +rU +rU +rU +rU +rU +rU +rU +YT +xi +xi +xi +rU +rU +rU +rU +rU +bF +bF +PM +PM +PM +EB +NP +NP +NP +NP +NP +Lw +PM +GS +GS +GS +GS +GS +YX +IP +NP +NP +NP +NP +EB +NP +GR +NP +Lw +PM +PM +Ho +"} +(91,1,1) = {" +yz +OW +OW +OW +OW +OW +oF +Tk +XK +oF +oF +oF +oF +oF +oF +oF +hf +Tu +ol +ol +ol +BI +ol +QI +hf +hf +hf +rI +hf +hf +hf +tu +ol +ln +Lv +JH +Aw +Aw +eq +kK +fe +fe +Lv +Aw +Aw +Aw +Aw +Aw +fe +LT +LT +LT +ga +ga +ga +ga +ga +sd +OV +Xu +OV +xR +xR +Xu +sd +st +st +st +st +ac +qg +uT +ER +ac +st +st +st +st +st +OW +OW +OW +OW +OW +OW +OW +OW +OW +rU +mt +rU +ta +UP +In +xi +xi +rU +rU +rU +rU +rU +rU +rU +rU +LI +rU +rU +rU +rU +rU +rU +rU +rU +mt +rU +bF +rU +rU +rU +rU +PM +PM +PM +GS +GS +NP +NP +bt +NP +NP +GS +GS +PM +PM +GS +GS +YX +IP +GR +NP +NP +NP +NP +PM +PM +NP +PM +PM +PM +Ho +"} +(92,1,1) = {" +yz +nd +nd +nd +nd +RM +RM +KI +Rr +RM +LA +LA +LA +LA +LA +LA +hf +tu +sm +sm +sm +BI +ol +MM +Bw +DP +Eo +UT +Eo +CW +hf +tu +ol +hL +St +JH +Aw +Aw +Aw +jX +fe +fe +Aw +Aw +Aw +Aw +Aw +Aw +fe +LT +LT +LT +ga +aP +SW +HK +GG +sd +CI +SW +SW +WT +tA +Jn +sd +st +st +ac +ac +ac +qg +uT +ER +ac +ac +st +st +st +st +OW +OW +OW +OW +OW +OW +OW +OW +OW +rU +rU +rU +rU +no +In +xi +xi +xi +rU +vA +rU +rU +rU +mt +rU +rU +rU +rU +rU +Jt +Jt +rU +rU +rU +rU +rU +bF +bF +rU +mt +rU +PM +PM +PM +PM +GS +GS +GS +NP +GR +SC +NP +GS +PM +PM +PM +GS +YX +yZ +NP +NP +NP +NP +NP +PM +PM +PM +PM +PM +PM +Ho +"} +(93,1,1) = {" +yz +nK +nK +nK +nK +bK +RM +KI +TT +FV +LA +jv +jv +jv +SQ +Xw +hf +tu +sm +sm +sm +BI +ol +co +Bw +YH +is +BI +is +cv +hf +Tu +BI +mj +qw +JH +Aw +Aw +Aw +Aw +Aw +KF +Aw +Aw +Aw +Aw +Aw +Aw +ls +LT +LT +LT +ga +gC +BE +NK +at +sO +BE +BE +BE +nU +NK +GL +sd +st +st +st +ac +ac +qg +uT +ER +ac +ac +ac +ac +st +st +st +st +st +st +st +st +OW +OW +OW +OW +OW +OW +YT +no +In +rU +xi +xi +rU +rU +LI +rU +rU +rU +rU +bF +bF +rU +rU +rU +rU +rU +rU +rU +bF +bF +bF +bF +YT +rU +rU +GS +PM +PM +PM +GS +GS +PM +NP +NP +NP +NP +NP +NP +PM +PM +PM +YX +IP +NP +NP +GR +jb +NP +Lw +PM +PM +PM +PM +PM +Ho +"} +(94,1,1) = {" +yz +aq +hA +hA +hA +hA +gR +KI +TT +KI +FR +SQ +SQ +eT +SQ +Xw +hf +wS +ol +ol +ol +BI +ol +Us +hf +hE +OI +DF +OI +oK +hf +Lk +ol +ln +JH +Aw +Aw +Aw +Aw +Aw +Aw +Aw +Aw +Aw +Aw +Aw +Aw +Aw +fe +lF +gB +lr +ga +gi +Bt +BE +BE +bH +BE +BE +BE +BE +BE +Oh +sd +st +st +st +st +ac +qg +uT +ER +ac +st +st +ac +ac +ac +st +st +st +st +st +st +OW +OW +OW +OW +OW +OW +rU +no +gI +jQ +jQ +jQ +jQ +tG +rU +rU +Qb +Qb +bF +bF +bF +YT +rU +rU +si +rU +bF +bF +bF +bF +bF +rU +rU +LI +rU +GS +GS +GS +GS +GS +PM +PM +PM +NP +NP +NP +NP +NP +NP +PM +PM +YX +IP +NP +Xm +NP +NP +NP +PM +PM +PM +PM +PM +PM +Ho +"} +(95,1,1) = {" +yz +nK +nK +nK +nK +bK +RM +Kl +TT +TT +An +An +dE +LA +SQ +Xw +hf +mh +fr +fr +fr +zA +zA +bL +Ad +Ad +Ad +Ad +Ad +Ad +Ad +Ad +HN +ln +JH +JH +JH +JH +JH +JH +JH +JH +JH +JH +JH +JH +JH +JH +zy +Aa +Aa +dF +sd +rf +BE +LC +LC +LC +LC +BE +BE +BE +eF +Nz +sd +st +st +st +st +st +qg +uT +ER +ac +st +st +st +st +ac +st +st +st +st +st +st +OW +OW +OW +OW +OW +OW +rU +ta +OK +OK +OK +OK +UP +gI +vN +Qb +Qb +bF +bF +bF +bF +rU +rU +rU +rU +rU +rU +bF +bF +bF +rU +rU +rU +rU +rU +NP +GS +GS +PM +PM +PM +PM +PM +PM +Lw +NP +NP +NP +NP +NP +NP +YX +IP +NP +NP +NP +NP +PM +PM +PM +PM +PM +PM +PM +Ho +"} +(96,1,1) = {" +yz +aq +hA +hA +hA +hA +eE +xj +Pl +FV +LA +QH +An +LA +Vw +Xw +hf +hf +hf +hf +hf +Bw +Sc +hf +Ad +PS +ma +Vc +Qe +hM +Um +Ad +HN +ls +Lx +Aw +Aw +Aw +Aw +va +Aw +va +Aw +Aw +Aw +Aw +Aw +Aw +fe +UQ +Rt +dF +sd +Ya +aH +al +aH +Yn +dn +fw +Tw +BE +BE +be +sd +st +st +st +st +Pd +Ic +uT +ER +st +st +st +st +st +ac +ac +st +st +st +st +st +OW +OW +OW +OW +OW +OW +OW +OW +OW +rU +si +rU +ta +UP +In +Qb +Qb +Qb +Qb +bF +Qb +rU +rU +rU +rU +rU +rU +rU +rU +rU +rU +rU +mt +rU +Jt +NP +NP +GS +GS +GS +PM +PM +PM +PM +NP +NP +NP +NP +EB +NP +NP +Ja +TA +bt +NP +NP +NP +PM +PM +PM +NP +PM +PM +PM +Ho +"} +(97,1,1) = {" +yz +nK +nK +nK +nK +bK +RM +Ze +TT +iU +LA +Ap +An +Op +SQ +Xw +hf +yC +yC +hf +hP +yg +UT +YP +Ad +tr +wT +nE +EG +Qn +RS +Ad +HN +fe +Aw +sU +Aw +Aw +Aw +AO +sU +Aw +Aw +Gh +Nw +Aw +sU +Aw +fe +ze +TX +BA +sd +sd +sd +LC +Xz +sd +sd +sd +dw +aH +pz +hq +sd +st +st +st +st +st +qg +uT +ER +st +st +ac +ac +st +st +ac +ac +jY +st +Pd +st +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +rU +rU +rU +no +In +bF +bF +bF +Qb +Qb +Qb +rU +rU +mQ +rU +rU +Jt +rU +rU +ZD +rU +rU +rU +rU +rU +NP +NP +NP +NP +NP +NP +PM +PM +NP +NP +NP +NP +NP +NP +NP +jb +YX +IP +GR +NP +NP +Nh +NP +NP +EB +NP +NP +PM +PM +Ho +"} +(98,1,1) = {" +yz +hA +aq +hA +hA +hA +gR +KI +TT +KI +LA +QH +An +SQ +eT +zQ +hf +yC +yC +hf +Th +ol +BI +tC +Ad +ig +RS +Ad +Ad +YG +RS +Ad +Ad +Ad +Ad +Ad +Ad +ls +ls +ls +lM +lM +lM +GC +El +lM +lM +lM +fe +dF +Aa +Aa +VA +HB +RT +Sl +SW +dD +fa +hk +hk +hv +hv +hk +hk +st +st +st +Pd +Pd +ws +uT +ER +st +st +ac +gK +ac +ac +ac +ac +ac +ac +ac +st +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +rU +rU +rU +no +In +bF +bF +Qb +Qb +rU +rU +rU +rU +rU +xv +rU +rU +rU +si +rU +rU +rU +rU +Qb +Qb +GS +NP +NP +NP +NP +NP +EB +NP +NP +NP +Qd +NP +NP +bt +NP +NP +YX +IP +NP +NP +NP +NP +NP +NP +NP +GR +GR +PM +PM +Ho +"} +(99,1,1) = {" +yz +nK +nK +nK +nK +bK +RM +KI +TT +Zm +LA +LA +An +SQ +LA +LA +LA +iB +iB +iB +iB +ew +HS +iB +Ad +VS +iq +nY +Ad +OL +Hx +Ad +DX +Vc +Qe +dd +Ad +yF +yF +yF +yF +yF +nF +dN +LW +nF +LT +LT +LT +dF +Aa +LT +sd +tv +BE +LC +BE +BE +Zo +hk +Ro +MW +lL +Mf +hk +st +st +Pd +Vo +qD +av +uT +Ng +IS +IS +IS +IS +IS +IS +IS +IS +GW +ac +ac +st +OW +OW +OW +OW +OW +OW +OW +OW +OW +rU +mt +LI +rU +no +gI +vN +rU +rU +rU +rU +rU +rU +rU +rU +rU +rU +rU +rU +rU +rU +rU +mt +Qb +Qb +Qb +GS +NP +NP +NP +NP +NP +NP +NP +NP +kT +NP +NP +iM +Vt +Vt +Vt +kr +ht +Vt +Vt +Vt +Vt +Vt +Vt +Vt +Vt +cS +NP +PM +Ho +"} +(100,1,1) = {" +yz +aq +hA +hA +hA +hA +gR +KI +TT +FV +LA +Nk +An +SQ +Op +FT +LA +zi +fb +iB +ev +Iw +nw +ct +LY +YG +wT +Gc +Ad +pJ +wq +Ad +gr +QY +kG +TD +Ad +yF +yF +nF +nF +nF +nF +ZZ +Kd +nF +nF +nF +nF +Aa +Aa +LT +sd +tv +ug +uE +LC +LC +Vf +zw +Rh +Cm +BP +ww +hk +WR +fu +fu +Li +rY +uT +uT +uT +uT +uT +uT +uT +uT +uT +uT +uT +ER +ac +st +st +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +mt +ta +UP +gI +vN +rU +rU +rU +YT +rU +rU +mt +rU +mt +rU +vA +LI +rU +rU +rU +Qb +Qb +xi +jJ +jJ +NP +NP +SC +NP +NP +GR +NP +jb +iM +Vt +qP +vd +vd +vd +vd +vd +vd +vd +vd +vd +vd +vd +vd +vd +Qz +Vt +Vt +Ho +"} +(101,1,1) = {" +yz +nK +nK +nK +nK +bK +RM +KI +TT +Fi +LA +vB +An +wE +SQ +FT +LA +sI +uQ +iB +oo +wJ +Ow +wn +LY +YG +RS +Ad +Ad +YG +RS +Ad +pW +QL +QL +TF +yR +FQ +gX +nF +lu +ah +bs +gx +Pw +tb +mN +da +nF +Aa +LT +LT +ga +tv +nC +Zg +BE +BE +Zo +hk +xO +Cm +Cm +xL +ea +fu +Yp +Yp +Vo +qD +HJ +HJ +HJ +HJ +HJ +HJ +HJ +HJ +db +KJ +uT +ER +ac +st +st +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +rU +rU +ta +UP +gI +jQ +jQ +jQ +jQ +jQ +vN +rU +rU +rU +rU +rU +rU +rU +LI +rU +rU +Qb +xi +jJ +jJ +NP +NP +NP +NP +NP +NP +NP +iM +qP +vd +vd +vd +vd +vd +vd +vd +vd +vd +vd +vd +vd +vd +vd +vd +vd +vd +vd +Ho +"} +(102,1,1) = {" +yz +aq +hA +hA +hA +hA +gR +KI +TT +KI +LA +Vw +SQ +LA +Rx +FT +LA +mD +mD +fk +mB +wY +Ow +EI +Ad +ik +cB +Vc +rO +VH +Ms +Ad +XM +QY +QL +MX +Ad +cg +FQ +nF +dy +dN +dN +dN +dN +dN +ib +Xy +nF +Aa +LT +LT +ga +tv +BE +BE +BE +BE +Zo +Zq +FS +CS +KB +xA +hk +Pd +OW +OW +Pd +Pd +me +ac +ac +ac +st +st +ac +ac +Pd +Ic +uT +ER +st +st +st +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +mt +rU +nc +rU +DJ +OK +OK +OK +Ql +OK +UP +In +rU +fZ +rU +xi +xi +xi +YT +rU +rU +rU +xi +xi +jJ +NP +Lw +NP +bt +NP +NP +NP +Zh +qP +vd +vd +vd +vd +vd +vd +vd +vd +vd +vd +vd +vd +vd +vd +vd +vd +vd +vd +vd +Ho +"} +(103,1,1) = {" +yz +nK +nK +nK +nK +bK +RM +KI +TT +FV +LA +SQ +SQ +LA +Rx +Rw +LA +mD +mD +iB +iB +Jq +Ow +wn +Ad +Ad +WG +nE +zG +jd +ua +Ad +gD +QL +nX +zC +Ad +yF +FQ +nF +TB +ub +dN +dN +dN +dN +dN +dA +nF +Aa +LT +LT +ga +tv +BE +BE +BE +BE +tM +hk +hk +cx +hv +hk +hk +OW +OW +OW +OW +OW +OW +OW +ac +ac +st +st +st +st +Pd +qg +uT +ER +st +st +st +st +st +st +st +st +st +st +st +st +st +st +LI +rU +LI +rU +OW +OW +rU +rU +rU +rU +no +In +rU +rU +rU +xi +xi +xi +rU +rU +mt +rU +xi +xi +jJ +jJ +NP +NP +NP +NP +NP +iM +qP +vd +vd +vd +vd +vd +vd +vd +vd +vd +vd +vd +vd +vd +vd +vd +vd +vd +vd +vd +vd +Ho +"} +(104,1,1) = {" +yz +hA +aq +hA +hA +hA +gR +KI +TT +KI +FR +SQ +SQ +LA +Rx +FT +LA +JA +mD +kD +iB +Jq +Ow +Ey +ct +Ad +Ad +QL +BB +oe +Ad +Ad +nT +Qn +QL +MX +Ad +yF +FQ +nF +dy +dN +dN +dN +SS +dN +hx +dA +nF +Aa +Aa +LT +ga +pj +BE +BE +bg +BE +rx +hk +Bk +mH +qZ +HY +hk +OW +OW +OW +OW +OW +OW +OW +OW +OW +st +st +st +st +jY +qg +uT +ER +ac +st +st +st +st +st +st +st +ac +st +st +st +st +st +OW +OW +mt +OW +OW +OW +OW +OW +Dl +mt +no +In +rU +Jt +rU +xi +xi +xi +xi +xi +rU +xi +xi +xi +jJ +jJ +jJ +EB +NP +NP +iM +qP +vd +vd +vd +vd +vd +vd +vd +vd +vd +vd +vd +vd +vd +vd +vd +vd +vd +vd +vd +vd +vd +Ho +"} +(105,1,1) = {" +yz +nK +nK +nK +nK +bK +RM +KI +TT +KI +SQ +SQ +SQ +UV +SQ +FT +LA +bp +mD +kD +iB +oo +Ow +wJ +Ey +Iw +Lp +Iw +nw +Iw +ct +Ad +Ad +YG +QL +cV +Ad +FQ +FQ +nF +jj +dN +dN +dN +dN +dN +dN +tB +nF +LT +Aa +LT +ga +iL +aH +uH +Nl +Ph +lv +hk +kR +KB +KB +MG +bA +OW +cd +cd +cd +cd +cd +OW +OW +OW +st +ac +ac +st +ac +qg +uT +ER +ac +ac +ac +st +st +st +st +ac +ac +ac +st +st +st +st +OW +OW +OW +OW +OW +OW +OW +OW +IK +rU +no +In +LI +vA +rU +rU +xi +xi +xi +xi +xi +xi +xi +xi +NP +jJ +jJ +jJ +NP +Ge +qP +vd +vd +vd +vd +vd +vd +vd +vd +vd +Gu +tJ +lg +lg +lg +lg +Bv +vd +vd +vd +vd +vd +vd +Ho +"} +(106,1,1) = {" +yz +hA +aq +hA +hA +hA +gR +KI +TT +FV +LA +SQ +SQ +SQ +SQ +FT +LA +mD +mD +GI +iB +mB +BG +IL +Ow +Ow +Ow +Ow +Ow +Ow +SA +ct +oe +Hd +nE +Ru +Ad +FQ +yF +nF +Gt +dN +kP +dJ +dJ +VC +hx +tl +nF +LT +Aa +WX +WX +cd +cd +NJ +cd +iP +cd +hk +bA +bA +bA +bA +bA +cd +cd +Im +UM +on +cd +cd +OW +OW +st +st +ac +ac +ac +qg +uT +ER +st +st +ac +ac +st +st +st +st +ac +ac +ac +ac +st +st +OW +OW +OW +OW +OW +OW +OW +OW +IK +si +no +In +rU +rU +rU +xi +xi +xi +xi +xi +xi +xi +mt +mt +NP +NP +jJ +jJ +iM +qP +vd +vd +vd +vd +vd +vd +vd +kJ +lg +lg +ip +kT +GR +NP +SC +NP +Wf +lg +tJ +lg +lg +lg +lg +Ho +"} +(107,1,1) = {" +yz +OW +OW +yI +yI +Os +Os +gw +LO +yI +yI +yI +yI +LA +LA +LA +LA +UU +LG +LG +LG +LG +LG +mB +ai +ai +ai +ai +FH +wY +Ow +CZ +Ad +NG +Ad +Ad +Ad +ZQ +ZQ +to +vn +dN +Xy +nF +nF +qE +dN +Dq +nF +Aa +Aa +cd +cd +cd +fR +za +Ml +Pz +zJ +cd +cd +cd +WX +cd +cd +cd +XE +bJ +Ml +Pz +qV +cd +cd +cd +OW +OW +OW +st +ac +qg +uT +ER +st +st +st +st +st +st +hU +ve +hU +ac +iy +ac +gK +st +OW +OW +OW +OW +st +st +ID +GN +rd +mt +no +In +rU +eX +ZD +xi +xi +xi +xi +mt +mt +rU +rU +rU +NP +NP +NP +iM +qP +vd +vd +vd +vd +vd +vd +vd +Ps +UL +jJ +NP +NP +NP +NP +NP +NP +Lw +NP +NP +NP +NP +NP +NP +PM +Ho +"} +(108,1,1) = {" +yz +OW +OW +yI +qp +zk +zk +Lb +Lb +zk +zk +Uk +yI +ej +LG +LG +LG +LG +LG +Jx +jZ +OD +LG +LG +XH +LG +LG +LG +LG +Jq +Ow +Ey +Iw +Iw +ct +iB +yF +ZQ +rh +nF +iW +ub +Pw +fA +fA +gx +Lu +Xy +nF +Aa +dF +cd +Vm +UN +za +Ml +Ml +Ml +Pz +Kx +lf +cd +WX +cd +fR +UN +za +Ml +Ml +Ml +Pz +cs +bi +cd +OW +OW +OW +st +st +qg +uT +ER +ac +st +st +st +st +st +ac +ms +qD +qD +qD +ac +ac +st +st +st +st +st +xZ +II +JC +IK +rU +rU +no +In +rU +rU +rU +xi +xi +xi +xi +xi +ov +rU +mt +rU +iM +Vt +Vt +qP +vd +vd +vd +vd +vd +vd +vd +kJ +UL +jJ +jJ +jJ +NP +NP +NP +Xm +NP +NP +NP +NP +NP +NP +PM +PM +PM +Ho +"} +(109,1,1) = {" +yz +OW +OW +yI +pv +Yh +vw +Lb +zk +pv +Yh +vw +yI +ej +LG +cU +DG +WA +LG +Nc +mJ +Mv +LG +oT +ok +RX +QO +KO +LG +Jq +Ow +wJ +wJ +wJ +wn +rC +yF +ZQ +FQ +nF +Eb +ML +dJ +jV +jV +dJ +qA +Qq +nF +Aa +xc +cd +ZI +Ml +Ml +Ml +Ml +Ml +Ml +rt +qe +cd +cd +cd +UX +Ml +Ml +Ml +Ml +Ml +Ml +Ml +gA +cd +cd +OW +OW +st +st +qg +uT +ER +ac +st +st +st +st +st +SG +qD +qD +qD +qD +qD +ac +ac +hj +lO +II +II +II +II +JC +jI +dv +MI +Yv +eN +dv +dv +dv +dv +dv +xi +xi +dv +dv +dv +dv +dv +qP +vd +vd +vd +vd +vd +vd +vd +vd +vd +kJ +UL +NP +jJ +jJ +jJ +NP +NP +NP +NP +NP +NP +NP +NP +NP +EB +PM +PM +PM +Ho +"} +(110,1,1) = {" +yz +OW +OW +yI +pv +Yh +vw +Lb +zk +pv +Bn +vw +yI +ej +LG +cU +uB +WA +LG +UJ +rM +Lf +LG +tq +mJ +mJ +mJ +gz +LG +Jq +Ow +wJ +jC +ai +hC +iB +FQ +ZQ +yF +nF +nF +nF +nF +dN +LW +nF +nF +nF +nF +Aa +xc +fR +za +fC +Ml +ij +nb +FU +Ml +Ml +Pz +zJ +cd +fR +za +Ml +Ml +Mq +ul +FU +Ml +Ml +Pz +zJ +cd +OW +OW +Pd +Pd +qg +uT +ER +ac +ac +ac +st +st +qD +qD +qD +qD +qD +qD +ac +ac +ac +DL +II +II +II +II +II +JC +JC +JC +JC +JC +JC +JC +JC +JC +JC +JC +JC +JC +JC +JC +JC +JC +JC +vd +vd +vd +vd +vd +vd +vd +vd +vd +kJ +UL +NP +jJ +jJ +jJ +jJ +EB +NP +NP +NP +NP +NP +NP +NP +NP +NP +PM +PM +PM +Ho +"} +(111,1,1) = {" +yz +OW +OW +yI +pv +BC +vw +Lb +zk +pv +Yh +vw +yI +ej +LG +cU +uB +WA +LG +LG +DH +LG +LG +Zu +rM +rM +rM +eJ +LG +UD +Ow +wJ +CZ +iB +iB +iB +ZQ +ZQ +ZQ +ZQ +yF +yF +nF +dN +TK +nF +LT +LT +Aa +Aa +xc +Yb +Ml +Ml +ij +fj +cd +hZ +FU +Ml +Ml +gA +GF +UX +Ml +Ml +ij +sP +cd +hZ +FU +Ml +Ml +gA +cd +OW +OW +Pd +qD +qg +uT +Ng +IS +IS +IS +IS +IS +IS +qD +qD +qD +qD +qD +qD +qD +qD +wI +dZ +SH +II +dZ +dZ +vi +Yg +Yg +Wy +JC +JC +JC +JC +JC +JC +JC +JC +JC +JC +JC +JC +JC +JC +vd +vd +vd +vd +vd +vd +vd +vd +kJ +UL +jJ +jJ +jJ +jJ +jJ +NP +NP +NP +Lw +NP +bt +jb +NP +NP +Lw +NP +Lw +PM +PM +Ho +"} +(112,1,1) = {" +yz +OW +OW +yI +zk +zk +zk +Lb +zk +zk +zk +zk +yI +ej +LG +cU +uB +uB +IN +mO +ok +uC +LG +LG +LG +mJ +gf +LG +LG +AA +Ow +wJ +Ey +Ak +rC +yF +ZQ +yF +yF +ZQ +ZQ +ZQ +Uy +ox +ox +Uy +Aa +Aa +Aa +LT +xc +ft +Ml +Ml +Qf +cd +cd +cd +vG +Ml +Ml +gA +uY +UX +Ml +Ml +zD +cd +cd +cd +vG +Ml +Ml +gA +cd +OW +OW +st +qD +qg +uT +qD +qD +qD +qD +qD +qD +qD +qD +qD +qD +qD +qD +qD +qD +qD +CJ +hK +II +II +II +II +JC +JC +JC +JC +JC +JC +JC +JC +JC +JC +JC +JC +JC +JC +JC +JC +JC +JC +vd +vd +vd +vd +vd +vd +vd +kJ +UL +jJ +jJ +jJ +jJ +Lw +NP +NP +NP +Lw +Lw +NP +NP +NP +NP +NP +NP +NP +NP +PM +PM +Ho +"} +(113,1,1) = {" +yz +OW +OW +yI +pv +Yh +vw +Lb +zk +pv +Yh +vw +yI +ej +LG +cU +yN +uw +LG +nD +mJ +Oj +ok +ok +Py +ok +ok +tt +LG +hg +Ow +wJ +wJ +jh +rC +yF +ZQ +ZQ +yF +yF +ks +Jp +nF +sx +dN +nF +dF +HA +Aa +DO +Cd +ft +Ml +Ml +Pz +Qc +cd +Hj +Hm +Ml +Ml +gA +GF +UX +Ml +Ml +Pz +Qx +cd +fR +za +Ml +Ml +wi +cd +OW +OW +ac +qD +qg +uT +En +HJ +HJ +HJ +HJ +HJ +HJ +qD +qD +qD +qD +qD +qD +qD +qD +qD +vS +SH +dZ +dZ +dZ +vi +sg +by +by +aM +by +by +by +aM +by +by +by +kk +aM +by +by +by +by +Ga +zq +zq +zq +zq +dR +kM +jJ +jJ +jJ +jJ +Lw +NP +NP +NP +GR +NP +NP +NP +NP +NP +NP +Lw +PM +PM +NP +Lw +NP +PM +Ho +"} +(114,1,1) = {" +yz +OW +OW +yI +pv +Bn +vw +Lb +zk +pv +Bn +vw +yI +ej +LG +LG +LG +LG +LG +Si +mJ +mJ +mJ +mJ +mJ +mJ +mJ +wp +LG +qs +Ow +wJ +jC +ho +iB +yF +FQ +ZQ +yF +BM +BM +BM +BM +gH +LE +BM +BM +BM +zT +zT +BM +hZ +FU +Ml +Ml +Pz +iQ +za +Ml +Ml +ij +fj +cd +hZ +mC +Ml +Ml +Pz +iQ +za +oG +Ml +ij +vc +cd +OW +OW +st +Pd +SG +uT +qD +ac +st +ac +ac +st +qD +qD +qD +qD +qD +qD +qD +ac +ac +ac +DL +II +II +II +II +JC +jI +dv +Dl +LI +rU +rU +LI +rU +Jt +rU +mt +Rn +rU +mt +rU +si +rU +GK +GK +GK +GK +GK +LP +LP +LP +LP +LP +LP +GK +GK +GK +Hc +GK +GK +GK +GK +GK +GK +GK +GK +yK +yK +GK +GK +GK +yK +wZ +"} +(115,1,1) = {" +yz +OW +OW +yI +pv +Yh +vw +Lb +zk +pv +Bn +vw +yI +ef +ef +ef +ej +LG +pX +od +Nn +vo +nj +vo +xE +mJ +mJ +La +LG +Jq +Ow +wJ +CZ +iB +iB +iB +FQ +ZQ +yF +BM +Rs +jn +Pi +gH +gH +FL +BM +ay +ay +ay +BM +cd +mb +Ml +Ml +Ml +Ml +Ml +Ml +Ml +OO +cd +cd +cd +Qr +tL +Ml +Ml +Ml +Xt +Ml +Ml +Dk +cd +cd +OW +OW +st +st +Zi +Tc +Ue +Zi +ut +st +st +st +st +Xc +qD +qD +qD +qD +qD +qD +ac +ac +mV +De +Gp +Vs +II +JC +JC +JC +jI +er +rU +si +rU +rU +rU +rU +rU +wj +AC +rs +PV +PV +rs +Wq +ce +ce +ce +ce +sZ +LP +LP +LP +LP +LP +GK +GK +GK +GK +GK +GK +GK +GK +GK +wR +pE +yK +yK +yK +GK +GK +yK +yK +wZ +"} +(116,1,1) = {" +yz +OW +OW +yI +fs +Lb +Lb +Lb +zk +zk +zk +zk +fH +Ac +ef +ef +ef +LG +yL +mJ +kz +LG +LG +LG +lV +mJ +mJ +HL +rK +Jq +Ow +wJ +Ey +Iw +Va +iB +le +ZQ +yF +BM +gH +gU +gH +gH +gH +eC +No +pe +pe +pe +zT +cd +JO +mf +FU +Ml +Ml +Ml +ij +mf +fj +cd +WX +cd +hd +Ag +FU +Ml +Ml +Ml +ij +mf +Su +cd +OW +OW +OW +Zi +Zi +Zi +Fx +sD +Zi +Zi +st +st +st +st +EL +qD +qD +qD +Pg +qD +qD +st +ac +ac +st +st +st +st +st +st +ID +JC +jI +Dl +rU +vA +rU +BF +rU +rU +rU +mt +rU +BD +BD +rU +GK +GK +GK +GK +GK +GK +zS +Ex +LP +LP +LP +LP +wR +Sf +GK +Gg +GK +GK +GK +GK +yK +yK +yK +yK +GK +GK +Hc +yK +yK +wZ +"} +(117,1,1) = {" +yz +OW +yI +yI +qj +Lb +zk +zk +Uk +gJ +CF +gJ +gJ +gJ +gJ +gJ +yH +LG +Si +mJ +Oj +kq +sh +kq +od +mJ +mJ +HL +sf +Jq +Ow +wJ +wJ +wJ +wn +iB +iB +ES +iB +BM +lT +gH +gH +gH +gH +nM +BM +ay +ay +li +zT +cd +cd +cd +hZ +FU +Ml +ij +fj +cd +cd +cd +WX +cd +cd +cd +hZ +FU +Ml +ij +fj +cd +cd +cd +OW +OW +OW +Zi +Mm +nN +vE +ZM +bY +Zi +st +st +st +st +gp +oB +qD +qD +Lg +Lg +aU +st +ac +st +st +st +st +st +st +st +st +OW +JC +jI +Dl +mt +rU +rU +rU +YT +wU +wU +wU +tE +tE +wU +wU +wU +GK +sX +GK +GK +GK +Ex +Ex +Ex +LP +LP +GK +GK +GK +GK +Hc +GK +GK +yK +yK +yK +yK +GK +GK +GK +yK +yK +yK +wZ +"} +(118,1,1) = {" +yz +OW +yI +fz +zk +Lb +zk +zk +WE +KE +Dd +qo +gJ +gh +ch +gJ +Ab +Sv +Te +eG +eG +cJ +eG +cJ +mJ +mJ +mJ +HL +rK +Jq +Ow +Ow +Ow +Ow +Ef +XV +LR +nw +ct +pT +gH +gH +gH +gH +gH +nM +BM +ay +ay +pe +zT +WX +WX +cd +cd +hZ +mf +fj +cd +cd +WX +WX +WX +WX +WX +cd +cd +hZ +mf +fj +cd +cd +Dz +Dz +Dz +Dz +Dz +Zi +UY +bv +BS +zc +io +ut +st +st +st +st +st +st +qD +st +st +ac +st +st +st +st +st +st +st +st +st +st +st +OW +JC +JC +IK +rU +rU +rU +rU +rU +wU +Dt +pn +PG +PG +Eg +Dt +wU +GK +GK +GK +GK +GK +GK +Ex +Ex +Ex +Ex +GK +GK +GK +GK +GK +GK +yK +yK +yK +yK +GK +GK +GK +GK +yK +yK +yK +wZ +"} +(119,1,1) = {" +yz +OW +yI +zk +zk +Lb +zk +zk +ng +Dd +Dd +xH +gJ +Mg +Me +QZ +Ab +LG +Jl +mJ +mJ +mJ +mJ +eG +mJ +mJ +mJ +Ma +LG +Jq +Ow +wJ +wJ +wJ +wn +wJ +mB +ai +kL +gH +gH +gH +gH +xT +xT +tm +BM +pe +pe +pe +zT +WX +WX +WX +cd +ow +cd +ow +cd +WX +WX +WX +WX +WX +WX +WX +cd +ow +cd +ow +cd +WX +Dz +Dz +Dz +Dz +Dz +Zi +JM +BS +BS +zc +BL +Zi +st +st +st +st +st +st +mI +st +st +st +st +st +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +IK +rU +rU +rU +rU +Qb +wU +Dt +Eg +PG +PG +Eg +Ev +wU +GK +GK +Gg +GK +GK +GK +GK +Ex +Ex +GK +GK +GK +Se +GK +yK +yK +yK +yK +yK +GK +GK +GK +GK +sX +GK +yK +yK +wZ +"} +(120,1,1) = {" +yz +OW +yI +zk +zk +Lb +zk +zk +aW +Dd +Dd +cY +lc +rc +wb +gJ +ef +LG +iC +xd +fn +kh +rM +yG +rM +jA +Ff +Ej +LG +mB +BG +BG +FH +ai +Wc +iB +iB +CP +iB +BM +BM +BU +gH +xT +MT +BM +BM +nS +pe +eQ +zT +WX +WX +cd +cd +fR +wy +zJ +cd +cd +WX +WX +WX +WX +WX +cd +cd +fR +UN +zJ +cd +cd +Dz +Dz +Dz +Dz +Dz +ut +GP +zc +zc +zc +BL +he +Yp +st +MD +Av +Er +st +Er +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +GK +GK +GK +GK +Ex +wU +Eg +Eg +PG +PG +Eg +Eg +Eg +GK +Hc +GK +GK +Hc +Hc +GK +GK +Hc +GK +ck +GK +GK +GK +GK +yK +yK +GK +GK +GK +GK +wR +GK +GK +GK +yK +yK +wZ +"} +(121,1,1) = {" +yz +OW +yI +zk +zk +Lb +Lb +Lb +Xd +Kk +Kk +Kk +wr +Me +Ny +gJ +ef +LG +LG +LG +LG +LG +LG +Pk +LG +LG +LG +LG +LG +Zj +ew +RB +iB +iB +iB +iB +zo +pu +sl +BM +Vj +gH +gH +xT +gH +Kp +tg +pe +pe +pe +zT +cd +cd +cd +oa +za +Ml +Pz +zJ +cd +cd +cd +WX +cd +cd +cd +fR +za +Ml +Pz +zJ +cd +cd +cd +Dz +Dz +Dz +ut +ld +gL +Gf +jf +WJ +Zi +mY +Er +Er +Er +Yp +Er +Yp +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +GK +GK +Hc +GK +Ex +Ex +wU +Eg +Eg +tE +tE +Eg +Eg +Eg +GK +GK +GK +GK +GK +GK +GK +GK +GK +GK +GK +GK +GK +GK +GK +GK +wR +GK +GK +GK +GK +GK +GK +GK +GK +yK +yK +wZ +"} +(122,1,1) = {" +yz +OW +yI +zk +zk +Lb +Kh +zk +Sm +Dd +Dd +Dd +gJ +rA +BK +gJ +ef +ef +ef +ej +ej +ej +It +Ab +Ab +bd +of +Ab +HX +Nj +nw +MC +iB +sl +sl +sl +pu +pu +sl +BM +ag +gH +gH +xT +FN +ag +tg +pe +ay +Qk +zT +cd +jL +UN +za +Ml +Ml +Ml +Pz +UN +tn +cd +WX +cd +CO +UN +za +Ml +Ml +Ml +Pz +UN +zJ +cd +QR +oR +Dz +Zi +Zi +ut +Zi +SV +Zi +Zi +st +st +Er +Er +Yp +st +st +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +Hc +ck +GK +GK +GK +wR +Ex +Ex +LP +LP +Jf +MV +PG +Eg +Eg +wU +wR +GK +GK +GK +yK +sX +GK +GK +GK +GK +yK +Hc +GK +GK +GK +GK +GK +GK +GK +GK +GK +GK +Gg +GK +GK +Hc +yK +wZ +"} +(123,1,1) = {" +yz +OW +yI +lH +Os +jl +yI +yI +gJ +LX +XW +vX +gJ +gJ +gJ +gJ +ej +ef +ef +ef +ef +Ab +Ab +Ab +EY +EY +EY +EY +EY +Jq +wJ +Ef +iB +xw +fp +fp +fp +fp +qm +zT +Vj +gH +gH +xT +gH +gH +BM +pe +ay +ay +BM +cd +Ox +Ml +Ml +Ml +Ml +Ml +Ml +Ml +fX +cd +cd +cd +UX +Ml +Ml +Ml +Ml +Ml +Ml +Ml +gA +cd +cd +QR +oR +Dz +Dz +Dz +Dz +mU +km +Dz +st +st +Yp +Er +Er +st +st +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +GK +GK +GK +LP +LP +LP +LP +LP +LP +uU +Zb +Eg +Eg +wU +GK +GK +Hc +GK +yK +yK +GK +Sf +yK +yK +yK +wR +GK +ck +GK +GK +GK +GK +nP +GK +GK +GK +GK +GK +Hc +GK +yK +wZ +"} +(124,1,1) = {" +yz +OW +rG +CD +CD +XG +rG +OW +vO +vT +vT +vT +vT +vT +vT +vT +ej +ej +ej +ej +ej +Ab +Ac +Ab +rv +bS +XX +md +PQ +Jq +wJ +Ef +HX +fp +fp +pu +pu +fp +pu +zT +LM +LM +gH +xT +gH +FC +BM +pe +pe +pe +BM +fR +za +Ml +Ml +ij +yo +pm +lt +Ml +Pz +zJ +cd +fR +za +Ml +Ml +ij +vf +Od +Ml +Ml +Pz +cq +cd +Dz +oR +oR +lD +Dz +Dz +Dz +mU +oR +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +OW +OW +GK +GK +Ex +LP +LP +LP +LP +LP +LP +LP +KK +Eg +Eg +wU +pE +GK +GK +GK +yK +yK +yK +yK +yK +yK +yK +yK +GK +GK +GK +GK +GK +GK +GK +yK +yK +Hc +Ex +Ex +Ex +GK +yK +wZ +"} +(125,1,1) = {" +yz +OW +rG +CD +CD +XG +rG +OW +OW +vT +Oq +Oq +am +eu +yV +vT +vT +vT +vT +vT +vT +Sy +vT +ej +EY +qy +Wj +mp +PQ +Jq +wJ +wn +iB +sl +sl +sl +sl +fp +sl +zT +zT +zT +zT +wO +BM +BM +BM +BM +zR +BM +BM +UX +Ml +Ml +ij +xm +cd +oH +FU +Ml +Ml +gA +GF +UX +Ml +Ml +SL +hc +cd +zZ +rn +Ml +Ml +RH +cd +Dz +Dz +oR +oR +Dz +Dz +Dz +oR +oR +lW +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +ck +GK +Hc +GK +Ex +Ex +LP +LP +xW +LP +LP +LP +LP +wU +Eg +wU +GK +GK +Sf +Hc +GK +yK +yK +yK +yK +yK +yK +yK +yK +GK +GK +GK +Se +GK +GK +yK +yK +yK +yK +Ex +Ex +Ex +yK +wZ +"} +(126,1,1) = {" +yz +OW +rG +qq +Pf +Ds +rG +OW +OW +vT +Ei +nV +nV +WK +WK +vT +ky +XB +XB +US +WK +LN +vT +Oo +EY +NV +Wj +mp +PQ +mB +ai +Wc +iB +sl +sl +sl +sl +fp +fp +fp +fp +yT +fp +fp +RI +Ah +ec +bW +oI +OJ +cd +UX +Ml +Ml +AW +cd +cd +cd +AY +Ml +Ml +gA +uY +UX +Ml +Ml +Qf +cd +cd +cd +vG +Ml +Ml +gA +cd +Dz +Dz +oR +oR +Dz +Dz +Dz +Dz +oR +oR +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Hc +ck +Hc +Se +Ex +Ex +Ex +GK +GK +Sf +GK +LP +GK +wN +QD +ad +GK +GK +Se +GK +GK +yK +yK +yK +GK +Hc +yK +yK +yK +Hc +Hc +ck +GK +GK +GK +Hc +yK +yK +yK +yK +Ex +Ex +yK +wZ +"} +(127,1,1) = {" +yz +OW +rG +Jw +OB +oP +rG +OW +OW +vT +am +WK +WK +WK +WK +Eq +nV +nV +nV +WK +WK +LN +vT +Oo +EY +iR +Wj +lQ +EY +Zj +ew +Zj +iB +zN +zN +zN +zN +zN +zN +RI +RI +RI +tO +RI +RI +GA +Uo +Ke +gG +sk +cd +UX +Ml +Ml +Pz +zJ +cd +Yq +za +Ml +Ml +gA +GF +UX +Ml +Ml +Pz +jM +cd +cW +QK +Ml +Ml +bQ +cd +Dz +Dz +oR +oR +oR +Dz +Dz +Dz +oR +oR +oR +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +oR +oR +Dz +Dz +WW +oR +oR +oR +oR +Dz +Dz +Dz +Dz +RU +GK +GK +Ex +GK +GK +GK +GK +GK +Pt +kX +qF +Ch +GD +GK +Hc +GK +Hc +GK +yK +yK +wR +GK +GK +GK +yK +GK +GK +GK +GK +Gg +GK +Sf +GK +yK +yK +yK +yK +GK +GK +yK +wZ +"} +(128,1,1) = {" +yz +rG +rG +rJ +CD +Ie +rG +rG +rG +vT +vT +vT +vT +uo +vT +vT +yV +yV +yV +WK +WK +LN +rl +EA +lP +ys +KG +nQ +EY +ev +Iw +ct +zN +fv +gW +tH +xs +xs +zN +RI +Az +sr +Mo +zj +RI +GA +Uo +Ke +gG +gs +cd +hZ +FU +Ml +Ml +Pz +iQ +za +Ml +Ml +ij +fj +cd +hZ +FU +Ml +Ml +Pz +BO +QK +Ml +Ml +ij +QP +cd +Dz +Dz +Dz +oR +oR +Dz +Dz +oR +oR +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +oR +oR +oR +oR +Dz +Dz +Dz +oR +oR +Dz +bC +oR +FZ +Gg +GK +GK +GK +yK +yK +wR +GK +sv +Ch +sy +GD +GK +LP +LP +GK +Gg +GK +GK +GK +GK +Hc +Hc +GK +GK +Hc +GK +GK +GK +GK +GK +GK +GK +GK +GK +yK +yK +wR +GK +yK +wZ +"} +(129,1,1) = {" +yz +rG +Jw +Eu +CD +pM +ki +uV +tK +vT +fF +WK +vT +Vk +hB +Eq +nV +nV +nV +WK +WK +wh +vT +Oo +EY +qy +Cj +mp +PQ +Jq +wJ +wn +zN +gn +gW +gW +tH +LD +zN +FJ +wK +gG +gG +Vr +RI +oA +gG +VR +gG +AS +cd +cd +QM +Ml +Ml +Ml +Ml +Ml +Ml +Ml +xr +cd +cd +cd +NQ +Ml +Ml +Ml +Ml +Ml +Ml +Ml +gA +cd +cd +Dz +Dz +oR +oR +oR +oR +Dz +oR +oR +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +LB +oR +oR +Dz +Dz +Dz +Dz +Dz +Dz +Dz +oR +oR +oR +Dz +vM +Hc +GK +xV +yK +yK +yK +yK +Pt +qF +ad +GK +GK +LP +LP +LP +GK +GK +GK +Ex +Ex +GK +GK +GK +GK +GK +GK +Ex +Ex +yK +yK +GK +Hc +GK +Hc +GK +GK +GK +Hc +GK +yK +wZ +"} +(130,1,1) = {" +yz +rG +rJ +CD +CD +aG +WV +WV +il +vT +HV +nV +Eq +WK +WK +vT +ky +XB +XB +WK +WK +LN +vT +Oo +EY +Hw +Bd +HE +PQ +Jq +wJ +wn +zN +FK +gW +FK +gW +xs +zN +Pm +gG +mZ +Xg +hD +gG +yX +iO +uZ +in +gs +cd +cd +lb +mf +FU +Ml +Ml +Ml +ij +mf +TP +cd +WX +cd +ZC +RA +FU +Ml +Ml +Ml +ij +mf +OT +cd +Dz +Dz +Dz +Dz +Dz +oR +oR +RN +oR +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +wo +oR +oR +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +GK +Hc +GK +yK +yK +yK +wN +Ch +GD +GK +LP +LP +LP +Hc +GK +xV +Ex +Ex +Ex +Ex +GK +GK +sX +GK +Ex +Ex +yK +yK +yK +pE +GK +GK +Hc +xV +GK +GK +GK +GK +yK +wZ +"} +(131,1,1) = {" +yz +rG +Al +CD +CD +aG +WV +WV +iz +vT +Ts +WK +qr +CN +WK +vT +vT +vT +vT +WK +WK +LN +WK +vT +EY +PQ +EY +PQ +EY +oo +wJ +wn +zN +xs +gW +xs +gW +Vb +Du +Vq +gG +DU +Yj +Vr +RI +RI +RI +RI +yX +Ay +cd +cd +cd +cd +hZ +FU +Ml +ij +fj +cd +cd +cd +WX +cd +cd +cd +hZ +FU +Ml +ij +fj +cd +cd +cd +Dz +Dz +Dz +Dz +Dz +Dz +LB +oR +oR +oR +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +oR +oR +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +RU +Pt +pA +pA +pA +pA +qF +ad +LP +LP +LP +GK +GK +GK +Sf +GK +Ex +Ex +Ex +Ex +GK +GK +GK +GK +yK +Ex +yK +yK +Ex +GK +GK +GK +GK +GK +Hc +yK +yK +yK +yK +wZ +"} +(132,1,1) = {" +yz +ic +tx +EQ +Tn +aG +WV +WV +iz +vT +vT +vT +vT +Ua +WK +vT +TR +CE +vT +CN +WK +LN +LN +zl +LR +MC +Da +Nj +SI +ie +Ow +Ef +zN +FK +gW +FK +gW +gW +zN +Pm +Uc +QV +vD +Hn +SF +gS +Wx +SF +sa +RI +cd +WX +WX +cd +cd +hZ +mf +fj +cd +cd +WX +WX +WX +WX +WX +cd +cd +hZ +mf +fj +cd +cd +Dz +Dz +Dz +Dz +Dz +Dz +Dz +oR +oR +oR +oR +oR +QR +Dz +Dz +Dz +Dz +oR +Dz +oR +oR +oR +oR +oR +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +oR +oR +nr +oR +sW +nr +we +gm +sy +sy +sy +sy +sy +Dg +GK +LP +LP +LP +Hc +GK +GK +GK +GK +Ex +Ex +Hc +GK +GK +GK +Hc +yK +Ex +Ex +Ex +Ex +GK +GK +yK +yK +GK +GK +yK +yK +yK +yK +wZ +"} +(133,1,1) = {" +yz +rG +Bq +Fa +We +XG +XG +XG +Ie +cb +LN +LN +LN +LN +LN +zz +LN +LN +so +LN +LN +LN +WK +vT +Jq +wn +iB +Jq +wJ +wJ +wJ +Ef +zN +xs +gW +xs +gW +ya +zN +ud +in +Uo +gG +ue +wW +gG +gG +wW +AS +RI +WX +WX +WX +WX +cd +ow +cd +ow +cd +WX +WX +WX +WX +WX +WX +WX +cd +ow +cd +ow +cd +Dz +Dz +Dz +Dz +Dz +oR +oR +Dz +oR +oR +Dz +Dz +oR +oR +oR +Dz +Dz +oR +oR +oR +oR +oR +Dz +Dz +oR +oR +oR +oR +Dz +Dz +EV +oR +oR +oR +oR +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +GK +GK +dU +Sf +Ex +Ex +LP +LP +GK +GK +GK +wR +GK +GK +GK +GK +GK +GK +yK +yK +yK +Ex +Ex +GK +Hc +GK +yK +yK +yK +yK +yK +yK +yK +yK +wZ +"} +(134,1,1) = {" +yz +ic +Ck +GM +Tn +aG +WV +WV +iz +WK +WK +WK +WK +WK +WK +WK +WK +WK +oL +WK +WK +WK +WK +Xv +mB +Wc +VD +mB +FH +ai +ai +ur +zN +ou +gW +FK +Ll +cj +zN +RI +LV +Ur +in +ue +gF +XT +ob +gF +gs +RI +cd +WX +WX +cd +cd +fR +UN +zJ +cd +cd +WX +WX +WX +WX +WX +cd +cd +fR +UN +zJ +cd +cd +Dz +Dz +Dz +Dz +Dz +oR +oR +oR +oR +Dz +Dz +Dz +Dz +oR +oR +oR +oR +oR +oR +oR +Dz +Dz +oR +oR +Dz +Dz +WW +oR +oR +oR +oR +oR +oR +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +LB +dm +xq +GK +GK +GK +GK +Ex +Ex +Ex +GK +GK +GK +GK +Hc +GK +GK +sX +Hc +GK +yK +yK +yK +yK +Ex +GK +GK +GK +GK +GK +yK +yK +yK +yK +GK +yK +wZ +"} +(135,1,1) = {" +yz +rG +Al +CD +CD +aG +WV +WV +il +vT +WK +WK +WK +WK +WK +Np +JP +dB +BY +wg +Fl +WK +aY +vT +iB +iB +iB +zN +zN +ZJ +zN +MF +zN +xs +gW +xs +Ll +gW +zN +RI +RI +RI +Ii +vk +gG +gG +gG +gG +Cl +Nf +cd +cd +cd +cd +gZ +za +Ml +Pz +zJ +cd +cd +cd +WX +cd +cd +cd +Xp +za +Ml +Pz +zJ +cd +cd +cd +Dz +Dz +Dz +Dz +Dz +bC +Dz +Dz +Dz +Dz +Dz +Dz +Dz +LB +oR +oR +Dz +Dz +Dz +Dz +Dz +Dz +Dz +IE +oR +oR +oR +oR +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +oR +oR +oR +oR +FZ +GK +GK +sX +Pt +Nr +Hc +GK +GK +GK +GK +pE +Hc +GK +GK +GK +GK +Sf +GK +yK +yK +Ex +Ex +GK +GK +GK +Hc +GK +GK +yK +yK +Hc +GK +yK +wZ +"} +(136,1,1) = {" +yz +rG +CK +XG +XG +aG +WV +WV +iz +vT +WK +WK +WK +WK +NI +vT +JP +zF +BY +zF +Fl +WK +WK +vT +OW +zN +Dv +LH +pD +gW +LH +Ll +zN +zN +zN +zN +MF +zN +ci +zg +KV +RI +RI +aC +gG +Be +Be +gG +gG +qz +cd +cd +jB +UN +vv +Ml +Ml +Ml +Pz +RZ +MP +cd +WX +cd +Xp +Co +za +Ml +yO +Vi +Pz +UN +Vg +cd +Dz +Dz +Dz +Dz +Dz +oR +oR +Dz +oR +oR +oR +Dz +Dz +Dz +Dz +Dz +Dz +Dz +oR +oR +RN +oR +oR +oR +oR +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +oR +oR +oR +oR +Dz +OW +OW +OW +OW +OW +ad +GK +GK +GK +Gg +GK +Se +GK +GK +Hc +GK +GK +GK +GK +GK +GK +GK +GK +GK +wR +GK +GK +GK +GK +sX +GK +GK +Gg +yK +wZ +"} +(137,1,1) = {" +yz +rG +Et +Mr +CD +aG +WV +WV +iz +vT +CN +WK +NI +NI +Dr +vT +CN +WK +US +WK +WK +WK +WK +vT +OW +zN +uz +gW +gW +gW +gW +Ll +gW +gW +LH +gW +Ll +LH +QE +gG +Cl +SK +Vh +rZ +gG +gG +gG +gG +hi +Ay +cd +cd +Ys +Ml +Ml +Ml +Ml +Ml +Ml +Ml +qM +cd +cd +cd +UX +Ml +Ml +Ml +Ml +jN +Ml +Ml +gA +cd +cd +Dz +Dz +Dz +Dz +oR +oR +oR +oR +Dz +oR +oR +yx +Dz +QR +Dz +oR +oR +oR +oR +oR +oR +oR +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +oR +oR +yx +oR +Dz +Dz +Dz +OW +OW +OW +OW +OW +EO +kX +pA +Sq +Sq +YN +GK +GK +OW +OW +GK +GK +GK +Gg +GK +GK +GK +GK +GK +GK +GK +GK +GK +Ex +Ex +Ex +GK +Hc +yK +wZ +"} +(138,1,1) = {" +yz +rG +rG +Et +OF +JY +CD +RR +cu +vT +vT +JP +Pn +UK +ku +vT +WK +WK +WK +WK +BJ +oL +WK +vT +OW +zN +pU +gW +lj +Uq +gW +Ll +Ll +Ll +Ll +Ll +Ll +Ll +aC +ue +ue +ue +ue +ue +gG +gG +gG +gG +AS +RI +cd +fR +za +Ml +Ml +ij +nb +FU +Ml +Ml +Pz +Qc +cd +fR +za +Ml +Ml +ij +nb +FU +Ml +Ml +Oi +CU +cd +Dz +Dz +Dz +oR +oR +Dz +oR +oR +Dz +Dz +Dz +oR +oR +oR +oR +oR +oR +oR +Dz +Dz +bC +oR +oR +Dz +Dz +Dz +Dz +Dz +Dz +Dz +oR +oR +oR +oR +Dz +Dz +oR +Dz +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +vY +Hc +Hc +OW +OW +OW +GK +GK +GK +GK +GK +GK +Gg +GK +GK +GK +GK +Ex +Ex +Ex +Ex +GK +GK +yK +wZ +"} +(139,1,1) = {" +yz +OW +rG +rG +rG +iD +rN +cu +Cq +rX +vT +vT +vT +vT +vT +vT +rX +DI +Np +DI +vT +vT +vT +vT +OW +zN +Dv +gW +Wo +dt +gW +gW +gW +gW +gW +gW +gW +gW +QE +gG +hi +Pu +Ea +Hk +Hk +Ea +in +gG +hW +RG +Ml +UX +Ml +Ml +ij +kO +cd +hZ +FU +Ml +Ml +gA +GF +UX +Ml +Ml +ij +xU +cd +aT +FU +Ml +Ml +gA +cd +QR +oR +bC +oR +Dz +Dz +Dz +oR +oR +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +oR +oR +oR +oR +oR +Dz +Dz +Dz +oR +oR +oR +oR +Dz +Dz +Dz +Dz +oR +oR +Dz +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +EO +Nr +GK +GK +OW +OW +Hc +Hc +GK +GK +Hc +GK +GK +GK +Hc +GK +Sf +Ex +Ex +yK +yK +GK +Se +yK +wZ +"} +(140,1,1) = {" +yz +OW +OW +dW +dW +zL +aI +kQ +mW +mW +mW +mW +mW +mW +mW +mW +mW +If +nt +Ol +mW +mW +OW +OW +OW +zN +uz +gW +gW +gW +gW +gW +gW +zN +zN +zN +zN +zN +QE +gG +gs +CL +CL +NO +NO +CL +IX +gG +WD +RI +Ml +UX +Ml +Ml +Qf +cd +cd +cd +vG +Ml +Ml +gA +uY +UX +Ml +Ml +ZH +cd +cd +cd +vG +Ep +Ml +gA +cd +Dz +Dz +oR +Dz +Dz +Dz +lW +oR +oR +oR +Dz +Dz +Dz +Dz +oR +Dz +oR +oR +oR +oR +wo +Dz +Dz +oR +oR +oR +oR +oR +Dz +Dz +Dz +Dz +Dz +oR +oR +oR +Dz +Dz +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +pE +GK +Hc +GK +GK +GK +GK +GK +GK +GK +Ex +yK +yK +yK +GK +GK +yK +wZ +"} +(141,1,1) = {" +yz +OW +OW +dW +iT +WF +nt +nt +Gq +Gq +Sg +mW +mW +iT +Gq +Gq +Gq +Pr +Yi +JB +hR +mW +OW +OW +OW +zN +Dm +gW +gW +gW +gW +Dv +zN +zN +OW +OW +OW +zN +GV +qN +Ay +eA +Fj +dg +qn +HG +Qy +Hk +py +RG +Ml +UX +Ml +Ml +wd +Kc +cd +fR +za +Ml +Ml +gA +GF +UX +Ml +Ml +Pz +Gm +cd +TO +za +Ml +Ml +jk +cd +Dz +Dz +oR +oR +Dz +Dz +Dz +Dz +oR +oR +oR +yx +oR +oR +oR +oR +oR +oR +oR +Dz +Dz +Dz +Dz +Dz +Dz +wo +oR +oR +oR +Dz +Dz +Dz +oR +EV +Dz +Dz +Dz +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +GK +GK +Hc +GK +OW +OW +Se +GK +GK +yK +yK +yK +GK +GK +yK +wZ +"} +(142,1,1) = {" +yz +OW +OW +dW +cr +bX +Yi +Yi +Yi +ym +IT +mW +mW +Ks +Yi +Yi +Yi +Yi +Yi +Yi +IT +mW +OW +OW +OW +zN +Wl +uz +WQ +Wl +cD +uz +zN +OW +OW +OW +OW +zN +RI +RI +RI +CL +Wu +uR +AJ +CL +RI +RI +RI +RI +cd +hZ +FU +Ml +Ml +Pz +iQ +za +Ml +Ml +ij +fj +cd +hZ +FU +Ml +Ml +Pz +iQ +za +Ml +Ml +ij +xU +cd +Dz +Dz +Dz +oR +oR +Dz +Dz +Dz +Dz +Dz +Dz +oR +oR +oR +oR +oR +oR +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +WW +oR +oR +oR +yx +Dz +Dz +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +GK +OW +OW +OW +GK +GK +Hc +yK +yK +GK +Hc +GK +yK +wZ +"} +(143,1,1) = {" +yz +OW +OW +dW +pb +Cu +Cu +Yi +Yi +Yi +JB +nt +nt +Pr +Cu +Cu +Cu +Yi +Cu +Cu +hI +mW +OW +OW +OW +zN +zN +zN +zN +zN +zN +zN +zN +OW +OW +OW +OW +OW +OW +OW +OW +CL +JF +mk +AJ +CL +OW +OW +OW +OW +cd +cd +UX +Ml +Ml +Ml +Ml +Ml +Ml +Ml +gA +cd +cd +cd +IW +Ml +Ml +Ml +Ml +Ml +Ml +Ml +gA +cd +cd +Dz +Dz +lW +oR +oR +oR +Dz +Dz +Dz +Dz +oR +oR +oR +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +GK +GK +GK +GK +GK +GK +GK +yK +yK +wZ +"} +(144,1,1) = {" +yz +OW +OW +dW +pb +Cu +Cu +Yi +Yi +Yi +Yi +GU +GU +TU +Cu +Cu +Cu +Yi +Cu +Cu +hI +mW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +CL +DK +uR +AJ +CL +OW +OW +OW +OW +OW +cd +Nu +mf +FU +Ml +Ml +Ml +ts +uI +fj +cd +WX +cd +hZ +mf +FU +Ml +Ml +Ml +ij +By +TP +cd +Dz +Dz +Dz +Dz +Dz +oR +oR +RN +oR +oR +oR +oR +Dz +oR +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +Hc +GK +GK +Gg +GK +GK +GK +GK +wR +yK +yK +wZ +"} +(145,1,1) = {" +yz +OW +OW +dW +Zw +Yi +Yi +Yi +Cu +Cu +Cu +mW +mW +Ks +Yi +Yi +Yi +Yi +Yi +Yi +IT +mW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +CL +sQ +vI +zx +CL +OW +OW +OW +OW +OW +cd +cd +cd +hZ +FU +AT +Jo +xI +cd +cd +cd +WX +cd +cd +cd +iJ +Zc +Ml +ij +fj +cd +cd +cd +Dz +Dz +Dz +Dz +Dz +Dz +oR +oR +oR +oR +Dz +Dz +Dz +Dz +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +GK +GK +GK +Hc +GK +GK +GK +GK +GK +yK +yK +wZ +"} +(146,1,1) = {" +yz +OW +OW +dW +pb +Cu +Cu +Yi +Cu +Cu +Cu +mW +mW +Ks +Cu +Cu +Cu +Yi +Cu +Cu +hI +mW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +CL +CL +CL +CL +CL +OW +OW +OW +OW +OW +WX +WX +cd +cd +hZ +mf +fj +cd +cd +WX +WX +WX +WX +WX +cd +cd +hZ +mf +fj +cd +cd +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +WW +oR +Dz +Dz +Dz +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +GK +sX +GK +Sf +GK +Hc +GK +Hc +yK +yK +wZ +"} +(147,1,1) = {" +yz +OW +OW +dW +pb +Cu +Cu +Yi +Yi +Yi +Yi +nt +nt +Pr +Cu +Cu +Cu +Yi +Cu +Cu +hI +mW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +cd +cd +cd +cd +cd +OW +OW +OW +OW +OW +OW +OW +cd +cd +cd +cd +cd +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +oR +oR +oR +Dz +Dz +Dz +Dz +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +GK +GK +GK +GK +Se +GK +GK +yK +yK +wZ +"} +(148,1,1) = {" +yz +OW +OW +dW +xS +Yi +Yi +Yi +Yi +uW +uM +GU +GU +TU +Yi +Yi +Yi +Yi +Yi +Yi +IT +mW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +oR +oR +oR +Dz +Dz +Dz +Dz +Dz +Dz +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +GK +Hc +GK +yK +yK +yK +wZ +"} +(149,1,1) = {" +yz +OW +OW +dW +Fq +et +et +Xb +et +et +vp +mW +mW +cl +et +et +et +Xb +et +et +cP +mW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +Dz +Dz +Dz +Dz +Dz +Dz +QR +oR +oR +Dz +Dz +Dz +Dz +Dz +Dz +Dz +Dz +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +OW +yK +yK +yK +yK +yK +wZ +"} +(150,1,1) = {" +yz +yz +yz +KW +KW +KW +KW +KW +KW +KW +KW +KW +KW +KW +KW +KW +KW +KW +KW +KW +KW +KW +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +kv +kv +kv +kv +kv +kv +kv +kv +kv +kv +kv +kv +kv +kv +kv +kv +kv +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +yz +wZ +wZ +wZ +wZ +wZ +"} diff --git a/_maps/map_files/DaedalusPrison/DaedalusPrison.dmm b/_maps/map_files/DaedalusPrison/DaedalusPrison.dmm index cd8f27100a192..4d1a809cad6b9 100644 --- a/_maps/map_files/DaedalusPrison/DaedalusPrison.dmm +++ b/_maps/map_files/DaedalusPrison/DaedalusPrison.dmm @@ -2529,7 +2529,7 @@ "chJ" = ( /obj/effect/landmark/lv624/fog_blocker/xeno_spawn, /obj/effect/landmark/lv624/fog_blocker/xeno_spawn, -/turf/closed/mineral/smooth/darkfrostwall/cuttable, +/turf/closed/mineral/smooth/darkfrostwall, /area/daedalusprison/caves/rock) "chS" = ( /obj/structure/table, @@ -8694,7 +8694,7 @@ /area/daedalusprison/inside/mechanicshop) "hoO" = ( /obj/effect/landmark/lv624/fog_blocker/xeno_spawn, -/turf/closed/mineral/smooth/darkfrostwall/cuttable, +/turf/closed/mineral/smooth/darkfrostwall, /area/daedalusprison/caves/rock) "hoW" = ( /obj/structure/table/reinforced/weak, @@ -13521,7 +13521,7 @@ }, /area/daedalusprison/inside/centralhalls) "liI" = ( -/turf/closed/mineral/smooth/darkfrostwall/cuttable, +/turf/closed/mineral/smooth/darkfrostwall, /area/daedalusprison/caves/rock) "lja" = ( /obj/machinery/atmospherics/pipe/simple/green/hidden{ @@ -17333,7 +17333,7 @@ /turf/open/floor/tile/dark/purple2/corner, /area/daedalusprison/inside/colonydorms) "opr" = ( -/turf/closed/mineral/smooth/darkfrostwall/cuttable, +/turf/closed/mineral/smooth/darkfrostwall, /area/daedalusprison/caves/northwest) "opN" = ( /turf/open/floor/tile/green/greentaupe{ diff --git a/_maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm b/_maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm index 6c1ea0929527b..aa7477fb1d2e7 100644 --- a/_maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm +++ b/_maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm @@ -9324,7 +9324,7 @@ }, /area/ice_colony/underground/medical/treatment/garbledradio) "beE" = ( -/turf/closed/mineral/smooth/darkfrostwall, +/turf/closed/mineral/smooth/darkfrostwall/indestructible, /area/ice_colony/exterior/underground/caves/ice_w) "beK" = ( /obj/machinery/chem_dispenser, @@ -17416,7 +17416,7 @@ /turf/open/floor/plating/icefloor/warnplate, /area/ice_colony/exterior/surface/landing_pad) "bXS" = ( -/turf/closed/mineral/smooth/darkfrostwall, +/turf/closed/mineral/smooth/darkfrostwall/indestructible, /area/ice_colony/exterior/underground/caves/ice_se) "bXT" = ( /obj/structure/table, @@ -19093,7 +19093,7 @@ /turf/open/floor/plating/ground/ice, /area/ice_colony/exterior/surface/landing_pad) "dSq" = ( -/turf/closed/mineral/smooth/darkfrostwall, +/turf/closed/mineral/smooth/darkfrostwall/indestructible, /area/ice_colony/exterior/underground/caves) "dTb" = ( /obj/effect/spawner/random/misc/plant, @@ -20528,7 +20528,7 @@ /area/ice_colony/underground/requesition) "ghx" = ( /obj/effect/turf_underlay/icefloor, -/turf/closed/mineral/smooth/darkfrostwall, +/turf/closed/mineral/smooth/darkfrostwall/indestructible, /area/ice_colony/exterior/underground/caves/rock) "ghG" = ( /obj/structure/table, @@ -22771,7 +22771,7 @@ "jyc" = ( /obj/effect/landmark/lv624/fog_blocker/xeno_spawn, /obj/effect/landmark/lv624/fog_blocker/xeno_spawn, -/turf/closed/mineral/smooth/darkfrostwall, +/turf/closed/mineral/smooth/darkfrostwall/indestructible, /area/ice_colony/exterior/underground/caves/rock) "jyU" = ( /obj/machinery/light{ @@ -26979,7 +26979,7 @@ /obj/machinery/door/poddoor/timed_late/containment/landing_zone{ dir = 2 }, -/turf/closed/mineral/smooth/darkfrostwall, +/turf/closed/mineral/smooth/darkfrostwall/indestructible, /area/ice_colony/exterior/underground/caves/rock) "ppt" = ( /obj/effect/spawner/random/misc/structure/closet/welding, @@ -27289,7 +27289,7 @@ /area/ice_colony/underground/medical/hallway) "pPK" = ( /obj/effect/landmark/weed_node, -/turf/closed/mineral/smooth/darkfrostwall, +/turf/closed/mineral/smooth/darkfrostwall/indestructible, /area/ice_colony/exterior/underground/caves) "pQh" = ( /obj/effect/spawner/random/engineering/structure/atmospherics_portable/icecolony, @@ -27596,7 +27596,7 @@ /turf/open/floor/tile/dark2, /area/ice_colony/surface/dorms) "qlb" = ( -/turf/closed/mineral/smooth/darkfrostwall, +/turf/closed/mineral/smooth/darkfrostwall/indestructible, /area/ice_colony/exterior/surface/landing_pad2) "qlJ" = ( /obj/machinery/door/poddoor/timed_late/containment/landing_zone, @@ -29062,7 +29062,7 @@ /obj/machinery/door/poddoor/timed_late/containment/landing_zone/lz2{ dir = 2 }, -/turf/closed/mineral/smooth/darkfrostwall, +/turf/closed/mineral/smooth/darkfrostwall/indestructible, /area/ice_colony/exterior/underground/caves/rock) "scU" = ( /obj/structure/bed/chair{ @@ -29221,7 +29221,7 @@ /area/ice_colony/underground/maintenance/east) "snG" = ( /obj/effect/landmark/lv624/fog_blocker/xeno_spawn, -/turf/closed/mineral/smooth/darkfrostwall, +/turf/closed/mineral/smooth/darkfrostwall/indestructible, /area/ice_colony/exterior/underground/caves) "sox" = ( /obj/machinery/atmospherics/pipe/simple/green/hidden{ @@ -29331,7 +29331,7 @@ /area/ice_colony/underground/hallway/north_west) "svd" = ( /obj/machinery/door/poddoor/timed_late/containment/landing_zone/lz2, -/turf/closed/mineral/smooth/darkfrostwall, +/turf/closed/mineral/smooth/darkfrostwall/indestructible, /area/ice_colony/exterior/underground/caves/rock) "svt" = ( /obj/effect/spawner/random/misc/structure/broken_window/colonyspawn, @@ -29716,7 +29716,7 @@ /obj/effect/landmark/lv624/fog_blocker, /obj/effect/landmark/lv624/fog_blocker/xeno_spawn, /obj/machinery/door/poddoor/timed_late/containment/landing_zone/lz2, -/turf/closed/mineral/smooth/darkfrostwall, +/turf/closed/mineral/smooth/darkfrostwall/indestructible, /area/ice_colony/exterior/underground/caves/rock) "sUw" = ( /obj/structure/cable, @@ -30157,7 +30157,7 @@ /area/ice_colony/surface/engineering/generator) "tvD" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/closed/mineral/smooth/darkfrostwall, +/turf/closed/mineral/smooth/darkfrostwall/indestructible, /area/ice_colony/exterior/underground/caves) "tvQ" = ( /obj/effect/spawner/random/misc/plant, @@ -30243,7 +30243,7 @@ /area/ice_colony/underground/hallway/south_east/garbledradio) "tzo" = ( /obj/machinery/door/poddoor/timed_late/containment/landing_zone, -/turf/closed/mineral/smooth/darkfrostwall, +/turf/closed/mineral/smooth/darkfrostwall/indestructible, /area/ice_colony/exterior/underground/caves/rock) "tzI" = ( /obj/machinery/atmospherics/pipe/manifold/green/hidden{ @@ -30842,7 +30842,7 @@ /obj/effect/landmark/lv624/fog_blocker, /obj/effect/landmark/lv624/fog_blocker/xeno_spawn, /obj/effect/landmark/lv624/fog_blocker/xeno_spawn, -/turf/closed/mineral/smooth/darkfrostwall, +/turf/closed/mineral/smooth/darkfrostwall/indestructible, /area/ice_colony/exterior/underground/caves/rock) "uwf" = ( /obj/structure/rack, @@ -31398,7 +31398,7 @@ /obj/machinery/door/poddoor/timed_late/containment/landing_zone/lz2{ dir = 2 }, -/turf/closed/mineral/smooth/darkfrostwall, +/turf/closed/mineral/smooth/darkfrostwall/indestructible, /area/ice_colony/exterior/underground/caves/rock) "vdL" = ( /obj/effect/landmark/weed_node, @@ -31895,7 +31895,7 @@ /area/ice_colony/exterior/surface/clearing/south) "vQg" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/closed/mineral/smooth/darkfrostwall, +/turf/closed/mineral/smooth/darkfrostwall/indestructible, /area/ice_colony/exterior/underground/caves/rock) "vRq" = ( /obj/structure/disposalpipe/segment{ @@ -32482,7 +32482,7 @@ "wFT" = ( /obj/effect/landmark/lv624/fog_blocker, /obj/effect/landmark/lv624/fog_blocker/xeno_spawn, -/turf/closed/mineral/smooth/darkfrostwall, +/turf/closed/mineral/smooth/darkfrostwall/indestructible, /area/ice_colony/exterior/underground/caves/rock) "wGa" = ( /obj/effect/spawner/random/engineering/structure/tank/fuelweighted, @@ -33462,7 +33462,7 @@ /turf/open/floor/tile/dark/yellow2, /area/ice_colony/underground/engineering) "xJX" = ( -/turf/closed/mineral/smooth/darkfrostwall, +/turf/closed/mineral/smooth/darkfrostwall/indestructible, /area/ice_colony/exterior/underground/caves/rock) "xKA" = ( /obj/machinery/atmospherics/pipe/simple/green/hidden{ @@ -33806,7 +33806,7 @@ /area/ice_colony/underground/medical/lobby/garbledradio) "yeX" = ( /obj/effect/landmark/lv624/fog_blocker/xeno_spawn, -/turf/closed/mineral/smooth/darkfrostwall, +/turf/closed/mineral/smooth/darkfrostwall/indestructible, /area/ice_colony/exterior/underground/caves/rock) "yfG" = ( /obj/structure/bed/chair/wood/normal{ diff --git a/_maps/map_files/Pillar_of_Spring/TGS_Pillar_of_Spring.dmm b/_maps/map_files/Pillar_of_Spring/TGS_Pillar_of_Spring.dmm index c0e744e63afd1..2a5ad5a420382 100644 --- a/_maps/map_files/Pillar_of_Spring/TGS_Pillar_of_Spring.dmm +++ b/_maps/map_files/Pillar_of_Spring/TGS_Pillar_of_Spring.dmm @@ -9,13 +9,13 @@ /turf/open/floor/mainship, /area/mainship/squads/general) "abX" = ( -/obj/effect/ai_node, -/turf/open/floor/mainship/floor, +/obj/machinery/camera/autoname/mainship{ + dir = 1 + }, +/turf/open/floor/mainship/white{ + dir = 6 + }, /area/mainship/living/pilotbunks) -"abZ" = ( -/obj/structure/cable, -/turf/closed/wall/mainship/outer, -/area/mainship/hull/lower_hull) "acn" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 @@ -32,10 +32,9 @@ /turf/open/floor/mainship/mono, /area/mainship/hallways/hangar) "acv" = ( -/obj/structure/bed/chair/wood/wings, -/obj/effect/landmark/start/job/chiefshipengineer, -/turf/open/floor/wood, -/area/mainship/living/grunt_rnr) +/obj/structure/bed/chair/comfy/black, +/turf/open/floor/mainship/red/full, +/area/mainship/living/briefing) "acR" = ( /obj/machinery/power/monitor/grid, /obj/structure/cable, @@ -44,6 +43,19 @@ }, /turf/open/floor/mainship/mono, /area/mainship/engineering/upper_engineering) +"adg" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/item/stack/conveyor/thirty, +/obj/structure/rack, +/obj/item/conveyor_switch_construct, +/obj/item/tool/crowbar, +/obj/item/paper/factoryhowto, +/obj/item/tool/wrench, +/obj/item/tool/screwdriver, +/turf/open/floor/mainship/green{ + dir = 8 + }, +/area/mainship/squads/req) "adk" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/mainship, @@ -62,20 +74,6 @@ }, /turf/open/floor/mainship/stripesquare, /area/mainship/hallways/stern_hallway) -"aeO" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment/corner{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 9 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/layer1{ - dir = 8; - on = 1 - }, -/turf/open/floor/mainship/sterile/plain, -/area/mainship/living/tankerbunks) "afG" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ @@ -83,19 +81,22 @@ }, /turf/open/floor/wood, /area/mainship/living/commandbunks) -"aha" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/camera/autoname/mainship{ +"agP" = ( +/obj/machinery/door_control/mainship/ammo{ dir = 8 }, -/obj/machinery/door_control/unmeltable{ - dir = 8; - id = "s_umbilical"; - name = "Air Lock Door Control"; - pixel_x = 22 +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 1 }, +/turf/open/floor/mainship/cargo/arrow, +/area/mainship/hallways/hangar) +"aha" = ( +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 4 + }, +/obj/effect/ai_node, /turf/open/floor/mainship/mono, -/area/mainship/hallways/port_umbilical) +/area/mainship/hallways/hangar) "ahe" = ( /obj/structure/closet/crate, /turf/open/floor/mainship/mono, @@ -151,6 +152,14 @@ }, /turf/open/floor/wood, /area/mainship/command/corporateliaison) +"amE" = ( +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 9 + }, +/obj/structure/cable, +/obj/effect/ai_node, +/turf/open/floor/mainship/mono, +/area/mainship/hull/lower_hull) "amG" = ( /turf/open/floor/mainship/cargo/arrow, /area/mainship/hull/lower_hull) @@ -168,11 +177,6 @@ /obj/effect/ai_node, /turf/open/floor/plating/plating_catwalk, /area/mainship/hallways/stern_hallway) -"anH" = ( -/obj/structure/bed, -/obj/item/bedsheet/captain, -/turf/open/floor/mainship/mono, -/area/mainship/living/bridgebunks) "anW" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -181,6 +185,12 @@ }, /turf/open/floor/plating/plating_catwalk, /area/mainship/hull/lower_hull) +"aoJ" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar) "aoQ" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -195,26 +205,11 @@ /turf/open/floor/mainship/mono, /area/mainship/command/self_destruct) "apO" = ( -/obj/machinery/power/apc{ - dir = 8 - }, -/obj/structure/cable, +/obj/effect/spawner/random/misc/structure/flavorvending/coffeeweighted, /turf/open/floor/mainship/green{ dir = 4 }, /area/mainship/squads/req) -"apW" = ( -/obj/machinery/door/airlock/mainship/maint, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/machinery/door/firedoor/mainship, -/turf/open/floor/plating/mainship, -/area/mainship/shipboard/weapon_room) "aql" = ( /obj/machinery/floodlight/landing, /obj/effect/turf_decal/warning_stripes/thick{ @@ -222,10 +217,20 @@ }, /turf/open/floor/plating, /area/mainship/hallways/hangar) +"aqn" = ( +/obj/structure/prop/mainship/ship_memorial, +/turf/open/floor/grass, +/area/mainship/living/starboard_garden) "aqp" = ( -/obj/machinery/light/mainship, -/turf/open/floor/mainship/floor, -/area/crew_quarters/toilet) +/obj/effect/turf_decal/warning_stripes/thick/corner{ + dir = 1 + }, +/obj/effect/ai_node, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/turf/open/floor/mainship/yellow_cargo/arrow{ + dir = 1 + }, +/area/mainship/hallways/hangar/droppod) "aqx" = ( /obj/machinery/floodlight/landing, /obj/effect/turf_decal/warning_stripes/thick{ @@ -241,6 +246,7 @@ /obj/effect/turf_decal/warning_stripes/thin{ dir = 8 }, +/obj/structure/reagent_dispensers/fueltank, /turf/open/floor/mainship/mono, /area/mainship/hallways/hangar) "atc" = ( @@ -268,51 +274,21 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 10 }, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 6 }, -/turf/open/floor/mainship/cargo/arrow{ - dir = 1 - }, -/area/mainship/hallways/hangar/droppod) -"atK" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/open/floor/mainship/mono, -/area/mainship/living/bridgebunks) +/turf/open/floor/mainship/floor, +/area/mainship/living/mechpilotquarters) "atN" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 8 }, /turf/open/floor/wood, /area/mainship/living/cryo_cells) -"atU" = ( -/obj/structure/cable, -/turf/open/floor/mainship/cargo/arrow{ - dir = 8 - }, -/area/mainship/engineering/engine_core) "avi" = ( /obj/machinery/telecomms/server/presets/bravo, /turf/open/floor/mainship/tcomms, /area/mainship/command/telecomms) -"avq" = ( -/obj/machinery/camera/autoname/mainship{ - dir = 4 - }, -/obj/structure/cable, -/obj/machinery/power/apc{ - dir = 4 - }, -/turf/open/floor/mainship/mono, -/area/mainship/living/briefing) "avK" = ( /obj/structure/table/mainship, /obj/item/ashtray/bronze, @@ -335,10 +311,16 @@ /turf/open/floor/mainship/mono, /area/mainship/hull/lower_hull) "axK" = ( -/obj/machinery/camera/autoname/mainship{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/effect/turf_decal/warning_stripes/thick{ dir = 8 }, -/turf/open/floor/mainship/mono, +/turf/open/floor/plating/plating_catwalk, /area/mainship/hallways/hangar) "ayg" = ( /obj/structure/bed/stool{ @@ -347,19 +329,8 @@ /obj/machinery/camera/autoname{ dir = 8 }, -/obj/structure/cable, /turf/open/floor/grass, /area/mainship/living/starboard_garden) -"aym" = ( -/obj/machinery/door_control/mainship/mech, -/turf/open/floor/mainship/black{ - dir = 1 - }, -/area/mainship/living/pilotbunks) -"ayR" = ( -/obj/structure/table/woodentable, -/turf/open/floor/wood, -/area/mainship/living/chapel) "azw" = ( /obj/structure/rack, /obj/item/reagent_containers/glass/bucket/janibucket, @@ -369,20 +340,27 @@ /obj/item/storage/bag/trash, /turf/open/floor/plating/plating_catwalk, /area/mainship/hull/lower_hull) +"azH" = ( +/obj/structure/sink{ + dir = 4 + }, +/turf/open/floor/mainship/floor, +/area/mainship/shipboard/brig) "aAu" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, /turf/open/floor/mainship/sterile, /area/mainship/medical/lower_medical) "aBm" = ( -/obj/machinery/vending/nanomed{ - dir = 4 +/obj/effect/turf_decal/warning_stripes/thick/corner{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/mainship/black{ - dir = 8 +/obj/effect/turf_decal/warning_stripes/thick/corner, +/obj/effect/ai_node, +/turf/open/floor/mainship/yellow_cargo/arrow{ + dir = 1 }, -/area/mainship/living/tankerbunks) +/area/mainship/hallways/hangar/droppod) "aBY" = ( /obj/structure/flora/pottedplant/ten, /obj/machinery/light/mainship{ @@ -394,13 +372,17 @@ /obj/effect/soundplayer, /turf/closed/wall/mainship, /area/mainship/command/cic) +"aCn" = ( +/obj/effect/ai_node, +/obj/machinery/holopad, +/turf/open/floor/mainship/mono, +/area/mainship/living/chapel) "aCB" = ( /obj/machinery/holopad, /turf/open/floor/carpet, /area/mainship/living/commandbunks) "aCM" = ( -/obj/structure/table/mainship/nometal, -/obj/item/storage/box/bodybags, +/obj/effect/spawner/random/misc/structure/flavorvending/snackweighted, /turf/open/floor/mainship/mono, /area/mainship/hallways/hangar) "aDc" = ( @@ -414,15 +396,9 @@ dir = 1 }, /area/mainship/squads/general) -"aDC" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/turf/closed/wall/mainship, -/area/mainship/living/tankerbunks) "aDG" = ( -/turf/open/floor/mainship/terragov/north{ - dir = 6 - }, +/obj/structure/bed/chair/comfy/black, +/turf/open/floor/mainship/orange/full, /area/mainship/living/briefing) "aDZ" = ( /obj/structure/table/mainship/nometal, @@ -430,11 +406,9 @@ /turf/open/floor/mainship/mono, /area/mainship/command/cic) "aEk" = ( -/obj/effect/ai_node, -/obj/machinery/light/mainship, -/obj/structure/cable, -/turf/open/floor/mainship/floor, -/area/crew_quarters/toilet) +/obj/machinery/door_control/mainship/droppod, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar/droppod) "aEu" = ( /obj/machinery/disposal, /obj/machinery/light/mainship{ @@ -455,23 +429,18 @@ /area/mainship/shipboard/firing_range) "aFn" = ( /obj/effect/turf_decal/warning_stripes/thin, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 4 - }, /obj/machinery/landinglight/cas{ - dir = 4; - pixel_x = -4 + pixel_y = 4 }, /turf/open/floor/mainship/mono, /area/mainship/hallways/hangar) "aFJ" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 1 - }, -/obj/machinery/light/mainship, +/obj/effect/turf_decal/warning_stripes/thin, /obj/machinery/landinglight/cas{ - dir = 1; - pixel_y = -4 + pixel_y = 4 + }, +/obj/effect/turf_decal/warning_stripes/thick{ + dir = 4 }, /turf/open/floor/mainship/mono, /area/mainship/hallways/hangar) @@ -492,32 +461,27 @@ /obj/machinery/firealarm, /turf/open/floor/wood, /area/mainship/living/commandbunks) -"aGR" = ( -/obj/structure/toilet{ - dir = 1 - }, -/obj/machinery/light/mainship/small, -/obj/effect/landmark/corpsespawner/marine/regular, -/obj/item/weapon/gun/pistol/standard_heavypistol/suppressed, -/obj/effect/decal/cleanable/blood, -/turf/open/floor/mainship/floor, -/area/crew_quarters/toilet) "aHp" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 5 - }, -/obj/structure/stairs/edge{ - dir = 1 - }, -/turf/open/floor/tile/dark, -/area/mainship/command/cic) +/turf/open/floor/mainship/yellow_cargo, +/area/mainship/hallways/hangar) "aHG" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/layer1{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 }, -/turf/open/floor/mainship/floor, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/mainship/mono, /area/mainship/hallways/aft_hallway) +"aHH" = ( +/obj/machinery/camera/autoname/mainship{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar) "aIy" = ( /obj/structure/bed/chair/office/dark{ dir = 8 @@ -546,23 +510,27 @@ }, /turf/open/floor/mainship/tcomms, /area/mainship/command/telecomms) -"aKj" = ( -/obj/machinery/door/poddoor/railing{ - dir = 1; - id = "supply_elevator_railing" - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +"aJH" = ( +/obj/effect/turf_decal/warning_stripes/thick{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 4 +/obj/machinery/atmospherics/components/unary/vent_pump/layer1{ + on = 1 }, -/turf/open/floor/mainship/cargo/arrow, -/area/mainship/squads/req) +/turf/open/floor/mainship/floor, +/area/mainship/hallways/hangar/droppod) +"aKj" = ( +/obj/effect/turf_decal/warning_stripes/thin, +/obj/machinery/landinglight/cas{ + pixel_y = 4 + }, +/turf/open/floor/mainship/yellow_cargo/arrow{ + dir = 1 + }, +/area/mainship/hallways/hangar) "aKk" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/turf/open/floor/prison/kitchen, +/turf/open/floor/iron/kitchen, /area/mainship/living/grunt_rnr) "aKr" = ( /obj/machinery/computer/squad_manager, @@ -573,12 +541,22 @@ /obj/item/reagent_containers/food/drinks/golden_cup, /turf/open/floor/wood, /area/mainship/living/commandbunks) +"aKX" = ( +/obj/effect/turf_decal/warning_stripes/thin, +/obj/machinery/landinglight/cas{ + pixel_y = 4 + }, +/obj/effect/turf_decal/warning_stripes/thick{ + dir = 8 + }, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar) "aLA" = ( /obj/machinery/atmospherics/components/unary/vent_pump/layer1, /obj/structure/sign/poster{ dir = 1 }, -/turf/open/floor/mainship/cargo, +/turf/open/floor/mainship/yellow_cargo, /area/mainship/squads/general) "aLV" = ( /obj/machinery/light/mainship{ @@ -591,19 +569,6 @@ dir = 4 }, /area/mainship/squads/general) -"aMa" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 6 - }, -/obj/item/clothing/head/warning_cone, -/turf/open/floor/mainship/mono, -/area/mainship/hallways/hangar) -"aMk" = ( -/obj/machinery/light/mainship{ - dir = 4 - }, -/turf/open/floor/mainship/floor, -/area/crew_quarters/toilet) "aME" = ( /obj/structure/disposalpipe/segment/corner{ dir = 8 @@ -613,26 +578,11 @@ }, /obj/structure/cable, /obj/effect/ai_node, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 9 - }, /turf/open/floor/mainship/mono, /area/mainship/hull/lower_hull) -"aNd" = ( -/obj/machinery/gear{ - id = "supply_elevator_gear" - }, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 10 - }, -/turf/open/floor/mainship/mono, -/area/mainship/squads/req) "aNM" = ( -/turf/open/floor/plating/mainship, -/area/mainship/living/evacuation) +/turf/open/space/basic, +/area/mainship/shipboard/weapon_room) "aNP" = ( /obj/structure/cable, /turf/open/floor/mainship/black/full, @@ -657,14 +607,14 @@ /obj/effect/soundplayer, /turf/closed/wall/mainship, /area/mainship/command/airoom) -"aPr" = ( -/obj/machinery/photocopier, -/turf/open/floor/mainship/mono, -/area/mainship/engineering/upper_engineering) "aPJ" = ( /obj/structure/bed/chair/wood/wings, /turf/open/floor/wood, /area/mainship/living/numbertwobunks) +"aPM" = ( +/obj/structure/ship_ammo/cas/rocket/keeper, +/turf/open/floor/mainship/cargo, +/area/mainship/hallways/hangar) "aQj" = ( /obj/effect/turf_decal/warning_stripes/thin{ dir = 1 @@ -678,17 +628,17 @@ /turf/open/floor/mainship/mono, /area/mainship/hallways/stern_hallway) "aQr" = ( -/obj/structure/cable, /obj/structure/disposalpipe/segment/corner{ dir = 4 }, -/obj/effect/ai_node, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 6 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 6 }, +/obj/structure/cable, +/obj/effect/ai_node, /turf/open/floor/plating/plating_catwalk, /area/mainship/hallways/port_hallway) "aQv" = ( @@ -715,8 +665,6 @@ /area/mainship/hallways/starboard_hallway) "aQX" = ( /obj/structure/prop/mainship/hangar_stencil, -/obj/structure/table/mainship/nometal, -/obj/item/storage/box/bodybags, /turf/open/floor/mainship/mono, /area/mainship/hallways/hangar) "aRK" = ( @@ -727,7 +675,6 @@ /obj/structure/bed/chair/sofa/left{ dir = 8 }, -/obj/structure/sign/double/barsign, /turf/open/floor/wood, /area/mainship/living/grunt_rnr) "aSw" = ( @@ -751,6 +698,23 @@ "aSJ" = ( /turf/closed/wall/mainship, /area/mainship/living/cryo_cells) +"aSV" = ( +/obj/machinery/light/mainship{ + dir = 4 + }, +/obj/structure/closet/firecloset, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/mainship/cargo, +/area/mainship/hallways/hangar) +"aTa" = ( +/obj/effect/turf_decal/warning_stripes/thin, +/obj/effect/ai_node, +/obj/machinery/landinglight/cas{ + pixel_y = 4 + }, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar) "aTk" = ( /obj/structure/table/fancywoodentable, /obj/item/tool/pen, @@ -767,10 +731,6 @@ /obj/machinery/grill/unwrenched, /turf/open/floor/mainship/mono, /area/mainship/hull/lower_hull) -"aTO" = ( -/obj/effect/soundplayer, -/turf/closed/wall/mainship, -/area/mainship/living/tankerbunks) "aUp" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 10 @@ -780,12 +740,13 @@ dir = 8 }, /area/mainship/squads/general) -"aVV" = ( -/obj/machinery/light/mainship{ +"aVn" = ( +/obj/structure/orbital_cannon, +/obj/machinery/light/mainship/small{ dir = 8 }, -/turf/open/floor/wood, -/area/mainship/living/chapel) +/turf/open/floor/mainship/hexagon, +/area/mainship/shipboard/weapon_room) "aWk" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -799,18 +760,14 @@ }, /turf/open/floor/plating/plating_catwalk, /area/mainship/hallways/hangar) -"aWL" = ( -/obj/effect/spawner/random/misc/structure/flavorvending/coffeeweighted, -/turf/open/floor/mainship/mono, -/area/mainship/hallways/hangar) "aXc" = ( -/obj/structure/table/woodentable, -/obj/item/clipboard{ - pixel_x = 5 +/obj/structure/toilet{ + dir = 1 }, -/obj/item/paper, -/obj/item/tool/pen, -/turf/open/floor/mainship/mono, +/obj/machinery/light/mainship/small{ + dir = 8 + }, +/turf/open/floor/mainship/sterile/white, /area/mainship/living/bridgebunks) "aYc" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -821,13 +778,23 @@ }, /obj/machinery/power/apc/mainship, /obj/structure/cable, -/turf/open/floor/mainship/mono, +/turf/open/floor/mainship/hexagon, /area/mainship/engineering/engine_core) "aYd" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /turf/open/floor/mainship/mono, /area/mainship/squads/req) +"aYW" = ( +/obj/machinery/power/apc/mainship{ + dir = 1 + }, +/obj/structure/cable, +/obj/effect/turf_decal/warning_stripes/thick{ + dir = 8 + }, +/turf/open/floor/mainship/mono, +/area/mainship/shipboard/weapon_room) "aYX" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -851,12 +818,25 @@ /area/mainship/hull/lower_hull) "aZD" = ( /obj/effect/ai_node, -/turf/open/floor/mainship/cargo, +/turf/open/floor/mainship/yellow_cargo, /area/mainship/hallways/hangar) +"aZI" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/layer1{ + dir = 1; + on = 1 + }, +/turf/open/floor/mainship/mono, +/area/mainship/living/bridgebunks) "aZM" = ( -/obj/vehicle/ridden/powerloader, -/turf/open/floor/mainship/cargo, -/area/mainship/shipboard/weapon_room) +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar) "bap" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment/corner{ @@ -884,24 +864,21 @@ }, /turf/open/floor/plating, /area/mainship/command/telecomms) +"bbw" = ( +/obj/machinery/vending/engivend, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar/droppod) "bby" = ( /obj/effect/ai_node, +/obj/structure/prop/mainship/name_stencil/G, /turf/open/floor/mainship/black{ dir = 5 }, /area/mainship/squads/general) "bch" = ( -/obj/structure/sink{ - dir = 4 - }, -/obj/structure/mirror{ - dir = 8 - }, -/obj/machinery/light/mainship{ - dir = 1 - }, -/turf/open/floor/mainship/floor, -/area/crew_quarters/toilet) +/obj/structure/bed/chair/comfy/black, +/turf/open/floor/mainship/silver/full, +/area/mainship/living/briefing) "bck" = ( /obj/effect/ai_node, /turf/open/floor/mainship/mono, @@ -919,12 +896,6 @@ "bdF" = ( /turf/open/floor/wood, /area/mainship/living/commandbunks) -"bdS" = ( -/obj/vehicle/ridden/motorbike, -/turf/open/floor/mainship/orange{ - dir = 4 - }, -/area/mainship/hallways/hangar) "bdT" = ( /obj/structure/prop/mainship/sensor_computer2/sd, /turf/open/floor/mainship/tcomms, @@ -944,7 +915,7 @@ /turf/open/floor/engine, /area/mainship/engineering/port_atmos) "bfc" = ( -/obj/effect/turf_decal/warning_stripes/thin{ +/obj/effect/turf_decal/warning_stripes/thick{ dir = 8 }, /turf/open/floor/mainship/stripesquare, @@ -991,13 +962,11 @@ /turf/open/floor/mainship/mono, /area/mainship/command/cic) "bjo" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, /turf/open/floor/plating/plating_catwalk, /area/mainship/command/cic) "bjy" = ( @@ -1013,27 +982,14 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating/plating_catwalk, /area/mainship/hallways/aft_hallway) -"bkF" = ( -/obj/structure/rack, -/obj/machinery/light/mainship/small, -/obj/structure/ob_ammo/ob_fuel, -/obj/structure/ob_ammo/ob_fuel, -/obj/structure/ob_ammo/ob_fuel, -/obj/structure/ob_ammo/ob_fuel, -/obj/structure/ob_ammo/ob_fuel, -/turf/open/floor/mainship/red{ - dir = 6 - }, -/area/mainship/shipboard/weapon_room) -"bll" = ( -/obj/effect/turf_decal/warning_stripes/thin{ +"bjJ" = ( +/obj/structure/toilet{ dir = 8 }, -/obj/effect/ai_node, -/obj/machinery/landinglight/tadpole{ - dir = 8; - pixel_x = 4 - }, +/turf/open/floor/mainship/floor, +/area/mainship/shipboard/brig) +"bld" = ( +/obj/structure/reagent_dispensers/fueltank, /turf/open/floor/mainship/mono, /area/mainship/hallways/hangar) "blX" = ( @@ -1050,24 +1006,14 @@ }, /turf/open/floor/plating/platebotc, /area/mainship/medical/upper_medical) -"bmp" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 1 - }, -/turf/open/floor/wood, -/area/mainship/living/chapel) "bmt" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/obj/machinery/light/mainship{ - dir = 4 - }, /turf/open/floor/mainship/ntlogo/nt3, /area/mainship/command/corporateliaison) "bni" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/prison/kitchen, +/turf/open/floor/iron/kitchen, /area/mainship/living/grunt_rnr) "bnq" = ( /obj/machinery/disposal, @@ -1116,6 +1062,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/mainship/black, /area/mainship/squads/general) +"brL" = ( +/turf/closed/wall/mainship/outer, +/area/space) "brN" = ( /obj/effect/turf_decal/warning_stripes/thin{ dir = 1 @@ -1126,6 +1075,15 @@ }, /turf/open/floor/mainship/mono, /area/mainship/hallways/hangar) +"brT" = ( +/obj/structure/disposalpipe/segment/corner{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar) "bsg" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -1134,6 +1092,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/ai_node, /turf/open/floor/mainship/mono, /area/mainship/engineering/upper_engineering) "bsG" = ( @@ -1142,22 +1101,12 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, -/turf/open/floor/prison/kitchen, +/turf/open/floor/iron/kitchen, /area/mainship/living/grunt_rnr) "bth" = ( -/obj/structure/bed/chair/office/dark{ - dir = 1 - }, +/obj/structure/bed/chair/office/dark, /turf/open/floor/mainship/mono, /area/mainship/command/cic) -"btQ" = ( -/obj/effect/turf_decal/warning_stripes/thin, -/obj/structure/rack, -/obj/item/stack/sheet/mineral/phoron{ - amount = 25 - }, -/turf/open/floor/mainship/sterile/plain, -/area/mainship/living/tankerbunks) "btW" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -1172,17 +1121,9 @@ }, /turf/open/floor/plating/plating_catwalk, /area/mainship/living/grunt_rnr) -"buo" = ( -/obj/structure/table/mainship/nometal, -/obj/item/clothing/head/chefhat, -/obj/item/clothing/under/rank/chef, -/obj/item/clothing/suit/storage/chef/classic, -/turf/open/floor/mainship/mono, -/area/mainship/living/grunt_rnr) "buM" = ( -/turf/open/floor/mainship/green/corner{ - dir = 8 - }, +/obj/structure/window/framed/mainship/requisitions, +/turf/open/floor/plating, /area/mainship/squads/req) "buS" = ( /turf/open/floor/mainship/ntlogo, @@ -1210,10 +1151,26 @@ /turf/open/floor/plating, /area/mainship/command/cic) "bxX" = ( -/obj/machinery/firealarm, -/obj/structure/reagent_dispensers/fueltank, -/turf/open/floor/mainship/mono, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/vending/nanomed, +/obj/effect/turf_decal/warning_stripes/thick{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, /area/mainship/hallways/hangar) +"byk" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/ai_node, +/turf/open/floor/plating/plating_catwalk, +/area/mainship/hull/lower_hull) "byY" = ( /obj/structure/bed/chair/nometal, /obj/effect/landmark/start/job/shiptech, @@ -1247,26 +1204,19 @@ /obj/machinery/firealarm{ dir = 1 }, -/turf/open/floor/mainship/cargo/arrow{ +/turf/open/floor/mainship/yellow_cargo/arrow{ dir = 8 }, /area/mainship/squads/general) "bAT" = ( -/obj/machinery/camera/autoname/mainship{ - dir = 4 - }, -/turf/open/floor/mainship/mono, +/obj/structure/bed/chair/comfy/black, +/turf/open/floor/mainship/purple/full, /area/mainship/living/briefing) "bBk" = ( /obj/structure/barricade/metal{ dir = 4 }, -/turf/open/floor/mainship/cargo, -/area/mainship/squads/req) -"bBq" = ( -/turf/open/floor/plating/icefloor/warnplate{ - dir = 1 - }, +/turf/open/floor/mainship/yellow_cargo, /area/mainship/squads/req) "bBG" = ( /obj/effect/turf_decal/warning_stripes/thin{ @@ -1312,6 +1262,10 @@ dir = 8 }, /area/mainship/squads/general) +"bDi" = ( +/obj/structure/ship_ammo/cas/rocket/banshee, +/turf/open/floor/mainship/cargo, +/area/mainship/hallways/hangar) "bDn" = ( /obj/machinery/telecomms/bus/preset_three, /turf/open/floor/mainship/tcomms, @@ -1327,6 +1281,12 @@ }, /turf/open/floor/mainship/mono, /area/mainship/hallways/hangar) +"bEi" = ( +/obj/structure/bed/chair/nometal{ + dir = 1 + }, +/turf/open/floor/mainship/orange/full, +/area/mainship/living/briefing) "bFc" = ( /obj/machinery/vending/marineFood, /obj/item/reagent_containers/food/snacks/protein_pack, @@ -1360,11 +1320,28 @@ }, /turf/open/floor/mainship/mono, /area/mainship/engineering/upper_engineering) +"bFG" = ( +/obj/effect/turf_decal/warning_stripes/thick{ + dir = 4 + }, +/obj/machinery/light/mainship{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/mainship/floor, +/area/mainship/hallways/hangar/droppod) "bFX" = ( -/obj/machinery/camera/autoname/mainship{ +/obj/machinery/door/firedoor/multi_tile{ + dir = 1 + }, +/obj/machinery/door/poddoor/shutters/mainship/open/hangar{ dir = 8 }, -/obj/effect/turf_decal/warning_stripes/thin{ +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/airlock/multi_tile/mainship/maint{ dir = 1 }, /turf/open/floor/mainship/mono, @@ -1387,23 +1364,19 @@ /turf/open/floor/plating/plating_catwalk, /area/mainship/hull/lower_hull) "bKn" = ( +/obj/structure/bed/chair/office/dark{ + dir = 4 + }, /turf/open/floor/mainship/red{ dir = 8 }, /area/mainship/command/cic) -"bKq" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 4 - }, -/obj/machinery/landinglight/tadpole{ - dir = 4; - pixel_x = -4 - }, -/turf/open/floor/mainship/mono, -/area/mainship/hallways/hangar) "bKB" = ( /obj/structure/cable, /obj/effect/ai_node, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 8 + }, /turf/open/floor/plating/plating_catwalk, /area/mainship/hallways/hangar) "bLz" = ( @@ -1476,13 +1449,6 @@ }, /turf/open/floor/mainship/mono, /area/mainship/hull/lower_hull) -"bNu" = ( -/obj/machinery/door/airlock/mainship/generic/mech_pilot/bunk, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/open/floor/mainship/mono, -/area/mainship/living/tankerbunks) "bOz" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -1494,7 +1460,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/mainship/cargo, +/turf/open/floor/mainship/yellow_cargo, /area/mainship/hallways/hangar) "bOF" = ( /obj/structure/disposalpipe/segment{ @@ -1519,8 +1485,6 @@ /obj/machinery/camera/autoname/mainship{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating/plating_catwalk, /area/mainship/hull/lower_hull) "bPP" = ( @@ -1541,12 +1505,15 @@ /turf/open/floor/mainship/mono, /area/mainship/hull/lower_hull) "bRC" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/warning_stripes/thin{ - dir = 9 + dir = 4 }, -/turf/open/floor/plating/plating_catwalk, +/obj/effect/ai_node, +/obj/machinery/landinglight/cas{ + dir = 4; + pixel_x = -4 + }, +/turf/open/floor/mainship/mono, /area/mainship/hallways/hangar) "bSp" = ( /obj/structure/cable, @@ -1554,12 +1521,8 @@ /area/mainship/squads/general) "bSC" = ( /obj/machinery/holopad, -/turf/open/floor/prison/kitchen, +/turf/open/floor/iron/kitchen, /area/mainship/living/grunt_rnr) -"bSK" = ( -/obj/structure/prop/mainship/sensor_computer2, -/turf/open/floor/mainship/mono, -/area/mainship/shipboard/weapon_room) "bSS" = ( /obj/structure/bed/chair/office/dark{ dir = 8 @@ -1568,18 +1531,6 @@ dir = 4 }, /area/mainship/command/cic) -"bTd" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 9 - }, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 10 - }, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 6 - }, -/turf/open/floor/mainship/mono, -/area/mainship/shipboard/weapon_room) "bTe" = ( /obj/effect/turf_decal/warning_stripes/engineer, /obj/effect/turf_decal/warning_stripes/box/small{ @@ -1598,35 +1549,28 @@ /turf/open/floor/wood, /area/mainship/living/commandbunks) "bTS" = ( -/obj/structure/droppod, -/obj/structure/drop_pod_launcher, -/turf/open/floor/mainship/cargo, -/area/mainship/hallways/hangar/droppod) -"bUN" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 10 - }, -/turf/open/floor/mainship/black{ - dir = 9 - }, -/area/mainship/living/tankerbunks) +/obj/structure/mirror, +/turf/open/floor/wood, +/area/mainship/living/mechpilotquarters) "bUW" = ( /obj/structure/flora/ausbushes/ppflowers, /obj/structure/bed/stool{ pixel_y = 8 }, -/obj/structure/cable, /turf/open/floor/grass, /area/mainship/living/starboard_garden) "bVx" = ( -/obj/structure/droppod, -/obj/structure/drop_pod_launcher, -/obj/machinery/camera/autoname/mainship, -/turf/open/floor/mainship/cargo, -/area/mainship/hallways/hangar/droppod) -"bVU" = ( -/obj/structure/closet/cabinet, +/obj/machinery/door/airlock/mainship/generic/mech_pilot/bunk, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, /turf/open/floor/mainship/mono, +/area/mainship/living/mechpilotquarters) +"bVU" = ( +/obj/machinery/door/airlock/mainship/generic/bathroom/toilet{ + dir = 2 + }, +/turf/open/floor/mainship/sterile/white, /area/mainship/living/bridgebunks) "bVZ" = ( /obj/effect/turf_decal/warning_stripes/thin, @@ -1656,15 +1600,11 @@ /turf/open/floor/wood, /area/mainship/command/corporateliaison) "bWA" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 10 +/obj/effect/turf_decal/warning_stripes/thick{ + dir = 4 }, -/turf/open/floor/mainship/floor, -/area/mainship/living/pilotbunks) +/turf/open/floor/mainship/hexagon, +/area/mainship/living/tankerbunks) "bXH" = ( /obj/effect/turf_decal/warning_stripes/thin{ dir = 4 @@ -1687,15 +1627,24 @@ /obj/machinery/light/mainship{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 4 - }, /obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 1 + }, /turf/open/floor/mainship/mono, /area/mainship/living/bridgebunks) +"bYx" = ( +/obj/machinery/light/mainship/small{ + dir = 1 + }, +/turf/open/floor/mainship/hexagon, +/area/mainship/shipboard/weapon_room) +"bYC" = ( +/turf/open/floor/plating/dmg1, +/area/mainship/hallways/hangar) "bYG" = ( /obj/machinery/firealarm{ dir = 8 @@ -1791,27 +1740,42 @@ /obj/structure/cable, /turf/open/floor/wood, /area/mainship/living/commandbunks) -"chT" = ( -/turf/closed/wall/mainship/outer, +"chD" = ( +/obj/item/toy/plush/carp, +/turf/open/space/basic, +/area/mainship/shipboard/weapon_room) +"chO" = ( +/obj/machinery/mech_bay_recharge_port, +/obj/machinery/light/mainship/small, +/turf/open/floor/mainship/tcomms, /area/mainship/shipboard/weapon_room) "cim" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 8 +/obj/machinery/holopad, +/turf/open/floor/mainship/green{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ - dir = 8 +/area/mainship/squads/req) +"ciN" = ( +/turf/open/floor/grass, +/area/mainship/living/starboard_garden) +"ciZ" = ( +/obj/structure/prop/mainship/name_stencil, +/turf/open/floor/mainship/black{ + dir = 4 }, -/obj/effect/ai_node, -/obj/structure/disposalpipe/junction/flipped, -/turf/open/floor/mainship/mono, -/area/mainship/hallways/aft_hallway) +/area/mainship/squads/general) "cjl" = ( /obj/machinery/marine_selector/gear/smartgun, /turf/open/floor/mainship/floor, /area/mainship/squads/general) +"cjC" = ( +/turf/open/floor/mainship/yellow_cargo, +/area/mainship/squads/req) "cjU" = ( -/turf/open/floor/mainship/cargo/arrow, +/obj/effect/attach_point/weapon/dropship2{ + dir = 8 + }, +/turf/open/floor/plating, /area/mainship/hallways/hangar) "ckd" = ( /obj/machinery/door/airlock/mainship/medical{ @@ -1901,12 +1865,6 @@ /obj/machinery/computer/telecomms/server/preset, /turf/open/floor/mainship/mono, /area/mainship/command/telecomms) -"cra" = ( -/obj/structure/disposalpipe/segment/corner, -/obj/effect/ai_node, -/obj/structure/cable, -/turf/open/floor/plating/plating_catwalk, -/area/mainship/hull/lower_hull) "csh" = ( /obj/machinery/light/mainship{ dir = 8 @@ -1921,23 +1879,12 @@ }, /turf/open/floor/plating, /area/mainship/hallways/hangar) -"cth" = ( -/obj/structure/cable, -/obj/effect/ai_node, -/turf/open/floor/mainship/mono, -/area/mainship/squads/req) "ctR" = ( /obj/structure/dropship_equipment/shuttle/sentry_holder, /turf/open/floor/mainship/orange{ dir = 4 }, /area/mainship/hallways/hangar) -"cui" = ( -/obj/machinery/shower{ - dir = 8 - }, -/turf/open/floor/mainship/sterile/dark, -/area/crew_quarters/toilet) "cuG" = ( /obj/structure/window/framed/mainship/hull, /turf/open/floor/mainship_hull, @@ -1983,6 +1930,12 @@ }, /turf/open/floor/plating, /area/mainship/hallways/hangar) +"cyn" = ( +/obj/machinery/light/mainship/small{ + dir = 1 + }, +/turf/open/floor/mainship/floor, +/area/mainship/shipboard/brig) "cyM" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 @@ -2027,23 +1980,13 @@ /obj/item/tool/pen, /turf/open/floor/wood, /area/mainship/command/corporateliaison) -"cAi" = ( -/obj/machinery/light/mainship{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/layer1{ - dir = 1; - on = 1 - }, -/turf/open/floor/mainship/mono, -/area/mainship/living/bridgebunks) "cAK" = ( /obj/structure/table/mainship/nometal, /obj/item/fuel_cell/full, /obj/machinery/camera/autoname/mainship{ dir = 8 }, -/turf/open/floor/mainship/mono, +/turf/open/floor/mainship/hexagon, /area/mainship/engineering/engine_core) "cBW" = ( /obj/structure/table/mainship/nometal, @@ -2054,7 +1997,7 @@ /area/mainship/command/cic) "cCg" = ( /obj/item/trash/cigbutt, -/turf/open/floor/mainship/cargo, +/turf/open/floor/mainship/yellow_cargo, /area/mainship/squads/general) "cCy" = ( /turf/closed/wall/mainship/outer, @@ -2067,12 +2010,12 @@ /turf/open/floor/mainship/mono, /area/mainship/hull/lower_hull) "cCZ" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 8 +/obj/structure/disposalpipe/segment, +/obj/item/reagent_containers/jerrycan, +/turf/open/floor/mainship/cargo/arrow{ + dir = 4 }, -/obj/structure/closet/emcloset, -/turf/open/floor/mainship/cargo, -/area/mainship/hallways/hangar) +/area/mainship/squads/req) "cDN" = ( /obj/machinery/light/mainship/small{ dir = 8 @@ -2098,37 +2041,28 @@ }, /area/mainship/engineering/engineering_workshop) "cEJ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 4 - }, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 5 - }, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 9 +/obj/machinery/atmospherics/components/unary/vent_pump/layer1{ + dir = 4; + on = 1 }, -/obj/effect/ai_node, -/turf/open/floor/mainship/mono, -/area/mainship/hallways/hangar/droppod) +/turf/open/floor/mainship/floor, +/area/mainship/living/mechpilotquarters) "cEZ" = ( -/obj/effect/turf_decal/warning_stripes/thin{ +/obj/effect/attach_point/weapon/dropship2{ dir = 4 }, -/obj/effect/ai_node, -/obj/machinery/landinglight/cas{ - dir = 4; - pixel_x = -4 - }, -/turf/open/floor/mainship/mono, +/turf/open/floor/plating, /area/mainship/hallways/hangar) "cFk" = ( /obj/machinery/telecomms/server/presets/medical, /turf/open/floor/mainship/tcomms, /area/mainship/command/telecomms) "cGu" = ( -/obj/structure/bed, -/obj/item/bedsheet/captain, -/obj/effect/landmark/start/job/staffofficer, +/obj/machinery/holopad, +/turf/open/floor/mainship/mono, +/area/mainship/squads/req) +"cGy" = ( +/obj/structure/closet/secure_closet/staff_officer, /turf/open/floor/mainship/mono, /area/mainship/living/bridgebunks) "cHc" = ( @@ -2148,11 +2082,15 @@ /turf/open/floor/plating/plating_catwalk, /area/mainship/hull/lower_hull) "cLc" = ( -/obj/structure/closet/crate/ammo, /obj/structure/cable, -/obj/structure/disposalpipe/segment, -/turf/open/floor/mainship/cargo, -/area/mainship/squads/req) +/obj/effect/ai_node, +/obj/machinery/power/apc{ + dir = 8 + }, +/turf/open/floor/mainship/white{ + dir = 4 + }, +/area/mainship/living/pilotbunks) "cLu" = ( /obj/effect/turf_decal/warning_stripes/thin, /obj/effect/turf_decal/warning_stripes/thin{ @@ -2182,10 +2120,6 @@ /obj/structure/cable, /turf/open/floor/plating/plating_catwalk, /area/mainship/hallways/port_hallway) -"cNz" = ( -/obj/effect/ai_node, -/turf/open/floor/wood, -/area/mainship/living/pilotbunks) "cNR" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 10 @@ -2193,12 +2127,6 @@ /obj/machinery/meter, /turf/open/floor/mainship/mono, /area/mainship/engineering/port_atmos) -"cOP" = ( -/obj/machinery/door_control/mainship/mech{ - dir = 1 - }, -/turf/open/floor/mainship/black, -/area/mainship/living/tankerbunks) "cPg" = ( /turf/open/floor/mainship, /area/mainship/squads/general) @@ -2252,21 +2180,6 @@ /obj/structure/disposalpipe/segment/corner, /turf/open/floor/mainship/mono, /area/mainship/hallways/stern_hallway) -"cRF" = ( -/obj/structure/cable, -/obj/machinery/door/firedoor/mainship, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/machinery/door/poddoor/mainship/mech, -/turf/open/floor/mainship/stripesquare, -/area/mainship/living/pilotbunks) "cRJ" = ( /obj/structure/bed/bunkbed, /obj/effect/landmark/start/job/squadengineer, @@ -2290,14 +2203,10 @@ /turf/open/floor/plating/plating_catwalk, /area/mainship/hallways/port_hallway) "cSp" = ( -/obj/structure/rack, -/obj/item/tool/wrench, -/obj/item/tool/crowbar, -/obj/item/tool/screwdriver, -/obj/item/paper/factoryhowto, /obj/machinery/light/mainship{ dir = 8 }, +/obj/machinery/vending/engivend, /turf/open/floor/mainship/green{ dir = 8 }, @@ -2330,6 +2239,15 @@ dir = 9 }, /area/space) +"cTx" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar/droppod) "cTF" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 1 @@ -2341,19 +2259,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/mainship/engineering/upper_engineering) -"cUW" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/open/floor/mainship/sterile/plain, -/area/mainship/living/pilotbunks) "cVd" = ( /obj/structure/table/woodentable, /turf/open/floor/wood, @@ -2374,19 +2279,22 @@ /obj/machinery/door/firedoor/multi_tile, /turf/open/floor/mainship/sterile, /area/mainship/medical/lower_medical) -"cWJ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 5 - }, -/turf/open/floor/mainship/floor, -/area/mainship/hallways/hangar) "cXa" = ( /obj/machinery/telecomms/processor/preset_four, /turf/open/floor/mainship/tcomms, /area/mainship/command/telecomms) +"cXd" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 6 + }, +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 1 + }, +/turf/open/floor/mainship/cargo/arrow, +/area/mainship/hallways/hangar) "cYi" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 1 @@ -2429,8 +2337,8 @@ /turf/open/floor/mainship/cargo, /area/mainship/engineering/port_atmos) "cZV" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/turf/open/floor/mainship/mono, +/obj/machinery/holopad, +/turf/open/floor/mainship/sterile/white, /area/mainship/living/bridgebunks) "daf" = ( /obj/machinery/door/airlock/mainship/maint{ @@ -2439,6 +2347,14 @@ /obj/structure/cable, /turf/open/floor/mainship/mono, /area/mainship/hull/lower_hull) +"dbm" = ( +/obj/effect/ai_node, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/mainship/hull/lower_hull) "dbu" = ( /obj/machinery/door/airlock/mainship/maint/core, /obj/machinery/door/firedoor/mainship, @@ -2461,12 +2377,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating/plating_catwalk, /area/mainship/hull/lower_hull) -"dct" = ( -/obj/machinery/vending/uniform_supply, -/turf/open/floor/mainship/black{ - dir = 5 - }, -/area/mainship/living/tankerbunks) "dcz" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -2528,16 +2438,16 @@ }, /area/mainship/squads/general) "dfT" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ +/obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 +/obj/effect/spawner/random/misc/structure/showcase, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 1 }, -/obj/structure/cable, -/obj/structure/bed/chair/wood/wings, -/turf/open/floor/tile/chapel{ - dir = 4 +/turf/open/floor/mainship/silver{ + dir = 9 }, /area/mainship/living/chapel) "dfW" = ( @@ -2557,9 +2467,12 @@ }, /area/space) "dgm" = ( -/turf/open/floor/mainship/green, -/area/mainship/squads/req) +/obj/structure/cable, +/obj/structure/disposalpipe/segment/corner, +/turf/open/floor/plating/plating_catwalk, +/area/mainship/hull/lower_hull) "dgy" = ( +/obj/effect/decal/cleanable/blood/gibs/xeno, /turf/open/floor/mainship/research/containment/floor2{ dir = 6 }, @@ -2569,6 +2482,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 8 }, +/obj/effect/ai_node, /turf/open/floor/mainship/cargo, /area/mainship/hallways/hangar) "dhv" = ( @@ -2580,11 +2494,20 @@ }, /area/mainship/medical/upper_medical) "dhK" = ( -/obj/structure/table/mainship/nometal, -/obj/item/folder/yellow, -/obj/item/tool/pen, -/turf/open/floor/mainship/floor, +/obj/structure/bed/chair/comfy/black, +/turf/open/floor/mainship/blue/full, /area/mainship/living/briefing) +"dii" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 8 + }, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar) "dit" = ( /obj/machinery/telecomms/server/presets/engineering, /turf/open/floor/mainship/tcomms, @@ -2598,6 +2521,12 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating/plating_catwalk, /area/mainship/hallways/hangar) +"diW" = ( +/obj/docking_port/stationary/escape_pod/right{ + dir = 2 + }, +/turf/open/floor/plating, +/area/mainship/living/chapel) "dkD" = ( /obj/machinery/door/airlock/mainship/medical/glass/chemistry{ dir = 1 @@ -2611,6 +2540,13 @@ }, /turf/open/floor/mainship/sterile/dark, /area/mainship/medical/chemistry) +"dkW" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/layer1{ + dir = 4; + on = 1 + }, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar) "dkX" = ( /obj/structure/bed/chair/wood/normal{ dir = 4 @@ -2654,6 +2590,16 @@ }, /turf/open/space/basic, /area/space) +"dmm" = ( +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 10 + }, +/obj/machinery/door/poddoor/railing{ + dir = 8; + id = "supply_elevator_railing" + }, +/turf/open/floor/mainship/floor, +/area/mainship/squads/req) "dmx" = ( /obj/machinery/light/mainship/small{ dir = 4 @@ -2661,12 +2607,6 @@ /obj/structure/cable, /turf/open/floor/mainship/floor, /area/crew_quarters/toilet) -"dmB" = ( -/obj/machinery/door/poddoor/mainship/droppod{ - dir = 2 - }, -/turf/open/floor/mainship/stripesquare, -/area/mainship/hallways/hangar/droppod) "dmE" = ( /obj/structure/reagent_dispensers/water_cooler, /obj/item/storage/box/cups{ @@ -2679,6 +2619,19 @@ }, /turf/open/floor/mainship/mono, /area/mainship/command/corporateliaison) +"dmU" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/mainship/mono, +/area/mainship/squads/req) "dnf" = ( /obj/machinery/door/airlock/multi_tile/mainship/maint{ dir = 1 @@ -2717,9 +2670,9 @@ }, /area/mainship/command/cic) "dpN" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/layer1{ - on = 1 - }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/mainship/mono, /area/mainship/command/cic) "dpY" = ( @@ -2727,11 +2680,9 @@ /area/mainship/hallways/hangar) "drx" = ( /obj/machinery/light/mainship, -/obj/structure/table/mainship/nometal, -/obj/item/newspaper, -/obj/effect/spawner/random/misc/plushie/nospawnninetynine, -/turf/open/floor/mainship/white, -/area/mainship/living/pilotbunks) +/obj/effect/ai_node, +/turf/open/floor/mainship/hexagon, +/area/mainship/living/tankerbunks) "drW" = ( /obj/docking_port/stationary/ert/target{ id = "port_target"; @@ -2752,21 +2703,6 @@ dir = 1 }, /area/mainship/engineering/engineering_workshop) -"dts" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 9 - }, -/turf/open/floor/mainship/sterile/plain, -/area/mainship/living/tankerbunks) -"dtB" = ( -/obj/machinery/light/mainship{ - dir = 1 - }, -/turf/open/floor/mainship/cargo, -/area/mainship/hallways/hangar) "dtC" = ( /obj/machinery/door/airlock/mainship/maint{ dir = 2 @@ -2784,7 +2720,7 @@ /obj/structure/sign/poster{ dir = 1 }, -/turf/open/floor/mainship/cargo, +/turf/open/floor/mainship/yellow_cargo, /area/mainship/squads/general) "duo" = ( /obj/structure/disposalpipe/segment/corner{ @@ -2807,13 +2743,11 @@ /turf/open/floor/mainship/mono, /area/mainship/hull/lower_hull) "duy" = ( -/obj/machinery/holopad, /obj/effect/turf_decal/warning_stripes/thin{ - dir = 1 + dir = 6 }, -/obj/machinery/landinglight/cas{ - dir = 1; - pixel_y = -4 +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 1 }, /turf/open/floor/mainship/mono, /area/mainship/hallways/hangar) @@ -2840,34 +2774,12 @@ /turf/closed/wall/mainship, /area/mainship/living/cryo_cells) "dvZ" = ( -/obj/structure/cable, -/obj/machinery/door/airlock/mainship/medical/glass/free_access{ - dir = 1; - name = "\improper Medical Storage Airlock" - }, -/obj/machinery/door/firedoor/mainship{ - dir = 2 - }, -/turf/open/floor/mainship/sterile/dark, -/area/mainship/medical/upper_medical) -"dwo" = ( -/obj/item/radio/intercom/general, -/obj/structure/ship_ammo/cas/rocket/widowmaker, -/turf/open/floor/mainship/cargo, -/area/mainship/hallways/hangar) -"dwG" = ( -/obj/structure/rack, -/obj/structure/ob_ammo/ob_fuel, -/obj/structure/ob_ammo/ob_fuel, -/obj/structure/ob_ammo/ob_fuel, -/obj/structure/ob_ammo/ob_fuel, -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/mainship/red{ - dir = 6 - }, -/area/mainship/shipboard/weapon_room) +/obj/item/attachable/bayonetknife, +/obj/structure/table/mainship/nometal, +/obj/item/book/manual/marine_law, +/obj/effect/spawner/random/misc/gnome, +/turf/open/floor/mainship/floor, +/area/mainship/shipboard/brig) "dxc" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 @@ -2877,35 +2789,31 @@ }, /turf/open/floor/wood, /area/mainship/living/numbertwobunks) +"dxg" = ( +/obj/machinery/light/mainship{ + dir = 8 + }, +/turf/open/floor/mainship/silver{ + dir = 10 + }, +/area/mainship/living/chapel) "dxA" = ( /obj/machinery/light/mainship{ dir = 4 }, /turf/open/floor/mainship/red, /area/mainship/command/airoom) -"dyd" = ( -/obj/structure/bed/chair/ob_chair, -/obj/machinery/computer/orbital_cannon_console, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 1 +"dzr" = ( +/obj/machinery/air_alarm{ + dir = 8 }, -/obj/effect/spawner/random/misc/gnome, /turf/open/floor/mainship/mono, -/area/mainship/shipboard/weapon_room) +/area/mainship/hallways/aft_hallway) "dzT" = ( /obj/structure/window/framed/mainship/requisitions, /obj/machinery/door/firedoor/mainship, /turf/open/floor/plating, /area/mainship/command/telecomms) -"dAn" = ( -/obj/structure/rack, -/obj/structure/ob_ammo/ob_fuel, -/obj/structure/ob_ammo/ob_fuel, -/obj/structure/ob_ammo/ob_fuel, -/obj/structure/ob_ammo/ob_fuel, -/obj/structure/ob_ammo/ob_fuel, -/turf/open/floor/mainship/red, -/area/mainship/shipboard/weapon_room) "dBi" = ( /obj/machinery/camera/autoname/mainship, /turf/open/floor/mainship, @@ -2950,10 +2858,15 @@ /turf/open/floor/mainship/mono, /area/mainship/hallways/hangar) "dFt" = ( -/turf/open/floor/mainship/green/corner{ - dir = 8 +/obj/machinery/light/mainship{ + dir = 4 }, -/area/mainship/hallways/aft_hallway) +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar) "dGh" = ( /obj/machinery/self_destruct/rod, /turf/open/floor/mainship/tcomms, @@ -2963,20 +2876,17 @@ /turf/open/floor/mainship/mono, /area/mainship/engineering/upper_engineering) "dGR" = ( -/turf/open/floor/mainship/terragov/north{ - dir = 8 - }, -/area/mainship/living/briefing) -"dHn" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 4 - }, -/obj/machinery/firealarm{ +/obj/machinery/camera/autoname/mainship{ dir = 4 }, -/obj/structure/sign/poster, /turf/open/floor/mainship/mono, -/area/mainship/shipboard/weapon_room) +/area/mainship/living/briefing) +"dHI" = ( +/obj/structure/table/gamblingtable, +/obj/item/toy/deck, +/obj/item/spacecash/c20, +/turf/open/floor/mainship/mono, +/area/mainship/hull/lower_hull) "dHW" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -3031,7 +2941,7 @@ /area/mainship/medical/medical_science) "dJU" = ( /obj/machinery/camera/autoname/mainship, -/turf/open/floor/mainship/cargo/arrow{ +/turf/open/floor/mainship/yellow_cargo/arrow{ dir = 8 }, /area/mainship/squads/general) @@ -3064,20 +2974,15 @@ /obj/machinery/door/poddoor/shutters/mainship/req/ro, /turf/open/floor/plating, /area/mainship/squads/req) -"dLM" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/mainship/hallways/hangar) +"dMg" = ( +/obj/structure/closet/cabinet, +/turf/open/floor/mainship/mono, +/area/mainship/living/bridgebunks) "dMk" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 }, -/turf/open/floor/plating/plating_catwalk, +/turf/open/floor/mainship/hexagon, /area/mainship/engineering/engine_core) "dMO" = ( /obj/structure/cable, @@ -3108,13 +3013,6 @@ /obj/effect/decal/cleanable/blood/gibs, /turf/open/floor/mainship/mono, /area/mainship/command/corporateliaison) -"dNM" = ( -/obj/structure/ship_ammo/cas/bomb/fourhundred, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 8 - }, -/turf/open/floor/mainship/floor, -/area/mainship/hallways/hangar) "dNQ" = ( /obj/structure/sink, /obj/structure/mirror, @@ -3129,23 +3027,6 @@ }, /turf/open/floor/wood, /area/mainship/living/commandbunks) -"dOU" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/obj/structure/rack, -/obj/structure/ob_ammo/ob_fuel, -/obj/structure/ob_ammo/ob_fuel, -/obj/structure/ob_ammo/ob_fuel, -/obj/structure/ob_ammo/ob_fuel, -/obj/machinery/camera/autoname/mainship{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/mainship/red{ - dir = 5 - }, -/area/mainship/shipboard/weapon_room) "dQG" = ( /turf/closed/wall/mainship/white, /area/mainship/medical/operating_room_one) @@ -3187,6 +3068,33 @@ /obj/machinery/door/poddoor/shutters/opened/medbay, /turf/open/floor/plating/platebotc, /area/mainship/medical/lower_medical) +"dTj" = ( +/obj/machinery/computer/arcade, +/turf/open/floor/mainship/white{ + dir = 4 + }, +/area/mainship/living/pilotbunks) +"dTH" = ( +/obj/effect/turf_decal/warning_stripes/thin, +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 4 + }, +/obj/machinery/landinglight/cas{ + dir = 4; + pixel_x = -4 + }, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar) +"dTK" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/mainship/mono, +/area/mainship/living/pilotbunks) "dUf" = ( /obj/machinery/camera/autoname/mainship{ dir = 4 @@ -3200,34 +3108,8 @@ /obj/machinery/door/airlock/multi_tile/mainship/marine/requisitions{ dir = 1 }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /turf/open/floor/mainship/mono, /area/mainship/squads/req) -"dUz" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 8 - }, -/obj/machinery/landinglight/tadpole{ - dir = 8; - pixel_x = 4 - }, -/turf/open/floor/mainship/mono, -/area/mainship/hallways/hangar) -"dUH" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 8 - }, -/turf/open/floor/mainship/mono, -/area/mainship/shipboard/weapon_room) "dVo" = ( /obj/machinery/door/firedoor/multi_tile{ dir = 8 @@ -3239,21 +3121,12 @@ dir = 8 }, /area/mainship/shipboard/firing_range) -"dVP" = ( -/obj/effect/turf_decal/warning_stripes/thin, -/obj/machinery/landinglight/tadpole{ - pixel_y = 4 - }, -/turf/open/floor/mainship/mono, -/area/mainship/hallways/hangar) "dWf" = ( -/obj/machinery/door/poddoor/mainship/ammo{ - dir = 2; - id = null; - name = "\improper Hangar Launch Hatch" - }, -/turf/closed/wall/mainship/outer, -/area/mainship/hull/lower_hull) +/obj/structure/table/mainship/nometal, +/obj/item/folder/red, +/obj/item/tool/pen, +/turf/open/floor/mainship/mono, +/area/mainship/living/briefing) "dWD" = ( /obj/structure/closet/secure_closet/guncabinet/m41aMK1, /turf/open/floor/mainship/red/full, @@ -3286,6 +3159,13 @@ /obj/structure/window/framed/mainship, /turf/open/floor/plating, /area/mainship/living/numbertwobunks) +"ean" = ( +/obj/machinery/door/airlock/mainship/evacuation{ + dir = 8 + }, +/obj/structure/sign/evac, +/turf/open/floor/mainship/mono, +/area/mainship/living/chapel) "eaH" = ( /obj/structure/bed/chair/comfy/black{ dir = 1 @@ -3304,17 +3184,21 @@ /obj/machinery/light/mainship{ dir = 8 }, -/turf/open/floor/mainship/mono, +/turf/open/floor/iron/kitchen, /area/mainship/living/grunt_rnr) "ebE" = ( /obj/machinery/telecomms/broadcaster/preset_left, /turf/open/floor/mainship/tcomms, /area/mainship/command/telecomms) "ecb" = ( -/obj/item/clothing/head/warning_cone, /obj/effect/turf_decal/warning_stripes/thin{ - dir = 1 + dir = 8 }, +/obj/machinery/landinglight/cas{ + dir = 8; + pixel_x = 4 + }, +/obj/effect/turf_decal/warning_stripes/thin, /turf/open/floor/mainship/mono, /area/mainship/hallways/hangar) "edj" = ( @@ -3347,11 +3231,11 @@ /obj/structure/cable, /obj/structure/disposalpipe/segment, /obj/effect/ai_node, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 5 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 5 }, /turf/open/floor/plating/plating_catwalk, /area/mainship/hull/lower_hull) @@ -3390,12 +3274,6 @@ /obj/structure/cable, /turf/open/floor/cult, /area/medical/morgue) -"efa" = ( -/obj/machinery/computer/mech_builder{ - dir = 8 - }, -/turf/open/floor/plating, -/area/mainship/living/tankerbunks) "efy" = ( /turf/open/floor/carpet/side{ dir = 4 @@ -3407,12 +3285,11 @@ }, /area/mainship/living/commandbunks) "egn" = ( -/obj/machinery/power/apc{ - dir = 8 - }, -/obj/structure/cable, -/turf/open/floor/mainship/mono, -/area/mainship/hallways/aft_hallway) +/obj/structure/table/mainship/nometal, +/obj/item/folder/yellow, +/obj/item/tool/pen, +/turf/open/floor/mainship/floor, +/area/mainship/living/briefing) "egI" = ( /obj/machinery/door/firedoor/mainship{ dir = 2; @@ -3424,22 +3301,23 @@ /turf/open/floor/mainship/mono, /area/mainship/hallways/hangar) "egW" = ( -/obj/machinery/door/airlock/multi_tile/mainship/maint{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 4 - }, -/obj/machinery/door/firedoor/multi_tile{ - dir = 1 - }, -/turf/open/floor/plating/mainship, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/turf/open/floor/mainship/mono, /area/mainship/living/bridgebunks) "ehf" = ( /obj/docking_port/stationary/marine_dropship/hangar/one, /obj/docking_port/stationary/marine_dropship/crash_target, /turf/open/floor/plating, /area/mainship/hallways/hangar) +"eho" = ( +/obj/effect/ai_node, +/obj/machinery/light/mainship{ + dir = 4 + }, +/turf/open/floor/mainship/white{ + dir = 4 + }, +/area/mainship/living/pilotbunks) "ehw" = ( /obj/effect/turf_decal/warning_stripes/box/small{ dir = 1 @@ -3451,18 +3329,6 @@ dir = 4 }, /area/mainship/squads/general) -"ehR" = ( -/obj/machinery/vending/nanomed, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 4 - }, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 8 - }, -/turf/open/floor/mainship/cargo/arrow{ - dir = 8 - }, -/area/mainship/hallways/hangar/droppod) "eiu" = ( /obj/machinery/door/airlock/mainship/maint/free_access, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -3545,7 +3411,7 @@ /area/mainship/engineering/port_atmos) "elQ" = ( /obj/structure/sign/poster, -/turf/open/floor/mainship/cargo, +/turf/open/floor/mainship/yellow_cargo, /area/mainship/squads/general) "emg" = ( /turf/closed/wall/mainship/research/containment/wall/purple{ @@ -3557,9 +3423,9 @@ /turf/open/floor/wood, /area/mainship/living/numbertwobunks) "emm" = ( -/obj/structure/bed/chair/wood/wings, -/turf/open/floor/tile/chapel{ - dir = 4 +/obj/effect/spawner/random/misc/plant, +/turf/open/floor/mainship/silver{ + dir = 8 }, /area/mainship/living/chapel) "emY" = ( @@ -3586,12 +3452,10 @@ /turf/open/floor/wood, /area/mainship/living/commandbunks) "esH" = ( -/obj/machinery/camera/autoname/mainship{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/mainship/mono, -/area/mainship/hallways/hangar) +/obj/structure/table/mainship/nometal, +/obj/item/megaphone, +/turf/open/floor/mainship/floor, +/area/mainship/living/briefing) "esN" = ( /turf/closed/wall/mainship/outer, /area/mainship/hull/lower_hull) @@ -3639,19 +3503,15 @@ /turf/open/floor/mainship/mono, /area/mainship/hallways/stern_hallway) "exv" = ( -/obj/structure/cable, -/obj/machinery/door/firedoor/mainship{ - dir = 2; - id = "hangar_lockdown" - }, -/obj/machinery/door/poddoor/shutters/mainship/open/hangar{ +/obj/machinery/door/poddoor/mainship/mech{ dir = 1 }, -/obj/structure/stairs/seamless/platform_vert{ - dir = 1 +/obj/machinery/door/firedoor/mainship{ + dir = 2 }, -/turf/open/floor/mainship/mono, -/area/mainship/hallways/hangar/droppod) +/obj/structure/cable, +/turf/open/floor/mainship/stripesquare, +/area/mainship/living/mechpilotquarters) "exV" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ @@ -3663,6 +3523,16 @@ /obj/effect/ai_node, /turf/open/floor/mainship/mono, /area/mainship/squads/req) +"eye" = ( +/obj/effect/ai_node, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 8 + }, +/obj/effect/turf_decal/warning_stripes/thick/corner, +/turf/open/floor/mainship/mono, +/area/mainship/shipboard/weapon_room) "eyX" = ( /obj/structure/window/framed/mainship/hull, /turf/open/floor/plating, @@ -3692,10 +3562,7 @@ /turf/open/floor/plating/plating_catwalk, /area/mainship/hallways/port_hallway) "ezY" = ( -/obj/structure/bed/stool{ - pixel_y = 8 - }, -/obj/structure/flora/ausbushes/ywflowers, +/obj/structure/flora/tree/dead, /turf/open/floor/grass, /area/mainship/living/starboard_garden) "eAd" = ( @@ -3765,6 +3632,13 @@ /obj/machinery/door/poddoor/shutters/mainship/cell/cell1, /turf/open/floor/mainship/sterile/dark, /area/mainship/medical/medical_science) +"eFh" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar) "eFi" = ( /obj/machinery/light/mainship, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -3774,12 +3648,12 @@ dir = 4 }, /obj/structure/cable, +/mob/living/simple_animal/mouse, /turf/open/floor/mainship/orange, /area/mainship/engineering/lower_engineering) "eFA" = ( -/turf/open/floor/mainship/green/corner{ - dir = 4 - }, +/obj/item/clothing/head/warning_cone, +/turf/open/floor/mainship/mono, /area/mainship/squads/req) "eFC" = ( /turf/open/floor/carpet/side{ @@ -3834,30 +3708,41 @@ /obj/machinery/camera/autoname/mainship, /turf/open/floor/mainship/tcomms, /area/mainship/command/telecomms) +"eKC" = ( +/obj/machinery/light/mainship{ + dir = 4 + }, +/obj/item/clothing/head/warning_cone, +/turf/open/floor/mainship/yellow_cargo, +/area/mainship/hallways/hangar/droppod) "eLq" = ( /obj/machinery/door/poddoor/mainship/open/cic, /obj/machinery/door/firedoor/mainship, /turf/open/floor/mainship/mono, /area/mainship/command/cic) +"eLs" = ( +/obj/item/clothing/head/modular/marine, +/obj/structure/flora/ausbushes/brflowers, +/turf/open/floor/grass, +/area/mainship/living/starboard_garden) "eLt" = ( /obj/item/stool, /obj/effect/decal/cleanable/blood, /obj/effect/landmark/corpsespawner/prisoner/regular, /turf/open/floor/mainship/mono, /area/mainship/hull/lower_hull) -"eLS" = ( -/obj/machinery/light/mainship{ - dir = 1 +"eLM" = ( +/obj/machinery/loadout_vendor, +/turf/open/floor/mainship/white{ + dir = 9 }, -/obj/structure/ship_ammo/cas/rocket/widowmaker, -/turf/open/floor/mainship/cargo, -/area/mainship/hallways/hangar) +/area/mainship/living/pilotbunks) "eMx" = ( /obj/machinery/light/mainship, /turf/open/floor/mainship/mono, /area/mainship/hallways/port_hallway) "eMz" = ( -/turf/open/floor/mainship/cargo, +/turf/open/floor/mainship/yellow_cargo, /area/mainship/squads/general) "eMJ" = ( /obj/item/facepaint/green, @@ -3883,13 +3768,30 @@ /obj/effect/ai_node, /turf/open/floor/wood, /area/mainship/command/corporateliaison) +"eOG" = ( +/obj/structure/table/mainship/nometal, +/obj/machinery/cell_charger, +/obj/effect/spawner/random/engineering/powercell, +/obj/effect/spawner/random/engineering/powercell, +/obj/machinery/light/mainship{ + dir = 8 + }, +/turf/open/floor/mainship/green{ + dir = 10 + }, +/area/mainship/squads/req) "eOT" = ( /obj/effect/turf_decal/warning_stripes/thin, /turf/open/shuttle/escapepod/eight, /area/mainship/command/self_destruct) "ePE" = ( -/obj/machinery/vending/nanomed, -/turf/open/floor/mainship/mono, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, /area/mainship/hallways/hangar) "eQg" = ( /obj/effect/turf_decal/warning_stripes/medical, @@ -3907,6 +3809,13 @@ dir = 10 }, /area/mainship/medical/lower_medical) +"eSw" = ( +/obj/machinery/door/airlock/mainship/generic{ + dir = 1; + name = "Bathroom" + }, +/turf/open/floor/mainship/mono, +/area/crew_quarters/toilet) "eSy" = ( /obj/machinery/door/airlock/mainship/maint{ dir = 1 @@ -3919,11 +3828,11 @@ /turf/open/floor/mainship/mono, /area/mainship/medical/medical_science) "eTC" = ( -/obj/structure/closet/secure_closet/engineering_personal, -/obj/item/storage/backpack/marine/engineerpack, -/obj/item/reagent_containers/food/drinks/bottle/vodka, +/obj/machinery/light/mainship{ + dir = 8 + }, /turf/open/floor/mainship/mono, -/area/mainship/hallways/hangar) +/area/mainship/living/briefing) "eTN" = ( /turf/open/floor/mainship/red/full, /area/mainship/shipboard/firing_range) @@ -3973,6 +3882,15 @@ /obj/item/trash/cigbutt, /turf/open/floor/wood, /area/mainship/living/cryo_cells) +"eXm" = ( +/obj/machinery/door/poddoor/railing{ + dir = 8; + id = "supply_elevator_railing" + }, +/turf/open/floor/mainship/cargo/arrow{ + dir = 4 + }, +/area/mainship/squads/req) "eYx" = ( /turf/open/floor/mainship/black{ dir = 1 @@ -3998,9 +3916,9 @@ /turf/open/floor/mainship/mono, /area/mainship/command/cic) "eZp" = ( -/obj/machinery/holopad, +/obj/machinery/door/airlock/mainship/generic, /turf/open/floor/mainship/floor, -/area/mainship/living/pilotbunks) +/area/mainship/living/tankerbunks) "faw" = ( /obj/structure/bed/chair/nometal{ dir = 1 @@ -4020,6 +3938,16 @@ /obj/item/binoculars, /turf/open/floor/wood, /area/mainship/living/numbertwobunks) +"faF" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/mainship/mono, +/area/mainship/squads/req) "faM" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -4033,6 +3961,8 @@ /turf/open/floor/mainship/mono, /area/mainship/hull/lower_hull) "fbL" = ( +/obj/structure/table/mainship/nometal, +/obj/machinery/door_control/old/req, /turf/open/floor/mainship/green{ dir = 6 }, @@ -4049,7 +3979,7 @@ on = 1 }, /obj/machinery/vending/nanomed, -/turf/open/floor/mainship/mono, +/turf/open/floor/mainship/hexagon, /area/mainship/engineering/engine_core) "fbT" = ( /obj/effect/attach_point/weapon/dropship1, @@ -4130,18 +4060,19 @@ /obj/structure/cable, /turf/open/floor/mainship/mono, /area/mainship/hull/lower_hull) -"fgF" = ( -/obj/structure/cable, -/turf/open/floor/plating/plating_catwalk, -/area/mainship/engineering/engine_core) "fgI" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 1 - }, -/turf/open/floor/mainship/cargo/arrow{ - dir = 1 - }, -/area/mainship/hallways/hangar/droppod) +/obj/structure/rack, +/obj/item/tool/crowbar, +/obj/effect/spawner/random/engineering/toolbox, +/obj/item/stack/cable_coil, +/obj/item/assembly/timer, +/obj/item/assembly/infra, +/turf/open/floor/mainship/floor, +/area/mainship/living/mechpilotquarters) +"fgN" = ( +/obj/structure/sign/poster, +/turf/open/floor/wood, +/area/mainship/living/pilotbunks) "fgW" = ( /obj/structure/table/mainship/nometal, /obj/machinery/computer/security/marinemainship{ @@ -4153,13 +4084,24 @@ }, /area/mainship/command/cic) "fiq" = ( +/obj/structure/closet/secure_closet/pilot_officer, +/obj/effect/ai_node, +/turf/open/floor/wood, +/area/mainship/living/pilotbunks) +"fku" = ( +/obj/effect/ai_node, /obj/effect/turf_decal/warning_stripes/thin{ - dir = 8 + dir = 1 }, -/obj/effect/ai_node, -/obj/machinery/landinglight/cas{ - dir = 8; - pixel_x = 4 +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 }, /turf/open/floor/mainship/mono, /area/mainship/hallways/hangar) @@ -4171,7 +4113,7 @@ dir = 4 }, /obj/machinery/air_alarm, -/turf/open/floor/mainship/mono, +/turf/open/floor/mainship/hexagon, /area/mainship/engineering/engine_core) "flk" = ( /obj/machinery/door_control/ai/exterior{ @@ -4214,16 +4156,20 @@ }, /turf/open/floor/mainship/cargo, /area/mainship/shipboard/firing_range) +"fnS" = ( +/obj/structure/closet, +/obj/item/clothing/under/rank/prisoner, +/turf/open/floor/plating/mainship, +/area/mainship/shipboard/brig) "foj" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 1 }, /obj/structure/sign/poster, -/turf/open/floor/mainship/cargo, +/turf/open/floor/mainship/yellow_cargo, /area/mainship/squads/general) "fol" = ( /obj/effect/ai_node, -/obj/structure/disposalpipe/segment, /turf/open/floor/mainship/ntlogo/nt2, /area/mainship/command/corporateliaison) "fom" = ( @@ -4240,10 +4186,6 @@ }, /turf/open/floor/mainship/mono, /area/mainship/hallways/hangar) -"foz" = ( -/obj/structure/ship_ammo/cas/rocket/keeper, -/turf/open/floor/mainship/cargo, -/area/mainship/hallways/hangar) "foU" = ( /obj/structure/bed/roller, /obj/effect/turf_decal/warning_stripes/thin{ @@ -4269,6 +4211,10 @@ }, /turf/open/floor/mainship/mono, /area/mainship/command/corporateliaison) +"fpg" = ( +/obj/effect/ai_node, +/turf/open/floor/wood, +/area/mainship/living/tankerbunks) "fpB" = ( /obj/structure/sign/prop4, /turf/closed/wall/mainship, @@ -4294,12 +4240,6 @@ /obj/machinery/computer/emails, /turf/open/floor/mainship/mono, /area/mainship/engineering/ce_room) -"frc" = ( -/obj/structure/bed/chair/wood/wings, -/turf/open/floor/tile/chapel{ - dir = 8 - }, -/area/mainship/living/chapel) "frR" = ( /obj/structure/cable, /turf/closed/wall/mainship, @@ -4318,12 +4258,6 @@ /obj/machinery/smartfridge/chemistry, /turf/open/floor/plating/platebotc, /area/mainship/medical/chemistry) -"ftT" = ( -/obj/structure/bed/chair/wood/wings, -/turf/open/floor/tile/chapel{ - dir = 1 - }, -/area/mainship/living/chapel) "ftY" = ( /obj/structure/table/woodentable, /turf/open/floor/wood, @@ -4340,11 +4274,26 @@ /obj/effect/spawner/random/misc/table_lighting, /turf/open/floor/mainship/mono, /area/mainship/medical/upper_medical) +"fvA" = ( +/turf/open/floor/mainship/floor, +/area/mainship/shipboard/brig) "fvB" = ( /obj/structure/table/mainship/nometal, /obj/machinery/faxmachine/research, /turf/open/floor/mainship/sterile/dark, /area/mainship/medical/medical_science) +"fvD" = ( +/obj/structure/table/mainship/nometal, +/obj/item/folder/black, +/obj/item/book/manual/orbital_cannon_manual, +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 9 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/mainship/mono, +/area/mainship/shipboard/weapon_room) "fvY" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -4365,11 +4314,6 @@ }, /turf/open/floor/mainship/mono, /area/mainship/hallways/hangar) -"fwA" = ( -/obj/structure/table/woodentable, -/obj/effect/spawner/random/misc/table_lighting, -/turf/open/floor/wood, -/area/mainship/living/chapel) "fxO" = ( /obj/structure/cable, /obj/effect/ai_node, @@ -4380,13 +4324,14 @@ /turf/open/floor/plating/plating_catwalk, /area/mainship/hull/lower_hull) "fyc" = ( -/obj/machinery/air_alarm, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/air_alarm, /turf/open/floor/mainship/mono, /area/mainship/living/bridgebunks) "fyH" = ( @@ -4397,7 +4342,7 @@ /area/mainship/living/commandbunks) "fyR" = ( /obj/structure/cable, -/turf/open/floor/mainship/mono, +/turf/closed/wall/mainship, /area/mainship/living/starboard_garden) "fza" = ( /obj/structure/disposalpipe/segment, @@ -4443,19 +4388,11 @@ /turf/closed/wall/mainship, /area/crew_quarters/toilet) "fAP" = ( -/obj/effect/ai_node, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/structure/cable, -/obj/structure/bed/chair/wood/wings, -/turf/open/floor/tile/chapel{ - dir = 1 +/obj/machinery/vending/weapon, +/turf/open/floor/mainship/white{ + dir = 9 }, -/area/mainship/living/chapel) +/area/mainship/living/pilotbunks) "fBs" = ( /obj/machinery/air_alarm, /turf/open/floor/mainship/orange{ @@ -4493,6 +4430,15 @@ dir = 8 }, /area/mainship/command/cic) +"fDn" = ( +/obj/machinery/light/mainship{ + dir = 4 + }, +/obj/structure/bed/chair/sofa{ + dir = 8 + }, +/turf/open/floor/wood, +/area/mainship/living/grunt_rnr) "fDJ" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -4533,10 +4479,6 @@ /obj/machinery/vending/weapon, /turf/open/floor/mainship/floor, /area/mainship/squads/general) -"fFa" = ( -/obj/structure/cable, -/turf/open/floor/mainship/cargo, -/area/mainship/engineering/engine_core) "fFd" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/structure/stairs/edge{ @@ -4544,8 +4486,16 @@ }, /turf/open/floor/tile/dark, /area/mainship/command/cic) +"fFo" = ( +/obj/structure/flora/ausbushes/brflowers, +/obj/structure/bed/stool{ + pixel_y = 8 + }, +/turf/open/floor/grass, +/area/mainship/living/starboard_garden) "fFD" = ( /obj/machinery/holopad, +/obj/effect/landmark/start/job/researcher, /turf/open/floor/mainship/sterile/dark, /area/mainship/medical/medical_science) "fGe" = ( @@ -4559,16 +4509,25 @@ dir = 1 }, /obj/structure/cable, -/obj/structure/disposalpipe/segment/corner{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/mainship/sterile/dark, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door_control{ + dir = 1; + id = "or1privacyshutter"; + name = "Privacy Shutters"; + pixel_x = -5; + pixel_y = 10 + }, +/turf/open/floor/mainship/sterile/corner{ + dir = 4 + }, /area/mainship/medical/operating_room_one) "fGZ" = ( /obj/effect/turf_decal/warning_stripes/thin{ @@ -4590,14 +4549,22 @@ /turf/open/floor/plating/mainship, /area/mainship/command/cic) "fIb" = ( -/turf/open/floor/mainship/terragov/north{ +/obj/structure/table/mainship/nometal, +/obj/item/folder/grape, +/obj/item/tool/pen, +/obj/item/whistle, +/turf/open/floor/mainship/mono, +/area/mainship/living/briefing) +"fIt" = ( +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 8 + }, +/obj/effect/turf_decal/warning_stripes/thin{ dir = 4 }, -/area/mainship/living/briefing) -"fIm" = ( -/obj/structure/prop/mainship/cannon_cables, -/turf/open/floor/plating/mainship, -/area/mainship/shipboard/weapon_room) +/mob/living/simple_animal/mouse, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar) "fJI" = ( /obj/machinery/atmospherics/components/unary/vent_pump/layer1{ dir = 8; @@ -4611,11 +4578,25 @@ }, /area/mainship/squads/general) "fKh" = ( -/obj/machinery/door/poddoor/mainship/umbilical/south{ - dir = 8 +/obj/structure/window/framed/mainship/white, +/obj/machinery/door/poddoor/shutters/opened/medbay, +/obj/machinery/holosign_switch{ + id = "or1sign"; + pixel_x = 0; + pixel_y = 0 }, -/turf/open/floor/mainship/stripesquare, -/area/mainship/shipboard/weapon_room) +/obj/machinery/door/poddoor/shutters/mainship{ + dir = 1; + id = "or2privacyshutter"; + name = "\improper Privacy Shutters" + }, +/obj/machinery/door/poddoor/shutters/mainship{ + dir = 1; + id = "or1privacyshutter"; + name = "\improper Privacy Shutters" + }, +/turf/open/floor/plating/platebotc, +/area/mainship/medical/operating_room_one) "fKj" = ( /obj/structure/table/mainship/nometal, /obj/item/reagent_containers/food/condiment/peppermill, @@ -4715,28 +4696,30 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on, /turf/open/floor/mainship/sterile/dark, /area/mainship/medical/operating_room_one) +"fTZ" = ( +/obj/machinery/computer/squad_selector, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar/droppod) "fUs" = ( /obj/machinery/light/mainship{ dir = 1 }, /turf/open/floor/mainship/mono, /area/mainship/hallways/starboard_hallway) -"fUI" = ( -/obj/machinery/door/firedoor/mainship{ - dir = 2; - id = "hangar_lockdown" +"fXg" = ( +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 9 }, -/obj/machinery/door/poddoor/shutters/mainship/open/hangar{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 }, -/obj/structure/stairs/seamless/platform_vert, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/machinery/floodlight/landing, /turf/open/floor/mainship/mono, -/area/mainship/hallways/hangar/droppod) -"fVg" = ( -/obj/machinery/camera/autoname/mainship, -/obj/structure/ship_ammo/cas/heavygun, -/turf/open/floor/mainship/cargo, -/area/mainship/hallways/hangar) +/area/mainship/squads/req) "fXL" = ( /obj/machinery/door/poddoor/shutters/mainship/selfdestruct, /obj/machinery/keycard_auth, @@ -4752,6 +4735,16 @@ dir = 4 }, /area/mainship/medical/lower_medical) +"fYa" = ( +/obj/machinery/light/mainship{ + dir = 4 + }, +/obj/structure/closet/secure_closet/shiptech, +/obj/item/lightreplacer, +/obj/item/lightreplacer, +/obj/item/lightreplacer, +/turf/open/floor/mainship/yellow_cargo, +/area/mainship/squads/req) "fYk" = ( /obj/machinery/conveyor_switch{ id = "garbage" @@ -4771,21 +4764,24 @@ /turf/open/floor/mainship/cargo/arrow, /area/mainship/squads/general) "fYT" = ( -/obj/machinery/optable, -/obj/item/tank/anesthetic, +/obj/structure/disposalpipe/trunk, +/obj/machinery/disposal, /turf/open/floor/mainship/sterile/side{ dir = 4 }, /area/mainship/medical/operating_room_two) "fZH" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ +/obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 +/obj/effect/spawner/random/misc/structure/showcase, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/open/floor/mainship/silver{ + dir = 5 }, -/obj/structure/cable, -/turf/open/floor/wood, /area/mainship/living/chapel) "fZP" = ( /obj/machinery/power/apc/mainship, @@ -4797,6 +4793,38 @@ dir = 1 }, /area/mainship/medical/chemistry) +"fZX" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/layer1{ + dir = 8; + on = 1 + }, +/turf/open/floor/mainship/mono, +/area/mainship/shipboard/weapon_room) +"gaz" = ( +/obj/machinery/vending/marineFood, +/obj/item/reagent_containers/food/snacks/protein_pack, +/obj/item/reagent_containers/food/snacks/protein_pack, +/obj/item/reagent_containers/food/snacks/protein_pack, +/obj/item/reagent_containers/food/snacks/protein_pack, +/obj/item/reagent_containers/food/snacks/protein_pack, +/obj/item/reagent_containers/food/snacks/protein_pack, +/obj/item/reagent_containers/food/snacks/protein_pack, +/obj/item/reagent_containers/food/snacks/protein_pack, +/obj/item/reagent_containers/food/snacks/protein_pack, +/obj/item/reagent_containers/food/snacks/protein_pack, +/obj/item/reagent_containers/food/snacks/protein_pack, +/obj/item/reagent_containers/food/snacks/protein_pack, +/obj/item/reagent_containers/food/snacks/protein_pack, +/obj/item/reagent_containers/food/snacks/protein_pack, +/obj/item/reagent_containers/food/snacks/protein_pack, +/obj/item/reagent_containers/food/snacks/protein_pack, +/obj/item/reagent_containers/food/snacks/protein_pack, +/obj/item/reagent_containers/food/snacks/protein_pack, +/obj/item/reagent_containers/food/snacks/protein_pack, +/turf/open/floor/mainship/black{ + dir = 4 + }, +/area/mainship/squads/general) "gaC" = ( /obj/structure/table/mainship/nometal, /obj/effect/spawner/random/engineering/extinguisher/miniweighted, @@ -4837,6 +4865,19 @@ }, /turf/open/floor/mainship/mono, /area/mainship/squads/req) +"gbC" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 5 + }, +/turf/open/floor/mainship/mono, +/area/mainship/engineering/upper_engineering) "gbJ" = ( /turf/open/floor/carpet/side{ dir = 6 @@ -4847,20 +4888,35 @@ /area/mainship/living/starboard_garden) "gcd" = ( /obj/structure/cable, -/obj/machinery/disposal, -/obj/structure/disposalpipe/trunk, +/obj/machinery/optable, +/obj/item/tank/anesthetic, /turf/open/floor/mainship/sterile/side{ dir = 4 }, /area/mainship/medical/operating_room_one) "gcr" = ( -/obj/structure/disposalpipe/segment/corner{ - dir = 4 - }, /obj/structure/cable, -/obj/effect/ai_node, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /turf/open/floor/mainship/mono, /area/mainship/hallways/hangar) +"gdb" = ( +/obj/structure/rack, +/obj/structure/ob_ammo/ob_fuel, +/obj/structure/ob_ammo/ob_fuel, +/obj/structure/ob_ammo/ob_fuel, +/obj/structure/ob_ammo/ob_fuel, +/obj/structure/ob_ammo/ob_fuel, +/obj/structure/ob_ammo/ob_fuel, +/obj/structure/ob_ammo/ob_fuel, +/obj/structure/ob_ammo/ob_fuel, +/obj/structure/ob_ammo/ob_fuel, +/obj/structure/ob_ammo/ob_fuel, +/obj/structure/ob_ammo/ob_fuel, +/obj/structure/ob_ammo/ob_fuel, +/turf/open/floor/mainship/hexagon, +/area/mainship/shipboard/weapon_room) "gdj" = ( /obj/structure/table/mainship/nometal, /obj/item/clothing/glasses/welding, @@ -4893,15 +4949,6 @@ /obj/item/trash/popcorn, /turf/open/floor/wood, /area/mainship/living/cryo_cells) -"gfn" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 1 - }, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 8 - }, -/turf/open/floor/mainship/cargo/arrow, -/area/mainship/hallways/hangar) "ggf" = ( /obj/structure/cable, /obj/machinery/door/airlock/mainship/maint, @@ -4916,12 +4963,11 @@ /turf/open/floor/wood, /area/mainship/living/grunt_rnr) "ghW" = ( -/obj/machinery/light/mainship{ - dir = 4 +/obj/structure/bed/chair/nometal{ + dir = 1 }, -/obj/effect/spawner/random/misc/structure/flavorvending/snackweighted, -/turf/open/floor/mainship/mono, -/area/mainship/hallways/hangar) +/turf/open/floor/mainship/blue/full, +/area/mainship/living/briefing) "gim" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 @@ -4939,6 +4985,15 @@ /obj/effect/ai_node, /turf/open/floor/mainship/mono, /area/mainship/hallways/stern_hallway) +"giN" = ( +/obj/effect/turf_decal/warning_stripes/thick{ + dir = 4 + }, +/obj/machinery/light/mainship{ + light_color = "#da2f1b" + }, +/turf/open/floor/mainship/floor, +/area/mainship/hallways/hangar/droppod) "giW" = ( /obj/machinery/door/airlock/mainship/medical/glass/CMO{ dir = 1 @@ -4953,16 +5008,12 @@ /turf/open/floor/mainship/mono, /area/mainship/hallways/hangar) "gkp" = ( -/obj/item/clothing/head/warning_cone, -/obj/effect/turf_decal/warning_stripes/thin{ +/obj/structure/table/mainship/nometal, +/obj/item/storage/firstaid/regular, +/turf/open/floor/mainship/white{ dir = 1 }, -/obj/machinery/landinglight/cas{ - dir = 1; - pixel_y = -4 - }, -/turf/open/floor/mainship/mono, -/area/mainship/hallways/hangar) +/area/mainship/living/pilotbunks) "gkL" = ( /obj/effect/soundplayer, /turf/closed/wall/mainship, @@ -5014,9 +5065,7 @@ /obj/machinery/firealarm, /obj/structure/cable, /obj/effect/ai_node, -/turf/open/floor/mainship/orange{ - dir = 5 - }, +/turf/open/floor/mainship/hexagon, /area/mainship/engineering/engine_core) "gmH" = ( /obj/structure/cable, @@ -5033,21 +5082,10 @@ /turf/open/floor/mainship/mono, /area/mainship/command/cic) "gnK" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/mainship/mono, -/area/mainship/hallways/port_hallway) -"gnS" = ( -/obj/machinery/light/mainship{ - dir = 1 - }, -/turf/open/floor/mainship/mono, -/area/mainship/living/briefing) +/obj/machinery/holopad, +/obj/machinery/iv_drip, +/turf/open/floor/mainship/sterile/dark, +/area/mainship/medical/lower_medical) "goh" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 @@ -5094,13 +5132,23 @@ /area/mainship/engineering/engineering_workshop) "gpC" = ( /obj/structure/cable, -/obj/structure/closet/secure_closet/medical2, +/obj/machinery/iv_drip, +/obj/machinery/power/apc/mainship, +/obj/item/reagent_containers/blood/OPlus, /turf/open/floor/mainship/sterile/corner, /area/mainship/medical/operating_room_one) -"gqg" = ( -/obj/structure/ship_ammo/cas/rocket/banshee, -/turf/open/floor/mainship/cargo, -/area/mainship/hallways/hangar) +"gpU" = ( +/obj/structure/toilet{ + dir = 1 + }, +/obj/machinery/light/mainship/small{ + dir = 8 + }, +/obj/effect/landmark/corpsespawner/bridgeofficer/regular, +/obj/effect/decal/cleanable/blood, +/obj/item/toy/katana, +/turf/open/floor/mainship/sterile/white, +/area/mainship/living/bridgebunks) "gqB" = ( /obj/item/defibrillator, /obj/item/defibrillator, @@ -5112,6 +5160,9 @@ /area/mainship/medical/lower_medical) "gqI" = ( /obj/machinery/vending/uniform_supply, +/obj/structure/closet/walllocker/hydrant/extinguisher{ + dir = 8 + }, /turf/open/floor/mainship/green{ dir = 4 }, @@ -5136,22 +5187,18 @@ /turf/open/floor/mainship/tcomms, /area/mainship/command/telecomms) "gup" = ( -/obj/effect/ai_node, /obj/effect/turf_decal/warning_stripes/thin{ - dir = 4 + dir = 1 }, -/obj/machinery/landinglight/cas{ - dir = 4; - pixel_x = -4 +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 5 }, /turf/open/floor/mainship/mono, /area/mainship/hallways/hangar) "guG" = ( -/obj/machinery/vending/uniform_supply, -/turf/open/floor/mainship/white{ - dir = 8 - }, -/area/mainship/living/pilotbunks) +/obj/effect/turf_decal/warning_stripes/thick, +/turf/open/floor/mainship/hexagon, +/area/mainship/living/tankerbunks) "guJ" = ( /obj/machinery/light/mainship/small{ dir = 8 @@ -5169,6 +5216,17 @@ dir = 4 }, /area/mainship/command/cic) +"gvv" = ( +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 1 + }, +/turf/open/floor/mainship/cargo/arrow, +/area/mainship/hallways/hangar) +"gvN" = ( +/obj/structure/cable, +/obj/machinery/power/apc/mainship, +/turf/open/floor/plating/mainship, +/area/mainship/shipboard/brig) "gwK" = ( /obj/structure/bed/chair/comfy{ dir = 1 @@ -5182,16 +5240,6 @@ }, /turf/open/floor/mainship/floor, /area/mainship/living/numbertwobunks) -"gwQ" = ( -/obj/effect/decal/cleanable/blood/gibs/robot, -/turf/open/floor/mech_bay_recharge_floor, -/area/mainship/living/tankerbunks) -"gxA" = ( -/obj/machinery/firealarm, -/turf/open/floor/mainship/black{ - dir = 1 - }, -/area/mainship/living/pilotbunks) "gxL" = ( /obj/machinery/marine_selector/clothes/engi, /turf/open/floor/mainship, @@ -5207,10 +5255,18 @@ }, /turf/open/floor/mainship/sterile/dark, /area/mainship/medical/lower_medical) +"gAS" = ( +/obj/structure/flora/ausbushes/fullgrass, +/obj/item/reagent_containers/food/snacks/grown/poppy, +/obj/item/clothing/head/modular/marine/helljumper, +/turf/open/floor/grass, +/area/mainship/living/starboard_garden) "gBQ" = ( -/obj/structure/closet/secure_closet/pilot_officer, +/obj/structure/bed/chair/wood/wings{ + dir = 4 + }, /turf/open/floor/wood, -/area/mainship/living/pilotbunks) +/area/mainship/living/tankerbunks) "gCk" = ( /obj/structure/closet/toolcloset, /turf/open/floor/mainship/orange{ @@ -5235,12 +5291,6 @@ dir = 5 }, /area/mainship/living/numbertwobunks) -"gFu" = ( -/obj/machinery/door/poddoor/mainship/mech{ - dir = 1 - }, -/turf/open/floor/mainship/mono, -/area/mainship/living/tankerbunks) "gFW" = ( /obj/machinery/marine_selector/gear/engi, /turf/open/floor/mainship, @@ -5259,12 +5309,8 @@ /turf/open/floor/mainship/mono, /area/mainship/command/telecomms) "gGg" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 10 - }, -/obj/item/clothing/head/warning_cone, /turf/open/floor/mainship/mono, -/area/mainship/hallways/hangar) +/area/mainship/living/briefing) "gHU" = ( /obj/structure/bed/chair/nometal, /turf/open/floor/mainship/mono, @@ -5281,13 +5327,19 @@ dir = 4 }, /obj/effect/ai_node, -/turf/open/floor/mainship/cargo, +/turf/open/floor/mainship/yellow_cargo, /area/mainship/hallways/hangar) "gKv" = ( -/obj/structure/cable, -/turf/open/floor/mainship/white{ +/obj/machinery/light/mainship{ dir = 4 }, +/turf/open/floor/mainship/hexagon, +/area/mainship/living/tankerbunks) +"gKG" = ( +/obj/machinery/door/airlock/mainship/generic/pilot/bunk{ + dir = 1 + }, +/turf/open/floor/mainship/floor, /area/mainship/living/pilotbunks) "gKP" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ @@ -5337,24 +5389,19 @@ dir = 5 }, /area/mainship/medical/lower_medical) -"gNi" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 5 - }, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 9 - }, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 10 - }, -/turf/open/floor/mainship/mono, -/area/mainship/hallways/hangar) "gPi" = ( /obj/machinery/door/airlock/multi_tile/mainship/maint{ dir = 1 }, /turf/open/floor/mainship/mono, /area/mainship/hull/lower_hull) +"gPw" = ( +/obj/structure/ship_ammo/cas/bomblet, +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 8 + }, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar) "gPQ" = ( /obj/machinery/flasher{ id = "Containment Cell 3"; @@ -5400,30 +5447,38 @@ /area/mainship/hallways/hangar) "gSr" = ( /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer1, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, +/obj/effect/ai_node, /turf/open/floor/plating/plating_catwalk, /area/mainship/command/cic) "gSJ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/vending/uniform_supply, +/turf/open/floor/mainship/white{ + dir = 1 + }, +/area/mainship/living/pilotbunks) +"gSN" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 9 }, -/obj/structure/cable, /turf/open/floor/mainship/mono, -/area/mainship/hallways/hangar) +/area/mainship/hallways/hangar/droppod) "gTg" = ( -/turf/open/floor/mainship/terragov/north{ - dir = 5 - }, -/area/mainship/living/briefing) -"gTA" = ( /obj/structure/table/mainship/nometal, -/obj/item/folder/red, +/obj/item/folder/blue, /obj/item/tool/pen, /turf/open/floor/mainship/mono, /area/mainship/living/briefing) +"gTA" = ( +/obj/machinery/light/mainship{ + dir = 1 + }, +/turf/open/floor/mainship/floor, +/area/mainship/living/mechpilotquarters) "gUa" = ( /turf/open/floor/plating, /area/mainship/squads/req) @@ -5432,20 +5487,15 @@ /turf/open/floor/mainship, /area/mainship/squads/general) "gUp" = ( -/obj/machinery/door/firedoor/mainship, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/door/airlock/mainship/maint, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/door/airlock/multi_tile/mainship/generic/personal{ + dir = 2; + name = "Pilot Bunks" }, -/obj/machinery/door/poddoor/shutters/mainship/open/hangar{ - dir = 8 +/obj/machinery/door/firedoor/multi_tile{ + dir = 2 }, /turf/open/floor/mainship/mono, -/area/mainship/hallways/hangar) +/area/mainship/living/pilotbunks) "gUJ" = ( /obj/structure/table/fancywoodentable, /turf/open/floor/mainship/floor, @@ -5461,15 +5511,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/mainship/mono, /area/mainship/hull/lower_hull) -"gVQ" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 4 - }, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 9 - }, -/turf/open/floor/mainship/mono, -/area/mainship/shipboard/weapon_room) "gVZ" = ( /obj/effect/turf_decal/warning_stripes/thick, /obj/effect/turf_decal/warning_stripes/thick{ @@ -5519,6 +5560,12 @@ "gYy" = ( /turf/open/floor/mainship/green/corner, /area/mainship/squads/req) +"gYD" = ( +/obj/machinery/door/airlock/mainship/evacuation{ + dir = 8 + }, +/turf/open/floor/mainship/mono, +/area/mainship/living/chapel) "gYL" = ( /obj/machinery/door/firedoor/mainship, /obj/machinery/door/airlock/mainship/marine/general/sl, @@ -5553,15 +5600,6 @@ /obj/item/frame/table/gambling, /turf/open/floor/mainship/mono, /area/mainship/hallways/hangar) -"hbh" = ( -/obj/structure/droppod, -/obj/structure/drop_pod_launcher, -/obj/effect/decal/cleanable/blood/writing{ - desc = "It looks like a writing in blood. It says, 'I am missing and forgotten.'"; - dir = 4 - }, -/turf/open/floor/mainship/cargo, -/area/mainship/hallways/hangar/droppod) "hcb" = ( /obj/machinery/door/airlock/multi_tile/mainship/maint{ dir = 1 @@ -5584,6 +5622,12 @@ "hcF" = ( /turf/open/floor/mainship/floor, /area/mainship/hallways/hangar) +"hdc" = ( +/obj/machinery/light/mainship{ + dir = 4 + }, +/turf/open/floor/mainship/mono, +/area/mainship/living/starboard_garden) "hdY" = ( /obj/machinery/holopad, /turf/open/floor/mainship/black{ @@ -5623,7 +5667,7 @@ /turf/open/floor/mainship, /area/mainship/squads/general) "hgl" = ( -/obj/structure/prop/mainship/hangar_stencil/two, +/obj/vehicle/ridden/motorbike, /turf/open/floor/mainship/mono, /area/mainship/hallways/hangar) "hgP" = ( @@ -5664,10 +5708,12 @@ dir = 5 }, /area/mainship/command/cic) -"hiK" = ( -/obj/structure/largecrate/guns/russian, -/obj/item/reagent_containers/jerrycan, -/turf/open/floor/mainship/office, +"hiO" = ( +/obj/machinery/light/mainship{ + dir = 1 + }, +/obj/structure/ship_ammo/cas/rocket/widowmaker, +/turf/open/floor/mainship/cargo, /area/mainship/hallways/hangar) "hjG" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -5692,28 +5738,25 @@ /obj/effect/spawner/random/food_or_drink/sugary_snack, /turf/open/floor/mainship, /area/mainship/squads/general) +"hlS" = ( +/obj/machinery/camera/autoname/mainship{ + dir = 4 + }, +/obj/structure/disposalpipe/segment/corner{ + dir = 1 + }, +/obj/effect/ai_node, +/obj/structure/cable, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/port_umbilical) "hme" = ( /obj/machinery/status_display, /turf/closed/wall/mainship, /area/mainship/squads/general) -"hmu" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 4 - }, -/obj/structure/reagent_dispensers/fueltank, -/turf/open/floor/plating/plating_catwalk, -/area/mainship/hallways/hangar) -"hmA" = ( -/obj/structure/bed/chair/wood/wings, -/turf/open/floor/tile/chapel, -/area/mainship/living/chapel) "hmH" = ( /obj/machinery/light/mainship, /obj/structure/sign/prop1, -/turf/open/floor/mainship/cargo, +/turf/open/floor/mainship/yellow_cargo, /area/mainship/squads/general) "hnk" = ( /obj/structure/cable, @@ -5752,12 +5795,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/mainship/hallways/port_hallway) -"hoo" = ( -/obj/machinery/firealarm{ - dir = 4 - }, -/turf/open/floor/wood, -/area/mainship/living/chapel) "hoB" = ( /obj/effect/turf_decal/warning_stripes/thin{ dir = 4 @@ -5779,9 +5816,15 @@ }, /area/mainship/living/numbertwobunks) "hpW" = ( -/obj/structure/sign/restroom, -/turf/closed/wall/mainship, -/area/crew_quarters/toilet) +/obj/effect/decal/cleanable/blood/gibs/robot, +/turf/open/floor/mainship/hexagon, +/area/mainship/living/mechpilotquarters) +"hqb" = ( +/obj/structure/bed/fancy, +/obj/item/bedsheet/captain, +/obj/machinery/light/mainship, +/turf/open/floor/mainship/floor, +/area/mainship/shipboard/brig) "hqJ" = ( /obj/effect/turf_decal/warning_stripes/thin{ dir = 4 @@ -5826,58 +5869,63 @@ }, /turf/open/floor/mainship/mono, /area/mainship/hull/lower_hull) +"hvL" = ( +/turf/open/floor/mainship/mono, +/area/mainship/living/bridgebunks) "hvM" = ( /obj/structure/target_stake, /turf/open/floor/mainship/red{ dir = 4 }, /area/mainship/shipboard/firing_range) +"hvY" = ( +/obj/machinery/vending/armor_supply, +/turf/open/floor/mainship/white{ + dir = 5 + }, +/area/mainship/living/pilotbunks) +"hwp" = ( +/obj/machinery/light/mainship/small{ + dir = 8 + }, +/turf/open/floor/plating/mainship, +/area/mainship/shipboard/brig) "hwU" = ( /obj/machinery/door/airlock/mainship/marine/general/engi, /obj/machinery/door/firedoor/mainship, /turf/open/floor/mainship, /area/mainship/squads/general) +"hwZ" = ( +/obj/structure/prop/mainship/valmoric, +/turf/open/floor/grass, +/area/mainship/living/starboard_garden) "hxc" = ( /obj/machinery/vending/armor_supply, /turf/open/floor/mainship/black{ dir = 1 }, /area/mainship/squads/general) +"hxz" = ( +/obj/structure/cable, +/turf/open/floor/mainship/mono, +/area/mainship/shipboard/weapon_room) "hzc" = ( /obj/machinery/door/airlock/mainship/command/CPTstudy, /turf/open/floor/wood, /area/mainship/living/commandbunks) "hzD" = ( /obj/machinery/cic_maptable, +/obj/machinery/vending/nanomed{ + dir = 4 + }, /turf/open/floor/mainship/green{ dir = 8 }, /area/mainship/squads/req) "hCx" = ( -/obj/machinery/door/firedoor/mainship{ - dir = 2 - }, -/obj/machinery/door/poddoor/mainship/ammo{ - dir = 2; - id = null; - name = "\improper Hangar Launch Hatch" - }, -/turf/closed/wall/mainship/outer, -/area/mainship/hallways/hangar) -"hCG" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/ai_node, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 4 - }, -/turf/open/floor/mainship/mono, -/area/mainship/shipboard/weapon_room) +/obj/machinery/camera/autoname/mainship, +/turf/open/floor/mainship/hexagon, +/area/mainship/living/mechpilotquarters) "hDg" = ( /obj/machinery/power/apc, /obj/structure/cable, @@ -5904,10 +5952,9 @@ /turf/open/floor/mainship/mono, /area/mainship/engineering/port_atmos) "hEa" = ( -/obj/machinery/light/mainship{ - dir = 4 - }, -/obj/structure/closet/firecloset, +/obj/structure/closet/toolcloset, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/mainship/cargo, /area/mainship/hallways/hangar) "hEy" = ( @@ -5918,33 +5965,13 @@ /turf/closed/wall/mainship, /area/mainship/command/corporateliaison) "hFt" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 4 - }, -/obj/effect/ai_node, -/obj/machinery/landinglight/tadpole{ - dir = 4; - pixel_x = -4 - }, -/turf/open/floor/mainship/mono, -/area/mainship/hallways/hangar) -"hFL" = ( /obj/effect/ai_node, -/obj/structure/cable, /turf/open/floor/mainship/mono, -/area/mainship/hull/lower_hull) +/area/mainship/living/briefing) "hFZ" = ( /obj/machinery/floodlight/landing, /turf/open/floor/plating, /area/mainship/hallways/hangar) -"hGi" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 8 - }, -/turf/open/floor/mainship/black/corner{ - dir = 4 - }, -/area/mainship/living/tankerbunks) "hGE" = ( /obj/machinery/marine_selector/clothes/engi, /obj/machinery/light/mainship, @@ -5965,6 +5992,12 @@ "hHH" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable, +/obj/effect/ai_node, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 8 + }, /turf/open/floor/mainship/mono, /area/mainship/hallways/hangar) "hId" = ( @@ -6002,9 +6035,6 @@ /obj/structure/closet/bodybag, /turf/open/floor/mainship/orange, /area/mainship/engineering/lower_engineering) -"hJa" = ( -/turf/open/floor/mech_bay_recharge_floor, -/area/mainship/living/tankerbunks) "hJe" = ( /obj/structure/bed/bunkbed, /obj/effect/landmark/start/job/squadsmartgunner, @@ -6037,6 +6067,8 @@ pixel_x = 2; pixel_y = -1 }, +/obj/item/stack/medical/heal_pack/advanced/burn_pack, +/obj/item/stack/medical/heal_pack/advanced/bruise_pack, /turf/open/floor/mainship/sterile/dark, /area/mainship/medical/lower_medical) "hMB" = ( @@ -6060,11 +6092,24 @@ /turf/open/floor/plating/plating_catwalk, /area/mainship/hull/lower_hull) "hNd" = ( -/obj/machinery/air_alarm{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 }, /turf/open/floor/mainship/mono, /area/mainship/hallways/aft_hallway) +"hOe" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/plating/plating_catwalk, +/area/mainship/hallways/hangar) "hOm" = ( /obj/item/trash/buritto, /turf/open/floor/wood, @@ -6081,9 +6126,19 @@ }, /turf/open/floor/mainship/mono, /area/mainship/command/self_destruct) +"hPp" = ( +/obj/effect/turf_decal/warning_stripes/thick{ + dir = 4 + }, +/obj/machinery/light/mainship{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/turf/open/floor/mainship/floor, +/area/mainship/hallways/hangar/droppod) "hPG" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/mainship/cargo/arrow, +/turf/open/floor/mainship/yellow_cargo/arrow, /area/mainship/squads/general) "hPQ" = ( /obj/effect/ai_node, @@ -6136,19 +6191,10 @@ /turf/open/floor/mainship/mono, /area/mainship/living/numbertwobunks) "hSb" = ( -/obj/machinery/door/poddoor/railing{ - dir = 1; - id = "supply_elevator_railing" - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 4 - }, -/turf/open/floor/mainship/floor, -/area/mainship/squads/req) +/obj/structure/bed/chair/wood/normal, +/obj/item/reagent_containers/jerrycan, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar) "hSc" = ( /obj/machinery/light/mainship/small, /turf/open/floor/mainship/research/containment/floor2, @@ -6171,6 +6217,15 @@ dir = 8 }, /area/mainship/hallways/boxingring) +"hSO" = ( +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 8 + }, +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/mainship/hallways/hangar) "hSQ" = ( /obj/effect/soundplayer, /turf/closed/wall/mainship, @@ -6182,9 +6237,10 @@ /turf/open/floor/wood, /area/mainship/command/corporateliaison) "hTr" = ( -/turf/open/floor/plating/icefloor/warnplate{ - dir = 6 +/obj/effect/turf_decal/warning_stripes/thick{ + dir = 4 }, +/turf/open/floor/plating, /area/mainship/squads/req) "hTJ" = ( /obj/effect/turf_decal/warning_stripes/thin{ @@ -6239,16 +6295,21 @@ /obj/structure/cable, /turf/open/floor/mainship/mono, /area/mainship/hallways/aft_hallway) +"hWy" = ( +/obj/effect/ai_node, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/mainship/mono, +/area/mainship/shipboard/weapon_room) "hWO" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on, /turf/open/floor/mainship/mono, /area/mainship/hull/lower_hull) "hXJ" = ( -/obj/structure/cable, +/obj/structure/closet/crate/ammo, /obj/structure/disposalpipe/segment, -/turf/open/floor/mainship/cargo/arrow{ - dir = 4 - }, +/turf/open/floor/mainship/yellow_cargo, /area/mainship/squads/req) "hYl" = ( /turf/open/floor/mainship/sterile/purple/side{ @@ -6260,10 +6321,6 @@ dir = 8 }, /area/mainship/shipboard/firing_range) -"hZr" = ( -/obj/machinery/camera/autoname/mainship, -/turf/open/floor/plating/mainship, -/area/mainship/living/evacuation) "hZt" = ( /obj/machinery/light/mainship{ dir = 8 @@ -6280,13 +6337,9 @@ }, /area/mainship/squads/general) "iaH" = ( -/obj/structure/sign/poster, -/obj/machinery/cic_maptable/droppod_maptable, -/obj/machinery/door_control/mainship/droppod{ - dir = 1 - }, +/obj/machinery/light/mainship, /turf/open/floor/mainship/floor, -/area/mainship/hallways/hangar/droppod) +/area/mainship/living/mechpilotquarters) "iaQ" = ( /obj/machinery/hydroponics, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ @@ -6316,27 +6369,19 @@ /obj/item/target/syndicate, /turf/open/floor/plating/plating_catwalk, /area/mainship/shipboard/firing_range) -"icg" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 9 - }, -/obj/machinery/gear{ - id = "supply_elevator_gear" - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 4 - }, -/obj/machinery/door_control/mainship/req{ - dir = 1; - id = "qm_warehouse"; - name = "Requisition Warehouse Shutters" +"ibZ" = ( +/obj/structure/rack, +/obj/structure/ob_ammo/warhead/cluster, +/obj/structure/ob_ammo/warhead/cluster, +/turf/open/floor/mainship/red{ + dir = 5 }, +/area/mainship/shipboard/weapon_room) +"icg" = ( +/obj/structure/prop/mainship/hangar_stencil/two, +/obj/item/clothing/head/warning_cone, /turf/open/floor/mainship/mono, -/area/mainship/squads/req) +/area/mainship/hallways/hangar) "idy" = ( /obj/item/stack/tile/plasteel, /turf/open/floor/plating/icefloor/warnplate{ @@ -6369,15 +6414,9 @@ }, /area/mainship/engineering/ce_room) "ifT" = ( -/turf/closed/wall/mainship/outer, -/area/mainship/living/pilotbunks) -"ifY" = ( -/obj/machinery/camera/autoname/mainship{ - dir = 1 - }, -/obj/structure/dropship_equipment/cas/weapon/bomblet_pod, -/turf/open/floor/mainship/floor, -/area/mainship/hallways/hangar) +/obj/structure/bed/bunkbed, +/turf/open/floor/wood, +/area/mainship/living/tankerbunks) "igh" = ( /obj/machinery/iv_drip, /turf/open/floor/mainship/sterile/dark, @@ -6416,6 +6455,12 @@ /obj/item/book/manual/marine_law, /turf/open/floor/wood, /area/mainship/living/commandbunks) +"iku" = ( +/obj/machinery/shower{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/crew_quarters/toilet) "ikM" = ( /obj/machinery/vending/weapon, /turf/open/floor/mainship/floor, @@ -6431,6 +6476,15 @@ /obj/item/radio, /turf/open/floor/mainship/stripesquare, /area/mainship/hallways/port_umbilical) +"ilf" = ( +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 1 + }, +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 8 + }, +/turf/open/floor/mainship/cargo/arrow, +/area/mainship/hallways/hangar) "ilH" = ( /obj/structure/table/mainship/nometal, /obj/item/clipboard{ @@ -6454,13 +6508,9 @@ }, /area/mainship/living/commandbunks) "imx" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment/corner{ - dir = 1 - }, -/obj/effect/ai_node, -/turf/open/floor/plating/plating_catwalk, -/area/mainship/hull/lower_hull) +/obj/machinery/vending/uniform_supply, +/turf/open/floor/mainship/floor, +/area/mainship/living/mechpilotquarters) "imJ" = ( /obj/machinery/door/firedoor/mainship{ dir = 2; @@ -6486,6 +6536,13 @@ dir = 6 }, /area/mainship/squads/general) +"inU" = ( +/obj/machinery/camera/autoname/mainship{ + dir = 1 + }, +/obj/item/clothing/head/warning_cone, +/turf/open/floor/mainship/mono, +/area/mainship/squads/req) "iom" = ( /obj/machinery/photocopier, /turf/open/floor/mainship/floor, @@ -6509,10 +6566,11 @@ /turf/open/floor/mainship/mono, /area/mainship/living/commandbunks) "irz" = ( -/obj/structure/cable, -/obj/machinery/computer/dropship_picker, -/turf/open/floor/mainship/mono, -/area/mainship/hallways/hangar) +/obj/structure/table/woodentable, +/obj/item/paper, +/obj/item/tool/pen, +/turf/open/floor/wood, +/area/mainship/living/mechpilotquarters) "irM" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 10 @@ -6535,11 +6593,8 @@ }, /area/mainship/squads/general) "isR" = ( -/obj/machinery/camera/autoname/mainship{ - dir = 8 - }, -/turf/open/floor/mainship/mono, -/area/mainship/living/briefing) +/turf/open/floor/wood, +/area/mainship/living/mechpilotquarters) "its" = ( /obj/machinery/bot/roomba, /turf/open/floor/mainship, @@ -6556,6 +6611,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 5 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/mainship/sterile/side, /area/mainship/medical/operating_room_one) "iuG" = ( @@ -6566,26 +6624,12 @@ /obj/machinery/camera/autoname/mainship, /turf/open/floor/mainship/mono, /area/mainship/command/telecomms) -"iuQ" = ( -/obj/structure/cable, -/turf/open/floor/wood, -/area/mainship/living/chapel) "ivw" = ( /obj/structure/bed/chair/wood/wings{ dir = 1 }, /turf/open/floor/wood, /area/mainship/living/numbertwobunks) -"ivB" = ( -/obj/structure/bed/chair/office/light{ - dir = 1 - }, -/obj/effect/ai_node, -/obj/machinery/atmospherics/components/unary/vent_pump/layer1{ - on = 1 - }, -/turf/open/floor/mainship/mono, -/area/mainship/engineering/upper_engineering) "ivW" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -6601,18 +6645,6 @@ }, /turf/open/floor/mainship/ntlogo, /area/mainship/squads/general) -"ixk" = ( -/turf/open/floor/mainship/cargo/arrow{ - dir = 4 - }, -/area/mainship/engineering/engine_core) -"ixv" = ( -/obj/structure/cable, -/obj/machinery/power/apc/mainship{ - dir = 4 - }, -/turf/open/floor/wood, -/area/mainship/living/chapel) "ixz" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, @@ -6628,14 +6660,19 @@ /turf/open/floor/mainship/tcomms, /area/mainship/command/telecomms) "iyl" = ( -/obj/effect/turf_decal/warning_stripes/linethick{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 }, -/obj/effect/turf_decal/warning_stripes/linethick{ +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 8 }, -/turf/open/floor/plating, -/area/mainship/hallways/starboard_hallway) +/turf/open/floor/mainship/mono, +/area/mainship/living/pilotbunks) +"iyr" = ( +/obj/machinery/computer/squad_selector, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar) "iyN" = ( /obj/machinery/camera/autoname/mainship{ dir = 8 @@ -6646,12 +6683,11 @@ /obj/effect/turf_decal/warning_stripes/thin{ dir = 8 }, -/obj/structure/prop/mainship/hangar_stencil/two, -/obj/effect/ai_node, /obj/machinery/landinglight/cas{ dir = 8; pixel_x = 4 }, +/obj/effect/ai_node, /turf/open/floor/mainship/mono, /area/mainship/hallways/hangar) "iBa" = ( @@ -6660,19 +6696,17 @@ /turf/open/floor/mainship/mono, /area/mainship/hallways/boxingring) "iCT" = ( -/obj/machinery/light/mainship{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/structure/cable, +/obj/machinery/door/airlock/mainship/generic/bathroom, /turf/open/floor/mainship/mono, /area/mainship/living/bridgebunks) "iDm" = ( -/obj/structure/disposalpipe/segment, /turf/open/floor/mainship/floor, /area/mainship/command/corporateliaison) "iDs" = ( @@ -6682,18 +6716,9 @@ /turf/open/floor/wood, /area/mainship/living/grunt_rnr) "iDE" = ( -/obj/structure/rack, -/obj/item/storage/toolbox/electrical{ - pixel_x = -5; - pixel_y = 4 - }, -/obj/item/robot_parts/head, -/obj/machinery/power/apc, -/obj/structure/cable, -/turf/open/floor/mainship/black{ - dir = 9 - }, -/area/mainship/living/tankerbunks) +/obj/machinery/cic_maptable/droppod_maptable, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar/droppod) "iDG" = ( /obj/machinery/light/mainship{ dir = 8 @@ -6715,18 +6740,18 @@ }, /turf/open/floor/mainship/floor, /area/mainship/command/airoom) -"iFq" = ( -/turf/open/floor/mainship/black{ - dir = 5 - }, -/area/mainship/living/tankerbunks) +"iFw" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/effect/turf_decal/warning_stripes/thin, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar) "iFI" = ( /obj/machinery/marine_selector/clothes/smartgun, /turf/open/floor/mainship/floor, /area/mainship/squads/general) -"iGu" = ( -/turf/open/floor/mainship/tcomms, -/area/mainship/shipboard/weapon_room) "iHm" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 @@ -6747,18 +6772,6 @@ /obj/structure/disposalpipe/junction, /turf/open/floor/plating/plating_catwalk, /area/mainship/hallways/port_hallway) -"iHE" = ( -/obj/structure/rack, -/obj/structure/ob_ammo/ob_fuel, -/obj/structure/ob_ammo/ob_fuel, -/obj/structure/ob_ammo/ob_fuel, -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/mainship/red{ - dir = 4 - }, -/area/mainship/shipboard/weapon_room) "iHY" = ( /obj/effect/spawner/random/misc/structure/flavorvending/cigaretteweighted, /turf/open/floor/mainship/orange{ @@ -6802,16 +6815,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/mainship/hallways/starboard_hallway) -"iJY" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/open/floor/wood, -/area/mainship/living/chapel) "iKm" = ( /obj/structure/prop/mainship/mapping_computer, /turf/open/floor/mainship/red{ @@ -6825,6 +6828,10 @@ /turf/open/floor/mainship/mono, /area/mainship/command/cic) "iKM" = ( +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, /turf/open/floor/mainship/ntlogo, /area/mainship/command/corporateliaison) "iLf" = ( @@ -6928,20 +6935,9 @@ /turf/open/floor/mainship/sterile/dark, /area/mainship/medical/medical_science) "iSK" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/open/floor/mainship/sterile/plain, -/area/mainship/living/tankerbunks) -"iTf" = ( -/obj/structure/prop/mainship/halfbuilt_mech/vanguard, -/turf/open/floor/mainship/black{ - dir = 1 - }, -/area/mainship/living/pilotbunks) +/obj/effect/turf_decal/warning_stripes/thick, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar/droppod) "iTn" = ( /obj/machinery/light/mainship, /obj/machinery/holopad, @@ -6958,9 +6954,14 @@ /turf/closed/wall/mainship/outer, /area/mainship/hallways/boxingring) "iTX" = ( -/obj/structure/reagent_dispensers/fueltank, -/obj/item/radio/intercom/general, -/turf/open/floor/mainship/mono, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/firealarm, +/turf/open/floor/plating/plating_catwalk, /area/mainship/hallways/hangar) "iUK" = ( /obj/structure/cable, @@ -7009,9 +7010,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/holopad, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 10 - }, /turf/open/floor/plating/plating_catwalk, /area/mainship/hallways/hangar) "iXQ" = ( @@ -7032,35 +7030,31 @@ /turf/open/floor/mainship/mono, /area/mainship/squads/req) "iYg" = ( -/obj/machinery/light/mainship{ - dir = 1 - }, /obj/structure/table/mainship/nometal, -/obj/effect/spawner/random/engineering/bomb_supply{ - pixel_x = -4 - }, -/obj/effect/spawner/random/engineering/toolbox, -/obj/effect/spawner/random/engineering/tool{ - pixel_x = 2 +/obj/effect/spawner/random/misc/paperbin, +/obj/item/storage/fancy/cigar, +/obj/item/tool/lighter/zippo, +/obj/item/tool/pen, +/obj/machinery/light/mainship{ + light_color = "#da2f1b" }, -/obj/effect/spawner/random/engineering/tool{ - pixel_x = -6; - pixel_y = 3 +/obj/machinery/camera/autoname/mainship{ + dir = 1 }, -/obj/effect/spawner/random/engineering/tool{ - pixel_x = 8; - pixel_y = 5 +/turf/open/floor/mainship/green{ + dir = 10 }, -/turf/open/floor/plating, -/area/mainship/hallways/starboard_hallway) +/area/mainship/squads/req) "iYD" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 }, -/obj/machinery/firealarm, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 1 }, +/obj/structure/cable, +/obj/machinery/power/apc/mainship, +/obj/effect/ai_node, /turf/open/floor/mainship/mono, /area/mainship/living/bridgebunks) "iZb" = ( @@ -7117,10 +7111,16 @@ /obj/structure/disposalpipe/trunk, /turf/open/floor/wood, /area/mainship/living/grunt_rnr) +"jcy" = ( +/obj/structure/table/woodentable, +/obj/structure/mirror, +/obj/item/camera, +/turf/open/floor/mainship/mono, +/area/mainship/living/bridgebunks) "jcH" = ( -/obj/structure/bed/chair/comfy/black, -/turf/open/floor/mainship/red/full, -/area/mainship/living/briefing) +/obj/machinery/loadout_vendor, +/turf/open/floor/mainship/floor, +/area/mainship/living/mechpilotquarters) "jdh" = ( /mob/living/simple_animal/corgi/ian, /turf/open/floor/mainship/mono, @@ -7144,6 +7144,14 @@ /obj/machinery/telecomms/bus/preset_one, /turf/open/floor/mainship/tcomms, /area/mainship/command/telecomms) +"jeG" = ( +/obj/structure/table/mainship/nometal, +/obj/effect/spawner/random/misc/plushie/nospawnninetynine, +/obj/item/newspaper, +/turf/open/floor/mainship/white{ + dir = 8 + }, +/area/mainship/living/pilotbunks) "jeQ" = ( /obj/machinery/light/mainship{ dir = 8 @@ -7164,13 +7172,9 @@ /turf/open/floor/mainship/mono, /area/mainship/hallways/port_hallway) "jhK" = ( -/obj/structure/droppod, -/obj/structure/drop_pod_launcher, -/obj/machinery/light/mainship{ - dir = 4 - }, -/turf/open/floor/mainship/cargo, -/area/mainship/hallways/hangar/droppod) +/obj/machinery/vending/coffee, +/turf/open/floor/mainship/floor, +/area/mainship/living/mechpilotquarters) "jhO" = ( /obj/structure/dropship_equipment/cas/weapon/bomb_pod, /turf/open/floor/mainship/floor, @@ -7186,11 +7190,11 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 }, -/obj/machinery/power/apc/mainship, /obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/machinery/firealarm, /turf/open/floor/mainship/mono, /area/mainship/living/bridgebunks) "jjR" = ( @@ -7198,12 +7202,22 @@ /obj/item/reagent_containers/food/drinks/flask/barflask, /turf/open/floor/wood, /area/mainship/living/commandbunks) +"jkK" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/poddoor/shutters/mainship/req/ro, +/obj/item/tool/hand_labeler, +/obj/machinery/door/window, +/obj/machinery/door/window/secure/req{ + dir = 8 + }, +/turf/open/floor/mainship/mono, +/area/mainship/squads/req) "jlV" = ( /obj/item/trash/cigbutt{ pixel_x = -8; pixel_y = 3 }, -/turf/open/floor/mainship/cargo, +/turf/open/floor/mainship/yellow_cargo, /area/mainship/squads/general) "jmu" = ( /obj/effect/turf_decal/warning_stripes/thin{ @@ -7221,37 +7235,28 @@ /turf/open/floor/wood, /area/mainship/living/numbertwobunks) "joi" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/door/firedoor/mainship{ - dir = 2; - id = "hangar_lockdown" - }, -/obj/machinery/door/poddoor/shutters/mainship/open/hangar{ +/obj/machinery/door/poddoor/mainship/mech{ dir = 1 }, -/obj/structure/stairs/seamless{ - dir = 1 +/obj/machinery/door/firedoor/mainship{ + dir = 2 }, -/turf/open/floor/mainship/mono, -/area/mainship/hallways/hangar/droppod) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/mainship/stripesquare, +/area/mainship/living/mechpilotquarters) "jox" = ( /turf/open/floor/mainship/floor, /area/mainship/command/airoom) -"jpE" = ( -/turf/open/floor/mainship/office, -/area/mainship/hallways/hangar) -"jpU" = ( -/obj/structure/rack, -/obj/item/tool/crowbar, -/obj/effect/spawner/random/engineering/toolbox, -/obj/item/stack/cable_coil, -/obj/item/assembly/timer, -/obj/item/assembly/infra, -/turf/open/floor/mainship/black{ +"joB" = ( +/obj/machinery/camera/autoname/mainship{ dir = 1 }, -/area/mainship/living/tankerbunks) +/obj/effect/turf_decal/warning_stripes/thick{ + dir = 4 + }, +/turf/open/floor/mainship/mono, +/area/mainship/shipboard/weapon_room) "jqy" = ( /obj/structure/disposalpipe/segment/corner, /obj/effect/turf_decal/warning_stripes/engineer, @@ -7264,19 +7269,21 @@ dir = 8 }, /area/mainship/squads/general) -"jqG" = ( -/obj/structure/cable, -/obj/machinery/light/mainship, -/turf/open/floor/mainship/cargo/arrow{ - dir = 1 - }, -/area/mainship/hallways/hangar/droppod) "jrk" = ( /obj/machinery/bioprinter/stocked, +/obj/structure/disposalpipe/segment/corner{ + dir = 8 + }, /turf/open/floor/mainship/sterile/corner{ dir = 4 }, /area/mainship/medical/operating_room_two) +"jrW" = ( +/obj/structure/cable, +/obj/effect/ai_node, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating/plating_catwalk, +/area/mainship/hull/lower_hull) "jsl" = ( /obj/machinery/light/mainship{ dir = 8 @@ -7287,17 +7294,17 @@ /area/mainship/living/numbertwobunks) "jsw" = ( /obj/machinery/door_control/mainship/ammo, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, /turf/open/floor/mainship/mono, /area/mainship/hallways/hangar) "jsE" = ( /turf/open/floor/mainship/mono, /area/mainship/living/grunt_rnr) -"jsW" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 10 - }, -/turf/open/floor/mainship/sterile/plain, -/area/mainship/living/tankerbunks) "jwr" = ( /obj/machinery/door/airlock/mainship/engineering/CSEoffice{ dir = 2 @@ -7317,6 +7324,7 @@ /turf/open/floor/mainship/mono, /area/mainship/hallways/port_hallway) "jwH" = ( +/obj/effect/decal/cleanable/blood, /turf/open/floor/mainship/research/containment/floor2{ dir = 10 }, @@ -7334,22 +7342,14 @@ /obj/structure/cable, /turf/open/floor/plating/plating_catwalk, /area/mainship/hallways/starboard_hallway) -"jxk" = ( -/obj/structure/ship_rail_gun, -/obj/effect/turf_decal/warning_stripes/thin, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 1 - }, -/obj/machinery/light/mainship/small{ - dir = 8 - }, -/turf/open/floor/mainship/mono, -/area/mainship/shipboard/weapon_room) +"jxi" = ( +/turf/open/floor/plating/plating_catwalk, +/area/mainship/hallways/port_hallway) "jxy" = ( -/obj/machinery/light/mainship{ +/obj/effect/spawner/random/misc/plant, +/turf/open/floor/mainship/silver{ dir = 4 }, -/turf/open/floor/wood, /area/mainship/living/chapel) "jzc" = ( /obj/structure/closet/emcloset, @@ -7429,6 +7429,9 @@ /obj/structure/cable, /turf/open/floor/mainship/mono, /area/mainship/shipboard/firing_range) +"jDG" = ( +/turf/open/floor/mainship/white, +/area/mainship/living/pilotbunks) "jDL" = ( /obj/machinery/camera/autoname{ dir = 1 @@ -7446,22 +7449,15 @@ }, /turf/open/floor/wood, /area/mainship/living/commandbunks) -"jFa" = ( -/obj/machinery/light/mainship{ - dir = 4 - }, -/turf/open/floor/mainship/black{ - dir = 4 - }, -/area/mainship/living/tankerbunks) "jGf" = ( /obj/machinery/door/airlock/mainship/maint, /obj/structure/cable, /turf/open/floor/plating/plating_catwalk, /area/mainship/hull/lower_hull) "jHd" = ( -/obj/structure/flora/pottedplant/ten, -/turf/open/floor/mainship/mono, +/obj/structure/flora/ausbushes/ppflowers, +/obj/effect/spawner/random/food_or_drink/drink_alcohol_bottle, +/turf/open/floor/grass, /area/mainship/living/starboard_garden) "jHk" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, @@ -7478,35 +7474,29 @@ }, /area/mainship/medical/medical_science) "jHU" = ( -/obj/machinery/door/airlock/mainship/command/officer{ - dir = 2 - }, -/obj/machinery/door/firedoor/mainship{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/turf/open/floor/mainship/mono, +/turf/open/floor/mainship/sterile/white, /area/mainship/living/bridgebunks) "jIc" = ( -/obj/effect/spawner/random/misc/structure/flavorvending/colaweighted, -/turf/open/floor/mainship/mono, -/area/mainship/hallways/hangar) +/obj/structure/bed/chair/nometal{ + dir = 1 + }, +/turf/open/floor/mainship/purple/full, +/area/mainship/living/briefing) "jIf" = ( /obj/machinery/telecomms/bus/preset_four, /turf/open/floor/mainship/tcomms, /area/mainship/command/telecomms) "jIy" = ( -/obj/machinery/shower{ - dir = 4; - pixel_y = -3 +/obj/machinery/computer/mech_builder{ + dir = 2 }, -/turf/open/floor/mainship/sterile/dark, -/area/crew_quarters/toilet) +/turf/open/floor/plating, +/area/mainship/living/mechpilotquarters) "jLn" = ( -/obj/item/reagent_containers/spray/surgery, -/obj/item/reagent_containers/spray/surgery, /obj/structure/rack, /obj/item/toy/deck/kotahi, +/obj/item/toy/deck, +/obj/item/storage/belt/protein_pack, /turf/open/floor/mainship/sterile/dark, /area/mainship/medical/lower_medical) "jLC" = ( @@ -7520,9 +7510,9 @@ /turf/open/floor/plating/plating_catwalk, /area/mainship/hallways/stern_hallway) "jLS" = ( -/obj/effect/turf_decal/warning_stripes/thin, -/turf/closed/wall/mainship, -/area/mainship/hallways/hangar) +/obj/effect/ai_node, +/turf/open/floor/mainship/hexagon, +/area/mainship/living/mechpilotquarters) "jMH" = ( /obj/effect/turf_decal/warning_stripes/thin{ dir = 4 @@ -7549,15 +7539,6 @@ /obj/effect/ai_node, /turf/open/floor/plating/plating_catwalk, /area/mainship/hallways/aft_hallway) -"jNX" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 5 - }, -/obj/structure/sign/poster, -/turf/open/floor/mainship/cargo/arrow{ - dir = 4 - }, -/area/mainship/shipboard/weapon_room) "jOm" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -7565,27 +7546,27 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 8 + dir = 4 }, /turf/open/floor/plating/plating_catwalk, /area/mainship/hallways/aft_hallway) -"jOZ" = ( -/obj/structure/cable, -/obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 +"jOS" = ( +/obj/effect/turf_decal/warning_stripes/thick/corner{ + dir = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/effect/turf_decal/warning_stripes/thick/corner, +/turf/open/floor/mainship/yellow_cargo/arrow{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 4 +/area/mainship/hallways/hangar/droppod) +"jPt" = ( +/obj/effect/turf_decal/warning_stripes/thick/corner{ + dir = 8 + }, +/obj/effect/turf_decal/warning_stripes/thick{ + dir = 8 }, /turf/open/floor/mainship/mono, -/area/mainship/engineering/upper_engineering) -"jPi" = ( -/obj/effect/turf_decal/warning_stripes/thin, -/turf/open/floor/plating/mainship, /area/mainship/shipboard/weapon_room) "jPT" = ( /obj/structure/curtain/medical, @@ -7595,26 +7576,27 @@ "jQH" = ( /turf/open/floor/wood, /area/mainship/hallways/boxingring) +"jQS" = ( +/obj/structure/table/fancywoodentable, +/obj/item/clock, +/turf/open/floor/wood, +/area/mainship/command/corporateliaison) "jQT" = ( /obj/machinery/light/mainship{ dir = 4 }, /turf/open/floor/mainship/mono, /area/mainship/hallways/starboard_hallway) -"jRd" = ( -/obj/structure/bed/chair/nometal{ - dir = 1 - }, -/turf/open/floor/mainship/orange/full, -/area/mainship/living/briefing) "jRn" = ( /obj/structure/benchpress, /turf/open/floor/mainship/mono, /area/mainship/engineering/engineering_workshop) "jRQ" = ( -/obj/structure/prop/mainship/sensor_computer1, -/turf/open/floor/mainship/mono, -/area/mainship/shipboard/weapon_room) +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/effect/ai_node, +/turf/open/floor/plating/plating_catwalk, +/area/mainship/hull/lower_hull) "jRR" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 8 @@ -7629,6 +7611,15 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/mainship/sterile/dark, /area/mainship/medical/medical_science) +"jTZ" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 10 + }, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar) "jUl" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -7669,15 +7660,10 @@ dir = 1 }, /area/mainship/medical/lower_medical) -"jWh" = ( -/obj/structure/window/framed/mainship/requisitions, -/obj/machinery/door/poddoor/shutters{ - dir = 2; - id = "qm_warehouse"; - name = "\improper Warehouse Shutters" - }, -/turf/open/floor/mainship/mono, -/area/mainship/squads/req) +"jVU" = ( +/obj/structure/sign/evac, +/turf/closed/wall/mainship, +/area/mainship/living/bridgebunks) "jWo" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ @@ -7715,40 +7701,28 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/mainship/cargo/arrow{ +/turf/open/floor/mainship/yellow_cargo/arrow{ dir = 8 }, /area/mainship/squads/general) "jZZ" = ( -/obj/structure/cable, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 9 - }, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 4 - }, -/obj/effect/ai_node, -/turf/open/floor/mainship/cargo/arrow{ - dir = 4 - }, -/area/mainship/hallways/hangar/droppod) +/obj/effect/turf_decal/warning_stripes/thick, +/turf/open/floor/mainship/floor, +/area/mainship/living/mechpilotquarters) "kaa" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 4 }, /turf/open/floor/mainship, /area/mainship/squads/general) -"kbb" = ( -/obj/machinery/camera/autoname/mainship{ - dir = 1 - }, -/obj/structure/prop/mainship/halfbuilt_mech/legs, -/turf/open/floor/plating, -/area/mainship/living/tankerbunks) "kbe" = ( -/obj/structure/bed/chair/wood/wings, -/obj/effect/ai_node, -/turf/open/floor/tile/chapel, +/obj/machinery/light/mainship{ + dir = 8 + }, +/obj/machinery/vending/coffee, +/turf/open/floor/mainship/silver{ + dir = 8 + }, /area/mainship/living/chapel) "kbg" = ( /obj/structure/window/reinforced{ @@ -7796,7 +7770,7 @@ dir = 4 }, /obj/machinery/light/mainship, -/turf/open/floor/mainship/cargo/arrow{ +/turf/open/floor/mainship/yellow_cargo/arrow{ dir = 8 }, /area/mainship/squads/general) @@ -7808,21 +7782,18 @@ "kfm" = ( /turf/open/floor/mainship/mono, /area/mainship/engineering/engineering_workshop) -"kfo" = ( -/obj/structure/prop/mainship/ship_memorial, -/turf/open/floor/mainship/mono, -/area/mainship/living/starboard_garden) "kfB" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 8 +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ - dir = 8 +/obj/machinery/landinglight/cas{ + dir = 4; + pixel_x = -4 }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/plating/plating_catwalk, -/area/mainship/hallways/aft_hallway) +/obj/item/clothing/head/warning_cone, +/obj/effect/ai_node, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar) "kgo" = ( /obj/machinery/atmospherics/components/unary/vent_pump/layer1{ on = 1 @@ -7890,7 +7861,7 @@ /obj/machinery/camera/autoname/mainship{ dir = 4 }, -/turf/open/floor/mainship/mono, +/turf/open/floor/iron/kitchen, /area/mainship/living/grunt_rnr) "koA" = ( /obj/machinery/light/mainship{ @@ -7910,6 +7881,24 @@ }, /turf/open/floor/mainship, /area/mainship/squads/general) +"kpI" = ( +/obj/effect/turf_decal/warning_stripes/thick{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/open/floor/mainship/floor, +/area/mainship/hallways/hangar/droppod) +"krn" = ( +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/turf/open/floor/mainship/green{ + dir = 6 + }, +/area/mainship/squads/req) "krM" = ( /turf/open/floor/mainship/cargo/arrow{ dir = 1 @@ -7965,8 +7954,10 @@ }, /area/mainship/engineering/ce_room) "ksN" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, /turf/open/floor/mainship/floor, /area/mainship/hallways/hangar) "kta" = ( @@ -7996,6 +7987,12 @@ }, /turf/open/floor/plating/plating_catwalk, /area/mainship/hallways/hangar) +"ktH" = ( +/obj/machinery/camera/autoname/mainship{ + dir = 4 + }, +/turf/open/floor/mainship/mono, +/area/mainship/squads/req) "kuc" = ( /obj/machinery/loadout_vendor, /turf/open/floor/mainship/mono, @@ -8020,21 +8017,23 @@ /obj/effect/decal/cleanable/blood, /turf/open/floor/mainship/floor, /area/mainship/medical/upper_medical) -"kuZ" = ( -/obj/structure/table/woodentable, -/obj/item/paper, -/obj/item/tool/pen, -/turf/open/floor/wood, -/area/mainship/living/tankerbunks) "kwo" = ( -/obj/structure/bed/chair/nometal{ +/obj/effect/turf_decal/warning_stripes/thick{ dir = 1 }, -/turf/open/floor/mainship/red/full, -/area/mainship/living/briefing) +/obj/item/clothing/head/warning_cone, +/turf/open/floor/plating, +/area/mainship/hallways/hangar) "kwS" = ( +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 4 + }, +/obj/machinery/landinglight/tadpole{ + dir = 4; + pixel_x = -4 + }, /turf/open/floor/mainship/mono, -/area/mainship/living/briefing) +/area/mainship/hallways/hangar) "kxh" = ( /turf/closed/wall/mainship, /area/mainship/living/chapel) @@ -8042,6 +8041,11 @@ /obj/structure/window/framed/mainship/white, /obj/machinery/door/firedoor/mainship, /obj/machinery/door/poddoor/shutters/opened/medbay, +/obj/machinery/door/poddoor/shutters/mainship{ + dir = 1; + id = "or2privacyshutter"; + name = "\improper Privacy Shutters" + }, /turf/open/floor/plating/platebotc, /area/mainship/medical/operating_room_two) "kxw" = ( @@ -8069,10 +8073,7 @@ /area/space) "kxN" = ( /obj/machinery/light/mainship, -/obj/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, +/obj/structure/filingcabinet, /turf/open/floor/mainship/floor, /area/mainship/command/corporateliaison) "kxP" = ( @@ -8094,11 +8095,10 @@ /turf/open/floor/mainship/sterile/dark, /area/mainship/medical/lower_medical) "kyt" = ( -/obj/machinery/light/mainship{ - dir = 1 - }, +/obj/structure/table/mainship/nometal, +/obj/item/reagent_containers/food/drinks/coffee, /turf/open/floor/mainship/floor, -/area/crew_quarters/toilet) +/area/mainship/living/mechpilotquarters) "kyB" = ( /obj/effect/landmark/corpsespawner/engineer/regular, /turf/open/floor/mainship_hull, @@ -8126,39 +8126,48 @@ }, /turf/open/floor/mainship/mono, /area/mainship/engineering/engineering_workshop) -"kzV" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 9 - }, -/turf/open/floor/mainship/floor, -/area/mainship/hallways/hangar) "kAq" = ( /obj/effect/turf_decal/warning_stripes/thin{ dir = 1 }, /turf/open/floor/mainship/mono, /area/mainship/shipboard/firing_range) -"kAr" = ( -/obj/structure/rack, -/obj/item/storage/bible, -/obj/item/storage/bible, -/obj/item/storage/bible, -/obj/item/storage/bible, -/obj/item/storage/bible, -/obj/item/reagent_containers/food/drinks/bottle/holywater, -/turf/open/floor/wood, -/area/mainship/living/chapel) "kBk" = ( /turf/open/floor/mainship/mono, /area/mainship/engineering/upper_engineering) "kBO" = ( /obj/structure/largecrate/supply/ammo/standard_ammo, -/turf/open/floor/mainship/office, +/turf/open/floor/mainship/orange{ + dir = 4 + }, /area/mainship/hallways/hangar) +"kBR" = ( +/obj/machinery/door/airlock/mainship/maint/core, +/obj/machinery/door/firedoor/mainship, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/mainship/hexagon, +/area/mainship/engineering/lower_engineering) "kCk" = ( /turf/open/floor/mainship/floor, /area/crew_quarters/toilet) +"kCs" = ( +/obj/effect/turf_decal/warning_stripes/thick{ + dir = 4 + }, +/obj/effect/turf_decal/warning_stripes/thick{ + dir = 8 + }, +/obj/machinery/light/mainship{ + dir = 1 + }, +/turf/open/floor/mainship/floor, +/area/mainship/hallways/hangar/droppod) "kCI" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -8174,20 +8183,16 @@ "kDx" = ( /turf/open/floor/plating, /area/mainship/hallways/hangar) +"kDO" = ( +/obj/machinery/light/mainship, +/turf/open/floor/mainship/white, +/area/mainship/living/pilotbunks) "kDZ" = ( /obj/machinery/door/airlock/mainship/command/cic{ dir = 2 }, /turf/open/floor/mainship/mono, /area/mainship/command/telecomms) -"kEt" = ( -/obj/structure/rack, -/obj/structure/ob_ammo/warhead/explosive, -/obj/structure/ob_ammo/warhead/explosive, -/turf/open/floor/mainship/red{ - dir = 1 - }, -/area/mainship/shipboard/weapon_room) "kEC" = ( /obj/structure/table/mainship/nometal, /obj/item/reagent_containers/food/drinks/bottle/sake{ @@ -8200,6 +8205,7 @@ /obj/item/storage/box/drinkingglasses, /obj/item/portable_vendor/corporate, /obj/machinery/computer/emails, +/obj/item/reagent_containers/hypospray/autoinjector/mindbreaker, /turf/open/floor/wood, /area/mainship/command/corporateliaison) "kEP" = ( @@ -8219,12 +8225,6 @@ /obj/item/trash/cigbutt/cigarbutt, /turf/open/floor/wood, /area/mainship/living/cryo_cells) -"kFu" = ( -/obj/machinery/air_alarm{ - dir = 4 - }, -/turf/open/floor/wood, -/area/mainship/living/chapel) "kGb" = ( /obj/effect/spawner/random/misc/structure/flavorvending/colaweighted, /turf/open/floor/mainship/orange{ @@ -8232,10 +8232,8 @@ }, /area/mainship/engineering/engineering_workshop) "kGc" = ( -/obj/item/paper/memorial, -/obj/item/reagent_containers/food/snacks/grown/poppy, -/obj/effect/ai_node, -/turf/open/floor/mainship/mono, +/obj/structure/cable, +/turf/open/floor/grass, /area/mainship/living/starboard_garden) "kGk" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -8251,6 +8249,20 @@ /obj/machinery/status_display, /turf/closed/wall/mainship, /area/mainship/command/telecomms) +"kHN" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/machinery/light/mainship{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar) +"kHT" = ( +/obj/machinery/vending/tool, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar/droppod) "kIc" = ( /obj/structure/disposalpipe/segment/corner{ dir = 4 @@ -8270,12 +8282,17 @@ /obj/structure/window/framed/mainship/hull, /turf/open/floor/mainship_hull, /area/mainship/hallways/boxingring) +"kKd" = ( +/obj/structure/drop_pod_launcher, +/obj/structure/droppod, +/turf/open/floor/mainship/yellow_cargo, +/area/mainship/hallways/hangar/droppod) "kKJ" = ( /turf/closed/wall/mainship/research/containment/wall/south, /area/mainship/medical/medical_science) "kKO" = ( /obj/structure/closet/secure_closet/req_officer, -/turf/open/floor/mainship/cargo, +/turf/open/floor/mainship/yellow_cargo, /area/mainship/squads/req) "kLu" = ( /obj/machinery/computer/camera_advanced/remote_fob, @@ -8316,6 +8333,16 @@ /obj/effect/ai_node, /turf/open/floor/mainship/mono, /area/mainship/hallways/starboard_hallway) +"kMo" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/door/poddoor/mainship/droppod, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar/droppod) "kML" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/machinery/camera/autoname/mainship{ @@ -8338,7 +8365,7 @@ dir = 8 }, /obj/item/fuel_cell/full, -/turf/open/floor/mainship/mono, +/turf/open/floor/mainship/hexagon, /area/mainship/engineering/engine_core) "kNK" = ( /obj/machinery/light/mainship{ @@ -8350,6 +8377,15 @@ dir = 8 }, /area/mainship/living/numbertwobunks) +"kOe" = ( +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 5 + }, +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 6 + }, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar) "kPH" = ( /obj/structure/table/fancywoodentable, /obj/machinery/computer/marine_card, @@ -8420,9 +8456,6 @@ /obj/structure/cable, /turf/open/floor/plating/plating_catwalk, /area/mainship/hallways/boxingring) -"kSz" = ( -/turf/closed/wall/mainship, -/area/mainship/shipboard/weapon_room) "kTn" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -8460,7 +8493,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 }, -/turf/open/floor/mainship/cargo/arrow{ +/turf/open/floor/mainship/yellow_cargo/arrow{ dir = 1 }, /area/mainship/squads/general) @@ -8495,26 +8528,13 @@ /turf/open/floor/mainship/sterile, /area/mainship/medical/lower_medical) "kWG" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 6 - }, -/obj/effect/ai_node, +/obj/effect/turf_decal/warning_stripes/thick/corner, /obj/item/clothing/head/warning_cone, -/turf/open/floor/mainship/mono, +/turf/open/floor/plating, /area/mainship/hallways/hangar) "kWM" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/open/floor/mainship/sterile/plain, -/area/mainship/living/tankerbunks) +/turf/open/floor/mainship/yellow_cargo, +/area/mainship/hallways/hangar/droppod) "kXy" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -8549,6 +8569,8 @@ /obj/item/storage/toolbox/electrical, /obj/item/tool/wrench, /obj/item/cell/apc, +/obj/item/tool/screwdriver, +/obj/item/tool/crowbar, /turf/open/floor/mainship/sterile/side{ dir = 1 }, @@ -8590,12 +8612,15 @@ /obj/item/prop/organ/kidneys, /turf/open/floor/cult, /area/medical/morgue) +"lcE" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/item/clothing/head/warning_cone, +/turf/open/floor/plating/plating_catwalk, +/area/mainship/hallways/hangar) "lcL" = ( -/obj/machinery/light/mainship{ - dir = 1 - }, -/turf/open/floor/plating/mainship, -/area/mainship/living/evacuation) +/turf/open/floor/mainship/mono, +/area/mainship/shipboard/weapon_room) "ldA" = ( /obj/machinery/processor{ pixel_y = 5 @@ -8603,7 +8628,7 @@ /obj/machinery/light/mainship{ dir = 8 }, -/turf/open/floor/mainship/mono, +/turf/open/floor/iron/kitchen, /area/mainship/living/grunt_rnr) "ldG" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ @@ -8611,22 +8636,6 @@ }, /turf/open/floor/mainship/mono, /area/mainship/hallways/stern_hallway) -"ldT" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/obj/structure/rack, -/obj/structure/ob_ammo/ob_fuel, -/obj/structure/ob_ammo/ob_fuel, -/obj/structure/ob_ammo/ob_fuel, -/obj/structure/ob_ammo/ob_fuel, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/mainship/red{ - dir = 4 - }, -/area/mainship/shipboard/weapon_room) "ldW" = ( /obj/structure/cable, /turf/open/floor/plating/plating_catwalk, @@ -8634,6 +8643,10 @@ "leu" = ( /turf/closed/wall/mainship, /area/mainship/command/corporateliaison) +"lev" = ( +/obj/structure/window/framed/mainship/hull, +/turf/open/floor/mainship/floor, +/area/mainship/shipboard/weapon_room) "lew" = ( /obj/structure/cable, /obj/effect/ai_node, @@ -8655,15 +8668,6 @@ "leW" = ( /turf/open/floor/mainship/purple/full, /area/mainship/hallways/boxingring) -"lgy" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 8 - }, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 4 - }, -/turf/open/floor/mainship/floor, -/area/mainship/hallways/hangar) "lgF" = ( /obj/structure/prop/mainship/name_stencil, /turf/open/floor/mainship_hull, @@ -8675,6 +8679,10 @@ /obj/machinery/quick_vendor/beginner, /turf/open/floor/mainship, /area/mainship/squads/general) +"lgM" = ( +/obj/machinery/photocopier, +/turf/open/floor/mainship/mono, +/area/mainship/engineering/upper_engineering) "lgN" = ( /obj/machinery/light/mainship{ dir = 1 @@ -8693,35 +8701,43 @@ /turf/open/floor/mainship/floor, /area/mainship/squads/req) "lhG" = ( -/obj/effect/turf_decal/warning_stripes/linethick{ - dir = 1 +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 4 }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/mainship/hallways/starboard_hallway) -"lhT" = ( -/obj/structure/sign/evac, /turf/open/floor/mainship/mono, -/area/mainship/hallways/starboard_hallway) +/area/mainship/living/pilotbunks) +"lhT" = ( +/obj/structure/window/framed/mainship/white, +/obj/machinery/door/firedoor/mainship, +/obj/machinery/door/poddoor/shutters/opened/medbay, +/obj/machinery/holosign_switch{ + id = "or2sign" + }, +/obj/machinery/door/poddoor/shutters/mainship{ + dir = 1; + id = "or2privacyshutter"; + name = "\improper Privacy Shutters" + }, +/turf/open/floor/plating/platebotc, +/area/mainship/medical/operating_room_two) "lhZ" = ( /obj/structure/table/woodentable, /obj/item/storage/donut_box, /turf/open/floor/wood, /area/mainship/living/grunt_rnr) -"liK" = ( -/obj/structure/ob_ammo/warhead/plasmaloss, -/obj/structure/ob_ammo/warhead/plasmaloss, -/obj/structure/rack, -/turf/open/floor/mainship/red{ - dir = 9 - }, -/area/mainship/shipboard/weapon_room) "liX" = ( /mob/living/simple_animal/corgi/walten, /turf/open/floor/mainship/sterile, /area/mainship/medical/lower_medical) "ljb" = ( /obj/machinery/vending/weapon, +/obj/machinery/vending/nanomed{ + dir = 8 + }, /turf/open/floor/mainship/green{ dir = 4 }, @@ -8742,12 +8758,13 @@ /area/mainship/hull/lower_hull) "ljN" = ( /obj/structure/cable, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/vending/nanomed, /turf/open/floor/mainship/mono, /area/mainship/living/bridgebunks) "ljP" = ( @@ -8770,18 +8787,18 @@ dir = 4 }, /area/mainship/squads/general) -"llr" = ( -/turf/open/floor/mainship/mono, -/area/mainship/living/bridgebunks) -"llA" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 9 +"llq" = ( +/obj/machinery/light/mainship{ + dir = 8 }, -/obj/structure/stairs/edge{ - dir = 1 +/turf/open/floor/mainship/mono, +/area/mainship/living/starboard_garden) +"llr" = ( +/obj/machinery/shower{ + dir = 4 }, -/turf/open/floor/tile/dark, -/area/mainship/command/cic) +/turf/open/floor/plating/plating_catwalk, +/area/mainship/living/bridgebunks) "llC" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/light/mainship{ @@ -8800,7 +8817,7 @@ dir = 8; pixel_x = 4 }, -/turf/open/floor/mainship/cargo/arrow{ +/turf/open/floor/mainship/yellow_cargo/arrow{ dir = 8 }, /area/mainship/hallways/hangar) @@ -8812,6 +8829,10 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 9 }, +/obj/effect/ai_node, +/obj/machinery/cic_maptable/drawable/big{ + pixel_x = 0 + }, /turf/open/floor/mainship/mono, /area/mainship/command/cic) "lmy" = ( @@ -8821,14 +8842,8 @@ dir = 4 }, /obj/machinery/door/firedoor/mainship, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /turf/open/floor/mainship/mono, -/area/mainship/shipboard/weapon_room) +/area/mainship/hull/lower_hull) "lmF" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -8836,15 +8851,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating/plating_catwalk, /area/mainship/hull/lower_hull) -"lmH" = ( -/obj/machinery/light/mainship{ - dir = 1 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/open/floor/wood, -/area/mainship/living/tankerbunks) "lnQ" = ( /obj/structure/window/framed/mainship, /obj/machinery/door/poddoor/shutters/mainship/corporate, @@ -8869,9 +8875,6 @@ }, /area/mainship/medical/lower_medical) "lon" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -8879,6 +8882,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 }, +/obj/effect/turf_decal/warning_stripes/thick{ + dir = 8 + }, /turf/open/floor/mainship/stripesquare, /area/mainship/hallways/starboard_hallway) "lpn" = ( @@ -8905,15 +8911,6 @@ dir = 8 }, /area/mainship/command/self_destruct) -"lrW" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/mainship/hallways/hangar) "lsc" = ( /obj/structure/morgue{ dir = 1 @@ -8941,12 +8938,9 @@ /turf/open/floor/plating/plating_catwalk, /area/mainship/hallways/port_hallway) "lsS" = ( -/obj/structure/cable, -/obj/machinery/door/airlock/mainship/maint, -/obj/machinery/door/firedoor/mainship, -/obj/structure/sign/pods, -/turf/open/floor/plating/plating_catwalk, -/area/mainship/hallways/hangar) +/obj/machinery/vending/armor_supply, +/turf/open/floor/mainship/floor, +/area/mainship/living/mechpilotquarters) "ltw" = ( /obj/item/stack/tile/plasteel, /turf/open/floor/plating, @@ -8966,15 +8960,17 @@ /turf/open/floor/mainship/red/full, /area/mainship/shipboard/firing_range) "lue" = ( -/obj/machinery/light/mainship{ - dir = 4 +/obj/machinery/camera/autoname/mainship{ + dir = 8 }, /turf/open/floor/mainship/mono, -/area/mainship/hallways/hangar) -"lun" = ( -/obj/structure/bed/chair/comfy/black, -/turf/open/floor/mainship/silver/full, /area/mainship/living/briefing) +"lun" = ( +/obj/structure/bed/bunkbed, +/obj/effect/landmark/start/job/mechpilot, +/obj/effect/landmark/start/job/mechpilot, +/turf/open/floor/wood, +/area/mainship/living/mechpilotquarters) "lvi" = ( /obj/structure/cable, /turf/open/floor/plating/plating_catwalk, @@ -9011,10 +9007,12 @@ /turf/open/floor/mainship/red/full, /area/mainship/command/cic) "lvV" = ( -/obj/structure/bed, -/obj/item/bedsheet/captain, -/obj/effect/landmark/start/job/staffofficer, -/obj/effect/landmark/corpsespawner/marine/regular, +/obj/structure/table/woodentable, +/obj/item/clipboard{ + pixel_x = 5 + }, +/obj/item/paper, +/obj/item/tool/pen, /turf/open/floor/mainship/mono, /area/mainship/living/bridgebunks) "lwj" = ( @@ -9078,6 +9076,15 @@ "lAT" = ( /turf/open/floor/mainship/sterile/dark, /area/mainship/medical/lower_medical) +"lBs" = ( +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 6 + }, +/obj/machinery/door/poddoor/railing{ + id = "supply_elevator_railing" + }, +/turf/open/floor/mainship/floor, +/area/mainship/squads/req) "lCh" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 @@ -9105,18 +9112,18 @@ }, /turf/open/floor/mainship/mono, /area/mainship/hallways/port_umbilical) +"lEd" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/open/floor/mainship/mono, +/area/mainship/shipboard/weapon_room) "lEe" = ( /obj/structure/bed/bunkbed, /obj/effect/landmark/start/job/squadmarine, /obj/effect/landmark/start/job/squadcorpsman, /turf/open/floor/wood, /area/mainship/living/cryo_cells) -"lEx" = ( -/obj/machinery/door/airlock/mainship/maint{ - dir = 2 - }, -/turf/open/floor/plating/plating_catwalk, -/area/mainship/hallways/hangar/droppod) "lEz" = ( /obj/structure/bed/bunkbed, /obj/effect/landmark/start/job/squadsmartgunner, @@ -9127,11 +9134,29 @@ /turf/open/floor/wood, /area/mainship/living/cryo_cells) "lES" = ( -/obj/machinery/camera/autoname/mainship{ +/turf/open/floor/mainship/mono, +/area/mainship/living/chapel) +"lET" = ( +/obj/structure/ship_ammo/cas/bomb/fourhundred, +/obj/effect/turf_decal/warning_stripes/thin{ dir = 8 }, -/turf/open/floor/wood, -/area/mainship/living/chapel) +/turf/open/floor/mainship/floor, +/area/mainship/hallways/hangar) +"lFg" = ( +/obj/structure/cable, +/obj/machinery/holopad, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/turf/open/floor/mainship/mono, +/area/mainship/engineering/upper_engineering) "lFo" = ( /turf/open/floor/mainship/blue, /area/mainship/living/numbertwobunks) @@ -9145,17 +9170,12 @@ /turf/open/floor/mainship/red/full, /area/mainship/command/cic) "lGv" = ( -/turf/open/floor/mainship/green/corner{ +/obj/effect/turf_decal/warning_stripes/thick/corner{ dir = 1 }, -/area/mainship/hallways/aft_hallway) -"lGA" = ( -/obj/structure/orbital_cannon, -/obj/machinery/light/mainship/small{ - dir = 8 - }, -/turf/open/floor/plating/mainship, -/area/mainship/shipboard/weapon_room) +/obj/item/clothing/head/warning_cone, +/turf/open/floor/plating, +/area/mainship/hallways/hangar) "lGU" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, @@ -9184,6 +9204,17 @@ dir = 10 }, /area/mainship/living/numbertwobunks) +"lHG" = ( +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 8 + }, +/obj/machinery/landinglight/cas{ + dir = 8; + pixel_x = 4 + }, +/obj/structure/prop/mainship/hangar_stencil/two, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar) "lHN" = ( /obj/machinery/light/mainship{ dir = 4 @@ -9206,16 +9237,6 @@ }, /turf/open/floor/mainship/stripesquare, /area/mainship/hallways/starboard_hallway) -"lIj" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 8 - }, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 4 - }, -/obj/effect/ai_node, -/turf/open/floor/mainship/mono, -/area/mainship/shipboard/weapon_room) "lIB" = ( /obj/effect/turf_decal/warning_stripes/thin{ dir = 4 @@ -9231,18 +9252,20 @@ dir = 8 }, /area/mainship/living/numbertwobunks) +"lIW" = ( +/obj/structure/sign/pods, +/turf/closed/wall/mainship, +/area/mainship/hallways/hangar/droppod) "lJt" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/structure/window/reinforced{ dir = 4 }, -/obj/structure/cable, -/obj/structure/bed/chair/wood/wings, -/turf/open/floor/tile/chapel{ +/obj/effect/spawner/random/misc/structure/showcase, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ dir = 1 }, +/turf/open/floor/mainship/silver/full, /area/mainship/living/chapel) "lJE" = ( /obj/structure/window/framed/mainship/requisitions, @@ -9287,6 +9310,9 @@ }, /turf/open/floor/mainship/mono, /area/mainship/engineering/engineering_workshop) +"lLe" = ( +/turf/open/floor/mainship/mono, +/area/crew_quarters/toilet) "lLR" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 5 @@ -9301,17 +9327,11 @@ /turf/open/floor/mainship/mono, /area/mainship/command/corporateliaison) "lMf" = ( -/obj/machinery/door/airlock/multi_tile/mainship/maint{ - dir = 1 - }, -/obj/machinery/door/firedoor/multi_tile{ +/obj/structure/bed/chair/nometal{ dir = 1 }, -/obj/machinery/door/poddoor/shutters/mainship/open/hangar{ - dir = 8 - }, /turf/open/floor/mainship/mono, -/area/mainship/hallways/hangar) +/area/mainship/living/pilotbunks) "lMx" = ( /obj/structure/table/mainship/nometal, /obj/machinery/faxmachine, @@ -9360,11 +9380,14 @@ /turf/open/floor/plating/plating_catwalk, /area/mainship/hallways/port_hallway) "lPM" = ( -/obj/structure/bed, -/obj/item/bedsheet/red, -/obj/effect/landmark/start/job/transportofficer, -/turf/open/floor/wood, -/area/mainship/living/pilotbunks) +/obj/effect/landmark/start/job/shiptech, +/obj/structure/bed/chair/office/dark{ + dir = 4 + }, +/turf/open/floor/mainship/green{ + dir = 4 + }, +/area/mainship/squads/req) "lPY" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -9379,8 +9402,8 @@ /turf/open/floor/wood, /area/mainship/medical/lower_medical) "lQN" = ( -/obj/machinery/sleeper, /obj/machinery/light/mainship, +/obj/machinery/vending/MarineMed, /turf/open/floor/mainship/sterile/side, /area/mainship/medical/lower_medical) "lRc" = ( @@ -9398,6 +9421,10 @@ /obj/machinery/camera/autoname/mainship, /turf/open/floor/mainship/floor, /area/mainship/squads/general) +"lSr" = ( +/obj/structure/window/framed/mainship, +/turf/open/floor/mainship/floor, +/area/mainship/shipboard/brig) "lSQ" = ( /obj/effect/ai_node, /turf/open/floor/mainship/sterile/side, @@ -9475,12 +9502,6 @@ dir = 4 }, /area/mainship/engineering/engineering_workshop) -"lVn" = ( -/obj/machinery/loadout_vendor, -/turf/open/floor/mainship/white{ - dir = 9 - }, -/area/mainship/living/pilotbunks) "lVp" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating/plating_catwalk, @@ -9493,10 +9514,6 @@ dir = 1 }, /area/mainship/command/airoom) -"lVM" = ( -/obj/effect/turf_decal/warning_stripes/thick/corner, -/turf/open/floor/plating, -/area/mainship/hallways/hangar) "lVR" = ( /obj/machinery/light/mainship{ light_color = "#da2f1b" @@ -9517,18 +9534,31 @@ /obj/structure/sign/restroom, /turf/closed/wall/mainship, /area/mainship/hallways/hangar) -"lXB" = ( -/obj/structure/disposalpipe/segment/corner{ +"lWH" = ( +/obj/effect/turf_decal/warning_stripes/thick{ dir = 4 }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 6 +/obj/effect/turf_decal/warning_stripes/thick{ + dir = 8 }, -/turf/open/floor/mainship/black{ +/turf/open/floor/mainship/mono, +/area/mainship/shipboard/weapon_room) +"lXb" = ( +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 1 + }, +/obj/effect/ai_node, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar) +"lXB" = ( +/obj/effect/turf_decal/warning_stripes/thick/corner{ dir = 8 }, -/area/mainship/living/tankerbunks) +/obj/effect/turf_decal/warning_stripes/thick/corner{ + dir = 4 + }, +/turf/open/floor/mainship/yellow_cargo/arrow, +/area/mainship/hallways/hangar/droppod) "lXN" = ( /obj/effect/turf_decal/warning_stripes/thin{ dir = 10 @@ -9554,7 +9584,7 @@ }, /area/mainship/medical/upper_medical) "lYL" = ( -/obj/machinery/computer/sleep_console, +/obj/machinery/sleeper, /turf/open/floor/mainship/sterile/side, /area/mainship/medical/lower_medical) "mam" = ( @@ -9567,7 +9597,7 @@ "mbM" = ( /obj/structure/table/mainship/nometal, /obj/item/fuel_cell/full, -/turf/open/floor/mainship/mono, +/turf/open/floor/mainship/hexagon, /area/mainship/engineering/engine_core) "mbQ" = ( /obj/structure/table/mainship/nometal, @@ -9612,15 +9642,12 @@ /obj/structure/bed/chair/wood/wings{ dir = 8 }, -/turf/open/floor/mainship/mono, +/turf/open/floor/wood, /area/mainship/living/grunt_rnr) "mds" = ( -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/obj/machinery/disposal, -/turf/open/floor/mainship/green, -/area/mainship/squads/req) +/obj/structure/closet/secure_closet/pilot_officer, +/turf/open/floor/wood, +/area/mainship/living/pilotbunks) "mdQ" = ( /obj/machinery/door/airlock/mainship/research/pen, /obj/machinery/door/firedoor/mainship, @@ -9629,6 +9656,10 @@ }, /turf/open/floor/mainship/sterile/dark, /area/mainship/medical/medical_science) +"meN" = ( +/obj/structure/prop/mainship/cannon_cables, +/turf/open/floor/mainship/hexagon, +/area/mainship/shipboard/weapon_room) "mfH" = ( /turf/open/floor/mainship/sterile/purple/side, /area/mainship/medical/medical_science) @@ -9675,15 +9706,9 @@ /turf/closed/wall/mainship, /area/mainship/engineering/upper_engineering) "mjl" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 1 - }, -/obj/machinery/landinglight/tadpole{ - dir = 1; - pixel_y = -4 - }, -/turf/open/floor/mainship/mono, -/area/mainship/hallways/hangar) +/obj/machinery/vending, +/turf/open/floor/mainship/floor, +/area/mainship/living/mechpilotquarters) "mjo" = ( /obj/item/reagent_containers/hypospray/autoinjector/synaptizine_expired, /turf/open/floor/plating/mainship, @@ -9721,11 +9746,22 @@ /turf/open/floor/plating, /area/mainship/squads/general) "mnH" = ( -/obj/machinery/door/airlock/mainship/secure/evac{ - dir = 2 +/obj/structure/table/mainship/nometal, +/obj/machinery/recharger, +/obj/item/reagent_containers/spray/cleaner{ + pixel_x = 6; + pixel_y = -2 }, -/turf/open/floor/mainship/mono, -/area/mainship/hallways/starboard_hallway) +/obj/item/reagent_containers/spray/cleaner{ + pixel_x = -5; + pixel_y = 3 + }, +/obj/item/reagent_containers/spray/cleaner{ + pixel_x = 6; + pixel_y = -2 + }, +/turf/open/floor/mainship/sterile/side, +/area/mainship/medical/lower_medical) "mog" = ( /obj/item/trash/candy, /turf/open/floor/wood, @@ -9746,6 +9782,10 @@ }, /area/mainship/squads/req) "mpj" = ( +/obj/effect/turf_decal/warning_stripes/thin, +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 6 + }, /obj/effect/turf_decal/warning_stripes/thin{ dir = 9 }, @@ -9769,13 +9809,11 @@ /obj/effect/spawner/random/misc/structure/flavorvending/snackweighted, /turf/open/floor/mainship/sterile/side, /area/mainship/medical/lower_medical) -"mpS" = ( -/obj/machinery/camera/autoname/mainship{ - dir = 1 - }, -/turf/open/floor/mainship/black, -/area/mainship/living/pilotbunks) "mqD" = ( +/obj/structure/cable, +/obj/machinery/light/mainship{ + dir = 4 + }, /turf/open/floor/mainship/mono, /area/mainship/living/starboard_garden) "mqK" = ( @@ -9810,10 +9848,6 @@ /obj/structure/cable, /turf/open/floor/mainship/mono, /area/mainship/command/telecomms) -"mux" = ( -/obj/machinery/light/mainship, -/turf/open/floor/mainship/black, -/area/mainship/living/tankerbunks) "muT" = ( /obj/structure/cable, /turf/open/floor/mainship/mono, @@ -9845,11 +9879,11 @@ /turf/open/floor/mainship/mono, /area/mainship/command/corporateliaison) "mvX" = ( -/obj/structure/shipmast{ - pixel_y = 2 +/obj/machinery/light/mainship{ + dir = 8 }, -/turf/open/floor/mainship/green/full, -/area/mainship/squads/req) +/turf/open/floor/wood, +/area/mainship/living/pilotbunks) "mwj" = ( /obj/structure/curtain/medical, /turf/open/floor/mainship/sterile/dark, @@ -9860,7 +9894,7 @@ dir = 4 }, /obj/item/fuel_cell/full, -/turf/open/floor/mainship/mono, +/turf/open/floor/mainship/hexagon, /area/mainship/engineering/engine_core) "mxn" = ( /obj/item/stack/tile/plasteel, @@ -9875,15 +9909,16 @@ /turf/open/floor/mainship, /area/mainship/squads/general) "mxq" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 +/obj/machinery/landinglight/cas{ + dir = 1; + pixel_y = -4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 4 +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 1 }, +/obj/effect/ai_node, /turf/open/floor/mainship/mono, -/area/mainship/hallways/aft_hallway) +/area/mainship/hallways/hangar) "mxT" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, @@ -9891,28 +9926,15 @@ /obj/structure/cable, /turf/open/floor/plating/plating_catwalk, /area/mainship/hallways/starboard_hallway) -"myc" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 5 - }, -/turf/open/floor/mainship/mono, -/area/mainship/engineering/upper_engineering) -"mza" = ( -/obj/machinery/computer/navigation, -/turf/open/floor/mainship/mono, -/area/mainship/command/cic) "mzh" = ( -/obj/machinery/vending/engivend, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/mainship/hallways/starboard_hallway) +/obj/structure/disposalpipe/segment/corner{ + dir = 1 + }, +/obj/structure/table/mainship/nometal, +/obj/item/reagent_containers/food/drinks/bottle/vodka, +/obj/item/megaphone, +/turf/open/floor/mainship/green, +/area/mainship/squads/req) "mzs" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -9944,13 +9966,6 @@ "mBZ" = ( /turf/open/space, /area/space) -"mDv" = ( -/obj/machinery/door/poddoor/railing{ - dir = 2; - id = "supply_elevator_railing" - }, -/turf/open/floor/mainship/floor, -/area/mainship/squads/req) "mDY" = ( /obj/structure/cable, /obj/machinery/light/mainship/small{ @@ -9991,6 +10006,21 @@ dir = 9 }, /area/mainship/engineering/ce_room) +"mFw" = ( +/obj/structure/ship_rail_gun, +/obj/effect/turf_decal/warning_stripes/thick{ + dir = 1 + }, +/turf/open/floor/mainship/mono, +/area/mainship/shipboard/weapon_room) +"mFy" = ( +/obj/machinery/light/mainship{ + dir = 4 + }, +/turf/open/floor/mainship/white{ + dir = 4 + }, +/area/mainship/living/pilotbunks) "mGV" = ( /obj/structure/closet/secure_closet/personal/morgue, /turf/open/floor/cult, @@ -10009,28 +10039,27 @@ }, /area/mainship/medical/lower_medical) "mHk" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 1 - }, -/obj/machinery/light/mainship, -/turf/open/floor/mainship/mono, -/area/mainship/hallways/hangar) +/turf/open/floor/mech_bay_recharge_floor, +/area/mainship/living/mechpilotquarters) "mHW" = ( /turf/open/floor/mainship/sterile/side{ dir = 4 }, /area/mainship/medical/lower_medical) -"mJj" = ( -/obj/effect/turf_decal/warning_stripes/thin, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 1 - }, -/turf/open/floor/mainship/mono, -/area/mainship/shipboard/weapon_room) "mJo" = ( /obj/machinery/computer/telecomms/monitor/preset, /turf/open/floor/mainship/mono, /area/mainship/command/telecomms) +"mJw" = ( +/obj/structure/bed, +/obj/item/bedsheet/red, +/obj/effect/landmark/start/job/transportofficer, +/turf/open/floor/wood, +/area/mainship/living/pilotbunks) +"mJG" = ( +/obj/machinery/vending/weapon, +/turf/open/floor/wood, +/area/mainship/living/tankerbunks) "mJL" = ( /obj/structure/dropship_equipment/electronics/spotlights, /turf/open/floor/mainship/orange{ @@ -10038,14 +10067,10 @@ }, /area/mainship/hallways/hangar) "mJW" = ( -/obj/structure/rack, -/obj/item/storage/firstaid/fire{ - pixel_x = 3; - pixel_y = 3 +/obj/machinery/loadout_vendor, +/turf/open/floor/mainship/green{ + dir = 5 }, -/obj/item/storage/firstaid/regular, -/obj/item/storage/firstaid/adv, -/turf/open/floor/mainship/green, /area/mainship/squads/req) "mKE" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -10063,28 +10088,43 @@ }, /turf/open/floor/plating/plating_catwalk, /area/mainship/hallways/port_hallway) +"mKN" = ( +/obj/structure/table/mainship/nometal, +/obj/item/paper{ + pixel_x = 5 + }, +/obj/item/clipboard, +/obj/item/tool/pen, +/obj/item/flashlight, +/obj/item/reagent_containers/spray/cleaner, +/turf/open/floor/mainship/mono, +/area/mainship/squads/req) "mLd" = ( -/obj/structure/cable, -/obj/machinery/camera/autoname/mainship{ - dir = 4 +/obj/docking_port/stationary/escape_pod/escape_shuttle{ + dir = 8 }, -/turf/open/floor/wood, -/area/mainship/living/chapel) +/turf/open/floor/mainship/hexagon, +/area/mainship/living/evacuation) "mMx" = ( -/turf/closed/wall/mainship, -/area/mainship/living/briefing) +/obj/structure/bed/chair/nometal{ + dir = 4 + }, +/turf/open/floor/mainship/floor, +/area/mainship/living/mechpilotquarters) "mMA" = ( -/obj/docking_port/stationary/escape_pod/escape_shuttle{ - dir = 1 +/obj/structure/ob_ammo/warhead/plasmaloss, +/obj/structure/ob_ammo/warhead/plasmaloss, +/obj/structure/rack, +/turf/open/floor/mainship/red{ + dir = 8 }, -/turf/open/floor/plating/mainship, -/area/mainship/living/evacuation) +/area/mainship/shipboard/weapon_room) "mNK" = ( /obj/machinery/status_display, /turf/closed/wall/mainship, /area/mainship/command/corporateliaison) "mNM" = ( -/turf/open/floor/mainship/cargo/arrow{ +/turf/open/floor/mainship/yellow_cargo/arrow{ dir = 8 }, /area/mainship/squads/general) @@ -10094,11 +10134,11 @@ /turf/open/floor/mainship/mono, /area/mainship/command/corporateliaison) "mOo" = ( -/obj/machinery/camera/autoname/mainship{ - dir = 8 +/obj/effect/turf_decal/warning_stripes/thick{ + dir = 1 }, -/turf/open/floor/mainship/floor, -/area/crew_quarters/toilet) +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar/droppod) "mOz" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -10152,21 +10192,8 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 }, -/obj/effect/ai_node, /turf/open/floor/plating/plating_catwalk, /area/mainship/command/cic) -"mQl" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 6 - }, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 1 - }, -/turf/open/floor/mainship/cargo/arrow, -/area/mainship/hallways/hangar) "mQq" = ( /obj/machinery/light/mainship, /turf/open/floor/mainship/red{ @@ -10174,9 +10201,10 @@ }, /area/mainship/shipboard/firing_range) "mQy" = ( -/obj/structure/bed/chair/comfy/black, -/turf/open/floor/mainship/orange/full, -/area/mainship/living/briefing) +/obj/structure/table/mainship/nometal, +/obj/item/newspaper, +/turf/open/floor/mainship/floor, +/area/mainship/living/mechpilotquarters) "mQH" = ( /obj/machinery/door/poddoor/mainship/ammo{ dir = 2 @@ -10206,14 +10234,12 @@ /turf/open/floor/plating/plating_catwalk, /area/mainship/hull/lower_hull) "mSh" = ( -/obj/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/turf/open/floor/mainship/black{ +/obj/effect/turf_decal/warning_stripes/thick, +/obj/machinery/light/mainship{ dir = 4 }, -/area/mainship/living/tankerbunks) +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar/droppod) "mSo" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 @@ -10226,22 +10252,10 @@ /obj/effect/ai_node, /turf/open/floor/mainship/mono, /area/mainship/engineering/port_atmos) -"mTs" = ( -/turf/open/floor/mainship/sterile/dark, -/area/crew_quarters/toilet) "mTH" = ( /obj/machinery/marine_selector/gear/commander, /turf/open/floor/wood, /area/mainship/living/numbertwobunks) -"mUi" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 8 - }, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 4 - }, -/turf/open/floor/mainship/mono, -/area/mainship/hallways/hangar) "mUU" = ( /obj/machinery/light/mainship, /obj/structure/sink{ @@ -10254,6 +10268,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 9 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/mainship/sterile/side, /area/mainship/medical/operating_room_two) "mVr" = ( @@ -10277,9 +10294,9 @@ /obj/structure/disposalpipe/segment/corner{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, /obj/effect/ai_node, +/obj/machinery/atmospherics/pipe/manifold4w/scrubbers, +/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer1, /turf/open/floor/plating/plating_catwalk, /area/mainship/hallways/starboard_hallway) "mXf" = ( @@ -10293,6 +10310,17 @@ dir = 8 }, /area/mainship/medical/lower_medical) +"mXm" = ( +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 4 + }, +/obj/effect/ai_node, +/obj/machinery/landinglight/tadpole{ + dir = 4; + pixel_x = -4 + }, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar) "mXM" = ( /obj/machinery/light/mainship{ dir = 1 @@ -10300,32 +10328,21 @@ /turf/open/floor/mainship/sterile/dark, /area/mainship/medical/upper_medical) "mXR" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, /obj/structure/cable, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/structure/disposalpipe/segment, -/obj/effect/ai_node, -/turf/open/floor/plating/plating_catwalk, -/area/mainship/hallways/aft_hallway) -"mZj" = ( -/obj/structure/table/mainship/nometal, -/obj/item/reagent_containers/food/drinks/shaker, -/obj/item/clothing/gloves/latex, -/obj/item/clothing/head/chefhat, -/obj/item/clothing/suit/storage/chef/classic, -/obj/item/tool/kitchen/rollingpin, -/obj/item/book/manual/chef_recipes, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/mainship/mono, -/area/mainship/living/grunt_rnr) +/area/mainship/hallways/aft_hallway) "mZS" = ( /turf/open/floor/mainship/black/full, /area/mainship/command/self_destruct) -"nas" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/open/floor/mainship/mono, -/area/mainship/hallways/hangar) "nat" = ( /obj/structure/closet/radiation, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ @@ -10353,17 +10370,6 @@ }, /turf/open/floor/plating, /area/mainship/hallways/hangar) -"ncj" = ( -/obj/structure/cable, -/obj/machinery/door/airlock/mainship/maint, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/door/firedoor/mainship{ - dir = 2 - }, -/turf/open/floor/mainship/mono, -/area/mainship/shipboard/weapon_room) "ncF" = ( /obj/machinery/suit_storage_unit/carbon_unit, /turf/open/floor/mainship/mono, @@ -10387,9 +10393,9 @@ }, /area/mainship/medical/upper_medical) "ncO" = ( -/obj/machinery/door_control/mainship/droppod, -/turf/open/floor/mainship/mono, -/area/mainship/hallways/hangar) +/obj/machinery/vending/weapon, +/turf/open/floor/mainship/floor, +/area/mainship/living/mechpilotquarters) "ndG" = ( /obj/structure/bed/chair/sofa/right, /obj/item/bedsheet/ce{ @@ -10415,13 +10421,13 @@ /turf/open/floor/plating/plating_catwalk, /area/mainship/hull/lower_hull) "ndN" = ( -/obj/machinery/holosign_switch{ - id = "or1sign"; - pixel_x = 7; - pixel_y = -5 - }, -/turf/closed/wall/mainship/white, -/area/mainship/medical/operating_room_one) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/disposalpipe/segment, +/obj/effect/ai_node, +/turf/open/floor/plating/plating_catwalk, +/area/mainship/hallways/aft_hallway) "nei" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -10449,21 +10455,7 @@ /obj/structure/flora/pottedplant/twentytwo, /turf/open/floor/mainship/mono, /area/mainship/engineering/upper_engineering) -"nfC" = ( -/obj/structure/cable, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 5 - }, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 9 - }, -/obj/machinery/holopad, -/turf/open/floor/mainship/mono, -/area/mainship/hallways/hangar/droppod) "ngO" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 }, @@ -10471,13 +10463,11 @@ dir = 4 }, /obj/structure/cable, +/obj/effect/turf_decal/warning_stripes/thick{ + dir = 8 + }, /turf/open/floor/mainship/stripesquare, /area/mainship/command/cic) -"nhc" = ( -/obj/effect/turf_decal/warning_stripes/thin, -/obj/machinery/holopad, -/turf/open/floor/mainship/mono, -/area/mainship/shipboard/weapon_room) "nhn" = ( /obj/effect/turf_decal/warning_stripes/thin{ dir = 1 @@ -10498,6 +10488,16 @@ }, /turf/open/floor/mainship/floor, /area/crew_quarters/toilet) +"niE" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/effect/ai_node, +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 1 + }, +/turf/open/floor/mainship/cargo/arrow, +/area/mainship/hallways/hangar) "niH" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -10506,24 +10506,22 @@ /turf/open/floor/plating/plating_catwalk, /area/mainship/hallways/starboard_hallway) "njE" = ( -/obj/item/reagent_containers/spray/cleaner, -/obj/item/reagent_containers/spray/cleaner, -/obj/item/tool/extinguisher, -/obj/item/tool/extinguisher/mini, -/obj/structure/rack, -/obj/item/flashlight, -/obj/item/flashlight, -/obj/item/lightreplacer, -/obj/machinery/camera/autoname/mainship{ - dir = 8 +/obj/structure/bed/chair/nometal{ + dir = 1 }, -/turf/open/floor/mainship/green{ +/turf/open/floor/mainship/white{ dir = 10 }, -/area/mainship/squads/req) +/area/mainship/living/pilotbunks) "nkm" = ( -/obj/machinery/door_control/mainship/hangar, -/turf/open/floor/mainship/mono, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/prop/mainship/halfbuilt_mech/legs, +/turf/open/floor/plating/plating_catwalk, /area/mainship/hallways/hangar) "nku" = ( /obj/structure/table/mainship/nometal, @@ -10561,8 +10559,8 @@ /turf/open/floor/mainship/mono, /area/mainship/hull/lower_hull) "nkX" = ( -/obj/machinery/optable, -/obj/item/tank/anesthetic, +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk, /turf/open/floor/mainship/sterile/side{ dir = 8 }, @@ -10592,6 +10590,10 @@ pixel_x = 2; pixel_y = -1 }, +/obj/item/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner, /turf/open/floor/mainship/sterile/corner, /area/mainship/medical/upper_medical) "nld" = ( @@ -10600,15 +10602,6 @@ }, /turf/open/floor/mainship/mono, /area/mainship/hull/lower_hull) -"nmc" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 1 - }, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 4 - }, -/turf/open/floor/mainship/cargo/arrow, -/area/mainship/hallways/hangar) "nml" = ( /obj/machinery/disposal, /obj/structure/disposalpipe/trunk, @@ -10621,27 +10614,22 @@ /turf/open/floor/mainship/mono, /area/mainship/hallways/starboard_hallway) "nnF" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 1 +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 4 }, -/turf/open/floor/mainship/mono, -/area/mainship/living/bridgebunks) -"noZ" = ( -/obj/effect/ai_node, -/obj/structure/cable, -/turf/open/floor/mainship/floor, -/area/crew_quarters/toilet) +/obj/structure/punching_bag, +/turf/open/floor/plating/mainship, +/area/mainship/shipboard/firing_range) "npN" = ( /obj/structure/table/mainship/nometal, /obj/machinery/computer/med_data/laptop, /turf/open/floor/mainship/sterile/dark, /area/mainship/medical/upper_medical) "nqG" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/layer1{ - dir = 1; - on = 1 +/obj/machinery/shower{ + dir = 8 }, -/turf/open/floor/mainship/mono, +/turf/open/floor/plating/plating_catwalk, /area/mainship/living/bridgebunks) "nrK" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -10658,9 +10646,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /turf/open/floor/mainship/mono, /area/mainship/command/cic) -"nsR" = ( -/turf/open/floor/plating/mainship, -/area/mainship/shipboard/weapon_room) "ntb" = ( /obj/machinery/door/airlock/mainship/medical/morgue, /obj/structure/cable, @@ -10675,14 +10660,20 @@ /area/medical/morgue) "nuX" = ( /obj/effect/ai_node, -/turf/open/floor/mainship/black{ - dir = 8 - }, -/area/mainship/squads/general) +/obj/machinery/iv_drip, +/turf/open/floor/mainship/sterile/dark, +/area/mainship/medical/upper_medical) "nuZ" = ( /obj/structure/prop/mainship/sensor_computer3/sd, /turf/open/floor/mainship/tcomms, /area/mainship/command/self_destruct) +"nvH" = ( +/obj/machinery/power/apc{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/aft_hallway) "nvN" = ( /obj/structure/closet/firecloset, /obj/item/clothing/mask/gas, @@ -10698,13 +10689,9 @@ /turf/open/floor/mainship/mono, /area/mainship/command/cic) "nwc" = ( -/obj/machinery/holosign_switch{ - id = "or2sign"; - pixel_x = -7; - pixel_y = -5 - }, -/turf/closed/wall/mainship/white, -/area/mainship/medical/operating_room_two) +/obj/machinery/iv_drip, +/turf/open/floor/mainship/sterile/dark, +/area/mainship/medical/upper_medical) "nwt" = ( /obj/effect/spawner/random/misc/structure/flavorvending/colaweighted, /turf/open/floor/mainship, @@ -10724,7 +10711,7 @@ /turf/open/floor/plating, /area/mainship/squads/general) "nwX" = ( -/obj/machinery/vending/MarineMed, +/obj/machinery/computer/sleep_console, /turf/open/floor/mainship/sterile/side, /area/mainship/medical/lower_medical) "nxC" = ( @@ -10745,6 +10732,13 @@ /obj/structure/cable, /turf/open/floor/mainship/mono, /area/mainship/engineering/engineering_workshop) +"nyh" = ( +/obj/machinery/light/mainship{ + dir = 8 + }, +/obj/structure/flora/ausbushes/brflowers, +/turf/open/floor/grass, +/area/mainship/living/starboard_garden) "nyw" = ( /obj/machinery/door/firedoor/mainship, /obj/machinery/light/mainship{ @@ -10770,7 +10764,7 @@ "nzg" = ( /obj/machinery/fuelcell_recycler, /obj/machinery/light/mainship, -/turf/open/floor/mainship/mono, +/turf/open/floor/mainship/hexagon, /area/mainship/engineering/engine_core) "nzB" = ( /obj/effect/turf_decal/warning_stripes/thick{ @@ -10790,6 +10784,13 @@ dir = 8 }, /area/mainship/medical/upper_medical) +"nAM" = ( +/obj/machinery/door/poddoor/railing{ + dir = 1; + id = "supply_elevator_railing" + }, +/turf/open/floor/mainship/mono, +/area/mainship/squads/req) "nBk" = ( /obj/structure/bed/chair/comfy{ dir = 1 @@ -10807,6 +10808,11 @@ /obj/structure/cable, /turf/open/floor/mainship/tcomms, /area/mainship/engineering/lower_engineering) +"nDE" = ( +/turf/open/floor/mainship/white{ + dir = 8 + }, +/area/mainship/living/pilotbunks) "nDF" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -10848,12 +10854,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/mainship/mono, /area/mainship/hull/lower_hull) -"nGn" = ( -/obj/structure/bed/chair/nometal{ - dir = 1 - }, -/turf/open/floor/mainship/blue/full, -/area/mainship/living/briefing) "nHf" = ( /turf/open/floor/carpet/side{ dir = 1 @@ -10872,20 +10872,10 @@ /turf/open/floor/mainship/stripesquare, /area/mainship/hallways/stern_hallway) "nIa" = ( -/obj/effect/turf_decal/warning_stripes/thin, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 6 - }, -/obj/structure/table/mainship/nometal, -/obj/machinery/cell_charger, -/obj/effect/spawner/random/engineering/powercell, -/obj/effect/spawner/random/engineering/powercell, -/obj/machinery/light/mainship{ - dir = 8 - }, -/turf/open/floor/mainship/green{ - dir = 8 +/obj/effect/turf_decal/warning_stripes/thick{ + dir = 10 }, +/turf/open/floor/plating, /area/mainship/squads/req) "nId" = ( /obj/machinery/camera/autoname/mainship{ @@ -10902,12 +10892,10 @@ }, /area/mainship/squads/general) "nIj" = ( -/obj/machinery/firealarm, -/obj/structure/table/mainship/nometal, -/obj/item/storage/box/donkpockets, -/turf/open/floor/mainship/white{ - dir = 1 - }, +/obj/structure/bed, +/obj/item/bedsheet/blue, +/obj/effect/landmark/start/job/pilotofficer, +/turf/open/floor/wood, /area/mainship/living/pilotbunks) "nIr" = ( /turf/open/floor/mainship/black{ @@ -10918,6 +10906,10 @@ /obj/machinery/vending/medical/shipside, /turf/open/floor/mainship/sterile/dark, /area/mainship/medical/chemistry) +"nIG" = ( +/obj/machinery/vending/uniform_supply, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar/droppod) "nJd" = ( /obj/machinery/door/airlock/mainship/medical/glass/chemistry, /obj/machinery/door/firedoor/mainship, @@ -10946,17 +10938,6 @@ }, /turf/open/floor/mainship, /area/mainship/squads/general) -"nMd" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 8 - }, -/obj/machinery/camera/autoname/mainship{ - dir = 1 - }, -/turf/open/floor/mainship/cargo/arrow{ - dir = 8 - }, -/area/mainship/hallways/hangar/droppod) "nMm" = ( /obj/machinery/door/window, /obj/machinery/shower{ @@ -10970,10 +10951,10 @@ /turf/open/floor/mainship/floor, /area/mainship/squads/general) "nMG" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/item/stack/conveyor/thirty, -/obj/structure/rack, -/obj/item/conveyor_switch_construct, +/obj/machinery/vending/tool, +/obj/structure/closet/walllocker/hydrant/extinguisher{ + dir = 4 + }, /turf/open/floor/mainship/green{ dir = 8 }, @@ -10983,18 +10964,6 @@ /obj/item/trash/cigbutt, /turf/open/floor/wood, /area/mainship/living/cryo_cells) -"nNm" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 5 - }, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 8 - }, -/obj/effect/ai_node, -/turf/open/floor/mainship/cargo/arrow{ - dir = 8 - }, -/area/mainship/hallways/hangar/droppod) "nNo" = ( /obj/structure/table/mainship/nometal, /obj/item/camera, @@ -11009,6 +10978,11 @@ dir = 4 }, /area/mainship/medical/upper_medical) +"nNY" = ( +/obj/machinery/camera/autoname/mainship, +/obj/structure/ship_ammo/cas/heavygun, +/turf/open/floor/mainship/cargo, +/area/mainship/hallways/hangar) "nOv" = ( /obj/structure/table/mainship/nometal, /obj/item/tool/wrench, @@ -11024,6 +10998,25 @@ /obj/structure/cable, /turf/open/floor/mainship/mono, /area/mainship/hull/lower_hull) +"nOV" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/open/floor/mainship/mono, +/area/mainship/living/pilotbunks) +"nPF" = ( +/obj/structure/disposalpipe/segment/corner{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 9 + }, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar) "nRz" = ( /obj/effect/soundplayer, /turf/closed/wall/mainship/white, @@ -11042,11 +11035,11 @@ /turf/open/floor/mainship/sterile/dark, /area/mainship/medical/lower_medical) "nRP" = ( -/obj/machinery/light/mainship{ - dir = 4 +/obj/structure/sink{ + dir = 8 }, -/turf/open/floor/mainship/mono, -/area/mainship/living/grunt_rnr) +/turf/open/floor/mainship/sterile/white, +/area/mainship/living/bridgebunks) "nSH" = ( /obj/structure/table/mainship/nometal, /obj/machinery/computer/shuttle/shuttle_control/dropship, @@ -11069,22 +11062,32 @@ }, /turf/open/floor/mainship/mono, /area/mainship/engineering/upper_engineering) +"nUc" = ( +/obj/item/clothing/mask/muzzle, +/turf/open/floor/mainship/mono, +/area/mainship/hull/lower_hull) +"nVl" = ( +/obj/structure/rack, +/obj/structure/ob_ammo/warhead/explosive, +/obj/structure/ob_ammo/warhead/explosive, +/turf/open/floor/mainship/red{ + dir = 9 + }, +/area/mainship/shipboard/weapon_room) "nWd" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable, -/obj/machinery/power/apc{ - dir = 4 - }, -/turf/open/floor/mainship/mono, +/turf/open/floor/plating/plating_catwalk, /area/mainship/hallways/port_umbilical) -"nWE" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 +"nWM" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 8 }, -/turf/open/floor/plating/plating_catwalk, -/area/mainship/hallways/hangar) +/obj/item/reagent_containers/hypospray/autoinjector/synaptizine_expired, +/turf/open/floor/mainship/mono, +/area/mainship/shipboard/weapon_room) "nWT" = ( /turf/open/floor/mainship_hull, /area/space) @@ -11122,16 +11125,32 @@ dir = 4 }, /area/mainship/shipboard/firing_range) -"oac" = ( -/obj/effect/turf_decal/warning_stripes/linethick{ +"nZU" = ( +/obj/machinery/landinglight/cas{ + dir = 1; + pixel_y = -4 + }, +/obj/effect/turf_decal/warning_stripes/thin{ dir = 1 }, -/obj/effect/turf_decal/warning_stripes/linethick{ +/obj/structure/cable, +/obj/structure/disposalpipe/segment/corner{ dir = 4 }, -/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 6 + }, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar) +"oac" = ( +/obj/effect/turf_decal/warning_stripes/thick{ + dir = 6 + }, /turf/open/floor/plating, -/area/mainship/hallways/starboard_hallway) +/area/mainship/squads/req) "oaf" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ @@ -11161,9 +11180,11 @@ /turf/open/floor/mainship/sterile/side, /area/mainship/medical/lower_medical) "oca" = ( -/obj/machinery/iv_drip, -/obj/machinery/power/apc/mainship, /obj/structure/cable, +/obj/structure/closet/secure_closet/medical2, +/obj/structure/sign/nosmoking_2{ + dir = 1 + }, /turf/open/floor/mainship/sterile/corner{ dir = 1 }, @@ -11177,21 +11198,13 @@ /turf/open/floor/plating/plating_catwalk, /area/mainship/hull/lower_hull) "ocE" = ( -/obj/structure/cable, -/obj/effect/ai_node, -/turf/open/floor/mainship/sterile/dark, +/obj/machinery/vending/medical/shipside, +/turf/open/floor/mainship/sterile/side, /area/mainship/medical/upper_medical) "ocK" = ( -/obj/structure/cable, /obj/machinery/light/mainship{ light_color = "#da2f1b" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 4 - }, /turf/open/floor/mainship/mono, /area/mainship/squads/req) "ocY" = ( @@ -11214,16 +11227,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/mainship/hull/lower_hull) -"oel" = ( -/obj/item/clothing/head/warning_cone, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 9 - }, -/turf/open/floor/mainship/mono, -/area/mainship/hallways/hangar) "ogF" = ( /obj/structure/noticeboard, /turf/closed/wall/mainship, @@ -11238,6 +11241,7 @@ /obj/machinery/camera/autoname/mainship{ dir = 8 }, +/obj/structure/sign/double/barsign, /turf/open/floor/wood, /area/mainship/living/grunt_rnr) "ohw" = ( @@ -11257,35 +11261,20 @@ /turf/open/floor/mainship/mono, /area/mainship/hull/lower_hull) "oiy" = ( -/obj/structure/bed/chair/nometal{ - dir = 1 +/turf/open/floor/mainship/terragov/north{ + dir = 9 }, -/obj/effect/ai_node, -/turf/open/floor/mainship/orange/full, /area/mainship/living/briefing) -"ojv" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +"oke" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/mainship/mono, -/area/mainship/shipboard/weapon_room) -"ojz" = ( /obj/structure/cable, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 8 - }, -/obj/structure/disposalpipe/segment/corner{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 9 - }, -/turf/open/floor/mainship/mono, -/area/mainship/shipboard/weapon_room) +/turf/open/floor/mainship/sterile/white, +/area/mainship/living/bridgebunks) "okO" = ( /obj/machinery/light/mainship/small, /obj/structure/cable, @@ -11304,13 +11293,8 @@ /turf/closed/wall/mainship/white, /area/mainship/medical/upper_medical) "omd" = ( -/obj/structure/sink{ - dir = 4 - }, -/obj/structure/mirror{ - dir = 8 - }, -/turf/open/floor/mainship/floor, +/obj/structure/sign/restroom, +/turf/open/floor/mainship/mono, /area/crew_quarters/toilet) "omk" = ( /obj/machinery/light/mainship{ @@ -11318,6 +11302,10 @@ }, /turf/open/floor/mainship/mono, /area/mainship/hallways/port_hallway) +"omz" = ( +/obj/machinery/holopad, +/turf/open/floor/grass, +/area/mainship/living/starboard_garden) "onk" = ( /obj/machinery/light/mainship{ dir = 4 @@ -11325,7 +11313,6 @@ /obj/machinery/camera/autoname/mainship{ dir = 1 }, -/obj/machinery/bot/cleanbot, /turf/open/floor/mainship/sterile/corner{ dir = 4 }, @@ -11373,13 +11360,8 @@ /turf/closed/wall/mainship, /area/mainship/command/self_destruct) "opn" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 1 - }, -/obj/machinery/landinglight/cas{ - dir = 1; - pixel_y = -4 - }, +/obj/effect/turf_decal/warning_stripes/thin, +/obj/structure/largecrate/guns, /turf/open/floor/mainship/mono, /area/mainship/hallways/hangar) "opA" = ( @@ -11387,22 +11369,6 @@ /obj/structure/sign/safety/cryogenic, /turf/open/floor/mainship/sterile/side, /area/mainship/medical/lower_medical) -"opN" = ( -/obj/structure/rack, -/obj/machinery/camera/autoname/mainship{ - dir = 1 - }, -/obj/structure/ob_ammo/ob_fuel, -/obj/structure/ob_ammo/ob_fuel, -/obj/structure/ob_ammo/ob_fuel, -/obj/structure/ob_ammo/ob_fuel, -/obj/structure/ob_ammo/ob_fuel, -/turf/open/floor/mainship/red, -/area/mainship/shipboard/weapon_room) -"oqI" = ( -/obj/effect/turf_decal/warning_stripes/thin, -/turf/open/floor/mainship/sterile/plain, -/area/mainship/living/tankerbunks) "oqS" = ( /obj/machinery/marine_selector/gear/engi, /obj/machinery/camera/autoname/mainship, @@ -11425,10 +11391,16 @@ }, /area/mainship/living/briefing) "orC" = ( -/obj/machinery/status_display, -/obj/effect/soundplayer, -/turf/closed/wall/mainship, -/area/mainship/living/briefing) +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 4 + }, +/obj/machinery/landinglight/tadpole{ + dir = 4; + pixel_x = -4 + }, +/obj/machinery/computer/dropship_picker, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar) "osb" = ( /obj/structure/dropship_equipment/shuttle/sentry_holder, /turf/open/floor/mainship/orange{ @@ -11443,24 +11415,28 @@ }, /area/mainship/medical/chemistry) "osF" = ( -/obj/structure/cable, +/obj/structure/closet/crate/weapon, /obj/structure/disposalpipe/segment, -/obj/item/reagent_containers/jerrycan, -/turf/open/floor/mainship/cargo/arrow{ - dir = 4 - }, +/turf/open/floor/mainship/yellow_cargo, /area/mainship/squads/req) "osQ" = ( /obj/machinery/atmospherics/components/unary/vent_pump/layer1{ on = 1 }, -/turf/open/floor/prison/kitchen, +/turf/open/floor/iron/kitchen, /area/mainship/living/grunt_rnr) "osT" = ( /obj/structure/table/mainship/nometal, /obj/effect/spawner/random/food_or_drink/donut, /turf/open/floor/mainship, /area/mainship/squads/general) +"otn" = ( +/obj/machinery/door/poddoor/railing{ + dir = 1; + id = "supply_elevator_railing" + }, +/turf/open/floor/mainship/cargo/arrow, +/area/mainship/squads/req) "ouq" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment/corner{ @@ -11516,10 +11492,6 @@ /obj/machinery/cryopod/right, /turf/open/floor/mainship/sterile/side, /area/mainship/medical/lower_medical) -"ozQ" = ( -/obj/structure/closet/wardrobe/chaplain_black, -/turf/open/floor/wood, -/area/mainship/living/chapel) "ozU" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -11530,6 +11502,15 @@ "oAb" = ( /turf/closed/wall/mainship/research/containment/wall/north, /area/mainship/medical/medical_science) +"oAz" = ( +/obj/effect/turf_decal/warning_stripes/thick{ + dir = 1 + }, +/obj/machinery/light/mainship{ + dir = 4 + }, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar/droppod) "oAD" = ( /obj/machinery/camera/autoname/mainship{ dir = 4 @@ -11541,7 +11522,9 @@ /area/mainship/squads/general) "oCo" = ( /obj/structure/cable, -/obj/structure/closet/secure_closet/medical2, +/obj/machinery/power/apc/mainship, +/obj/machinery/iv_drip, +/obj/item/reagent_containers/blood/OPlus, /turf/open/floor/mainship/sterile/corner{ dir = 1 }, @@ -11558,6 +11541,12 @@ /obj/structure/table/reinforced, /turf/open/floor/mainship/black, /area/mainship/squads/general) +"oDl" = ( +/obj/structure/sign/poster{ + dir = 1 + }, +/turf/open/floor/mainship/cargo, +/area/mainship/hallways/hangar) "oDx" = ( /obj/effect/soundplayer, /turf/closed/wall/mainship, @@ -11570,30 +11559,18 @@ /area/mainship/hallways/port_hallway) "oEm" = ( /obj/structure/cable, +/obj/vehicle/ridden/wheelchair{ + dir = 1 + }, /turf/open/floor/mainship/sterile/dark, /area/mainship/medical/upper_medical) -"oFE" = ( -/obj/machinery/light/mainship{ - light_color = "#da2f1b" - }, -/turf/open/floor/wood, -/area/mainship/living/chapel) "oGN" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 5 - }, -/obj/machinery/gear{ - id = "supply_elevator_gear" - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 4 +/obj/effect/turf_decal/warning_stripes/thin, +/obj/machinery/landinglight/tadpole{ + pixel_y = 4 }, /turf/open/floor/mainship/mono, -/area/mainship/squads/req) +/area/mainship/hallways/hangar) "oGO" = ( /obj/machinery/light/mainship{ dir = 4 @@ -11619,10 +11596,16 @@ /obj/machinery/holopad, /turf/open/floor/mainship/mono, /area/mainship/shipboard/firing_range) -"oHV" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 4 +"oHw" = ( +/obj/effect/turf_decal/warning_stripes/thick/corner, +/obj/effect/turf_decal/warning_stripes/thick/corner{ + dir = 1 + }, +/turf/open/floor/mainship/yellow_cargo/arrow{ + dir = 1 }, +/area/mainship/shipboard/weapon_room) +"oHV" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 }, @@ -11630,16 +11613,22 @@ dir = 4 }, /obj/structure/cable, +/obj/effect/turf_decal/warning_stripes/thick{ + dir = 4 + }, /turf/open/floor/mainship/stripesquare, /area/mainship/hallways/port_hallway) -"oIb" = ( -/obj/effect/ai_node, -/obj/machinery/landinglight/alamo{ - pixel_y = 4 +"oHX" = ( +/obj/effect/turf_decal/warning_stripes/thick{ + dir = 9 }, -/obj/effect/turf_decal/warning_stripes/thin, /turf/open/floor/mainship/mono, -/area/mainship/hallways/hangar) +/area/mainship/shipboard/weapon_room) +"oIb" = ( +/turf/open/floor/mainship/terragov/north{ + dir = 5 + }, +/area/mainship/living/briefing) "oIc" = ( /obj/machinery/status_display, /turf/closed/wall/mainship, @@ -11649,16 +11638,9 @@ /turf/open/floor/plating, /area/mainship/engineering/port_atmos) "oIu" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 1 - }, -/obj/machinery/holopad, -/obj/machinery/landinglight/tadpole{ - dir = 1; - pixel_y = -4 - }, -/turf/open/floor/mainship/mono, -/area/mainship/hallways/hangar) +/mob/living/simple_animal/mouse, +/turf/open/floor/mainship/floor, +/area/mainship/living/mechpilotquarters) "oIC" = ( /obj/structure/table/mainship/nometal, /obj/item/storage/box/ids, @@ -11678,9 +11660,6 @@ }, /turf/open/floor/mainship/ntlogo/nt3, /area/mainship/squads/general) -"oKe" = ( -/turf/open/floor/mainship/black, -/area/mainship/living/pilotbunks) "oKm" = ( /obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -11727,13 +11706,6 @@ }, /turf/open/floor/cult, /area/medical/morgue) -"oOo" = ( -/obj/machinery/light/mainship{ - dir = 8 - }, -/obj/structure/cable, -/turf/open/floor/wood, -/area/mainship/living/chapel) "oOG" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -11741,6 +11713,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 }, +/mob/living/simple_animal/mouse, /turf/open/floor/mainship/mono, /area/mainship/hull/lower_hull) "oOM" = ( @@ -11763,14 +11736,17 @@ /turf/open/floor/mainship/mono, /area/mainship/engineering/upper_engineering) "oOX" = ( -/obj/effect/turf_decal/warning_stripes/thin{ +/obj/effect/turf_decal/warning_stripes/thick{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 1 +/obj/effect/turf_decal/warning_stripes/thick{ + dir = 8 }, -/turf/open/floor/mainship/black, -/area/mainship/living/tankerbunks) +/obj/machinery/light/mainship{ + light_color = "#da2f1b" + }, +/turf/open/floor/mainship/floor, +/area/mainship/hallways/hangar/droppod) "oQL" = ( /obj/structure/cable, /turf/open/floor/mainship/mono, @@ -11785,15 +11761,11 @@ /turf/open/floor/mainship/mono, /area/mainship/engineering/engineering_workshop) "oRH" = ( -/obj/machinery/light/mainship{ - dir = 1 - }, -/obj/structure/table/mainship/nometal, -/obj/machinery/microwave, -/turf/open/floor/mainship/white{ - dir = 1 +/obj/effect/turf_decal/warning_stripes/thick{ + dir = 5 }, -/area/mainship/living/pilotbunks) +/turf/open/floor/mainship/hexagon, +/area/mainship/living/tankerbunks) "oRM" = ( /obj/machinery/atmospherics/components/binary/valve/digital/on{ dir = 4 @@ -11804,23 +11776,19 @@ }, /turf/open/floor/mainship/mono, /area/mainship/engineering/port_atmos) -"oSl" = ( -/obj/machinery/door/poddoor/mainship/mech{ - dir = 1 - }, -/obj/machinery/door/airlock/multi_tile/mainship/generic/mechbay, -/obj/machinery/door/firedoor/multi_tile, -/turf/open/floor/mainship/mono, -/area/mainship/living/tankerbunks) "oSs" = ( -/obj/structure/rack, -/obj/item/pizzabox/meat, -/obj/item/facepaint/green, /obj/machinery/light/mainship{ dir = 4 }, +/obj/structure/rack, +/obj/item/storage/firstaid/adv, +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/fire{ + pixel_x = 3; + pixel_y = 3 + }, /turf/open/floor/mainship/green{ - dir = 6 + dir = 4 }, /area/mainship/squads/req) "oSt" = ( @@ -11835,6 +11803,15 @@ /obj/machinery/light/mainship, /turf/open/floor/mainship/mono, /area/mainship/hallways/stern_hallway) +"oTZ" = ( +/obj/machinery/light/mainship{ + dir = 1 + }, +/obj/machinery/vending/cola, +/turf/open/floor/mainship/silver{ + dir = 1 + }, +/area/mainship/living/chapel) "oUt" = ( /obj/machinery/recycler{ dir = 8 @@ -11874,17 +11851,6 @@ }, /turf/open/floor/mainship/mono, /area/mainship/engineering/port_atmos) -"oYA" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 6 - }, -/obj/effect/ai_node, -/turf/open/floor/mainship/mono, -/area/mainship/shipboard/weapon_room) -"oZb" = ( -/obj/effect/turf_decal/warning_stripes/thin, -/turf/open/floor/mainship/cargo, -/area/mainship/shipboard/weapon_room) "oZh" = ( /obj/item/reagent_containers/food/snacks/meat{ pixel_x = -1; @@ -11907,11 +11873,25 @@ /turf/open/floor/mainship/mono, /area/mainship/hull/lower_hull) "oZN" = ( -/obj/structure/closet/crate/weapon, +/obj/machinery/landinglight/cas{ + dir = 1; + pixel_y = -4 + }, +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 1 + }, /obj/structure/cable, -/obj/structure/disposalpipe/segment, -/turf/open/floor/mainship/cargo, -/area/mainship/squads/req) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar) "oZY" = ( /obj/machinery/light/mainship{ dir = 8 @@ -11931,6 +11911,19 @@ dir = 8 }, /area/mainship/squads/general) +"paw" = ( +/obj/item/reagent_containers/food/snacks/grown/poppy, +/obj/item/paper/memorial, +/turf/open/floor/grass, +/area/mainship/living/starboard_garden) +"pax" = ( +/obj/machinery/door/airlock/multi_tile/mainship/secdoor/glass{ + dir = 1; + req_access = null; + req_one_access = list(2,42) + }, +/turf/open/floor/mainship/mono, +/area/mainship/shipboard/brig) "pay" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -11939,6 +11932,13 @@ /obj/effect/ai_node, /turf/open/floor/plating/plating_catwalk, /area/mainship/hull/lower_hull) +"paT" = ( +/obj/machinery/camera/autoname/mainship{ + dir = 1 + }, +/obj/structure/dropship_equipment/cas/weapon/bomblet_pod, +/turf/open/floor/mainship/floor, +/area/mainship/hallways/hangar) "pbe" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 @@ -11949,6 +11949,13 @@ /obj/structure/cable, /turf/open/floor/plating/plating_catwalk, /area/mainship/hallways/port_hallway) +"pbh" = ( +/obj/effect/ai_node, +/obj/structure/prop/mainship/name_stencil/C, +/turf/open/floor/mainship/black{ + dir = 5 + }, +/area/mainship/squads/general) "pbx" = ( /obj/machinery/light/mainship, /obj/machinery/atmospherics/components/unary/vent_pump/layer1{ @@ -11978,45 +11985,35 @@ /turf/open/floor/mainship_hull, /area/space) "pdj" = ( -/obj/machinery/loadout_vendor, -/turf/open/floor/mainship/black{ - dir = 1 - }, -/area/mainship/living/tankerbunks) +/turf/closed/wall/mainship, +/area/mainship/hallways/hangar/droppod) "pdo" = ( /turf/open/floor/mainship/red/corner{ dir = 4 }, /area/mainship/command/airoom) +"pdw" = ( +/obj/structure/bed, +/obj/item/bedsheet/captain, +/obj/effect/landmark/start/job/staffofficer, +/turf/open/floor/mainship/mono, +/area/mainship/living/bridgebunks) "peg" = ( -/obj/structure/bed/stool{ - pixel_y = 8 - }, /obj/structure/flora/ausbushes/fullgrass, -/obj/structure/sign/prop1, /turf/open/floor/grass, /area/mainship/living/starboard_garden) "peH" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 4 - }, /obj/machinery/camera/autoname/mainship{ dir = 1 }, /turf/open/floor/mainship/mono, /area/mainship/squads/req) "peU" = ( -/obj/machinery/power/apc, -/obj/structure/cable, -/obj/structure/table/mainship/nometal, -/turf/open/floor/mainship/white{ +/obj/effect/turf_decal/warning_stripes/thick{ dir = 5 }, -/area/mainship/living/pilotbunks) +/turf/open/floor/plating, +/area/mainship/squads/req) "pfi" = ( /obj/machinery/door/window, /obj/machinery/shower{ @@ -12026,6 +12023,7 @@ /obj/item/tool/soap, /obj/item/attachable/bayonetknife, /obj/effect/decal/cleanable/blood, +/obj/item/storage/pill_bottle/quickclot, /turf/open/floor/mainship/sterile, /area/mainship/medical/upper_medical) "pfH" = ( @@ -12035,10 +12033,18 @@ }, /turf/open/floor/wood, /area/mainship/command/corporateliaison) +"pfU" = ( +/obj/effect/turf_decal/warning_stripes/thick/corner{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/mainship/yellow_cargo/arrow, +/area/mainship/hallways/hangar/droppod) "pfV" = ( /obj/structure/table/mainship, /obj/item/folder/white, /obj/item/pizzabox, +/obj/item/whistle, /turf/open/floor/mainship, /area/mainship/squads/general) "pgh" = ( @@ -12047,32 +12053,44 @@ }, /area/mainship/medical/chemistry) "pgp" = ( -/obj/effect/attach_point/weapon/dropship2{ +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 8 + }, +/obj/effect/turf_decal/warning_stripes/thin{ dir = 4 }, -/turf/open/floor/plating, +/obj/machinery/landinglight/alamo{ + dir = 8; + pixel_x = 4 + }, +/obj/structure/largecrate/guns, +/turf/open/floor/mainship/mono, /area/mainship/hallways/hangar) "pgq" = ( -/obj/structure/rack, -/obj/item/storage/toolbox/mechanical, -/turf/open/floor/mainship/black{ - dir = 1 - }, -/area/mainship/living/tankerbunks) +/obj/structure/drop_pod_launcher, +/obj/structure/droppod/leader, +/turf/open/floor/mainship/yellow_cargo, +/area/mainship/hallways/hangar/droppod) "pgv" = ( /obj/machinery/camera/autoname/mainship, /turf/open/floor/plating/mainship, /area/mainship/shipboard/firing_range) "pgL" = ( /obj/structure/flora/ausbushes/fullgrass, -/obj/machinery/light/mainship{ - dir = 8 - }, /obj/structure/bed/stool{ pixel_y = 8 }, /turf/open/floor/grass, /area/mainship/living/starboard_garden) +"pha" = ( +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 1 + }, +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 4 + }, +/turf/open/floor/mainship/cargo/arrow, +/area/mainship/hallways/hangar) "phr" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -12080,8 +12098,14 @@ /turf/open/floor/mainship/office, /area/mainship/hallways/hangar) "pid" = ( -/obj/structure/closet/walllocker/hydrant/extinguisher, -/turf/open/floor/mainship/mono, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/item/radio/intercom/general, +/turf/open/floor/mainship/yellow_cargo, /area/mainship/hallways/hangar) "pii" = ( /obj/effect/soundplayer, @@ -12132,6 +12156,16 @@ }, /turf/open/floor/plating, /area/mainship/hallways/hangar) +"plO" = ( +/obj/structure/sign/restroom, +/obj/structure/mirror{ + dir = 8 + }, +/obj/structure/sink{ + dir = 8 + }, +/turf/open/floor/mainship/mono, +/area/crew_quarters/toilet) "plR" = ( /obj/machinery/robotic_cradle, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, @@ -12140,6 +12174,10 @@ dir = 4 }, /area/mainship/medical/lower_medical) +"pmP" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor/mainship/mono, +/area/crew_quarters/toilet) "pmY" = ( /obj/structure/table/mainship/nometal, /obj/machinery/computer/atmos_alert, @@ -12204,11 +12242,6 @@ }, /turf/open/floor/mainship/sterile/dark, /area/mainship/medical/upper_medical) -"pqh" = ( -/turf/open/floor/mainship/black{ - dir = 1 - }, -/area/mainship/living/pilotbunks) "pqm" = ( /obj/machinery/marine_selector/clothes/engi, /obj/machinery/light/mainship{ @@ -12222,10 +12255,16 @@ /turf/open/floor/mainship/mono, /area/mainship/command/corporateliaison) "pqC" = ( -/obj/effect/attach_point/weapon/dropship2{ - dir = 8 +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 4 }, -/turf/open/floor/plating, +/obj/effect/ai_node, +/obj/machinery/landinglight/tadpole{ + dir = 4; + pixel_x = -4 + }, +/obj/item/clothing/head/warning_cone, +/turf/open/floor/mainship/mono, /area/mainship/hallways/hangar) "prY" = ( /obj/machinery/computer/camera_advanced/overwatch/req, @@ -12291,6 +12330,7 @@ "pvW" = ( /obj/item/toy/deck, /obj/structure/table/woodentable, +/obj/item/toy/plush/snake, /turf/open/floor/wood, /area/mainship/living/grunt_rnr) "pvX" = ( @@ -12299,12 +12339,6 @@ }, /turf/open/floor/mainship/mono, /area/mainship/hallways/starboard_hallway) -"pwa" = ( -/obj/machinery/vending/lasgun, -/turf/open/floor/mainship/orange{ - dir = 8 - }, -/area/mainship/hallways/hangar) "pwb" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/cable, @@ -12312,15 +12346,8 @@ /turf/open/floor/mainship/mono, /area/mainship/engineering/engineering_workshop) "pwj" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 8 - }, -/obj/effect/turf_decal/warning_stripes/thin, -/obj/machinery/landinglight/cas{ - dir = 8; - pixel_x = 4 - }, -/turf/open/floor/mainship/mono, +/obj/item/clothing/head/warning_cone, +/turf/open/floor/plating, /area/mainship/hallways/hangar) "pwI" = ( /obj/machinery/light/mainship{ @@ -12342,7 +12369,7 @@ "pyl" = ( /obj/machinery/power/fusion_engine/preset, /obj/structure/cable, -/turf/open/floor/mainship/mono, +/turf/open/floor/mainship/hexagon, /area/mainship/engineering/engine_core) "pyG" = ( /obj/machinery/vending/armor_supply, @@ -12352,7 +12379,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/mainship/cargo/arrow{ +/turf/open/floor/mainship/yellow_cargo/arrow{ dir = 8 }, /area/mainship/squads/general) @@ -12365,14 +12392,10 @@ }, /turf/open/floor/mainship/sterile/purple/corner, /area/mainship/medical/chemistry) -"pyX" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/mainship/black/corner{ - dir = 1 - }, -/area/mainship/living/tankerbunks) "pzq" = ( /obj/structure/prop/mainship/hangar_stencil, +/obj/structure/table/mainship/nometal, +/obj/item/storage/box/bodybags, /turf/open/floor/mainship/mono, /area/mainship/hallways/hangar) "pzU" = ( @@ -12398,8 +12421,10 @@ /turf/open/floor/mainship/mono, /area/mainship/hallways/port_hallway) "pBR" = ( -/obj/structure/largecrate/guns, -/turf/open/floor/mainship/office, +/obj/structure/largecrate/supply/supplies/water, +/turf/open/floor/mainship/orange{ + dir = 4 + }, /area/mainship/hallways/hangar) "pCd" = ( /obj/structure/closet/secure_closet/engineering_personal, @@ -12413,12 +12438,20 @@ }, /turf/open/floor/mainship/sterile/dark, /area/mainship/medical/lower_medical) -"pDT" = ( -/obj/structure/largecrate/supply/supplies/flares, -/turf/open/floor/mainship/orange{ - dir = 4 +"pEF" = ( +/obj/structure/table/mainship/nometal, +/obj/item/clothing/suit/storage/hazardvest, +/obj/item/clothing/suit/storage/hazardvest/lime, +/obj/item/clothing/suit/storage/hazardvest/blue, +/obj/item/tool/shovel/etool, +/obj/item/storage/pouch/medkit/firstaid, +/obj/item/tool/taperoll/engineering, +/obj/machinery/camera/autoname/mainship{ + dir = 8 }, -/area/mainship/hallways/hangar) +/obj/item/stack/sandbags_empty/half, +/turf/open/floor/mainship/mono, +/area/mainship/command/cic) "pEN" = ( /turf/closed/wall/mainship/white, /area/mainship/medical/operating_room_two) @@ -12426,8 +12459,17 @@ /obj/machinery/light/mainship{ dir = 1 }, +/obj/effect/spawner/random/misc/structure/flavorvending/snackweighted, /turf/open/floor/mainship/mono, /area/mainship/hallways/aft_hallway) +"pFs" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/effect/ai_node, +/turf/open/floor/plating/plating_catwalk, +/area/mainship/hallways/stern_hallway) "pFw" = ( /obj/machinery/door/airlock/mainship/maint{ dir = 2 @@ -12445,30 +12487,23 @@ dir = 1 }, /obj/machinery/camera/autoname/mainship, -/turf/open/floor/mainship/cargo, +/turf/open/floor/mainship/yellow_cargo, /area/mainship/squads/general) "pHl" = ( /obj/structure/cable, /obj/structure/window/framed/mainship, /turf/open/floor/plating, /area/mainship/engineering/lower_engineering) -"pHo" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/light/mainship{ - dir = 8 - }, -/turf/open/floor/mainship/black{ - dir = 8 - }, -/area/mainship/living/tankerbunks) "pHB" = ( -/obj/machinery/camera/autoname/mainship{ +/obj/effect/turf_decal/warning_stripes/thick{ + dir = 4 + }, +/obj/machinery/power/apc{ dir = 1 }, -/turf/open/floor/mainship/mono, -/area/mainship/hallways/hangar/droppod) +/obj/structure/cable, +/turf/open/floor/mainship/floor, +/area/mainship/living/mechpilotquarters) "pHC" = ( /obj/structure/bed/bunkbed, /obj/effect/landmark/start/job/squadmarine, @@ -12491,16 +12526,14 @@ /turf/open/floor/carpet, /area/mainship/living/commandbunks) "pJi" = ( -/obj/structure/table/mainship/nometal, -/obj/effect/spawner/random/misc/paperbin, -/obj/item/storage/fancy/cigar, -/obj/item/tool/lighter/zippo, -/obj/item/tool/pen, /obj/machinery/light/mainship{ - light_color = "#da2f1b" + dir = 8 }, +/obj/structure/table/mainship/nometal, +/obj/item/pizzabox/meat, +/obj/item/facepaint/green, /turf/open/floor/mainship/green{ - dir = 10 + dir = 9 }, /area/mainship/squads/req) "pJs" = ( @@ -12510,16 +12543,11 @@ /turf/open/floor/mainship/sterile/dark, /area/mainship/medical/chemistry) "pJv" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 4 - }, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 8 - }, -/turf/open/floor/mainship/cargo/arrow{ - dir = 8 +/obj/machinery/light/mainship{ + dir = 1 }, -/area/mainship/hallways/hangar/droppod) +/turf/open/floor/wood, +/area/mainship/living/mechpilotquarters) "pKl" = ( /obj/machinery/door/firedoor/mainship{ dir = 2 @@ -12536,13 +12564,15 @@ }, /turf/open/floor/mainship/stripesquare, /area/mainship/hallways/port_hallway) -"pKp" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 4 - }, -/obj/effect/spawner/random/misc/gnome, -/turf/open/floor/mainship/mono, -/area/mainship/hallways/hangar) +"pKr" = ( +/obj/structure/table/mainship/nometal, +/obj/item/reagent_containers/food/drinks/shaker, +/obj/item/clothing/gloves/latex, +/obj/item/clothing/head/chefhat, +/obj/item/tool/kitchen/rollingpin, +/obj/item/book/manual/chef_recipes, +/turf/open/floor/iron/kitchen, +/area/mainship/living/grunt_rnr) "pLb" = ( /obj/machinery/light/mainship{ dir = 8 @@ -12552,13 +12582,6 @@ dir = 8 }, /area/mainship/engineering/engineering_workshop) -"pLj" = ( -/obj/structure/prop/mainship/cannon_cable_connector, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 1 - }, -/turf/open/floor/mainship/mono, -/area/mainship/shipboard/weapon_room) "pLk" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 @@ -12566,8 +12589,15 @@ /turf/open/floor/mainship/cargo/arrow, /area/mainship/hallways/hangar) "pLB" = ( -/turf/open/floor/plating/icefloor/warnplate, +/obj/effect/ai_node, +/turf/open/floor/plating, /area/mainship/squads/req) +"pLD" = ( +/obj/effect/turf_decal/warning_stripes/thick/corner{ + dir = 1 + }, +/turf/open/floor/plating, +/area/mainship/hallways/hangar) "pLU" = ( /obj/machinery/light/mainship{ dir = 8 @@ -12627,7 +12657,6 @@ }, /area/mainship/medical/medical_science) "pPR" = ( -/obj/machinery/door/airlock/mainship/command, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 }, @@ -12636,6 +12665,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/machinery/door/airlock/mainship/command/officer, /turf/open/floor/mainship/mono, /area/mainship/living/bridgebunks) "pPS" = ( @@ -12657,6 +12687,14 @@ /obj/structure/closet/toolcloset, /turf/open/floor/mainship/mono, /area/mainship/hallways/starboard_hallway) +"pQt" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment/corner{ + dir = 1 + }, +/obj/effect/ai_node, +/turf/open/floor/plating/plating_catwalk, +/area/mainship/hull/lower_hull) "pQG" = ( /obj/machinery/door/airlock/mainship/command/cic, /turf/open/floor/mainship/mono, @@ -12677,23 +12715,17 @@ /turf/open/floor/mainship, /area/mainship/squads/general) "pSt" = ( -/obj/machinery/light/mainship{ - dir = 1 - }, -/turf/open/floor/mainship/sterile/dark, -/area/crew_quarters/toilet) -"pSV" = ( -/obj/item/radio/intercom/general, -/obj/effect/turf_decal/warning_stripes/thin{ +/obj/effect/turf_decal/warning_stripes/thick{ dir = 4 }, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 8 - }, -/turf/open/floor/mainship/cargo/arrow{ - dir = 4 +/obj/machinery/light/mainship{ + dir = 1 }, +/turf/open/floor/mainship/floor, /area/mainship/hallways/hangar/droppod) +"pSV" = ( +/turf/open/floor/mainship/hexagon, +/area/mainship/living/mechpilotquarters) "pSX" = ( /obj/machinery/light/mainship{ dir = 1 @@ -12715,7 +12747,7 @@ /area/mainship/hallways/boxingring) "pTP" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on, -/turf/open/floor/prison/kitchen, +/turf/open/floor/iron/kitchen, /area/mainship/living/grunt_rnr) "pTU" = ( /obj/machinery/disposal, @@ -12724,12 +12756,6 @@ }, /turf/open/floor/mainship/orange, /area/mainship/engineering/engineering_workshop) -"pUf" = ( -/obj/structure/sign/poster{ - dir = 1 - }, -/turf/open/floor/mainship/cargo, -/area/mainship/hallways/hangar) "pUK" = ( /obj/machinery/camera/autoname/mainship, /turf/open/floor/mainship/mono, @@ -12750,6 +12776,19 @@ dir = 8 }, /area/mainship/squads/general) +"pVY" = ( +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 5 + }, +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 9 + }, +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 10 + }, +/obj/effect/ai_node, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar) "pWo" = ( /obj/machinery/vending/weapon, /obj/structure/window/reinforced{ @@ -12780,18 +12819,24 @@ /turf/open/floor/mainship/stripesquare, /area/mainship/hallways/port_hallway) "pXw" = ( -/obj/structure/rack, -/obj/item/reagent_containers/jerrycan, -/obj/item/reagent_containers/jerrycan, -/obj/item/reagent_containers/jerrycan, -/obj/item/reagent_containers/jerrycan, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/structure/closet/walllocker/hydrant/extinguisher, +/turf/open/floor/plating/plating_catwalk, +/area/mainship/hallways/hangar) +"pZE" = ( +/obj/structure/sign/prop1{ + dir = 1 + }, /obj/machinery/light/mainship{ dir = 1 }, -/obj/item/reagent_containers/jerrycan, -/obj/item/reagent_containers/jerrycan, /turf/open/floor/mainship/mono, -/area/mainship/hallways/hangar) +/area/mainship/hallways/port_hallway) "pZF" = ( /obj/machinery/light/mainship{ dir = 8 @@ -12811,7 +12856,7 @@ dir = 8; pixel_x = 4 }, -/turf/open/floor/mainship/cargo/arrow{ +/turf/open/floor/mainship/yellow_cargo/arrow{ dir = 8 }, /area/mainship/hallways/hangar) @@ -12837,11 +12882,6 @@ }, /turf/open/floor/engine, /area/mainship/engineering/port_atmos) -"qcx" = ( -/obj/structure/table/woodentable, -/obj/item/storage/bible, -/turf/open/floor/wood, -/area/mainship/living/chapel) "qcA" = ( /obj/structure/cable, /obj/machinery/camera/autoname/mainship{ @@ -12849,14 +12889,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/mainship/hull/lower_hull) -"qdq" = ( -/obj/effect/decal/cleanable/blood/writing{ - desc = "It looks like a writing in blood. It says, 'We live as we dream, alone.'"; - dir = 4 - }, -/obj/structure/ship_ammo/cas/minirocket, -/turf/open/floor/mainship/cargo, -/area/mainship/hallways/hangar) "qej" = ( /obj/machinery/door/firedoor/mainship{ dir = 2 @@ -12889,10 +12921,12 @@ /turf/open/floor/mainship/sterile/purple/side, /area/mainship/medical/chemistry) "qfG" = ( -/obj/item/clothing/head/modular/marine, -/obj/item/reagent_containers/food/snacks/grown/poppy, /obj/structure/cable, -/turf/open/floor/mainship/mono, +/obj/structure/bed/stool{ + pixel_y = 8 + }, +/obj/machinery/power/apc, +/turf/open/floor/grass, /area/mainship/living/starboard_garden) "qha" = ( /turf/closed/wall/mainship, @@ -12901,12 +12935,6 @@ /obj/machinery/marine_selector/clothes/medic, /turf/open/floor/mainship/floor, /area/mainship/squads/general) -"qhv" = ( -/obj/structure/largecrate/supply/supplies/water, -/turf/open/floor/mainship/orange{ - dir = 4 - }, -/area/mainship/hallways/hangar) "qiy" = ( /obj/structure/cable, /obj/machinery/door/airlock/mainship/maint, @@ -12919,12 +12947,21 @@ /turf/open/floor/wood, /area/mainship/living/cryo_cells) "qjj" = ( -/obj/machinery/door/airlock/mainship/generic/pilot/bunk, -/turf/open/floor/mainship/floor, -/area/mainship/living/pilotbunks) +/obj/machinery/door/airlock/mainship/maint, +/obj/machinery/door/firedoor/mainship{ + dir = 8 + }, +/turf/open/floor/mainship/mono, +/area/mainship/living/tankerbunks) "qjm" = ( -/turf/open/floor/plating/plating_catwalk, -/area/mainship/shipboard/weapon_room) +/obj/effect/ai_node, +/obj/structure/disposalpipe/segment/corner{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/power/apc, +/turf/open/floor/mainship/mono, +/area/mainship/hull/lower_hull) "qjw" = ( /obj/structure/closet/bodybag, /obj/effect/decal/cleanable/blood, @@ -12936,14 +12973,6 @@ /obj/item/moneybag/vault, /turf/open/floor/mainship/red/full, /area/mainship/command/cic) -"qjW" = ( -/obj/effect/turf_decal/warning_stripes/thin, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 5 - }, -/obj/effect/ai_node, -/turf/open/floor/mainship/mono, -/area/mainship/shipboard/weapon_room) "qkt" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -12968,11 +12997,6 @@ /obj/machinery/photocopier, /turf/open/floor/mainship/mono, /area/mainship/command/cic) -"qlc" = ( -/obj/structure/table/woodentable, -/obj/effect/spawner/random/misc/table_lighting, -/turf/open/floor/wood, -/area/mainship/living/tankerbunks) "qlo" = ( /obj/machinery/light/mainship{ dir = 1 @@ -13046,15 +13070,6 @@ dir = 1 }, /area/mainship/medical/lower_medical) -"qrR" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 6 - }, -/obj/machinery/gear{ - id = "supply_elevator_gear" - }, -/turf/open/floor/mainship/mono, -/area/mainship/squads/req) "qsh" = ( /obj/effect/turf_decal/warning_stripes/thick{ dir = 1 @@ -13069,12 +13084,13 @@ /area/mainship/hull/lower_hull) "qsC" = ( /obj/structure/cable, -/turf/open/floor/mainship/mono, +/turf/open/floor/mainship/hexagon, /area/mainship/engineering/engine_core) "qsI" = ( -/obj/structure/cable, /obj/structure/disposalpipe/segment, -/turf/open/floor/mainship/mono, +/turf/open/floor/mainship/yellow_cargo/arrow{ + dir = 4 + }, /area/mainship/squads/req) "qto" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -13084,7 +13100,7 @@ dir = 4 }, /obj/structure/cable, -/turf/open/floor/mainship/orange, +/turf/open/floor/mainship/hexagon, /area/mainship/engineering/engine_core) "qtz" = ( /obj/machinery/camera/autoname/mainship, @@ -13111,6 +13127,26 @@ "qvJ" = ( /turf/closed/wall/mainship, /area/mainship/living/grunt_rnr) +"qvM" = ( +/obj/docking_port/stationary/supply, +/turf/open/floor/mainship/empty, +/area/mainship/squads/req) +"qvN" = ( +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 1 + }, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar) "qwg" = ( /obj/structure/disposalpipe/segment, /obj/effect/ai_node, @@ -13135,14 +13171,10 @@ /obj/machinery/vending/armor_supply, /turf/open/floor/mainship/mono, /area/mainship/hallways/hangar) -"qwW" = ( -/obj/machinery/door/firedoor/mainship, -/obj/machinery/door/poddoor/mainship/mech, -/turf/open/floor/mainship/stripesquare, -/area/mainship/living/pilotbunks) "qxp" = ( -/obj/structure/bed/chair/comfy/black, -/turf/open/floor/mainship/purple/full, +/turf/open/floor/mainship/terragov/north{ + dir = 8 + }, /area/mainship/living/briefing) "qxw" = ( /obj/machinery/power/apc/mainship, @@ -13172,16 +13204,9 @@ /area/mainship/hull/lower_hull) "qyU" = ( /obj/effect/ai_node, +/obj/structure/disposalpipe/segment, /turf/open/floor/mainship/floor, /area/mainship/command/corporateliaison) -"qyZ" = ( -/obj/structure/rack, -/obj/structure/ob_ammo/warhead/cluster, -/obj/structure/ob_ammo/warhead/cluster, -/turf/open/floor/mainship/red{ - dir = 5 - }, -/area/mainship/shipboard/weapon_room) "qzp" = ( /obj/structure/bed/bunkbed, /obj/effect/landmark/start/job/squadcorpsman, @@ -13197,6 +13222,13 @@ }, /turf/open/floor/plating/plating_catwalk, /area/mainship/hallways/hangar) +"qzN" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/layer1{ + dir = 8; + on = 1 + }, +/turf/open/floor/mainship/hexagon, +/area/mainship/living/tankerbunks) "qAE" = ( /obj/machinery/light/mainship/small{ dir = 8 @@ -13241,20 +13273,6 @@ /obj/structure/closet/secure_closet/guncabinet/mp_armory, /turf/open/floor/mainship/sterile/dark, /area/mainship/medical/medical_science) -"qDG" = ( -/obj/machinery/door/firedoor/mainship, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/open/floor/mainship/stripesquare, -/area/mainship/living/pilotbunks) "qEt" = ( /obj/structure/sign/poster{ dir = 1 @@ -13281,7 +13299,7 @@ dir = 1 }, /obj/structure/sign/poster, -/turf/open/floor/mainship/cargo, +/turf/open/floor/mainship/yellow_cargo, /area/mainship/squads/general) "qFQ" = ( /obj/effect/turf_decal/warning_stripes/thin{ @@ -13345,6 +13363,10 @@ }, /turf/open/floor/mainship/tcomms, /area/mainship/command/telecomms) +"qHC" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/layer1, +/turf/open/floor/mainship/mono, +/area/mainship/living/pilotbunks) "qIt" = ( /obj/structure/table/mainship/nometal, /obj/effect/spawner/random/engineering/extinguisher/regularweighted, @@ -13353,6 +13375,16 @@ /obj/machinery/door_display/research_cell/cell, /turf/open/floor/mainship/sterile/dark, /area/mainship/medical/medical_science) +"qIE" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/plating/plating_catwalk, +/area/mainship/hallways/hangar) "qIG" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 @@ -13370,6 +13402,14 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on, /turf/open/floor/wood, /area/mainship/living/numbertwobunks) +"qKp" = ( +/obj/effect/decal/cleanable/blood/writing{ + desc = "It looks like a writing in blood. It says, 'We live as we dream, alone.'"; + dir = 4 + }, +/obj/structure/ship_ammo/cas/minirocket, +/turf/open/floor/mainship/cargo, +/area/mainship/hallways/hangar) "qKw" = ( /obj/machinery/door/firedoor/mainship{ dir = 2 @@ -13400,10 +13440,12 @@ }, /area/mainship/squads/general) "qMG" = ( -/obj/machinery/firealarm{ +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/machinery/power/apc/mainship/hardened{ dir = 4 }, -/turf/open/floor/mainship/mono, +/turf/open/floor/plating/plating_catwalk, /area/mainship/hallways/port_umbilical) "qMI" = ( /obj/machinery/shower{ @@ -13413,27 +13455,52 @@ /area/mainship/medical/medical_science) "qMJ" = ( /obj/structure/window/framed/mainship/white, -/obj/machinery/door/firedoor/mainship, /obj/machinery/door/poddoor/shutters/opened/medbay, +/obj/machinery/door/poddoor/shutters/mainship{ + dir = 1; + id = "or2privacyshutter"; + name = "\improper Privacy Shutters" + }, +/obj/machinery/door/poddoor/shutters/mainship{ + dir = 1; + id = "or1privacyshutter"; + name = "\improper Privacy Shutters" + }, /turf/open/floor/plating/platebotc, /area/mainship/medical/operating_room_one) "qMR" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/warning_stripes/thin{ dir = 8 }, -/turf/open/floor/plating/plating_catwalk, +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 4 + }, +/obj/machinery/landinglight/alamo{ + dir = 8; + pixel_x = 4 + }, +/obj/structure/largecrate/guns/russian, +/turf/open/floor/mainship/mono, /area/mainship/hallways/hangar) "qNE" = ( -/obj/machinery/door/poddoor/railing{ - dir = 2; - id = "supply_elevator_railing" - }, -/obj/machinery/computer/ordercomp, -/turf/open/floor/mainship/cargo/arrow{ +/obj/effect/turf_decal/warning_stripes/thin{ dir = 1 }, +/obj/machinery/landinglight/tadpole{ + dir = 1; + pixel_y = -4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/machinery/gear{ + id = "supply_elevator_gear" + }, +/turf/open/floor/mainship/mono, /area/mainship/squads/req) "qOa" = ( /obj/structure/table/reinforced, @@ -13442,32 +13509,57 @@ id = "or2privacyshutter"; name = "Privacy Shutters" }, -/obj/structure/cable, /obj/item/storage/surgical_tray, -/obj/item/reagent_containers/spray/surgery, -/obj/structure/sign/nosmoking_2{ - dir = 1 +/obj/item/reagent_containers/spray/surgery{ + pixel_x = -5; + pixel_y = 10 + }, +/obj/item/reagent_containers/spray/cleaner{ + desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; + name = "Surgery Cleaner"; + pixel_x = 6; + pixel_y = 10 }, /turf/open/floor/mainship/sterile/side{ dir = 1 }, /area/mainship/medical/operating_room_two) +"qOC" = ( +/obj/structure/closet/secure_closet/military_police, +/turf/open/floor/plating/mainship, +/area/mainship/shipboard/brig) +"qOJ" = ( +/obj/machinery/power/apc, +/obj/structure/cable, +/turf/open/floor/mainship/hexagon, +/area/mainship/living/tankerbunks) "qPc" = ( -/obj/effect/turf_decal/warning_stripes/thick/corner{ +/obj/machinery/landinglight/cas{ + dir = 1; + pixel_y = -4 + }, +/obj/effect/turf_decal/warning_stripes/thin{ dir = 1 }, -/turf/open/floor/plating, +/turf/open/floor/mainship/mono, /area/mainship/hallways/hangar) "qPq" = ( /obj/structure/sign/chemistry, /turf/closed/wall/mainship/white, /area/mainship/medical/chemistry) "qPD" = ( -/obj/effect/turf_decal/warning_stripes/thick{ +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 8 + }, +/obj/effect/turf_decal/warning_stripes/thin{ dir = 4 }, -/obj/item/clothing/head/warning_cone, -/turf/open/floor/plating, +/obj/machinery/landinglight/alamo{ + dir = 8; + pixel_x = 4 + }, +/obj/structure/largecrate/guns/merc, +/turf/open/floor/mainship/mono, /area/mainship/hallways/hangar) "qQk" = ( /obj/machinery/light/mainship/small, @@ -13478,15 +13570,20 @@ /turf/open/floor/mainship/mono, /area/mainship/hull/lower_hull) "qQD" = ( -/obj/machinery/vending/weapon, -/turf/open/floor/mainship/white{ - dir = 8 - }, -/area/mainship/living/pilotbunks) +/obj/effect/decal/cleanable/blood/oil, +/turf/open/floor/mainship/hexagon, +/area/mainship/living/tankerbunks) "qQF" = ( -/obj/docking_port/stationary/supply, -/turf/open/floor/mainship/empty, -/area/mainship/squads/req) +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 4 + }, +/obj/machinery/landinglight/tadpole{ + dir = 4; + pixel_x = -4 + }, +/obj/item/clothing/head/warning_cone, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar) "qQR" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -13500,17 +13597,13 @@ /turf/open/floor/mainship/mono, /area/mainship/command/corporateliaison) "qQY" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ +/obj/machinery/light/mainship{ dir = 1 }, -/obj/structure/cable, -/obj/machinery/light/mainship{ +/obj/machinery/vending/snack, +/turf/open/floor/mainship/silver{ dir = 1 }, -/turf/open/floor/wood, /area/mainship/living/chapel) "qRu" = ( /obj/structure/window/reinforced{ @@ -13529,18 +13622,6 @@ }, /turf/open/floor/mainship/sterile/dark, /area/mainship/medical/upper_medical) -"qRX" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/obj/machinery/light/mainship{ - dir = 4 - }, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/mainship/mono, -/area/mainship/shipboard/weapon_room) "qRY" = ( /obj/machinery/light/mainship{ light_color = "#da2f1b" @@ -13548,11 +13629,6 @@ /obj/machinery/door/firedoor/mainship, /turf/open/floor/mainship/stripesquare, /area/mainship/hallways/port_hallway) -"qSz" = ( -/turf/open/floor/mainship/black{ - dir = 6 - }, -/area/mainship/living/tankerbunks) "qST" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -13560,6 +13636,10 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating/plating_catwalk, /area/mainship/hallways/hangar) +"qTD" = ( +/obj/effect/turf_decal/warning_stripes/thick, +/turf/open/floor/mainship/mono, +/area/mainship/shipboard/weapon_room) "qUg" = ( /turf/open/floor/mainship/floor, /area/mainship/living/numbertwobunks) @@ -13585,15 +13665,11 @@ /turf/open/space/basic, /area/space) "qVu" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 +/obj/vehicle/ridden/wheelchair{ + dir = 1 }, -/obj/structure/cable, -/turf/open/floor/mainship/mono, -/area/mainship/living/chapel) +/turf/open/floor/mainship/sterile/dark, +/area/mainship/medical/upper_medical) "qVS" = ( /obj/machinery/light/mainship, /turf/open/floor/wood, @@ -13619,6 +13695,30 @@ }, /turf/open/floor/plating, /area/mainship/hallways/hangar) +"qXc" = ( +/obj/machinery/vending/marineFood, +/obj/item/reagent_containers/food/snacks/protein_pack, +/obj/item/reagent_containers/food/snacks/protein_pack, +/obj/item/reagent_containers/food/snacks/protein_pack, +/obj/item/reagent_containers/food/snacks/protein_pack, +/obj/item/reagent_containers/food/snacks/protein_pack, +/obj/item/reagent_containers/food/snacks/protein_pack, +/obj/item/reagent_containers/food/snacks/protein_pack, +/obj/item/reagent_containers/food/snacks/protein_pack, +/obj/item/reagent_containers/food/snacks/protein_pack, +/obj/item/reagent_containers/food/snacks/protein_pack, +/obj/item/reagent_containers/food/snacks/protein_pack, +/obj/item/reagent_containers/food/snacks/protein_pack, +/obj/item/reagent_containers/food/snacks/protein_pack, +/obj/item/reagent_containers/food/snacks/protein_pack, +/obj/item/reagent_containers/food/snacks/protein_pack, +/obj/item/reagent_containers/food/snacks/protein_pack, +/obj/item/reagent_containers/food/snacks/protein_pack, +/obj/item/reagent_containers/food/snacks/protein_pack, +/turf/open/floor/mainship/black{ + dir = 4 + }, +/area/mainship/squads/general) "qXC" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/cable, @@ -13655,30 +13755,19 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 1 }, -/turf/open/floor/mainship/cargo/arrow{ +/turf/open/floor/mainship/yellow_cargo/arrow{ dir = 1 }, /area/mainship/squads/general) "rbL" = ( -/obj/machinery/door/firedoor/multi_tile{ - dir = 1 - }, -/obj/machinery/door/airlock/multi_tile/mainship/blackgeneric/glass{ - dir = 1 - }, -/obj/structure/sign/holy, -/turf/open/floor/mainship/mono, +/obj/structure/sign/evac, +/turf/closed/wall/mainship, /area/mainship/living/chapel) "rcm" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/obj/machinery/light/mainship/small{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plating/plating_catwalk, -/area/mainship/hull/lower_hull) +/obj/structure/flora/ausbushes/fullgrass, +/obj/effect/ai_node, +/turf/open/floor/grass, +/area/mainship/living/starboard_garden) "rcC" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 @@ -13688,22 +13777,6 @@ }, /turf/open/floor/mainship/mono, /area/mainship/command/corporateliaison) -"rdS" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/camera/autoname/mainship{ - dir = 4 - }, -/turf/open/floor/mainship/black{ - dir = 8 - }, -/area/mainship/living/tankerbunks) -"rdT" = ( -/obj/structure/ship_ammo/cas/bomblet, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 8 - }, -/turf/open/floor/mainship/mono, -/area/mainship/hallways/hangar) "rea" = ( /obj/effect/turf_decal/warning_stripes/thin{ dir = 8 @@ -13718,40 +13791,40 @@ /turf/closed/wall/mainship, /area/mainship/living/commandbunks) "reJ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/wood, +/obj/structure/bed/chair/nometal, +/turf/open/floor/mainship/mono, /area/mainship/living/chapel) "reZ" = ( /obj/machinery/vending/uniform_supply, /turf/open/floor/mainship/red/full, /area/mainship/command/cic) "rgj" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 8 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/machinery/air_alarm, -/obj/structure/table/mainship/nometal, -/obj/item/folder/black, -/obj/item/book/manual/orbital_cannon_manual, -/turf/open/floor/mainship/mono, -/area/mainship/shipboard/weapon_room) +/obj/structure/cable, +/obj/machinery/light/mainship/small{ + dir = 1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/mainship/hull/lower_hull) +"rgx" = ( +/obj/machinery/door/firedoor/multi_tile, +/obj/structure/cable, +/obj/machinery/door/airlock/multi_tile/mainship/secdoor/glass{ + req_access = null; + req_one_access = list(2,42) + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/mainship/floor, +/area/mainship/hallways/starboard_hallway) "rio" = ( /obj/structure/toilet{ dir = 4 }, /turf/open/floor/mainship/mono, /area/mainship/living/commandbunks) -"rip" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 8 - }, -/turf/open/floor/mainship/floor, -/area/mainship/living/pilotbunks) "rjL" = ( /obj/structure/table/mainship/nometal, /obj/machinery/computer/secure_data, @@ -13792,41 +13865,39 @@ /turf/open/floor/mainship/mono, /area/mainship/hallways/port_hallway) "rly" = ( -/obj/effect/spawner/random/misc/structure/flavorvending/cigaretteweighted, +/obj/machinery/light/mainship{ + dir = 4 + }, /turf/open/floor/mainship/mono, -/area/mainship/hallways/hangar) +/area/mainship/living/briefing) "rlR" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 8 + }, /turf/open/floor/mainship/mono, /area/mainship/hallways/hangar) "rmQ" = ( -/obj/structure/bed/chair/nometal{ +/obj/effect/turf_decal/warning_stripes/thick{ dir = 1 }, -/turf/open/floor/mainship/floor, -/area/mainship/living/pilotbunks) +/turf/open/floor/mainship/hexagon, +/area/mainship/living/tankerbunks) "roD" = ( -/obj/structure/cable, -/obj/structure/table/mainship/nometal, -/obj/machinery/door_control/old/req, -/turf/open/floor/mainship/green{ - dir = 4 - }, +/obj/effect/landmark/start/job/requisitionsofficer, +/obj/structure/bed/chair/office/dark, +/obj/structure/disposalpipe/segment, +/turf/open/floor/mainship/mono, /area/mainship/squads/req) "roM" = ( /obj/machinery/portable_atmospherics/canister/air, /turf/open/floor/engine, /area/mainship/engineering/port_atmos) "roN" = ( -/obj/machinery/light/mainship{ - dir = 1 - }, -/turf/open/floor/mainship/black{ - dir = 1 - }, -/area/mainship/living/pilotbunks) +/obj/machinery/loadout_vendor, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar/droppod) "roU" = ( /obj/structure/table/mainship/nometal, /obj/machinery/microwave{ @@ -13835,23 +13906,6 @@ /obj/item/storage/box/donkpockets, /turf/open/floor/mainship/mono, /area/mainship/engineering/upper_engineering) -"rpk" = ( -/turf/open/floor/plating, -/area/mainship/living/tankerbunks) -"rpu" = ( -/obj/structure/table/mainship/nometal, -/obj/item/clothing/suit/storage/hazardvest, -/obj/item/clothing/suit/storage/hazardvest/lime, -/obj/item/clothing/suit/storage/hazardvest/blue, -/obj/item/tool/shovel/etool, -/obj/item/storage/pouch/medkit/firstaid, -/obj/item/tool/taperoll/engineering, -/obj/machinery/camera/autoname/mainship{ - dir = 8 - }, -/obj/item/stack/sandbags_empty/half, -/turf/open/floor/mainship/mono, -/area/mainship/command/cic) "rpv" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ @@ -13863,6 +13917,16 @@ }, /turf/open/floor/mainship/mono, /area/mainship/squads/req) +"rpB" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/plating/plating_catwalk, +/area/mainship/hallways/hangar) "rpS" = ( /obj/structure/sink{ dir = 1 @@ -13872,6 +13936,15 @@ }, /turf/open/floor/mainship/floor, /area/mainship/medical/upper_medical) +"rqz" = ( +/obj/structure/bed/chair/ob_chair, +/obj/machinery/computer/orbital_cannon_console, +/obj/effect/spawner/random/misc/gnome, +/obj/effect/turf_decal/warning_stripes/thick{ + dir = 1 + }, +/turf/open/floor/mainship/mono, +/area/mainship/shipboard/weapon_room) "rqW" = ( /obj/effect/spawner/random/machinery/machine_frame, /turf/open/floor/mainship/cargo, @@ -13884,16 +13957,19 @@ /turf/open/floor/mainship, /area/mainship/squads/general) "rrj" = ( -/obj/effect/decal/cleanable/blood/gibs/robot/limb, -/obj/machinery/computer/mech_builder{ - dir = 8 +/obj/structure/droppod, +/obj/structure/drop_pod_launcher, +/obj/effect/decal/cleanable/blood/writing{ + desc = "It looks like a writing in blood. It says, 'I am missing and forgotten.'"; + dir = 4 }, -/turf/open/floor/plating, -/area/mainship/living/tankerbunks) +/turf/open/floor/mainship/yellow_cargo, +/area/mainship/hallways/hangar/droppod) "rrt" = ( -/obj/structure/sign/evac, -/turf/open/floor/mainship/mono, -/area/mainship/hallways/port_hallway) +/obj/structure/table/woodentable, +/obj/item/toy/plush/lizard, +/turf/open/floor/wood, +/area/mainship/living/grunt_rnr) "rrw" = ( /obj/machinery/loadout_vendor, /turf/open/floor/mainship/red/full, @@ -13924,6 +14000,12 @@ /obj/machinery/holopad, /turf/open/floor/wood, /area/mainship/command/corporateliaison) +"rsk" = ( +/obj/structure/table/mainship/nometal, +/obj/item/book/manual/marine_law, +/obj/effect/spawner/random/misc/gnome, +/turf/open/floor/mainship/floor, +/area/mainship/shipboard/brig) "rst" = ( /obj/structure/bed/chair/comfy{ dir = 1 @@ -13931,7 +14013,7 @@ /turf/open/floor/mainship/sterile/side, /area/mainship/medical/upper_medical) "rtf" = ( -/obj/effect/turf_decal/warning_stripes/thin{ +/obj/effect/turf_decal/warning_stripes/thick{ dir = 4 }, /turf/open/floor/mainship/stripesquare, @@ -13940,6 +14022,7 @@ /obj/structure/table/fancywoodentable, /obj/item/newspaper, /obj/item/reagent_containers/food/drinks/britcup, +/obj/item/reagent_containers/food/drinks/milk, /turf/open/floor/wood, /area/mainship/living/numbertwobunks) "ruM" = ( @@ -13948,6 +14031,16 @@ }, /turf/open/floor/wood, /area/mainship/living/commandbunks) +"rwK" = ( +/obj/item/clothing/head/warning_cone, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 5 + }, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar) "rxx" = ( /obj/effect/turf_decal/warning_stripes/thick{ dir = 5 @@ -13965,7 +14058,7 @@ /area/mainship/medical/lower_medical) "ryB" = ( /obj/machinery/camera/autoname/mainship, -/turf/open/floor/mainship/mono, +/turf/open/floor/mainship/hexagon, /area/mainship/engineering/engine_core) "rzd" = ( /obj/machinery/cryopod/right, @@ -13986,24 +14079,28 @@ /turf/open/floor/mainship/mono, /area/mainship/command/cic) "rzG" = ( -/obj/structure/table/mainship/nometal, -/obj/item/megaphone, -/turf/open/floor/mainship/floor, +/turf/open/floor/mainship/terragov/north{ + dir = 4 + }, /area/mainship/living/briefing) "rzU" = ( -/obj/machinery/door/poddoor/railing{ - dir = 8; - id = "supply_elevator_railing" +/obj/structure/closet/emcloset, +/obj/machinery/landinglight/tadpole{ + dir = 4; + pixel_x = -4 }, -/obj/machinery/floodlight/landing, -/turf/open/floor/mainship/cargo/arrow{ +/obj/effect/turf_decal/warning_stripes/thin{ dir = 4 }, -/area/mainship/squads/req) +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar) "rAj" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/layer1, -/turf/open/floor/mainship/floor, -/area/mainship/living/pilotbunks) +/obj/structure/computerframe, +/obj/machinery/light/mainship{ + dir = 1 + }, +/turf/open/floor/mainship/hexagon, +/area/mainship/living/tankerbunks) "rAB" = ( /obj/machinery/door/firedoor/mainship{ dir = 2; @@ -14012,7 +14109,8 @@ /turf/open/floor/mainship/stripesquare, /area/mainship/hallways/starboard_hallway) "rAZ" = ( -/turf/open/floor/plating/dmg1, +/obj/docking_port/stationary/marine_dropship/cas, +/turf/open/floor/plating, /area/mainship/hallways/hangar) "rBx" = ( /obj/effect/turf_decal/warning_stripes/thin{ @@ -14027,20 +14125,9 @@ /turf/open/floor/mainship, /area/mainship/squads/general) "rCb" = ( -/obj/machinery/door/poddoor/railing{ - dir = 1; - id = "supply_elevator_railing" - }, -/obj/machinery/holopad, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 4 - }, -/turf/open/floor/mainship/floor, -/area/mainship/squads/req) +/obj/machinery/vending/tool, +/turf/open/floor/mainship/hexagon, +/area/mainship/living/tankerbunks) "rCl" = ( /obj/structure/disposalpipe/segment, /obj/effect/ai_node, @@ -14055,7 +14142,7 @@ dir = 1; pixel_y = -4 }, -/turf/open/floor/mainship/cargo/arrow{ +/turf/open/floor/mainship/yellow_cargo/arrow{ dir = 1 }, /area/mainship/hallways/hangar) @@ -14069,12 +14156,14 @@ /obj/structure/cable, /obj/effect/ai_node, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 8 + }, /turf/open/floor/mainship/mono, /area/mainship/hallways/hangar) "rDn" = ( -/obj/machinery/recharger, /obj/structure/table/mainship/nometal, +/obj/machinery/recharger, /turf/open/floor/mainship/sterile/side, /area/mainship/medical/lower_medical) "rEw" = ( @@ -14083,6 +14172,7 @@ /obj/structure/cable, /obj/structure/disposalpipe/segment, /obj/effect/ai_node, +/obj/item/clothing/head/warning_cone, /turf/open/floor/plating/plating_catwalk, /area/mainship/hallways/hangar) "rEM" = ( @@ -14120,9 +14210,9 @@ /turf/open/floor/mainship/sterile/dark, /area/mainship/medical/medical_science) "rGl" = ( -/obj/machinery/mech_bay_recharge_port, -/turf/open/floor/mainship/tcomms, -/area/mainship/shipboard/weapon_room) +/obj/effect/ai_node, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/port_hallway) "rHh" = ( /obj/machinery/holopad, /turf/open/floor/mainship, @@ -14165,14 +14255,16 @@ "rKn" = ( /turf/closed/wall/mainship, /area/mainship/hull/lower_hull) -"rLL" = ( -/obj/machinery/door/firedoor/multi_tile{ - dir = 2 +"rKT" = ( +/obj/machinery/light/mainship{ + dir = 4 }, -/obj/machinery/door/airlock/multi_tile/mainship/generic/personal{ - dir = 2; - name = "Pilot Bunks" +/turf/open/floor/mainship/silver{ + dir = 6 }, +/area/mainship/living/chapel) +"rLL" = ( +/obj/machinery/holopad, /turf/open/floor/mainship/mono, /area/mainship/living/pilotbunks) "rMa" = ( @@ -14181,16 +14273,6 @@ }, /turf/open/floor/mainship/mono, /area/mainship/hallways/stern_hallway) -"rMR" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/effect/ai_node, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 1 - }, -/turf/open/floor/mainship/cargo/arrow, -/area/mainship/hallways/hangar) "rOr" = ( /obj/machinery/holopad, /turf/open/floor/mainship/floor, @@ -14199,14 +14281,9 @@ /turf/open/floor/carpet/side, /area/mainship/living/commandbunks) "rOV" = ( -/obj/structure/sign/poster{ - dir = 1 - }, -/obj/machinery/light/mainship{ - dir = 8 - }, +/obj/machinery/vending/armor_supply, /turf/open/floor/wood, -/area/mainship/living/pilotbunks) +/area/mainship/living/tankerbunks) "rPd" = ( /obj/machinery/light/mainship{ dir = 1 @@ -14224,8 +14301,14 @@ /turf/open/floor/mainship/mono, /area/mainship/hallways/hangar) "rPt" = ( -/obj/machinery/status_display, -/turf/closed/wall/mainship, +/obj/machinery/door/airlock/mainship/command/officer{ + dir = 2 + }, +/obj/machinery/door/firedoor/mainship{ + dir = 2 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/turf/open/floor/mainship/mono, /area/mainship/living/bridgebunks) "rPu" = ( /obj/structure/cable, @@ -14247,14 +14330,10 @@ /turf/closed/wall/mainship, /area/mainship/living/cryo_cells) "rRC" = ( -/obj/effect/landmark/start/job/shiptech, -/obj/structure/bed/chair/office/dark{ - dir = 1 - }, -/turf/open/floor/mainship/green{ - dir = 4 - }, -/area/mainship/squads/req) +/obj/effect/decal/cleanable/blood/oil, +/obj/effect/ai_node, +/turf/open/floor/mainship/hexagon, +/area/mainship/living/tankerbunks) "rSg" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -14265,6 +14344,15 @@ dir = 1 }, /area/mainship/medical/lower_medical) +"rSr" = ( +/obj/machinery/light/mainship{ + dir = 8 + }, +/obj/structure/mirror{ + dir = 4 + }, +/turf/open/floor/wood, +/area/mainship/living/tankerbunks) "rSA" = ( /turf/closed/wall/mainship/white, /area/medical/morgue) @@ -14283,6 +14371,12 @@ }, /turf/open/floor/mainship/mono, /area/mainship/hull/lower_hull) +"rUm" = ( +/obj/structure/prop/mainship/name_stencil/M, +/turf/open/floor/mainship/black{ + dir = 5 + }, +/area/mainship/squads/general) "rUw" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -14299,15 +14393,6 @@ /obj/machinery/door/firedoor/mainship, /turf/open/floor/mainship, /area/mainship/squads/general) -"rUR" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 4 - }, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 8 - }, -/turf/open/floor/mainship/mono, -/area/mainship/shipboard/weapon_room) "rUW" = ( /obj/machinery/telecomms/receiver/preset_left, /turf/open/floor/mainship/tcomms, @@ -14323,24 +14408,33 @@ /turf/open/floor/wood, /area/mainship/living/grunt_rnr) "rWD" = ( -/obj/machinery/door/airlock/mainship/generic{ - name = "\improper Bathroom" - }, /obj/structure/cable, -/obj/structure/sign/restroom, /turf/open/floor/mainship/mono, -/area/crew_quarters/toilet) +/area/mainship/hallways/hangar/droppod) +"rWK" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/junction{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 8 + }, +/turf/open/floor/plating/plating_catwalk, +/area/mainship/hallways/aft_hallway) "rWR" = ( /obj/structure/rack, /obj/item/uav_turret/droid, /turf/open/floor/plating/plating_catwalk, /area/mainship/command/airoom) "rXa" = ( -/obj/structure/bed, -/obj/item/bedsheet/blue, -/obj/effect/landmark/start/job/pilotofficer, -/turf/open/floor/wood, -/area/mainship/living/pilotbunks) +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/starboard_hallway) "rXy" = ( /obj/effect/decal/cleanable/blood, /turf/open/floor/mainship/blue/full, @@ -14352,12 +14446,13 @@ /area/mainship/hallways/hangar) "rYQ" = ( /obj/machinery/vending/nanomed, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, /turf/open/floor/mainship/mono, /area/mainship/living/bridgebunks) "rZg" = ( @@ -14397,11 +14492,6 @@ /obj/item/reagent_containers/food/drinks/coffee, /turf/open/floor/mainship/mono, /area/mainship/engineering/engineering_workshop) -"sbg" = ( -/obj/structure/drop_pod_launcher, -/obj/structure/droppod/leader, -/turf/open/floor/mainship/cargo, -/area/mainship/hallways/hangar/droppod) "sbr" = ( /obj/structure/sink{ dir = 4 @@ -14417,11 +14507,16 @@ }, /area/mainship/squads/general) "sbN" = ( -/obj/structure/sign/nosmoking_2, -/turf/open/floor/mainship/black{ - dir = 6 +/obj/machinery/door/airlock/multi_tile/mainship/secdoor/glass{ + req_access = null; + req_one_access = list(2,42) }, -/area/mainship/squads/general) +/obj/machinery/door/firedoor/multi_tile, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/mainship/floor, +/area/mainship/hallways/starboard_hallway) "sbQ" = ( /obj/machinery/chem_master, /obj/item/reagent_containers/glass/beaker/bluespace, @@ -14431,12 +14526,15 @@ }, /area/mainship/medical/medical_science) "scb" = ( -/obj/machinery/camera/autoname/mainship{ +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 }, -/obj/structure/closet/secure_closet/shiptech, -/turf/open/floor/mainship/cargo, -/area/mainship/squads/req) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 8 + }, +/turf/open/floor/mainship/mono, +/area/mainship/living/pilotbunks) "sdw" = ( /obj/machinery/power/smes/preset, /obj/structure/cable, @@ -14468,6 +14566,11 @@ }, /turf/open/floor/mainship/mono, /area/mainship/hallways/stern_hallway) +"ser" = ( +/obj/effect/decal/cleanable/blood/oil, +/obj/effect/turf_decal/warning_stripes/thick, +/turf/open/floor/mainship/hexagon, +/area/mainship/living/tankerbunks) "sfz" = ( /obj/machinery/power/apc/mainship{ dir = 8 @@ -14504,23 +14607,14 @@ /turf/open/floor/plating/plating_catwalk, /area/mainship/hallways/aft_hallway) "shB" = ( -/obj/machinery/door/window/secure/req{ - dir = 8 - }, -/obj/machinery/door/window, -/obj/structure/table/reinforced, -/obj/item/tool/hand_labeler, -/obj/machinery/door/poddoor/shutters/mainship/req/ro, -/turf/open/floor/mainship/mono, -/area/mainship/squads/req) +/obj/effect/ai_node, +/turf/open/floor/wood, +/area/mainship/living/pilotbunks) "sid" = ( -/obj/machinery/shower{ - dir = 4; - pixel_y = -3 - }, -/obj/effect/spawner/random/misc/soap/regularweighted, -/turf/open/floor/mainship/sterile/dark, -/area/crew_quarters/toilet) +/obj/structure/rack, +/obj/item/storage/toolbox/mechanical, +/turf/open/floor/mainship/floor, +/area/mainship/living/mechpilotquarters) "sjV" = ( /obj/machinery/vending/armor_supply, /turf/open/floor/mainship/red/full, @@ -14530,31 +14624,20 @@ dir = 10 }, /obj/effect/ai_node, +/obj/item/clothing/head/warning_cone, /obj/effect/turf_decal/warning_stripes/thin{ - dir = 5 + dir = 8 + }, +/obj/machinery/landinglight/cas{ + dir = 8; + pixel_x = 4 }, -/obj/item/clothing/head/warning_cone, /turf/open/floor/mainship/mono, /area/mainship/hallways/hangar) "smb" = ( /obj/structure/closet/fireaxecabinet, /turf/closed/wall/mainship, /area/mainship/engineering/ce_room) -"snh" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment/corner{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 6 - }, -/obj/machinery/power/apc/mainship, -/obj/effect/ai_node, -/turf/open/floor/mainship/mono, -/area/mainship/shipboard/weapon_room) "snm" = ( /obj/machinery/conveyor{ dir = 4; @@ -14567,25 +14650,15 @@ /turf/closed/wall/mainship/outer, /area/mainship/hallways/starboard_hallway) "snV" = ( -/obj/structure/table/mainship/nometal, -/obj/item/folder/grape, -/obj/item/tool/pen, -/turf/open/floor/mainship/mono, -/area/mainship/living/briefing) -"soa" = ( -/obj/machinery/door_control/mainship/ammo{ - dir = 8 - }, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 1 +/turf/open/floor/mainship/terragov/north{ + dir = 10 }, -/turf/open/floor/mainship/cargo/arrow, -/area/mainship/hallways/hangar) +/area/mainship/living/briefing) "soc" = ( /obj/machinery/line_nexter{ dir = 4 }, -/turf/open/floor/mainship/cargo, +/turf/open/floor/mainship/yellow_cargo, /area/mainship/squads/req) "soK" = ( /obj/item/stack/tile/plasteel, @@ -14603,9 +14676,9 @@ /turf/open/floor/engine, /area/mainship/engineering/port_atmos) "spJ" = ( -/obj/machinery/firealarm, -/turf/open/floor/wood, -/area/mainship/living/grunt_rnr) +/obj/structure/cable, +/turf/open/floor/mainship/sterile/side, +/area/mainship/medical/upper_medical) "spK" = ( /obj/machinery/door/poddoor/mainship/umbilical/south{ dir = 2; @@ -14619,13 +14692,6 @@ }, /turf/open/floor/mainship, /area/mainship/squads/general) -"sqP" = ( -/obj/machinery/light/mainship{ - dir = 8 - }, -/obj/structure/closet/firecloset, -/turf/open/floor/mainship/mono, -/area/mainship/hallways/hangar) "srb" = ( /obj/structure/closet/toolcloset, /obj/machinery/camera/autoname/mainship{ @@ -14633,32 +14699,10 @@ }, /turf/open/floor/mainship/cargo, /area/mainship/hallways/hangar) -"srn" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 8 - }, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/mainship/hallways/hangar) "srq" = ( /obj/structure/filingcabinet, /turf/open/floor/wood, /area/mainship/command/corporateliaison) -"srr" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/layer1{ - dir = 4; - on = 1 - }, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 8 - }, -/turf/open/floor/mainship/mono, -/area/mainship/shipboard/weapon_room) "ssm" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment/corner, @@ -14666,8 +14710,15 @@ /turf/open/floor/plating/plating_catwalk, /area/mainship/hull/lower_hull) "ste" = ( -/obj/machinery/vending/medical/shipside, -/turf/open/floor/mainship/sterile/side, +/obj/machinery/door/airlock/mainship/medical/glass/free_access{ + dir = 1; + name = "\improper Medical Storage Airlock" + }, +/obj/machinery/door/firedoor/mainship{ + dir = 2 + }, +/obj/structure/cable, +/turf/open/floor/mainship/sterile/dark, /area/mainship/medical/upper_medical) "stm" = ( /obj/machinery/door/airlock/multi_tile/mainship/marine/general{ @@ -14679,11 +14730,11 @@ /turf/open/floor/mainship, /area/mainship/squads/general) "suU" = ( -/obj/machinery/light/mainship{ - dir = 1 +/obj/structure/bed/chair{ + dir = 4 }, -/turf/open/floor/wood, -/area/mainship/living/grunt_rnr) +/turf/open/floor/mainship/sterile/dark, +/area/mainship/medical/medical_science) "svd" = ( /obj/structure/cable, /obj/machinery/door/airlock/multi_tile/mainship/maint{ @@ -14704,27 +14755,26 @@ }, /area/mainship/command/cic) "svo" = ( -/obj/structure/rack, -/obj/item/storage/belt/utility/full, -/obj/item/storage/belt/utility/full, -/obj/item/tool/weldpack, -/turf/open/floor/mainship/green, +/obj/machinery/light/mainship{ + dir = 1 + }, +/obj/machinery/holopad, +/turf/open/floor/mainship/green{ + dir = 1 + }, /area/mainship/squads/req) "svz" = ( -/turf/open/floor/mainship/white{ - dir = 4 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 8 }, -/area/mainship/living/pilotbunks) +/turf/open/floor/mainship/hexagon, +/area/mainship/living/tankerbunks) "swv" = ( /obj/machinery/door/firedoor/mainship{ dir = 2 }, /turf/open/floor/mainship/stripesquare, /area/mainship/hallways/aft_hallway) -"swG" = ( -/obj/effect/soundplayer, -/turf/closed/wall/mainship, -/area/mainship/hallways/hangar/droppod) "swO" = ( /obj/machinery/light/mainship{ dir = 4 @@ -14749,19 +14799,11 @@ /obj/machinery/telecomms/server/presets/command, /turf/open/floor/mainship/tcomms, /area/mainship/command/telecomms) -"sxm" = ( -/obj/structure/table/mainship/nometal, -/obj/item/clipboard, -/obj/item/paper{ - pixel_x = 5 - }, -/obj/item/tool/pen, -/turf/open/floor/mainship/mono, -/area/mainship/squads/req) "syt" = ( -/turf/open/floor/plating/icefloor/warnplate{ - dir = 10 +/obj/effect/turf_decal/warning_stripes/thick{ + dir = 8 }, +/turf/open/floor/plating, /area/mainship/squads/req) "syD" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ @@ -14798,16 +14840,21 @@ /turf/open/floor/wood, /area/mainship/living/commandbunks) "sAl" = ( -/obj/effect/spawner/random/misc/structure/flavorvending/coffeeweighted, -/obj/effect/turf_decal/warning_stripes/linethick{ +/obj/effect/turf_decal/warning_stripes/thin{ dir = 8 }, -/turf/open/floor/plating, -/area/mainship/hallways/starboard_hallway) +/obj/machinery/landinglight/tadpole{ + dir = 8; + pixel_x = 4 + }, +/obj/item/clothing/head/warning_cone, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar) "sAI" = ( -/obj/structure/sink, -/obj/structure/mirror, -/turf/open/floor/mainship/floor, +/obj/machinery/shower{ + dir = 8 + }, +/turf/open/floor/plating/plating_catwalk, /area/crew_quarters/toilet) "sAR" = ( /obj/structure/cable, @@ -14817,6 +14864,16 @@ }, /turf/open/floor/plating/plating_catwalk, /area/mainship/hull/lower_hull) +"sBh" = ( +/obj/item/reagent_containers/jerrycan, +/obj/item/reagent_containers/jerrycan, +/obj/item/reagent_containers/jerrycan, +/obj/item/reagent_containers/jerrycan, +/obj/item/reagent_containers/jerrycan, +/obj/item/reagent_containers/jerrycan, +/obj/structure/rack, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar) "sBq" = ( /obj/structure/closet/secure_closet/engineering_welding, /turf/open/floor/mainship/orange/full, @@ -14827,13 +14884,6 @@ }, /turf/open/floor/mainship/mono, /area/mainship/hull/lower_hull) -"sBx" = ( -/obj/machinery/door/airlock/mainship/generic{ - dir = 1; - name = "Bathroom" - }, -/turf/open/floor/mainship/floor, -/area/crew_quarters/toilet) "sCk" = ( /obj/machinery/light/mainship{ dir = 1 @@ -14865,10 +14915,7 @@ }, /area/mainship/medical/lower_medical) "sEl" = ( -/obj/structure/table/mainship/nometal, -/obj/item/folder/blue, -/obj/item/tool/pen, -/turf/open/floor/mainship/mono, +/turf/open/floor/mainship/terragov/north, /area/mainship/living/briefing) "sEr" = ( /obj/machinery/computer/supplycomp, @@ -14925,33 +14972,14 @@ /obj/effect/ai_node, /turf/open/floor/plating/mainship, /area/mainship/shipboard/firing_range) -"sIM" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/mainship/red{ - dir = 4 - }, -/area/mainship/shipboard/weapon_room) "sIN" = ( /obj/structure/window/reinforced, /turf/open/floor/mainship/sterile/dark, /area/mainship/medical/upper_medical) "sJa" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 4 - }, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 8 - }, -/turf/open/floor/mainship/cargo/arrow{ - dir = 4 - }, -/area/mainship/hallways/hangar/droppod) +/obj/machinery/firealarm, +/turf/open/floor/mainship/floor, +/area/mainship/living/mechpilotquarters) "sJE" = ( /obj/structure/table/mainship/nometal, /obj/machinery/chem_dispenser/beer, @@ -14959,9 +14987,13 @@ /area/mainship/medical/lower_medical) "sKa" = ( /turf/open/floor/mainship/terragov/north{ - dir = 9 + dir = 6 }, /area/mainship/living/briefing) +"sKH" = ( +/obj/effect/turf_decal/warning_stripes/thick, +/turf/open/floor/mainship/yellow_cargo, +/area/mainship/shipboard/weapon_room) "sLC" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 @@ -14969,7 +15001,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 }, -/turf/open/floor/mainship/mono, +/turf/open/floor/mainship/hexagon, /area/mainship/engineering/engine_core) "sMl" = ( /obj/structure/closet/emcloset, @@ -14982,13 +15014,6 @@ }, /turf/open/floor/mainship/cargo, /area/mainship/hallways/hangar) -"sMS" = ( -/obj/machinery/light/mainship/small, -/obj/structure/toilet{ - dir = 1 - }, -/turf/open/floor/mainship/floor, -/area/crew_quarters/toilet) "sOJ" = ( /obj/structure/table/reinforced, /obj/effect/spawner/random/food_or_drink/kitchenknife/butcherweighted, @@ -14996,6 +15021,25 @@ /obj/effect/spawner/random/food_or_drink/burger, /turf/open/floor/mainship/mono, /area/mainship/hull/lower_hull) +"sPc" = ( +/obj/item/radio/intercom/general, +/obj/structure/ship_ammo/cas/rocket/widowmaker, +/turf/open/floor/mainship/cargo, +/area/mainship/hallways/hangar) +"sPS" = ( +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/machinery/floodlight/landing, +/turf/open/floor/mainship/mono, +/area/mainship/squads/req) "sQz" = ( /obj/machinery/atmospherics/components/unary/vent_pump/layer1{ on = 1 @@ -15005,7 +15049,7 @@ /area/mainship/living/numbertwobunks) "sQI" = ( /obj/machinery/fuelcell_recycler, -/turf/open/floor/mainship/mono, +/turf/open/floor/mainship/hexagon, /area/mainship/engineering/engine_core) "sRP" = ( /obj/structure/table/mainship/nometal, @@ -15022,9 +15066,8 @@ /turf/open/floor/mainship/mono, /area/mainship/engineering/port_atmos) "sSz" = ( -/obj/machinery/floodlight/landing, -/turf/open/floor/mainship/mono, -/area/mainship/living/briefing) +/turf/open/floor/mainship/floor, +/area/mainship/hallways/starboard_hallway) "sSA" = ( /obj/machinery/atmospherics/components/unary/vent_pump/layer1{ dir = 8; @@ -15036,23 +15079,28 @@ /turf/open/floor/mainship, /area/mainship/squads/general) "sSN" = ( -/obj/machinery/door/poddoor/railing{ - id = "supply_elevator_railing" - }, -/obj/machinery/floodlight/landing, -/turf/open/floor/mainship/cargo/arrow{ +/obj/effect/turf_decal/warning_stripes/thin{ dir = 8 }, -/area/mainship/squads/req) +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 4 + }, +/obj/machinery/landinglight/alamo{ + dir = 8; + pixel_x = 4 + }, +/obj/item/clothing/head/warning_cone, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar) "sUb" = ( -/obj/structure/sign/evac, -/turf/open/floor/plating/mainship, -/area/mainship/living/evacuation) +/obj/vehicle/ridden/powerloader, +/turf/open/floor/mainship/cargo, +/area/mainship/shipboard/weapon_room) "sUR" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plating/plating_catwalk, +/turf/open/floor/mainship/floor, /area/mainship/hallways/hangar) "sUT" = ( /obj/structure/cable, @@ -15081,17 +15129,10 @@ }, /area/mainship/medical/medical_science) "sVR" = ( -/obj/structure/cable, -/obj/machinery/power/apc/mainship{ - dir = 1 - }, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 4 - }, -/turf/open/floor/mainship/cargo/arrow{ - dir = 4 - }, -/area/mainship/hallways/hangar/droppod) +/obj/structure/drop_pod_launcher/mech, +/obj/structure/droppod/nonmob/mech_pod, +/turf/open/floor/mainship/floor, +/area/mainship/living/mechpilotquarters) "sWo" = ( /obj/machinery/camera/autoname/mainship{ dir = 8 @@ -15128,7 +15169,7 @@ pixel_x = -8; pixel_y = 3 }, -/turf/open/floor/mainship/cargo, +/turf/open/floor/mainship/yellow_cargo, /area/mainship/squads/general) "sYd" = ( /obj/structure/table/mainship/nometal, @@ -15152,10 +15193,6 @@ /obj/effect/ai_node, /turf/open/floor/mainship/sterile/dark, /area/mainship/medical/lower_medical) -"sZK" = ( -/obj/machinery/holopad, -/turf/open/floor/wood, -/area/mainship/living/chapel) "sZP" = ( /turf/open/floor/carpet/side{ dir = 10 @@ -15165,19 +15202,17 @@ /obj/structure/closet/firecloset, /turf/open/floor/mainship/cargo, /area/mainship/engineering/lower_engineering) -"tbT" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ +"sZZ" = ( +/obj/effect/turf_decal/warning_stripes/thin{ dir = 4 }, -/turf/open/floor/mainship/sterile/plain, -/area/mainship/living/pilotbunks) +/obj/effect/spawner/random/misc/gnome, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar) +"tbT" = ( +/obj/machinery/vending/armor_supply, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar/droppod) "tdm" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/wood, @@ -15193,15 +15228,14 @@ }, /area/mainship/squads/general) "teh" = ( -/obj/effect/turf_decal/warning_stripes/thin{ +/obj/structure/window/framed/mainship/hull, +/turf/open/floor/mainship/floor, +/area/mainship/hallways/starboard_hallway) +"tem" = ( +/obj/machinery/vending/lasgun, +/turf/open/floor/mainship/orange{ dir = 4 }, -/obj/structure/punching_bag, -/turf/open/floor/plating/mainship, -/area/mainship/shipboard/firing_range) -"tem" = ( -/obj/machinery/dropship_part_fabricator, -/turf/open/floor/mainship/cargo, /area/mainship/hallways/hangar) "tet" = ( /obj/machinery/camera/autoname/mainship{ @@ -15215,8 +15249,15 @@ /turf/open/floor/mainship/mono, /area/mainship/engineering/engineering_workshop) "tfG" = ( -/turf/open/floor/prison/kitchen, +/turf/open/floor/iron/kitchen, /area/mainship/living/grunt_rnr) +"tfJ" = ( +/obj/machinery/holopad, +/obj/effect/turf_decal/warning_stripes/thick/corner{ + dir = 4 + }, +/turf/open/floor/mainship/mono, +/area/mainship/shipboard/weapon_room) "tfK" = ( /obj/machinery/computer/general_air_control/large_tank_control{ frequency = 1443; @@ -15242,11 +15283,12 @@ /turf/open/floor/mainship/mono, /area/mainship/command/cic) "tgh" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 1 +/obj/effect/decal/cleanable/blood/oil, +/obj/effect/turf_decal/warning_stripes/thick{ + dir = 4 }, -/turf/open/floor/mainship/floor, -/area/mainship/living/pilotbunks) +/turf/open/floor/mainship/hexagon, +/area/mainship/living/tankerbunks) "tgi" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/mainship/floor, @@ -15257,17 +15299,18 @@ /turf/open/floor/plating/plating_catwalk, /area/mainship/hull/lower_hull) "thc" = ( +/obj/structure/sign/poster, /obj/machinery/light/mainship{ - dir = 4 - }, -/turf/open/floor/mainship/green{ - dir = 4 + dir = 8 }, -/area/mainship/squads/req) +/turf/open/floor/wood, +/area/mainship/living/pilotbunks) "thg" = ( -/obj/docking_port/stationary/marine_dropship/minidropship, -/turf/open/floor/plating, -/area/mainship/hallways/hangar) +/obj/effect/ai_node, +/turf/open/floor/mainship/terragov{ + dir = 1 + }, +/area/mainship/living/briefing) "thB" = ( /obj/structure/window/reinforced/extratoughened{ dir = 1 @@ -15310,14 +15353,8 @@ "tkA" = ( /obj/structure/table/mainship/nometal, /obj/machinery/chem_dispenser/soda, -/turf/open/floor/mainship/mono, +/turf/open/floor/iron/kitchen, /area/mainship/living/grunt_rnr) -"tkJ" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 1 - }, -/turf/open/floor/mainship/cargo/arrow, -/area/mainship/hallways/hangar) "tkS" = ( /turf/open/floor/mainship/sterile/purple/side, /area/mainship/medical/chemistry) @@ -15340,9 +15377,12 @@ }, /turf/open/floor/mainship/mono, /area/mainship/hallways/hangar) +"tlT" = ( +/obj/machinery/door/poddoor/mainship/droppod, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar/droppod) "tnR" = ( /obj/structure/bed/chair/office/dark, -/obj/effect/landmark/start/job/chiefshipengineer, /obj/machinery/keycard_auth{ pixel_y = 25 }, @@ -15355,24 +15395,31 @@ /area/mainship/engineering/ce_room) "ton" = ( /obj/structure/cable, -/obj/machinery/light/mainship, -/turf/open/floor/mainship/floor, -/area/crew_quarters/toilet) +/obj/machinery/light/mainship{ + dir = 1 + }, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar/droppod) "tpo" = ( /obj/structure/closet/secure_closet/medical3, /obj/item/storage/surgical_tray, /turf/open/floor/mainship/sterile/side, /area/mainship/medical/upper_medical) "tpU" = ( -/obj/effect/turf_decal/warning_stripes/thin{ +/obj/effect/turf_decal/warning_stripes/thick{ dir = 8 }, /turf/open/floor/mainship/stripesquare, /area/mainship/command/cic) "tqC" = ( -/obj/structure/bed/chair/comfy/black, -/turf/open/floor/mainship/blue/full, -/area/mainship/living/briefing) +/obj/structure/rack, +/obj/item/storage/toolbox/electrical{ + pixel_x = -5; + pixel_y = 4 + }, +/obj/item/robot_parts/head, +/turf/open/floor/mainship/floor, +/area/mainship/living/mechpilotquarters) "tqD" = ( /obj/machinery/door_control/old/medbay{ id = "Medbay"; @@ -15415,15 +15462,13 @@ /area/mainship/hull/lower_hull) "ttb" = ( /obj/structure/reagent_dispensers/watertank, +/obj/structure/reagent_dispensers/watertank, /turf/open/floor/mainship/orange{ dir = 8 }, /area/mainship/hallways/hangar) "ttp" = ( -/obj/item/radio/intercom/general{ - dir = 1 - }, -/turf/open/floor/wood, +/turf/open/floor/plating, /area/mainship/living/chapel) "ttt" = ( /obj/structure/cable, @@ -15433,7 +15478,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/prison/kitchen, +/turf/open/floor/iron/kitchen, /area/mainship/living/grunt_rnr) "ttT" = ( /obj/structure/bed/roller, @@ -15460,6 +15505,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /turf/open/floor/plating/plating_catwalk, /area/mainship/hallways/port_hallway) +"tuW" = ( +/turf/closed/wall/mainship/outer, +/area/mainship/shipboard/weapon_room) "tvv" = ( /obj/machinery/atmospherics/components/binary/valve/digital/on, /turf/open/floor/mainship/mono, @@ -15532,12 +15580,6 @@ /obj/item/stack/tile/plasteel, /turf/open/floor/plating, /area/mainship/squads/general) -"tBb" = ( -/obj/effect/turf_decal/warning_stripes/linethick{ - dir = 1 - }, -/turf/open/floor/plating, -/area/mainship/hallways/starboard_hallway) "tBh" = ( /obj/machinery/firealarm{ dir = 8 @@ -15547,6 +15589,18 @@ }, /turf/open/floor/wood, /area/mainship/command/corporateliaison) +"tBi" = ( +/obj/effect/turf_decal/warning_stripes/thick{ + dir = 4 + }, +/obj/effect/turf_decal/warning_stripes/thick{ + dir = 8 + }, +/obj/effect/turf_decal/warning_stripes/thick{ + dir = 1 + }, +/turf/open/floor/mainship/hexagon, +/area/mainship/shipboard/weapon_room) "tBj" = ( /obj/structure/closet/secure_closet/chemical, /turf/open/floor/mainship/sterile/purple/corner{ @@ -15585,6 +15639,16 @@ /obj/effect/ai_node, /turf/open/floor/mainship/mono, /area/mainship/command/telecomms) +"tCJ" = ( +/obj/structure/rack, +/obj/item/storage/belt/utility/full, +/obj/item/storage/belt/utility/full, +/obj/item/tool/weldpack, +/obj/item/tool/weldpack, +/turf/open/floor/mainship/green{ + dir = 8 + }, +/area/mainship/squads/req) "tCK" = ( /obj/machinery/door/airlock/mainship/maint, /obj/structure/cable, @@ -15600,40 +15664,20 @@ /turf/open/floor/mainship/mono, /area/mainship/hull/lower_hull) "tCO" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/effect/turf_decal/warning_stripes/thick{ dir = 4 }, -/obj/effect/ai_node, -/obj/effect/ai_node, -/turf/open/floor/mainship/sterile/plain, -/area/mainship/living/pilotbunks) +/turf/open/floor/mainship/floor, +/area/mainship/hallways/hangar/droppod) "tDC" = ( /obj/structure/table/reinforced, +/obj/effect/spawner/random/misc/earmuffs, /turf/open/floor/mainship/stripesquare, /area/mainship/shipboard/firing_range) "tDG" = ( /obj/machinery/telecomms/server/presets/common, /turf/open/floor/mainship/tcomms, /area/mainship/command/telecomms) -"tEa" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/mainship/red{ - dir = 8 - }, -/area/mainship/shipboard/weapon_room) "tEm" = ( /obj/machinery/telecomms/receiver/preset_right, /turf/open/floor/mainship/tcomms, @@ -15642,7 +15686,7 @@ /obj/structure/sign/prop1{ dir = 1 }, -/turf/open/floor/mainship/cargo, +/turf/open/floor/mainship/yellow_cargo, /area/mainship/squads/general) "tEV" = ( /obj/structure/cable, @@ -15655,6 +15699,10 @@ dir = 8 }, /area/mainship/medical/lower_medical) +"tFb" = ( +/obj/structure/flora/ausbushes/brflowers, +/turf/open/floor/grass, +/area/mainship/living/starboard_garden) "tFM" = ( /obj/machinery/door/firedoor/mainship{ dir = 2; @@ -15692,9 +15740,11 @@ /area/mainship/hallways/hangar) "tGU" = ( /obj/structure/cable, -/obj/machinery/disposal, -/obj/structure/disposalpipe/trunk, -/turf/open/floor/mainship/sterile/dark, +/obj/machinery/optable, +/obj/item/tank/anesthetic, +/turf/open/floor/mainship/sterile/side{ + dir = 8 + }, /area/mainship/medical/operating_room_two) "tHk" = ( /obj/effect/turf_decal/warning_stripes/thick/corner{ @@ -15702,15 +15752,6 @@ }, /turf/open/floor/plating, /area/mainship/hallways/hangar) -"tHw" = ( -/obj/machinery/light/mainship{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/mainship/black{ - dir = 8 - }, -/area/mainship/living/tankerbunks) "tHY" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -15731,13 +15772,11 @@ /turf/open/floor/mainship/floor, /area/mainship/living/numbertwobunks) "tIA" = ( -/obj/machinery/camera/autoname/mainship{ - dir = 1 - }, -/turf/open/floor/mainship/white{ - dir = 6 +/obj/effect/turf_decal/warning_stripes/thick{ + dir = 9 }, -/area/mainship/living/pilotbunks) +/turf/open/floor/mainship/hexagon, +/area/mainship/living/tankerbunks) "tIE" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -15764,14 +15803,14 @@ "tKd" = ( /obj/structure/table/mainship/nometal, /obj/machinery/chem_dispenser/beer, -/turf/open/floor/mainship/mono, +/turf/open/floor/iron/kitchen, /area/mainship/living/grunt_rnr) "tKs" = ( /obj/structure/mirror, /obj/machinery/light/mainship{ dir = 1 }, -/turf/open/floor/mainship/cargo, +/turf/open/floor/mainship/yellow_cargo, /area/mainship/squads/general) "tKu" = ( /obj/structure/cable, @@ -15780,12 +15819,11 @@ /turf/open/floor/mainship/mono, /area/mainship/hull/lower_hull) "tLf" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 9 +/obj/machinery/door_control/mainship/mech{ + dir = 1 }, -/obj/item/clothing/head/warning_cone, -/turf/open/floor/mainship/mono, -/area/mainship/hallways/hangar) +/turf/open/floor/mainship/floor, +/area/mainship/living/mechpilotquarters) "tMy" = ( /obj/effect/ai_node, /turf/open/floor/mainship/sterile/side{ @@ -15807,12 +15845,6 @@ /area/mainship/living/grunt_rnr) "tNQ" = ( /obj/structure/cable, -/obj/structure/disposalpipe/segment/corner{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 6 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 6 }, @@ -15847,16 +15879,23 @@ /turf/open/floor/mainship/mono, /area/mainship/hull/lower_hull) "tPa" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 1 - }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 8 }, -/turf/open/floor/mainship/cargo/arrow{ - dir = 1 +/turf/open/floor/mainship/floor, +/area/mainship/living/mechpilotquarters) +"tQa" = ( +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 8 }, -/area/mainship/hallways/hangar/droppod) +/obj/effect/ai_node, +/obj/machinery/landinglight/tadpole{ + dir = 8; + pixel_x = 4 + }, +/obj/item/clothing/head/warning_cone, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar) "tQO" = ( /obj/effect/turf_decal/warning_stripes/thin{ dir = 1 @@ -15891,20 +15930,35 @@ }, /area/mainship/medical/medical_science) "tRG" = ( -/obj/effect/turf_decal/warning_stripes/thin, -/obj/effect/ai_node, -/obj/machinery/landinglight/cas{ - pixel_y = 4 +/obj/structure/closet/firecloset, +/obj/machinery/landinglight/tadpole{ + dir = 4; + pixel_x = -4 + }, +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 4 }, /turf/open/floor/mainship/mono, /area/mainship/hallways/hangar) "tTc" = ( -/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/segment/corner, +/obj/machinery/door_control/unmeltable{ + dir = 8; + id = "s_umbilical"; + name = "Air Lock Door Control"; + pixel_x = 22 + }, /obj/machinery/light/mainship/small{ - dir = 4 + dir = 1 }, /turf/open/floor/mainship/mono, /area/mainship/hallways/port_umbilical) +"tTg" = ( +/obj/effect/turf_decal/warning_stripes/thick{ + dir = 10 + }, +/turf/open/floor/mainship/hexagon, +/area/mainship/living/tankerbunks) "tTm" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -15914,11 +15968,8 @@ /turf/open/floor/mainship/stripesquare, /area/mainship/hallways/hangar) "tTR" = ( -/obj/machinery/light/mainship, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 1 - }, -/turf/open/floor/mainship/mono, +/obj/docking_port/stationary/marine_dropship/minidropship, +/turf/open/floor/plating, /area/mainship/hallways/hangar) "tTW" = ( /obj/structure/cable, @@ -15928,11 +15979,9 @@ }, /area/mainship/medical/lower_medical) "tUZ" = ( -/obj/machinery/light/mainship{ - dir = 1 - }, +/obj/machinery/firealarm, /turf/open/floor/mainship/mono, -/area/mainship/hallways/port_hallway) +/area/mainship/living/grunt_rnr) "tVd" = ( /obj/structure/window/reinforced/extratoughened, /obj/structure/window/reinforced/windowstake{ @@ -15941,7 +15990,7 @@ /turf/open/floor/mainship/tcomms, /area/mainship/command/airoom) "tVr" = ( -/turf/open/floor/mainship/cargo/arrow, +/turf/open/floor/mainship/yellow_cargo/arrow, /area/mainship/squads/general) "tVF" = ( /obj/machinery/light/mainship, @@ -15964,9 +16013,6 @@ /turf/open/floor/plating/plating_catwalk, /area/mainship/hallways/hangar) "tWq" = ( -/obj/structure/disposalpipe/segment/corner{ - dir = 8 - }, /obj/machinery/camera/autoname{ dir = 1 }, @@ -15977,6 +16023,16 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door_control{ + dir = 1; + id = "or2privacyshutter"; + name = "Privacy Shutters"; + pixel_x = -5; + pixel_y = 10 + }, /turf/open/floor/mainship/sterile/corner{ dir = 8 }, @@ -16035,23 +16091,28 @@ /turf/open/floor/plating/plating_catwalk, /area/mainship/hallways/port_hallway) "uay" = ( -/obj/machinery/researchcomp, -/turf/open/floor/mainship/orange{ - dir = 4 +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 8 }, +/obj/item/clothing/head/warning_cone, +/turf/open/floor/mainship/mono, /area/mainship/hallways/hangar) "uaD" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 8 + }, /turf/open/floor/plating/plating_catwalk, /area/mainship/hallways/hangar) "ubh" = ( -/obj/structure/reagent_dispensers/watertank, -/turf/open/floor/mainship/orange{ - dir = 4 +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 8 }, +/turf/open/floor/mainship/mono, /area/mainship/hallways/hangar) "ubk" = ( /obj/structure/table/mainship/nometal, @@ -16070,23 +16131,35 @@ /turf/open/floor/mainship/mono, /area/mainship/hallways/hangar) "ubU" = ( -/turf/open/floor/mainship/green{ - dir = 8 - }, -/area/mainship/hallways/aft_hallway) -"ubW" = ( -/obj/machinery/door/firedoor/mainship{ +/obj/machinery/door/poddoor/railing{ dir = 2; - id = "hangar_lockdown" + id = "supply_elevator_railing" }, -/obj/machinery/door/poddoor/shutters/mainship/open/hangar{ +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/landinglight/tadpole{ + dir = 1; + pixel_y = -4 + }, +/obj/effect/turf_decal/warning_stripes/thin{ dir = 1 }, -/obj/structure/stairs/seamless{ +/turf/open/floor/mainship/floor, +/area/mainship/squads/req) +"ubW" = ( +/obj/machinery/door/poddoor/mainship/mech{ dir = 1 }, -/turf/open/floor/mainship/mono, -/area/mainship/hallways/hangar/droppod) +/obj/machinery/door/firedoor/mainship{ + dir = 2 + }, +/turf/open/floor/mainship/stripesquare, +/area/mainship/living/mechpilotquarters) "ucj" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -16129,18 +16202,9 @@ /area/mainship/command/self_destruct) "uer" = ( /obj/structure/cable, -/obj/structure/disposalpipe/junction{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 8 - }, -/obj/effect/ai_node, -/turf/open/floor/plating/plating_catwalk, -/area/mainship/hallways/aft_hallway) +/obj/machinery/light/mainship, +/turf/open/floor/mainship/floor, +/area/mainship/living/mechpilotquarters) "ueH" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 @@ -16155,15 +16219,13 @@ }, /obj/item/camera, /obj/item/tool/pen, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/item/reagent_containers/food/snacks/sandwiches/sandwich, +/obj/structure/disposalpipe/segment/corner, /turf/open/floor/mainship/mono, /area/mainship/command/corporateliaison) "ufq" = ( /turf/closed/wall/mainship, -/area/mainship/hallways/hangar/droppod) +/area/mainship/living/mechpilotquarters) "ufT" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -16173,11 +16235,19 @@ /area/mainship/hallways/port_hallway) "ugv" = ( /obj/structure/cable, -/obj/machinery/door/poddoor/mainship/droppod{ - dir = 2 +/turf/open/floor/mainship/floor, +/area/mainship/living/mechpilotquarters) +"uhj" = ( +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 1 }, -/turf/open/floor/mainship/stripesquare, -/area/mainship/hallways/hangar/droppod) +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/mainship/cargo/arrow, +/area/mainship/hallways/hangar) "uhP" = ( /obj/machinery/air_alarm, /turf/open/floor/mainship/mono, @@ -16191,16 +16261,29 @@ /obj/structure/cable, /obj/item/storage/surgical_tray, /obj/item/storage/box/gloves, -/obj/item/reagent_containers/spray/surgery, -/obj/structure/sign/nosmoking_2{ - dir = 1 +/obj/item/reagent_containers/spray/surgery{ + pixel_x = -5; + pixel_y = 10 + }, +/obj/item/reagent_containers/spray/cleaner{ + desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; + name = "Surgery Cleaner"; + pixel_x = 6; + pixel_y = 10 }, /turf/open/floor/mainship/sterile/side{ dir = 1 }, /area/mainship/medical/operating_room_one) "uiG" = ( -/obj/machinery/holopad, +/obj/effect/turf_decal/warning_stripes/thick, +/turf/open/floor/plating, +/area/mainship/squads/req) +"uiX" = ( +/obj/machinery/light/mainship{ + light_color = "#da2f1b" + }, +/obj/item/clothing/head/warning_cone, /turf/open/floor/mainship/mono, /area/mainship/squads/req) "ujw" = ( @@ -16221,18 +16304,17 @@ /obj/machinery/door/firedoor/mainship, /turf/open/floor/mainship/stripesquare, /area/mainship/hallways/stern_hallway) -"ukI" = ( -/obj/structure/sign/poster, -/obj/machinery/light/mainship{ - dir = 8 - }, -/turf/open/floor/wood, -/area/mainship/living/pilotbunks) "ukJ" = ( /obj/machinery/marine_selector/clothes/medic, /obj/machinery/light/mainship, /turf/open/floor/mainship/floor, /area/mainship/squads/general) +"umj" = ( +/obj/structure/sink{ + dir = 4 + }, +/turf/open/floor/mainship/sterile/white, +/area/mainship/living/bridgebunks) "umU" = ( /obj/effect/landmark/start/latejoin, /obj/machinery/light/mainship{ @@ -16265,15 +16347,6 @@ /obj/structure/bed/chair/sofa/corner, /turf/open/floor/wood, /area/mainship/living/grunt_rnr) -"uoU" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 5 - }, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 6 - }, -/turf/open/floor/mainship/mono, -/area/mainship/hallways/hangar) "upv" = ( /obj/structure/closet/firecloset, /obj/item/clothing/mask/gas, @@ -16316,18 +16389,11 @@ }, /turf/open/floor/plating/plating_catwalk, /area/mainship/hallways/hangar) -"uqt" = ( -/obj/effect/soundplayer, -/turf/closed/wall/mainship, -/area/crew_quarters/toilet) "uqA" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/obj/machinery/door/poddoor/mainship/droppod{ - dir = 2 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/mainship/stripesquare, -/area/mainship/hallways/hangar/droppod) +/turf/open/floor/mainship/floor, +/area/mainship/living/mechpilotquarters) "uqV" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 @@ -16341,19 +16407,12 @@ }, /turf/open/floor/plating/plating_catwalk, /area/mainship/hallways/starboard_hallway) -"urs" = ( -/obj/machinery/vending/boozeomat, -/turf/open/floor/mainship/mono, -/area/mainship/living/grunt_rnr) "urD" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/obj/effect/ai_node, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 6 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 6 + dir = 4 }, /turf/open/floor/mainship/mono, /area/mainship/hallways/hangar) @@ -16384,9 +16443,9 @@ }, /area/mainship/squads/general) "uvy" = ( -/turf/open/floor/plating/icefloor/warnplate{ - dir = 5 - }, +/obj/structure/cable, +/obj/machinery/holopad, +/turf/open/floor/mainship/mono, /area/mainship/squads/req) "uvB" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ @@ -16431,10 +16490,6 @@ /obj/machinery/light/mainship, /turf/open/floor/mainship/mono, /area/mainship/engineering/upper_engineering) -"uvW" = ( -/obj/structure/prop/mainship/sensor_computer3, -/turf/open/floor/mainship/mono, -/area/mainship/shipboard/weapon_room) "uwg" = ( /turf/open/floor/mainship/black{ dir = 6 @@ -16448,7 +16503,7 @@ /area/mainship/hallways/hangar) "uxI" = ( /obj/structure/sign/poster, -/turf/open/floor/mainship/cargo/arrow{ +/turf/open/floor/mainship/yellow_cargo/arrow{ dir = 8 }, /area/mainship/squads/general) @@ -16461,23 +16516,32 @@ /turf/open/floor/mainship/sterile/dark, /area/mainship/medical/lower_medical) "uzm" = ( -/obj/structure/closet/toolcloset, -/turf/open/floor/mainship/cargo, -/area/mainship/hallways/hangar) -"uzn" = ( -/obj/effect/turf_decal/warning_stripes/thin{ +/obj/machinery/door/poddoor/railing{ + dir = 2; + id = "supply_elevator_railing" + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/machinery/light/mainship/small{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 }, -/turf/open/floor/mainship/mono, -/area/mainship/shipboard/weapon_room) -"uzy" = ( -/turf/open/floor/mainship/black{ +/obj/machinery/landinglight/tadpole{ + dir = 1; + pixel_y = -4 + }, +/obj/effect/turf_decal/warning_stripes/thin{ dir = 1 }, -/area/mainship/living/tankerbunks) +/turf/open/floor/mainship/cargo/arrow{ + dir = 1 + }, +/area/mainship/squads/req) +"uzy" = ( +/obj/machinery/vending/weapon, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar/droppod) "uzA" = ( /obj/machinery/light/mainship/small{ dir = 1 @@ -16516,9 +16580,6 @@ /turf/open/floor/mainship/sterile/dark, /area/mainship/medical/operating_room_two) "uCk" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -16526,8 +16587,18 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 }, +/obj/effect/turf_decal/warning_stripes/thick{ + dir = 4 + }, /turf/open/floor/mainship/stripesquare, /area/mainship/command/cic) +"uCC" = ( +/obj/structure/sign/prop1, +/obj/machinery/light/mainship{ + light_color = "#da2f1b" + }, +/turf/open/floor/plating/plating_catwalk, +/area/mainship/hallways/port_hallway) "uCO" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -16535,20 +16606,27 @@ /area/mainship/hallways/hangar) "uDd" = ( /obj/effect/landmark/corpsespawner/marine/burst, +/obj/effect/decal/cleanable/blood, /turf/open/floor/mainship/research/containment/floor1, /area/mainship/medical/medical_science) -"uDj" = ( -/obj/machinery/vending/weapon, -/turf/open/floor/mainship/black{ - dir = 1 - }, -/area/mainship/living/tankerbunks) "uDl" = ( -/obj/structure/cable, +/obj/machinery/light/mainship{ + light_color = "#da2f1b" + }, +/obj/structure/sign/prop1, /turf/open/floor/mainship/mono, /area/mainship/hallways/port_hallway) +"uDq" = ( +/obj/machinery/light/mainship{ + dir = 1 + }, +/turf/open/floor/mainship/cargo, +/area/mainship/hallways/hangar) "uDQ" = ( /obj/machinery/bioprinter/stocked, +/obj/structure/disposalpipe/segment/corner{ + dir = 1 + }, /turf/open/floor/mainship/sterile/corner{ dir = 8 }, @@ -16597,14 +16675,17 @@ /turf/open/floor/tile/dark, /area/mainship/command/cic) "uIy" = ( -/obj/structure/table/mainship/nometal, -/obj/item/storage/firstaid/regular, -/turf/open/floor/mainship/white, -/area/mainship/living/pilotbunks) +/obj/effect/turf_decal/warning_stripes/thick{ + dir = 9 + }, +/turf/open/floor/plating, +/area/mainship/squads/req) "uIX" = ( -/obj/structure/bed/chair/nometal, -/turf/open/floor/mainship/floor, -/area/mainship/living/pilotbunks) +/obj/effect/turf_decal/warning_stripes/thick{ + dir = 6 + }, +/turf/open/floor/mainship/hexagon, +/area/mainship/living/tankerbunks) "uKk" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, @@ -16634,9 +16715,11 @@ /turf/open/floor/mainship/black, /area/mainship/command/self_destruct) "uKM" = ( -/obj/effect/ai_node, -/turf/open/floor/mainship/terragov/north, -/area/mainship/living/briefing) +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 8 + }, +/turf/closed/wall/mainship, +/area/mainship/living/mechpilotquarters) "uLb" = ( /obj/effect/decal/cleanable/blood, /obj/item/reagent_containers/hypospray/autoinjector/synaptizine_expired, @@ -16683,21 +16766,6 @@ /obj/structure/flora/pottedplant/twentytwo, /turf/open/floor/wood, /area/mainship/living/numbertwobunks) -"uNz" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ - dir = 1 - }, -/turf/open/floor/plating/plating_catwalk, -/area/mainship/hallways/hangar) -"uOd" = ( -/obj/machinery/vending/armor_supply, -/turf/open/floor/mainship/black{ - dir = 1 - }, -/area/mainship/living/tankerbunks) "uOe" = ( /obj/structure/closet/bodybag, /turf/open/floor/mainship/mono, @@ -16739,16 +16807,6 @@ /obj/item/storage/fancy/cigar, /turf/open/floor/wood, /area/mainship/living/commandbunks) -"uQk" = ( -/obj/item/clothing/head/warning_cone, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 4 - }, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 5 - }, -/turf/open/floor/mainship/mono, -/area/mainship/hallways/hangar) "uQB" = ( /obj/effect/turf_decal/warning_stripes/thin{ dir = 8 @@ -16763,24 +16821,14 @@ /turf/open/floor/mainship/mono, /area/mainship/hallways/hangar) "uQI" = ( -/obj/effect/turf_decal/warning_stripes/thin{ +/obj/effect/turf_decal/warning_stripes/thick{ dir = 4 }, /turf/open/floor/mainship/stripesquare, /area/mainship/hallways/port_hallway) "uQQ" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/layer1{ - dir = 4; - on = 1 - }, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 1 - }, -/obj/machinery/light/mainship, -/turf/open/floor/mainship/cargo/arrow{ - dir = 1 - }, -/area/mainship/hallways/hangar/droppod) +/turf/open/floor/mainship/floor, +/area/mainship/living/mechpilotquarters) "uSe" = ( /turf/open/floor/plating/mainship, /area/mainship/hull/lower_hull) @@ -16789,6 +16837,16 @@ /obj/structure/cable, /turf/open/floor/plating/plating_catwalk, /area/mainship/hull/lower_hull) +"uTs" = ( +/obj/structure/bed/chair/office/light{ + dir = 1 + }, +/obj/effect/ai_node, +/obj/machinery/atmospherics/components/unary/vent_pump/layer1{ + on = 1 + }, +/turf/open/floor/mainship/mono, +/area/mainship/engineering/upper_engineering) "uTv" = ( /obj/effect/ai_node, /turf/open/floor/mainship/mono, @@ -16801,33 +16859,20 @@ /turf/open/floor/plating, /area/mainship/hallways/hangar) "uTG" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/effect/turf_decal/warning_stripes/thick{ dir = 8 }, -/turf/open/floor/mainship/mono, -/area/mainship/hallways/hangar) +/turf/open/floor/mainship/hexagon, +/area/mainship/living/tankerbunks) "uTM" = ( /obj/machinery/door/airlock/mainship/maint/free_access, /obj/structure/sign/hydro, /turf/open/floor/mainship/mono, /area/mainship/hull/lower_hull) "uUp" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 4 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/mainship/mono, -/area/mainship/hallways/aft_hallway) +/obj/machinery/door/poddoor/mainship, +/turf/closed/wall/mainship/outer, +/area/mainship/shipboard/weapon_room) "uUU" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -16843,11 +16888,11 @@ /turf/open/floor/plating/plating_catwalk, /area/mainship/hull/lower_hull) "uVa" = ( -/obj/structure/bed/chair/office/dark{ - dir = 1 - }, -/obj/effect/landmark/start/job/requisitionsofficer, /obj/structure/disposalpipe/segment, +/obj/machinery/door/airlock/mainship/marine/requisitions{ + dir = 2; + name = "\improper Requisition's Office" + }, /turf/open/floor/mainship/mono, /area/mainship/squads/req) "uVk" = ( @@ -16858,15 +16903,6 @@ /obj/effect/ai_node, /turf/open/floor/mainship/sterile/dark, /area/mainship/medical/chemistry) -"uWa" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 4 - }, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 8 - }, -/turf/open/floor/plating/mainship, -/area/mainship/shipboard/weapon_room) "uWB" = ( /obj/machinery/camera/autoname/mainship, /turf/open/floor/mainship/floor, @@ -16883,16 +16919,20 @@ /obj/item/reagent_containers/glass/beaker/large, /turf/open/floor/mainship/sterile/dark, /area/mainship/medical/chemistry) -"uWP" = ( -/obj/effect/turf_decal/warning_stripes/thin, -/turf/open/floor/mainship/mono, -/area/mainship/shipboard/weapon_room) "uXb" = ( -/obj/structure/cable, -/turf/open/floor/mainship/cargo/arrow{ - dir = 1 +/obj/effect/turf_decal/warning_stripes/thick/corner{ + dir = 8 }, -/area/mainship/hallways/hangar/droppod) +/turf/open/floor/mainship/floor, +/area/mainship/living/mechpilotquarters) +"uXw" = ( +/obj/machinery/vending/uniform_supply, +/turf/open/floor/wood, +/area/mainship/living/tankerbunks) +"uXy" = ( +/obj/effect/soundplayer, +/turf/closed/wall/mainship/outer, +/area/mainship/hallways/starboard_hallway) "uYe" = ( /obj/structure/disposalpipe/segment/corner{ dir = 8 @@ -16944,11 +16984,13 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/structure/cable, +/obj/machinery/door/airlock/mainship/maint, /turf/open/floor/plating/mainship, /area/mainship/living/bridgebunks) "van" = ( /obj/machinery/vending/boozeomat, -/turf/open/floor/prison/kitchen, +/turf/open/floor/iron/kitchen, /area/mainship/living/grunt_rnr) "vaW" = ( /obj/effect/turf_decal/warning_stripes/thin{ @@ -16961,11 +17003,9 @@ /turf/open/floor/mainship/mono, /area/mainship/hull/lower_hull) "vaX" = ( -/obj/machinery/vending/armor_supply, -/turf/open/floor/mainship/white{ - dir = 10 - }, -/area/mainship/living/pilotbunks) +/obj/machinery/light/mainship, +/turf/open/floor/mainship/hexagon, +/area/mainship/living/tankerbunks) "vbf" = ( /obj/effect/turf_decal/warning_stripes/thin{ dir = 1 @@ -16990,7 +17030,6 @@ /turf/open/floor/mainship/mono, /area/mainship/squads/req) "vdN" = ( -/obj/item/clothing/head/warning_cone, /obj/effect/turf_decal/warning_stripes/thin{ dir = 8 }, @@ -17032,17 +17071,10 @@ /turf/closed/wall/mainship, /area/mainship/command/cic) "vfU" = ( -/obj/structure/droppod, -/obj/structure/drop_pod_launcher, -/obj/machinery/light/mainship{ - dir = 8 - }, -/turf/open/floor/mainship/cargo, -/area/mainship/hallways/hangar/droppod) -"vgd" = ( -/obj/effect/ai_node, -/turf/open/floor/plating, -/area/mainship/living/tankerbunks) +/obj/structure/table/woodentable, +/obj/effect/spawner/random/misc/table_lighting, +/turf/open/floor/wood, +/area/mainship/living/mechpilotquarters) "vgo" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -17076,16 +17108,15 @@ /obj/machinery/air_alarm{ dir = 4 }, -/turf/open/floor/mainship/mono, +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/turf/open/floor/plating/plating_catwalk, /area/mainship/hallways/port_umbilical) "viq" = ( /turf/closed/wall/mainship, /area/mainship/engineering/port_atmos) -"viN" = ( -/turf/closed/wall/mainship, -/area/mainship/living/tankerbunks) "vjs" = ( -/obj/machinery/cic_maptable/drawable/big, +/obj/machinery/computer/navigation, /turf/open/floor/mainship/mono, /area/mainship/command/cic) "vjC" = ( @@ -17138,7 +17169,7 @@ /turf/open/floor/mainship/black, /area/mainship/squads/general) "vou" = ( -/turf/open/floor/mainship/floor, +/turf/closed/wall/mainship, /area/mainship/living/pilotbunks) "voR" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ @@ -17199,6 +17230,12 @@ dir = 9 }, /area/mainship/squads/general) +"vua" = ( +/mob/living/simple_animal/mouse, +/turf/open/floor/mainship/red{ + dir = 4 + }, +/area/mainship/command/airoom) "vuc" = ( /obj/machinery/door/window{ dir = 2 @@ -17212,6 +17249,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/showcase/coinpress, /turf/open/floor/wood, /area/mainship/living/commandbunks) "vuM" = ( @@ -17223,9 +17261,11 @@ /turf/closed/wall/mainship, /area/mainship/command/self_destruct) "vvE" = ( -/obj/structure/closet/emcloset, -/turf/open/floor/mainship/mono, -/area/mainship/hallways/hangar) +/obj/structure/bed/chair/nometal{ + dir = 1 + }, +/turf/open/floor/mainship/red/full, +/area/mainship/living/briefing) "vvV" = ( /obj/machinery/camera/autoname/mainship{ dir = 8 @@ -17233,11 +17273,10 @@ /turf/open/floor/mainship/mono, /area/mainship/hallways/aft_hallway) "vwd" = ( -/obj/effect/turf_decal/warning_stripes/thick{ - dir = 8 +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 9 }, -/obj/item/clothing/head/warning_cone, -/turf/open/floor/plating, +/turf/open/floor/mainship/mono, /area/mainship/hallways/hangar) "vwh" = ( /obj/machinery/door/airlock/mainship/generic{ @@ -17279,7 +17318,6 @@ /obj/structure/bed/chair/nometal{ dir = 8 }, -/obj/structure/disposalpipe/segment/corner, /turf/open/floor/mainship/mono, /area/mainship/command/corporateliaison) "vxU" = ( @@ -17287,23 +17325,28 @@ /obj/machinery/faxmachine/cic, /turf/open/floor/mainship/mono, /area/mainship/command/cic) -"vyG" = ( +"vyj" = ( +/obj/machinery/power/apc, /obj/structure/cable, -/obj/machinery/door/firedoor/mainship{ - dir = 2 +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar/droppod) +"vyG" = ( +/obj/machinery/light/mainship{ + dir = 1 }, -/turf/open/floor/mainship/stripesquare, -/area/mainship/hallways/port_hallway) +/obj/structure/bed/chair/sofa, +/turf/open/floor/wood, +/area/mainship/living/grunt_rnr) "vyJ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 10 - }, -/obj/structure/cable, +/turf/open/floor/mainship/hexagon, +/area/mainship/shipboard/weapon_room) +"vzt" = ( +/obj/structure/bed, +/obj/item/bedsheet/captain, +/obj/effect/landmark/corpsespawner/marine/regular, +/obj/effect/landmark/start/job/staffofficer, /turf/open/floor/mainship/mono, -/area/mainship/hallways/port_hallway) +/area/mainship/living/bridgebunks) "vzy" = ( /obj/structure/cable, /obj/structure/disposalpipe/junction{ @@ -17343,6 +17386,7 @@ /turf/closed/wall/mainship, /area/mainship/engineering/upper_engineering) "vBY" = ( +/obj/machinery/bot/cleanbot, /turf/open/floor/mainship/sterile, /area/mainship/medical/lower_medical) "vCB" = ( @@ -17354,9 +17398,25 @@ /obj/structure/closet/secure_closet/staff_officer, /turf/open/floor/mainship/red/full, /area/mainship/command/cic) -"vEw" = ( -/turf/open/floor/plating/plating_catwalk, -/area/mainship/engineering/engine_core) +"vDr" = ( +/obj/effect/turf_decal/warning_stripes/thick{ + dir = 8 + }, +/turf/open/floor/mainship/mono, +/area/mainship/shipboard/weapon_room) +"vDH" = ( +/obj/structure/closet/secure_closet/engineering_personal, +/obj/item/storage/backpack/marine/engineerpack, +/obj/item/reagent_containers/food/drinks/bottle/vodka, +/obj/machinery/landinglight/tadpole{ + dir = 4; + pixel_x = -4 + }, +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 4 + }, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar) "vFb" = ( /obj/structure/table/fancywoodentable, /obj/item/book/codebook, @@ -17376,19 +17436,6 @@ }, /turf/open/floor/mainship/mono, /area/mainship/command/corporateliaison) -"vGw" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/obj/effect/turf_decal/warning_stripes/thin, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 8 - }, -/obj/effect/ai_node, -/turf/open/floor/mainship/mono, -/area/mainship/shipboard/weapon_room) "vGG" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, @@ -17397,23 +17444,17 @@ /turf/open/floor/plating/plating_catwalk, /area/mainship/hallways/aft_hallway) "vGQ" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 8 - }, -/turf/open/floor/mainship/mono, -/area/mainship/living/pilotbunks) +/turf/open/floor/mainship/hexagon, +/area/mainship/living/tankerbunks) +"vGX" = ( +/obj/machinery/loadout_vendor, +/turf/open/floor/wood, +/area/mainship/living/tankerbunks) "vHq" = ( /obj/machinery/light/mainship{ dir = 1 }, -/turf/open/floor/mainship/cargo/arrow{ +/turf/open/floor/mainship/yellow_cargo/arrow{ dir = 8 }, /area/mainship/squads/general) @@ -17427,17 +17468,12 @@ /obj/effect/spawner/random/engineering/wood, /turf/open/floor/mainship/mono, /area/mainship/command/self_destruct) -"vJi" = ( +"vJq" = ( /obj/effect/turf_decal/warning_stripes/thin{ - dir = 8 - }, -/obj/machinery/light/mainship{ dir = 4 }, -/turf/open/floor/mainship/black{ - dir = 4 - }, -/area/mainship/living/tankerbunks) +/turf/closed/wall/mainship, +/area/mainship/hallways/starboard_hallway) "vLD" = ( /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_pump/layer1{ @@ -17447,20 +17483,32 @@ /turf/open/floor/wood, /area/mainship/living/commandbunks) "vMp" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/light/mainship/small{ - dir = 4 +/obj/effect/turf_decal/warning_stripes/thick{ + dir = 8 }, /turf/open/floor/mainship/mono, /area/mainship/shipboard/weapon_room) "vMr" = ( -/obj/structure/cable, +/turf/closed/wall/mainship, +/area/mainship/shipboard/brig) +"vMM" = ( +/obj/effect/soundplayer, +/obj/structure/sign/evac, +/turf/closed/wall/mainship, +/area/mainship/command/cic) +"vNA" = ( +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 4 + }, +/obj/machinery/camera/autoname/mainship{ + dir = 4 + }, /obj/effect/ai_node, -/turf/open/floor/mainship/floor, -/area/mainship/living/pilotbunks) +/turf/open/floor/mainship/mono, +/area/mainship/hull/lower_hull) "vOs" = ( /turf/closed/wall/mainship, /area/mainship/hallways/stern_hallway) @@ -17483,16 +17531,26 @@ dir = 1 }, /area/mainship/medical/lower_medical) +"vPH" = ( +/turf/open/floor/mainship/mono, +/area/mainship/living/pilotbunks) "vQO" = ( /obj/machinery/telecomms/hub/preset, /turf/open/floor/mainship/tcomms, /area/mainship/command/telecomms) "vSd" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 8 +/obj/structure/table/mainship/nometal, +/obj/item/stack/barbed_wire/half_stack, +/obj/item/tool/crowbar, +/obj/machinery/landinglight/tadpole{ + dir = 4; + pixel_x = -4 + }, +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 4 }, /turf/open/floor/mainship/mono, -/area/mainship/hallways/aft_hallway) +/area/mainship/hallways/hangar) "vSo" = ( /obj/machinery/camera/autoname/mainship{ dir = 4 @@ -17507,17 +17565,6 @@ dir = 5 }, /area/mainship/shipboard/firing_range) -"vSI" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 9 - }, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 5 - }, -/turf/open/floor/mainship/cargo/arrow{ - dir = 1 - }, -/area/mainship/shipboard/weapon_room) "vSJ" = ( /obj/machinery/door/airlock/mainship/engineering/disposals, /obj/structure/disposalpipe/segment{ @@ -17525,20 +17572,12 @@ }, /turf/open/floor/mainship/mono, /area/mainship/hull/lower_hull) -"vTt" = ( -/obj/machinery/light/mainship{ - dir = 4 - }, -/obj/machinery/door/firedoor/mainship{ - dir = 2; - id = "hangar_lockdown" - }, -/obj/machinery/door/poddoor/shutters/mainship/open/hangar{ - dir = 1 - }, -/obj/structure/stairs/seamless/platform_vert{ - dir = 1 +"vSU" = ( +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 6 }, +/obj/effect/ai_node, +/obj/item/clothing/head/warning_cone, /turf/open/floor/mainship/mono, /area/mainship/hallways/hangar) "vTy" = ( @@ -17583,21 +17622,21 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/mainship/mono, /area/mainship/hull/lower_hull) -"vXG" = ( -/obj/structure/mirror, -/turf/open/floor/wood, -/area/mainship/living/tankerbunks) "vXQ" = ( /turf/open/floor/wood, -/area/mainship/living/pilotbunks) +/area/mainship/living/tankerbunks) "vXY" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/mainship/mono, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/light/mainship{ + dir = 1 + }, +/turf/open/floor/mainship/sterile/white, /area/mainship/living/bridgebunks) "vYd" = ( /obj/structure/morgue{ @@ -17614,12 +17653,15 @@ /area/mainship/hallways/hangar) "vYB" = ( /obj/machinery/light/mainship, -/turf/open/floor/mainship/black, -/area/mainship/living/pilotbunks) +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar/droppod) "vZa" = ( -/obj/machinery/door/poddoor/mainship, -/turf/open/floor/mainship/stripesquare, -/area/mainship/shipboard/weapon_room) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/plating/plating_catwalk, +/area/mainship/hull/lower_hull) "vZe" = ( /obj/effect/ai_node, /turf/open/floor/mainship/black/full, @@ -17644,6 +17686,13 @@ /obj/structure/cable, /turf/open/floor/plating/plating_catwalk, /area/mainship/hallways/boxingring) +"waC" = ( +/obj/structure/bed/stool{ + pixel_y = 8 + }, +/obj/structure/flora/ausbushes/fullgrass, +/turf/open/floor/grass, +/area/mainship/living/starboard_garden) "wcT" = ( /turf/closed/wall/mainship/white, /area/mainship/medical/upper_medical) @@ -17654,8 +17703,16 @@ /obj/structure/table/mainship/nometal, /obj/item/fuel_cell/full, /obj/structure/cable, -/turf/open/floor/mainship/mono, +/turf/open/floor/mainship/hexagon, /area/mainship/engineering/engine_core) +"wes" = ( +/obj/structure/rack, +/obj/structure/ob_ammo/warhead/incendiary, +/obj/structure/ob_ammo/warhead/incendiary, +/turf/open/floor/mainship/red{ + dir = 4 + }, +/area/mainship/shipboard/weapon_room) "weY" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/light/mainship{ @@ -17707,10 +17764,20 @@ dir = 4; pixel_x = -4 }, -/turf/open/floor/mainship/cargo/arrow{ +/turf/open/floor/mainship/yellow_cargo/arrow{ dir = 4 }, /area/mainship/hallways/hangar) +"whb" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/mainship/mono, +/area/mainship/shipboard/weapon_room) +"whQ" = ( +/obj/structure/prop/tgbrokenvendor/sec, +/turf/open/floor/plating/mainship, +/area/mainship/shipboard/brig) "whZ" = ( /turf/closed/wall/mainship, /area/mainship/living/bridgebunks) @@ -17727,7 +17794,7 @@ /obj/machinery/reagentgrinder{ pixel_y = 5 }, -/turf/open/floor/mainship/mono, +/turf/open/floor/iron/kitchen, /area/mainship/living/grunt_rnr) "wkJ" = ( /obj/machinery/iv_drip, @@ -17746,16 +17813,15 @@ /obj/structure/sign/prop1{ dir = 1 }, -/turf/open/floor/mainship/cargo, +/turf/open/floor/mainship/yellow_cargo, /area/mainship/squads/general) "wml" = ( /turf/open/floor/mainship/mono, /area/mainship/engineering/port_atmos) "wmy" = ( -/obj/structure/closet/secure_closet/pilot_officer, -/obj/effect/ai_node, -/turf/open/floor/wood, -/area/mainship/living/pilotbunks) +/obj/effect/turf_decal/warning_stripes/thick/corner, +/turf/open/floor/plating, +/area/mainship/hallways/hangar) "wmH" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -17764,7 +17830,7 @@ /turf/open/floor/mainship/mono, /area/mainship/command/cic) "wmX" = ( -/turf/open/floor/mainship/mono, +/turf/open/floor/mainship/hexagon, /area/mainship/engineering/engine_core) "wne" = ( /obj/machinery/light/mainship, @@ -17817,20 +17883,14 @@ dir = 8 }, /area/mainship/living/cryo_cells) -"wqh" = ( -/obj/structure/bed/bunkbed, -/obj/effect/landmark/start/job/mechpilot, -/obj/effect/landmark/start/job/mechpilot, -/turf/open/floor/wood, -/area/mainship/living/tankerbunks) "wql" = ( /obj/machinery/door/airlock/mainship/generic/bathroom, /obj/machinery/door/firedoor/mainship, /turf/open/floor/mainship/mono, /area/mainship/living/numbertwobunks) "wqq" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, /turf/open/floor/mainship/floor, /area/mainship/hallways/hangar) "wqw" = ( @@ -17852,7 +17912,7 @@ /obj/structure/sink{ dir = 1 }, -/turf/open/floor/prison/kitchen, +/turf/open/floor/iron/kitchen, /area/mainship/living/grunt_rnr) "wrP" = ( /obj/machinery/line_nexter, @@ -17866,6 +17926,13 @@ /obj/machinery/griddle, /turf/open/floor/mainship/floor, /area/mainship/living/grunt_rnr) +"wrW" = ( +/obj/structure/table/woodentable, +/obj/effect/spawner/random/misc/table_lighting, +/obj/item/paper, +/obj/item/paper, +/turf/open/floor/wood, +/area/mainship/living/tankerbunks) "wsb" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ dir = 8 @@ -17876,6 +17943,12 @@ /obj/effect/ai_node, /turf/open/floor/mainship/floor, /area/mainship/command/corporateliaison) +"wsG" = ( +/obj/structure/bed/chair/nometal{ + dir = 4 + }, +/turf/open/floor/mainship/mono, +/area/mainship/hull/lower_hull) "wsR" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 @@ -17883,10 +17956,19 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/mainship/cargo/arrow{ +/turf/open/floor/mainship/yellow_cargo/arrow{ dir = 8 }, /area/mainship/squads/general) +"wsX" = ( +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 8 + }, +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 4 + }, +/turf/open/floor/mainship/floor, +/area/mainship/hallways/hangar) "wtq" = ( /obj/structure/table/reinforced, /obj/effect/soundplayer, @@ -17918,12 +18000,31 @@ /turf/open/floor/mainship/tcomms, /area/mainship/command/self_destruct) "wvV" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/cable, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/obj/structure/disposalpipe/segment, -/turf/open/floor/plating/plating_catwalk, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 8 + }, +/obj/effect/ai_node, +/obj/structure/disposalpipe/junction/flipped, +/turf/open/floor/mainship/mono, /area/mainship/hallways/aft_hallway) +"wwp" = ( +/obj/machinery/light/mainship{ + dir = 4 + }, +/obj/structure/closet/cabinet, +/turf/open/floor/mainship/mono, +/area/mainship/living/bridgebunks) +"wwC" = ( +/obj/structure/table/mainship/nometal, +/obj/item/clothing/head/chefhat, +/obj/item/clothing/under/rank/chef, +/obj/item/clothing/suit/storage/chef/classic, +/turf/open/floor/mainship/mono, +/area/mainship/living/grunt_rnr) "wwQ" = ( /obj/structure/bed/chair/nometal{ dir = 1 @@ -17961,6 +18062,11 @@ /obj/item/ammo_magazine/handful/buckshot, /turf/open/floor/mainship/red/full, /area/mainship/shipboard/firing_range) +"wBa" = ( +/obj/structure/cable, +/obj/effect/landmark/start/job/chiefshipengineer, +/turf/open/floor/mainship/hexagon, +/area/mainship/engineering/engine_core) "wBC" = ( /obj/structure/table/fancywoodentable, /obj/machinery/computer/security/marinemainship_network, @@ -17973,18 +18079,6 @@ "wBL" = ( /turf/closed/wall/mainship/outer, /area/mainship/engineering/port_atmos) -"wBV" = ( -/obj/structure/rack, -/obj/machinery/light/mainship/small, -/obj/structure/ob_ammo/ob_fuel, -/obj/structure/ob_ammo/ob_fuel, -/obj/structure/ob_ammo/ob_fuel, -/obj/structure/ob_ammo/ob_fuel, -/obj/structure/ob_ammo/ob_fuel, -/turf/open/floor/mainship/red{ - dir = 10 - }, -/area/mainship/shipboard/weapon_room) "wCX" = ( /obj/structure/sign/poster, /obj/effect/decal/cleanable/cobweb{ @@ -18021,21 +18115,9 @@ /turf/open/floor/mainship/mono, /area/mainship/command/corporateliaison) "wEI" = ( -/obj/structure/cable, -/obj/machinery/door/airlock/mainship/maint, -/obj/machinery/door/firedoor/mainship{ - dir = 8 - }, -/turf/open/floor/plating/plating_catwalk, -/area/mainship/hallways/hangar) -"wEX" = ( -/obj/structure/rack, -/obj/structure/ob_ammo/warhead/incendiary, -/obj/structure/ob_ammo/warhead/incendiary, -/turf/open/floor/mainship/red{ - dir = 1 - }, -/area/mainship/shipboard/weapon_room) +/obj/machinery/holopad, +/turf/open/floor/mainship/mono, +/area/mainship/living/briefing) "wEZ" = ( /obj/structure/cable, /turf/open/floor/mainship/mono, @@ -18075,10 +18157,6 @@ /obj/item/storage/firstaid/rad, /turf/open/floor/mainship/blue/full, /area/mainship/command/cic) -"wHf" = ( -/obj/machinery/door/firedoor/mainship, -/turf/open/floor/mainship/stripesquare, -/area/mainship/living/pilotbunks) "wHk" = ( /obj/structure/cable, /obj/effect/ai_node, @@ -18087,11 +18165,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/mainship/hull/lower_hull) -"wHs" = ( -/turf/open/floor/mainship/black{ - dir = 4 - }, -/area/mainship/living/tankerbunks) "wHB" = ( /obj/machinery/firealarm{ dir = 1 @@ -18099,11 +18172,7 @@ /turf/open/floor/mainship/mono, /area/mainship/hallways/port_hallway) "wHI" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/layer1{ - dir = 1; - on = 1 - }, -/turf/open/floor/wood, +/turf/open/floor/mainship/silver, /area/mainship/living/chapel) "wHL" = ( /obj/structure/table/mainship/nometal, @@ -18173,10 +18242,8 @@ /turf/open/floor/mainship/mono, /area/mainship/hull/lower_hull) "wLx" = ( -/turf/open/floor/plating/icefloor/warnplate{ - dir = 9 - }, -/area/mainship/squads/req) +/turf/open/floor/mainship/green/full, +/area/mainship/hallways/aft_hallway) "wMh" = ( /obj/machinery/camera/autoname/mainship{ dir = 8 @@ -18208,16 +18275,8 @@ /turf/open/floor/mainship/mono, /area/mainship/hallways/starboard_hallway) "wOa" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment/corner{ - dir = 4 - }, -/obj/machinery/light/mainship/small{ - dir = 1 - }, -/obj/effect/ai_node, -/turf/open/floor/mainship/mono, -/area/mainship/hallways/port_umbilical) +/turf/open/floor/plating/mainship, +/area/mainship/shipboard/brig) "wPe" = ( /obj/machinery/light/mainship{ dir = 1 @@ -18238,6 +18297,10 @@ /obj/structure/cable, /turf/open/floor/plating/plating_catwalk, /area/mainship/hull/lower_hull) +"wQo" = ( +/obj/structure/cable, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/port_hallway) "wQJ" = ( /turf/closed/wall/mainship/outer, /area/mainship/hallways/port_umbilical) @@ -18299,7 +18362,7 @@ pixel_x = 3; pixel_y = 3 }, -/turf/open/floor/mainship/mono, +/turf/open/floor/iron/kitchen, /area/mainship/living/grunt_rnr) "wTX" = ( /obj/machinery/vending/nanomed, @@ -18318,36 +18381,38 @@ }, /turf/open/floor/mainship/mono, /area/mainship/engineering/port_atmos) +"wVG" = ( +/obj/structure/flora/ausbushes/ppflowers, +/turf/open/floor/grass, +/area/mainship/living/starboard_garden) "wVL" = ( /obj/structure/closet/boxinggloves, /turf/open/floor/plating/plating_catwalk, /area/mainship/hallways/boxingring) "wVZ" = ( -/obj/machinery/door/poddoor/mainship/ammo{ - dir = 2; - id = null; - name = "\improper Hangar Launch Hatch" - }, -/turf/closed/wall/mainship/outer, +/obj/structure/cable, +/obj/effect/ai_node, +/turf/open/floor/mainship/floor, /area/mainship/hallways/hangar) "wWG" = ( -/obj/structure/bed/chair/nometal{ - dir = 1 +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 8 }, -/turf/open/floor/mainship/purple/full, -/area/mainship/living/briefing) +/obj/machinery/landinglight/tadpole{ + dir = 8; + pixel_x = 4 + }, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar) "wWQ" = ( /turf/closed/wall/mainship, /area/mainship/command/telecomms) "wXm" = ( /obj/structure/cable, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 4 - }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/item/clothing/head/warning_cone, /turf/open/floor/plating/plating_catwalk, /area/mainship/hallways/aft_hallway) "wXr" = ( @@ -18355,14 +18420,10 @@ /obj/machinery/light/mainship{ dir = 4 }, -/obj/structure/bed/stool{ - pixel_y = 8 - }, -/obj/structure/cable, /turf/open/floor/grass, /area/mainship/living/starboard_garden) "wXN" = ( -/obj/structure/largecrate/guns/merc, +/obj/structure/largecrate/supply/supplies/flares, /turf/open/floor/mainship/orange{ dir = 8 }, @@ -18379,6 +18440,13 @@ dir = 8 }, /area/mainship/medical/medical_science) +"wYw" = ( +/obj/structure/cable, +/turf/open/floor/mainship/mono, +/area/mainship/shipboard/brig) +"wYz" = ( +/turf/open/floor/mainship/green/full, +/area/mainship/squads/req) "wZu" = ( /obj/machinery/camera/autoname/mainship{ dir = 8 @@ -18418,7 +18486,7 @@ id = "qm_warehouse"; name = "\improper Warehouse Shutters" }, -/turf/open/floor/mainship/mono, +/turf/open/floor/mainship/green/full, /area/mainship/squads/req) "xbv" = ( /obj/structure/disposalpipe/segment, @@ -18449,13 +18517,8 @@ /area/mainship/command/airoom) "xdN" = ( /obj/structure/flora/ausbushes/fullgrass, -/obj/structure/bed/stool{ - pixel_y = 8 - }, -/obj/structure/sign/prop1, -/obj/structure/cable, -/obj/machinery/power/apc{ - dir = 1 +/obj/machinery/light/mainship{ + dir = 4 }, /turf/open/floor/grass, /area/mainship/living/starboard_garden) @@ -18490,11 +18553,11 @@ /turf/open/floor/mainship/mono, /area/mainship/hallways/aft_hallway) "xfo" = ( -/obj/item/radio/intercom/general{ - dir = 8 +/obj/structure/shipmast{ + pixel_y = 2 }, -/turf/open/floor/mainship/mono, -/area/mainship/hallways/hangar) +/turf/open/floor/mainship/green/full, +/area/mainship/squads/req) "xfu" = ( /mob/living/simple_animal/cat/martin, /turf/open/floor/mainship/mono, @@ -18536,6 +18599,7 @@ /obj/machinery/camera/autoname/mainship{ dir = 4 }, +/obj/structure/showcase/coinpress, /turf/open/floor/mainship/mono, /area/mainship/living/grunt_rnr) "xiV" = ( @@ -18568,12 +18632,20 @@ idle_power_usage = 3; name = "modifed holopad" }, +/obj/machinery/light/mainship{ + dir = 8 + }, /turf/open/floor/mainship/mono, /area/mainship/hallways/port_hallway) +"xjD" = ( +/obj/item/clothing/head/warning_cone, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar/droppod) "xjF" = ( -/turf/open/floor/plating/icefloor/warnplate{ - dir = 4 +/obj/effect/turf_decal/warning_stripes/thick{ + dir = 1 }, +/turf/open/floor/plating, /area/mainship/squads/req) "xjG" = ( /obj/machinery/loadout_vendor, @@ -18585,15 +18657,34 @@ /obj/structure/closet/emcloset, /turf/open/floor/mainship/cargo, /area/mainship/engineering/upper_engineering) +"xkF" = ( +/obj/machinery/gear{ + id = "supply_elevator_gear" + }, +/turf/open/floor/mainship/mono, +/area/mainship/squads/req) "xlo" = ( -/obj/docking_port/stationary/marine_dropship/cas, -/turf/open/floor/plating, -/area/mainship/hallways/hangar) +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 8 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating/plating_catwalk, +/area/mainship/hallways/aft_hallway) "xlu" = ( -/turf/open/floor/mainship/terragov{ +/obj/machinery/door/poddoor/mainship/mech{ dir = 1 }, -/area/mainship/living/briefing) +/obj/machinery/door/firedoor/mainship{ + dir = 2 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/mainship/stripesquare, +/area/mainship/hallways/hangar) "xlx" = ( /obj/effect/soundplayer, /turf/closed/wall/mainship/white, @@ -18624,7 +18715,7 @@ /area/mainship/engineering/engineering_workshop) "xnW" = ( /obj/vehicle/ridden/powerloader, -/turf/open/floor/mainship/cargo, +/turf/open/floor/mainship/yellow_cargo, /area/mainship/squads/req) "xpe" = ( /obj/structure/cable, @@ -18657,15 +18748,20 @@ /obj/structure/sign/safety/cryogenic, /turf/open/floor/mainship, /area/mainship/living/cryo_cells) +"xqb" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/dropship_part_fabricator, +/turf/open/floor/mainship/yellow_cargo, +/area/mainship/hallways/hangar) "xqr" = ( /obj/item/trash/chips, /turf/open/floor/wood, /area/mainship/living/cryo_cells) -"xqu" = ( -/turf/open/floor/plating/icefloor/warnplate{ - dir = 8 - }, -/area/mainship/squads/req) "xqN" = ( /obj/machinery/suit_storage_unit/carbon_unit, /turf/open/floor/mainship/orange{ @@ -18679,26 +18775,41 @@ }, /turf/open/floor/mainship/sterile/dark, /area/mainship/medical/chemistry) -"xsI" = ( +"xtk" = ( /obj/effect/turf_decal/warning_stripes/thin{ dir = 8 }, -/turf/open/floor/mainship/black, -/area/mainship/living/tankerbunks) -"xtk" = ( -/turf/open/floor/mainship/terragov/north{ - dir = 10 - }, -/area/mainship/living/briefing) +/turf/closed/wall/mainship, +/area/mainship/hallways/hangar) "xtm" = ( /obj/structure/dropship_equipment/shuttle/flare_launcher, /turf/open/floor/mainship/orange{ dir = 8 }, /area/mainship/hallways/hangar) +"xtU" = ( +/obj/machinery/camera/autoname/mainship{ + dir = 8 + }, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar) +"xuA" = ( +/obj/item/clothing/head/warning_cone, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 9 + }, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar) "xvv" = ( -/turf/open/floor/mainship/black, -/area/mainship/living/tankerbunks) +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar/droppod) "xvA" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 @@ -18708,15 +18819,12 @@ }, /area/mainship/squads/general) "xvF" = ( -/obj/machinery/light/mainship{ - dir = 4 - }, -/obj/machinery/vending/tool, -/obj/effect/turf_decal/warning_stripes/linethick{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/plating, -/area/mainship/hallways/starboard_hallway) +/obj/machinery/computer/supplycomp, +/turf/open/floor/mainship/green, +/area/mainship/squads/req) "xwg" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -18746,7 +18854,13 @@ }, /area/mainship/squads/general) "xyn" = ( -/turf/open/floor/wood, +/obj/machinery/light/mainship{ + dir = 4 + }, +/obj/machinery/vending/cigarette, +/turf/open/floor/mainship/silver{ + dir = 4 + }, /area/mainship/living/chapel) "xyA" = ( /obj/machinery/landinglight/alamo{ @@ -18755,14 +18869,21 @@ /obj/effect/turf_decal/warning_stripes/thin, /turf/open/floor/mainship/mono, /area/mainship/hallways/hangar) -"xyO" = ( -/obj/effect/ai_node, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 4 +"xyG" = ( +/obj/structure/prop/mainship/cannon_cable_connector, +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 1 }, +/turf/open/floor/mainship/mono, +/area/mainship/shipboard/weapon_room) +"xyO" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 1 + }, /obj/machinery/camera/autoname/mainship, /turf/open/floor/mainship/mono, /area/mainship/living/bridgebunks) @@ -18907,6 +19028,12 @@ /obj/effect/decal/cleanable/blood, /turf/open/floor/plating/plating_catwalk, /area/mainship/hull/lower_hull) +"xEX" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/layer1{ + on = 1 + }, +/turf/open/floor/mainship/mono, +/area/mainship/command/cic) "xEZ" = ( /turf/closed/shuttle/ert/engines/left{ dir = 1 @@ -18924,9 +19051,17 @@ /obj/structure/window/framed/mainship/hull, /turf/open/floor/plating, /area/mainship/engineering/port_atmos) +"xGc" = ( +/obj/structure/closet/emcloset, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/mainship/cargo, +/area/mainship/hallways/hangar) "xGl" = ( -/turf/open/floor/wood, -/area/mainship/living/tankerbunks) +/obj/structure/droppod, +/obj/structure/drop_pod_launcher, +/turf/open/floor/mainship/yellow_cargo, +/area/mainship/hallways/hangar/droppod) "xGr" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 4 @@ -18963,6 +19098,7 @@ /area/mainship/command/cic) "xIv" = ( /obj/machinery/researchcomp, +/obj/machinery/researchcomp, /turf/open/floor/mainship/orange{ dir = 8 }, @@ -18974,16 +19110,13 @@ /turf/open/floor/mainship/mono, /area/mainship/hallways/port_hallway) "xJe" = ( -/obj/structure/sink{ - dir = 8 - }, -/obj/structure/mirror{ +/obj/machinery/shower{ dir = 4 }, -/obj/machinery/light/mainship{ +/obj/machinery/light/mainship/small{ dir = 1 }, -/turf/open/floor/mainship/floor, +/turf/open/floor/plating/plating_catwalk, /area/crew_quarters/toilet) "xJh" = ( /obj/machinery/power/fusion_engine/preset, @@ -18995,13 +19128,24 @@ /turf/closed/wall/mainship, /area/mainship/living/numbertwobunks) "xKE" = ( -/turf/open/floor/mainship/green{ - dir = 4 +/obj/machinery/door/poddoor/railing{ + id = "supply_elevator_railing" + }, +/turf/open/floor/mainship/cargo/arrow{ + dir = 8 }, /area/mainship/squads/req) "xLu" = ( /turf/closed/wall/mainship, -/area/mainship/living/pilotbunks) +/area/mainship/living/tankerbunks) +"xLy" = ( +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 5 + }, +/obj/structure/cable, +/obj/effect/ai_node, +/turf/open/floor/mainship/mono, +/area/mainship/hull/lower_hull) "xLV" = ( /obj/structure/window/reinforced{ dir = 8 @@ -19017,6 +19161,16 @@ dir = 1 }, /area/mainship/squads/general) +"xLZ" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/plating/plating_catwalk, +/area/mainship/hallways/hangar) "xNw" = ( /obj/machinery/light/mainship{ dir = 1 @@ -19044,20 +19198,17 @@ /turf/open/floor/carpet/side, /area/mainship/living/commandbunks) "xQB" = ( -/obj/machinery/light/mainship{ - dir = 8 - }, -/turf/open/floor/mainship/green{ +/obj/structure/table/woodentable, +/obj/effect/spawner/random/misc/cigar, +/obj/effect/spawner/random/misc/cigarettes, +/turf/open/floor/wood, +/area/mainship/living/tankerbunks) +"xQT" = ( +/obj/machinery/door/window/secure/brig/cell_2{ dir = 8 }, -/area/mainship/squads/req) -"xQT" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/turf/open/floor/plating/plating_catwalk, -/area/mainship/hull/lower_hull) +/turf/open/floor/mainship/floor, +/area/mainship/shipboard/brig) "xRb" = ( /obj/effect/turf_decal/warning_stripes/thin{ dir = 5 @@ -19078,35 +19229,27 @@ }, /turf/open/floor/plating, /area/mainship/hallways/hangar) -"xRP" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 10 - }, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/firealarm{ - dir = 8 - }, -/turf/open/floor/mainship/mono, -/area/mainship/shipboard/weapon_room) "xSb" = ( /turf/open/floor/cult, /area/medical/morgue) -"xSn" = ( -/obj/machinery/power/apc, -/obj/structure/cable, -/turf/open/floor/mainship/floor, -/area/crew_quarters/toilet) -"xSw" = ( -/obj/effect/turf_decal/warning_stripes/thin{ +"xSi" = ( +/obj/machinery/light/mainship/small{ dir = 1 }, +/obj/structure/toilet, +/obj/effect/landmark/corpsespawner/marine/burst, +/obj/effect/decal/cleanable/blood, +/obj/item/organ/brain, +/obj/item/weapon/gun/rifle/standard_autoshotgun, /turf/open/floor/mainship/mono, -/area/mainship/shipboard/weapon_room) +/area/crew_quarters/toilet) +"xSn" = ( +/obj/machinery/door_control/mainship/mech, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar) +"xSw" = ( +/turf/open/floor/mainship/hexagon, +/area/mainship/living/evacuation) "xSy" = ( /obj/machinery/door/airlock/mainship/command/FCDRoffice{ dir = 1 @@ -19128,6 +19271,12 @@ /obj/structure/morgue/crematorium, /turf/open/floor/cult, /area/medical/morgue) +"xSV" = ( +/obj/effect/turf_decal/warning_stripes/thick{ + dir = 1 + }, +/turf/open/floor/mainship/mono, +/area/mainship/shipboard/weapon_room) "xTr" = ( /obj/vehicle/ridden/motorbike{ dir = 4 @@ -19135,7 +19284,7 @@ /obj/machinery/firealarm{ dir = 4 }, -/turf/open/floor/mainship/cargo, +/turf/open/floor/mainship/yellow_cargo, /area/mainship/squads/req) "xTN" = ( /obj/effect/turf_decal/warning_stripes/thin{ @@ -19149,8 +19298,13 @@ pixel_y = 5 }, /obj/item/tool/pen/blue, +/obj/item/toy/inflatable_duck, /turf/open/floor/wood, /area/mainship/living/commandbunks) +"xUi" = ( +/obj/structure/cable, +/turf/open/floor/plating/mainship, +/area/mainship/shipboard/brig) "xVg" = ( /obj/item/clothing/head/warning_cone, /obj/effect/turf_decal/warning_stripes/thin{ @@ -19193,6 +19347,15 @@ }, /turf/open/floor/mainship/tcomms, /area/mainship/engineering/lower_engineering) +"xWh" = ( +/obj/machinery/power/apc{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/mainship/green{ + dir = 6 + }, +/area/mainship/squads/req) "xWB" = ( /obj/machinery/door/poddoor/shutters/mainship/open/hangar{ dir = 8 @@ -19218,7 +19381,7 @@ dir = 1 }, /obj/structure/sign/prop1, -/turf/open/floor/mainship/cargo, +/turf/open/floor/mainship/yellow_cargo, /area/mainship/squads/general) "xXW" = ( /obj/machinery/camera/autoname/mainship{ @@ -19249,7 +19412,7 @@ pixel_x = 5; pixel_y = -8 }, -/turf/open/floor/mainship/cargo, +/turf/open/floor/mainship/yellow_cargo, /area/mainship/squads/general) "xYD" = ( /obj/effect/ai_node, @@ -19267,6 +19430,20 @@ /obj/machinery/holopad, /turf/open/floor/mainship/sterile/dark, /area/mainship/medical/medical_science) +"xYJ" = ( +/obj/machinery/light/mainship/small{ + dir = 4 + }, +/turf/open/floor/mainship/mono, +/area/mainship/shipboard/weapon_room) +"xZo" = ( +/obj/machinery/door/poddoor/shutters{ + dir = 2; + id = "qm_warehouse"; + name = "\improper Warehouse Shutters" + }, +/turf/open/floor/mainship/cargo/arrow, +/area/mainship/squads/req) "xZy" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/structure/cable, @@ -19284,30 +19461,40 @@ /turf/open/floor/mainship/stripesquare, /area/mainship/command/self_destruct) "yaf" = ( -/obj/machinery/holopad, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, /turf/open/floor/mainship/mono, -/area/mainship/living/briefing) +/area/mainship/hallways/aft_hallway) "yao" = ( /obj/structure/dropship_equipment/cas/weapon/minirocket_pod, /turf/open/floor/mainship/floor, /area/mainship/hallways/hangar) "yaw" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 5 +/obj/effect/turf_decal/warning_stripes/thin, +/obj/machinery/landinglight/alamo{ + pixel_y = 4 }, -/obj/item/clothing/head/warning_cone, +/obj/effect/ai_node, /turf/open/floor/mainship/mono, /area/mainship/hallways/hangar) "yaz" = ( /turf/open/floor/mainship/mono, /area/mainship/command/cic) "ybP" = ( -/obj/effect/turf_decal/warning_stripes/thin, -/obj/machinery/landinglight/cas{ - pixel_y = 4 +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 }, /turf/open/floor/mainship/mono, -/area/mainship/hallways/hangar) +/area/mainship/squads/req) "ycp" = ( /obj/machinery/computer/camera_advanced/overwatch/bravo, /turf/open/floor/mainship/orange{ @@ -19315,11 +19502,12 @@ }, /area/mainship/command/cic) "ycz" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/door/airlock/mainship/maint{ + dir = 2 + }, +/obj/machinery/door/firedoor/mainship{ + dir = 2 }, -/obj/effect/ai_node, /turf/open/floor/plating/plating_catwalk, /area/mainship/hull/lower_hull) "ycD" = ( @@ -19398,32 +19586,34 @@ /turf/open/floor/mainship/mono, /area/mainship/hull/lower_hull) "ygT" = ( -/obj/machinery/light/mainship{ - dir = 8 +/obj/machinery/door/poddoor/mainship/mech{ + dir = 1 }, /obj/machinery/door/firedoor/mainship{ - dir = 2; - id = "hangar_lockdown" - }, -/obj/machinery/door/poddoor/shutters/mainship/open/hangar{ - dir = 1 + dir = 2 }, -/obj/structure/stairs/seamless/platform_vert, -/turf/open/floor/mainship/mono, +/turf/open/floor/mainship/stripesquare, /area/mainship/hallways/hangar) "ygV" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/mainship/black/corner{ - dir = 1 +/obj/effect/turf_decal/warning_stripes/thick{ + dir = 4 }, -/area/mainship/living/tankerbunks) +/obj/effect/turf_decal/warning_stripes/thick{ + dir = 8 + }, +/turf/open/floor/mainship/floor, +/area/mainship/hallways/hangar/droppod) "yhG" = ( /obj/machinery/vending/uniform_supply, /turf/open/floor/mainship/floor, /area/mainship/squads/general) +"yiq" = ( +/obj/structure/cable, +/obj/structure/sign/pods, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar/droppod) "yiF" = ( +/obj/effect/decal/cleanable/blood/gibs/xeno, /turf/open/floor/mainship/research/containment/floor2{ dir = 9 }, @@ -19450,11 +19640,17 @@ /turf/open/space, /area/space) "ykH" = ( -/obj/machinery/iv_drip, -/obj/machinery/power/apc/mainship, -/obj/structure/cable, +/obj/structure/closet/secure_closet/medical2, +/obj/structure/sign/nosmoking_2{ + dir = 1 + }, /turf/open/floor/mainship/sterile/corner, /area/mainship/medical/operating_room_two) +"ykK" = ( +/obj/structure/cable, +/obj/effect/landmark/start/job/shiptech, +/turf/open/floor/mainship/hexagon, +/area/mainship/engineering/engine_core) "ylc" = ( /turf/open/floor/mainship/red{ dir = 8 @@ -19467,8 +19663,7 @@ /turf/open/floor/mainship/floor, /area/mainship/hallways/hangar) "ylp" = ( -/obj/structure/window/framed/mainship, -/turf/open/floor/plating, +/turf/open/floor/mainship/mono, /area/mainship/living/starboard_garden) "ylq" = ( /obj/machinery/light/mainship{ @@ -40962,14 +41157,14 @@ esN esN esN esN -fKh -fKh -chT -fKh -fKh -chT -chT -chT +esN +esN +esN +esN +esN +esN +esN +esN wQJ wQJ wQJ @@ -41220,18 +41415,18 @@ nOJ bBG rKn qjm -qjm -chT -qjm -qjm -chT +cbS +cbS +anW +cbS +cbS jRQ -rGl -jTl +anW +nWd nWd qMG vhG -wMu +hlS wMu jTl ilc @@ -41443,7 +41638,7 @@ cfN rGg rGg wgy -rGg +suU qDh gmc jzI @@ -41476,18 +41671,18 @@ uSe uSe aQj rKn -qjm -qjm -chT -qjm -qjm -chT -bSK -aZM +rgj +rKn +rKn +rKn +rKn +rKn +rKn +rKn +jTl +jTl +jTl jTl -wOa -tTc -aha tTc uOi lDR @@ -41734,16 +41929,16 @@ uSe ior rKn vZa -vZa -chT -vZa -vZa -chT -uvW -jNX -kSz -ncj -kSz +rKn +xSw +xSw +xSw +xSw +xSw +xSw +xSw +xSw +xSw viq viq she @@ -41908,12 +42103,12 @@ qVo qVo qVo qVo -mBZ -mBZ -mBZ -mBZ -mBZ -mBZ +qVo +qVo +qVo +qVo +qVo +qVo qVo qVo qVo @@ -41990,17 +42185,17 @@ uSe uSe ior rKn -iGu -nsR -jxk -iGu -nsR -lGA +vZa +rKn +xSw +xSw +xSw +xSw +xSw +xSw +xSw +xSw xSw -oYA -uzn -hCG -dHn viq ncF wAg @@ -42158,8 +42353,8 @@ mBZ mBZ mBZ mBZ -mBZ -mBZ +qVo +qVo qVo qVo qVo @@ -42247,17 +42442,17 @@ uSe uSe ior rKn -iGu -nsR -mJj -iGu -jPi -uWa -vSI -oZb -liK -tEa -wBV +vZa +rKn +xSw +xSw +xSw +xSw +xSw +xSw +xSw +xSw +xSw viq sGA hlE @@ -42415,8 +42610,8 @@ mBZ mBZ mBZ mBZ -mBZ -mBZ +qVo +qVo qVo qVo qVo @@ -42504,17 +42699,17 @@ uSe uSe ior rKn -iGu -nsR -mJj -iGu -nsR -nsR -dyd -uWP -wEX -ojv -opN +vZa +rKn +xSw +xSw +xSw +xSw +xSw +xSw +xSw +xSw +xSw viq cPw mOX @@ -42761,17 +42956,17 @@ uSe uSe ior rKn -iGu -nsR -mJj -iGu -nsR -fIm -pLj -nhc -kEt -ojv -dAn +vZa +rKn +xSw +xSw +xSw +xSw +xSw +xSw +xSw +xSw +xSw viq sMl iNh @@ -43019,16 +43214,16 @@ uSe aQj rKn rgj -dUH -bTd -lIj -srr -rUR -gVQ -qjW -qyZ -sIM -bkF +rKn +xSw +xSw +xSw +xSw +xSw +xSw +xSw +xSw +xSw viq oYv plE @@ -43255,7 +43450,7 @@ cnd rKn yga fRw -fRw +wsG fRw dMO rKn @@ -43275,17 +43470,17 @@ kLK kLK kcC rKn -snh -vMp -vGw -dOU -ldT -iHE -dwG -xRP -qRX -ojz -dUH +vZa +rKn +xSw +xSw +xSw +xSw +xSw +xSw +xSw +xSw +xSw viq nOv oRM @@ -43459,18 +43654,6 @@ qVo qVo qVo qVo -qVo -qVo -qVo -qVo -qVo -qVo -qVo -qVo -qVo -qVo -qVo -qVo cTi bhv bhv @@ -43478,6 +43661,18 @@ bhv bhv bhv bhv +bhv +bhv +bhv +bhv +bhv +bhv +bhv +bhv +bhv +bhv +bhv +bhv nWT nWT esN @@ -43507,12 +43702,12 @@ ldA wTq knx ebr -urs -vzF +van +ttt rKn aYX fRw -fRw +dHI amG xJh rKn @@ -43533,16 +43728,16 @@ fRw fCk rKn lmy -kSz -apW -kSz -kSz -kSz -kSz -kSz -kSz -kSz -kSz +rKn +xSw +xSw +xSw +xSw +xSw +xSw +xSw +xSw +xSw viq upv cNR @@ -43693,22 +43888,10 @@ qVo qVo qVo qVo -kxJ -mBZ -mBZ -mBZ -qVo -qVo -qVo -qVo -qVo -qVo -qVo -qVo -qVo -qVo -qVo -qVo +kxJ +mBZ +mBZ +mBZ qVo qVo qVo @@ -43737,6 +43920,18 @@ nWT nWT nWT nWT +nWT +nWT +nWT +nWT +nWT +nWT +nWT +nWT +nWT +nWT +nWT +nWT esN fvY rSA @@ -43786,20 +43981,20 @@ jWu mRL jWu edH -xQT +hUz bPG -rcm +fAo aME rKn -iJY -iuQ -oOo +xSw +xSw +xSw mLd -ixv -xyn -aVV -hoo -kFu +xSw +xSw +xSw +xSw +xSw viq tfK wml @@ -43973,20 +44168,20 @@ qVo qVo qVo qVo -qVo -qVo -qVo -qVo -qVo -qVo -qVo -qVo -qVo -qVo -qVo -qVo hRh nWT +nWT +nWT +nWT +nWT +nWT +nWT +nWT +nWT +nWT +nWT +nWT +nWT iTM kJX kJX @@ -44043,20 +44238,20 @@ bpc bpc bpc vaj -egW whZ whZ whZ whZ -fAP -frc -ftT -frc -ftT -frc -xyn -xyn -xyn +whZ +kxh +kxh +kxh +gYD +kxh +kxh +kxh +kxh +kxh viq uvK wKA @@ -44230,18 +44425,18 @@ qVo qVo qVo qVo -qVo -qVo -qVo -qVo -qVo -qVo -qVo -cTi -bhv -bhv -bhv -bhv +hRh +nWT +nWT +nWT +nWT +nWT +nWT +nWT +nWT +nWT +nWT +nWT nWT nWT iTM @@ -44273,7 +44468,7 @@ wcT wcT vwh wcT -mZj +pKr tfG bSC tfG @@ -44299,20 +44494,20 @@ qaM kQr jjR bpc -atK +oke llr -whZ +nRP bVU aXc whZ dfT kbe emm -hmA -emm -hmA -xyn -ayR +lES +dxg +ttp +ttp +ttp ttp viq nat @@ -44487,13 +44682,6 @@ qVo qVo qVo qVo -qVo -qVo -qVo -qVo -qVo -qVo -qVo hRh nWT nWT @@ -44501,6 +44689,13 @@ nWT nWT nWT nWT +nWT +nWT +nWT +nWT +nWT +nWT +nWT iTM vuM aGA @@ -44535,7 +44730,7 @@ wrV fKj sXf sFo -buo +wwC xVr leu vha @@ -44559,18 +44754,18 @@ bpc vXY cZV jHU -cAi -cGu +whZ +whZ whZ qQY reJ reJ -bmp +lES wHI -sZK -xyn -qcx -oFE +ttp +ttp +ttp +ttp viq wUx iTI @@ -44744,13 +44939,13 @@ bhv bhv bhv bhv -bhv -bhv -bhv -bhv -bhv -bhv -bhv +nWT +nWT +nWT +nWT +nWT +nWT +nWT nWT nWT cCy @@ -44813,21 +45008,21 @@ kGq rOw oSt bpc -atK +oke nqG -whZ -whZ -whZ +umj +bVU +gpU whZ lJt -frc -ftT -frc -ftT -frc -xyn -fwA -xyn +reJ +reJ +aCn +wHI +diW +ttp +ttp +ttp viq vsu sSl @@ -45071,20 +45266,20 @@ gbJ rPv bpc iCT -llr whZ -bVU -aXc whZ -dfT -hmA -emm -hmA -emm -hmA -xyn -xyn -xyn +whZ +whZ +whZ +oTZ +reJ +reJ +lES +wHI +ttp +ttp +ttp +ttp viq pso dJv @@ -45301,8 +45496,8 @@ wcT lkD qJz xiT -jsE -acv +bLz +glL ogX pvW nHm @@ -45328,20 +45523,20 @@ bdF aRK bpc rYQ -cZV -jHU -cAi -anH +hvL +whZ +jcy +lvV whZ fZH xyn jxy lES -xyn -xyn -jxy -kAr -ozQ +rKT +ttp +ttp +ttp +ttp viq cZQ caT @@ -45558,7 +45753,7 @@ wcT poR jsE jsE -jsE +bLz glL pMf dBm @@ -45585,15 +45780,15 @@ hzc bpc bpc xyO -llr -whZ -whZ -whZ +egW +rPt +aZI +pdw whZ -qVu -rbL kxh +rbL kxh +ean kxh kxh kxh @@ -45766,7 +45961,7 @@ ufq ufq ufq ufq -wPV +fop tyN tyN tyN @@ -45797,7 +45992,7 @@ tyN tyN dQG dQG -ndN +dQG dQG dQG xjG @@ -45815,7 +46010,7 @@ wcT lkD qJz jsE -nRP +bLz bLz iDs ghV @@ -45842,19 +46037,19 @@ ruM bpc bpc iYD -nnF +hvL whZ -bVU -aXc +wwp +cGy whZ -gnK +hUf xjt nHq -hZt cWu cWu cWu cWu +hZt cWu viq ljP @@ -46017,13 +46212,13 @@ esN wPV ufq bTS -bTS -vfU -bTS -bTS +irz vfU ufq -lvi +sid +tqC +ufq +wEZ tyN ceN dpY @@ -46041,7 +46236,7 @@ cfp dpY xIb eiU -dpY +iyr dpY wpF wBE @@ -46069,10 +46264,10 @@ wcT wcT dIf wcT -qvJ -qvJ -qvJ -qvJ +tUZ +jsE +jsE +bLz jbg tdm tNb @@ -46086,7 +46281,7 @@ leu rcC alY oNS -srq +jQS bpc ess vLD @@ -46099,15 +46294,15 @@ jED csh bpc fyc -cZV -jHU -cAi -anH +hvL whZ -vyJ +whZ +whZ +whZ +hUf aQr eTR -dcz +pFs dcz dcz dcz @@ -46272,15 +46467,15 @@ qVo hRh esN bIO -lEx -pJv -pJv -pJv +ufq pJv -nNm -nMd +isR +lun ufq -wJQ +uQQ +uQQ +ufq +uud tyN fPH dpY @@ -46294,7 +46489,7 @@ dpY dpY eAd aZD -mVM +aHp eAd dpY dpY @@ -46326,11 +46521,11 @@ vTy qRK lVR wcT -hUf -hUf -hUf -qvJ -spJ +upL +cVd +bLz +bLz +bLz glL lhZ dBm @@ -46356,10 +46551,10 @@ szV pNT bpc jjO -llr -whZ -whZ +hvL whZ +jcy +lvV whZ hUf uBn @@ -46376,7 +46571,7 @@ emY sYv daf sYv -sYv +qFT hME wPV wPV @@ -46531,13 +46726,13 @@ esN wPV ufq bVx -bTS -bTS -bTS +ufq +ufq +ufq fgI iaH ufq -rYr +wEZ tyN eJJ dpY @@ -46580,16 +46775,16 @@ iwj ppG fPi wnJ -oEm +wnJ ocE -dvZ -nTx -rPu -jwA -qvJ +wcT +vyG +tjp +cVd +cVd bLz glL -cVd +rrt dST nHm mBi @@ -46613,10 +46808,10 @@ szV aKD bpc bYb -llr +egW rPt -bVU -aXc +aZI +vzt whZ hUf uBn @@ -46786,17 +46981,17 @@ mBZ hRh esN wPV -swG -bTS -bTS -bTS -sbg -uQQ ufq +gTA +jcH +mjl +uQQ +uQQ +tLf ufq -lsS +bDH tyN -dpY +xSn dpY nWV hFZ @@ -46825,7 +47020,7 @@ xBT pzq nRz qMJ -qMJ +fKh aSw dQG jVv @@ -46833,18 +47028,18 @@ jPT mwj mwj iwj -rDn +yjx wcT mbQ -fPi -oEm -ste +nuX +qVu +tpo wcT -hUf -nTx -hUf -qvJ -suU +uob +tur +fDn +aSq +bLz bLz iDs iDs @@ -46870,10 +47065,10 @@ hIF rEM bpc ljN -cZV -jHU -cAi -lvV +hvL +whZ +dMg +cGy whZ hUf tYe @@ -47044,18 +47239,18 @@ hRh esN pkN ufq -ehR -pJv -pJv -pJv +pSV +jIy +mHk +pSV cEJ -dmB -fUI -bKB +uQQ +ubW +cTc ygT -hcF +dkW dpY -oIb +xyA kDx kDx cfw @@ -47094,12 +47289,12 @@ rDn wcT ncI vhl -oEm +qVu tpo wcT -hUf -nTx -hUf +qvJ +qvJ +qvJ qvJ upL cVd @@ -47129,7 +47324,7 @@ hSQ pPR whZ whZ -whZ +jVU whZ oDx hUf @@ -47152,7 +47347,7 @@ ftH ejw wmX wmX -ixk +wmX wmX boV sYv @@ -47295,23 +47490,23 @@ kxJ mBZ mBZ mBZ -mBZ -mBZ +qVo +qVo hRh esN wPV ufq -bTS -bTS -bTS -bTS +hpW +pSV +pSV +hpW atF uqA joi sUR -qWc +xlu ksN -cWJ +dpY xyA csW csW @@ -47350,12 +47545,12 @@ lAT mpw wcT nku -wnJ -oEm +nwc +qVu tpo wcT hUf -nTx +jxi hUf qvJ upL @@ -47385,9 +47580,9 @@ uYe bpc rkA hUf -omk -xJd hUf +xJd +omk hUf hUf mKE @@ -47409,7 +47604,7 @@ acR ejw wmX pyl -fFa +qsC pyl uqg wPV @@ -47552,24 +47747,24 @@ kxJ mBZ mBZ mBZ -mBZ -mBZ +qVo +qVo hRh esN wPV ufq -bTS -bTS -bTS -hbh +hCx +jLS +hpW +pSV tPa -dmB +uQQ ubW -lvi -imJ +wVZ +ygT +ePE dpY -nWE -cPE +yaw kDx kDx kDx @@ -47607,12 +47802,12 @@ lAT mqY wcT nkC -wnJ +nuX oEm -tpo -wcT -hUf -nTx +spJ +ste +wQo +rPu jwA qvJ uob @@ -47666,7 +47861,7 @@ tqR tqR ryB pyl -fFa +qsC pyl uqg wPV @@ -47816,16 +48011,16 @@ esN wPV ufq pSV -sJa -sJa -sJa -nfC +jIy +mHk +pSV +uQQ ugv exv -lvi -vTt +cTc +ygT +ePE dpY -nWE xyA kDx kDx @@ -47923,7 +48118,7 @@ wKv tqR fbR pyl -fFa +qsC pyl uqg wPV @@ -48072,17 +48267,17 @@ hRh esN wPV ufq -bTS -bTS -bTS -sbg -jqG -ufq -ufq -wEI -tyN -ncO -nWE +uQQ +uQQ +mMx +uQQ +uQQ +uer +uKM +fop +xtk +ePE +dpY xyA kDx kDx @@ -48110,13 +48305,13 @@ bOz xOg kWu usa -bnL +gnK pDg lGi vBY eBB liX -yjx +mnH bnL lQN dLo @@ -48128,12 +48323,12 @@ pii hUf nTx hUf -hUf -hUf -xpj -omk -hUf -qej +gbM +nyh +mrK +mrK +nyh +gbM hUf pAF hUf @@ -48157,7 +48352,7 @@ xpj hUf cSg hUf -aCd +vMM vfH vfH wWQ @@ -48179,8 +48374,8 @@ mOz kBk ejw dMk -vEw -fgF +wmX +qsC nzg uqg wPV @@ -48329,17 +48524,17 @@ nWT esN wPV ufq -bVx -bTS -bTS -bTS +gTA +kyt +mQy +oIu uXb pHB ufq wEZ -jLS +tyN nkm -nWE +dpY cPE kDx kDx @@ -48384,14 +48579,14 @@ rQU uEg hUf xhP -nTx -nTx -nTx -nTx -nTx -nTx -vyG -nTx +uCC +gbM +waC +peg +wVG +mrK +gbM +pZE iHy ufT qKw @@ -48436,8 +48631,8 @@ bsg tzX ejw dMk -vEw -fgF +wmX +wBa sQI uqg tRh @@ -48585,18 +48780,18 @@ esN esN esN bIO -lEx -sJa -sJa -sJa +ufq sJa +uQQ +uQQ +uQQ jZZ sVR ufq uud tyN +ePE dpY -nWE cPE kDx kDx @@ -48642,12 +48837,12 @@ hGT hUf nTx hUf -hUf -hUf -hUf -hUf -hUf -qej +llq +fFo +aqn +eLs +mrK +llq hUf pbe hUf @@ -48688,13 +48883,13 @@ cWu nYD cWu cQN -ivB -myc +uTs +gbC nfr tqR sLC pyl -fFa +ykK pyl uqg aDc @@ -48843,17 +49038,17 @@ wPV wPV uSh ufq -bTS -bTS -bTS +imx +lsS +ncO jhK -bTS -bTS +jZZ +sVR ufq wEZ tyN ePE -nWE +dpY cPE xDq xDq @@ -48898,23 +49093,23 @@ tkS ftK hUf nTx -jwA -gbM -gbM -gbM -gbM -gbM -gbM -tUZ +hUf +ylp +peg +ciN +paw +tFb +ylp +hUf pbe wHB -ekx -ekx -ekx -ekx -ekx -ekx -ekx +snn +teh +snn +snn +uXy +teh +snn ekx ekx ekx @@ -48945,13 +49140,13 @@ ukg adr ukg tqR -aPr -jOZ +lgM +lFg qHv tqR fky pyl -fFa +qsC pyl uqg wPV @@ -49109,8 +49304,8 @@ tyN tyN bDH tyN -eJJ -nWE +ePE +dpY cPE kDx kDx @@ -49159,23 +49354,23 @@ hUf ylp pgL ezY -mrK +omz peg -gbM +ylp hUf pbe -eMx -ekx -aNM -aNM -aNM -aNM -aNM -aNM +hUf +snn aNM aNM +chD aNM aNM +tuW +gdb +gdb +gdb +chO ekx hUf gim @@ -49208,7 +49403,7 @@ uvS tqR aYc pyl -fFa +qsC pyl uqg wPV @@ -49351,23 +49546,23 @@ kxJ mBZ mBZ hRh -dWf +esN wPV -wVZ -dpY -eiU -xIb -dpY +tyN +eTC +dGR +gGg +vvE +vvE vvE -sqP eTC -dpY -dpY -eiU +bEi +bEi +bEi wEZ -esH -cTc -nWE +wEZ +xLZ +dpY cPE hFZ kDx @@ -49395,14 +49590,14 @@ aWk dpY fsp kxm -kxm +lhT cPY pEN rkq nRH lAT -mgw -mgw +lAT +lAT opA dLo tNW @@ -49412,26 +49607,26 @@ tkS hGT opd rPu -hUf +wQo mqD kGc -kfo +rcm jHd -mrK -gbM -hUf +ciN +hdc +rGl pbe -rrt -ekx -aNM -aNM -aNM -aNM -aNM -aNM -aNM -aNM -aNM +eMx +snn +uUp +uUp +lev +uUp +uUp +tuW +bYx +vyJ +vyJ sUb ekx hUf @@ -49465,7 +49660,7 @@ xkD tqR gmv qsC -atU +qsC qsC pFw qFT @@ -49608,23 +49803,23 @@ kxJ mBZ mBZ hRh -dWf +esN wPV -wVZ -dpY -aMa +tyN +gGg +gGg hFt -bKq -bKq -bKq -bKq -bKq -bKq -bKq +vvE +vvE +vvE hFt -yaw -wEZ -nWE +bEi +bEi +bEi +lYg +dpY +xLZ +dpY rPi pnF pnF @@ -49642,11 +49837,11 @@ pnF ubn pnF uQB +pgp +qMR +qPD gWI -gWI -gWI -gWI -gWI +sSN vdN tGI tQW @@ -49658,7 +49853,7 @@ pEN dNQ nRH lAT -mgw +lAT mgw oyZ dLo @@ -49672,31 +49867,31 @@ nTx uDl fyR qfG -mqD -jHd +hwZ +gAS mrK gbM -hUf +pZE lPc hUf ekx -aNM -aNM -aNM -aNM -aNM -aNM -aNM -aNM -aNM -aNM -ekx +vyJ +vyJ +mFw +vyJ +vyJ +aVn +oHX +jPt +lWH +joB +vJq uQI oHV uQI dla mBZ -vfH +fXS vfH bxQ vfH @@ -49865,23 +50060,23 @@ kxJ mBZ mBZ hRh -dWf +esN pkN -wVZ +tyN +gGg +gGg +gGg +vvE +vvE +vvE +gGg +bEi +bEi +bEi +dpY +dpY +xLZ dpY -dVP -kDx -kDx -tHk -csW -csW -csW -csW -csW -qPc -mjl -cTc -nWE dpY dpY dpY @@ -49891,17 +50086,17 @@ dpY dpY dpY eAd -mVM -mVM +aHp +aHp dpY dkX -dpY +hgl acq fMh uKp wXN vZK -pwa +wXN ttb xIv tzk @@ -49927,7 +50122,7 @@ hGT hUf cNy hUf -ylp +gbM wXr bUW ayg @@ -49937,17 +50132,17 @@ hUf pbe hUf ekx -hZr -aNM -aNM -aNM -aNM -aNM -aNM -aNM -aNM +vyJ +vyJ +xSV +vyJ +vyJ +tBi +oHw +sKH +nVl mMA -mnH +ekx eLq dWU eLq @@ -49977,7 +50172,7 @@ uhP xYg lal lal -dbu +kBR lal lal pHl @@ -50122,23 +50317,23 @@ kxJ mBZ mBZ hRh -dWf +esN wPV -hCx +tyN +acv +dWf +gGg +vvE +vvE +vvE +gGg +bEi +bEi +bEi dpY -dVP -kDx -tHk -nzB -kDx -kDx -kDx -kDx -kDx -cxw -mjl -wEZ -uNz +dpY +rpB +iXU iXU iXU kML @@ -50152,15 +50347,15 @@ fwq gRV dKF feK -dKF +hSb kLu eaH -uKp -hiK +opn +pBR kBO pBR -jpE -jpE +pBR +tem tzk aWk dpY @@ -50194,21 +50389,21 @@ nyw eel ekk ekx -aNM -aNM -aNM -aNM -aNM -aNM -aNM -aNM -aNM -aNM +vyJ +vyJ +xSV +vyJ +vyJ +vyJ +rqz +qTD +ibZ +wes ekx tpU ngO tpU -llA +com uZn eZf qoh @@ -50379,23 +50574,23 @@ kxJ mBZ mBZ hRh -dWf +esN wPV -wVZ +tyN +aDG +egn +gGg +vvE +vvE +oiy +qxp +snV +bEi +bEi +dpY +dpY +hOe dpY -dVP -kDx -cfw -kDx -kDx -kDx -kDx -kDx -kDx -cxw -mjl -wEZ -lrW dpY iPQ tyN @@ -50409,21 +50604,21 @@ xtm tzk dpY dEC -dpY +eAd hap uxC -uKp -bdS -pDT -qhv +lXN +uay ubh uay -tzk +ubh +uay +vwd aWk dpY fsp pEN -nwc +pEN pEN pEN pFn @@ -50449,20 +50644,20 @@ vmD vmD vmD acn -vmD +jDL ekx -aNM -aNM -aNM -aNM -aNM -aNM -aNM -aNM -aNM -aNM +vyJ +vyJ +xSV +vyJ +vyJ +meN +xyG +tfJ +vDr +aYW ekx -yaz +xEX bjo yaz com @@ -50636,23 +50831,23 @@ dmj qVo qVo hRh -dWf +esN wPV -wVZ -dpY -dVP -kDx -cfw -kDx -kDx +tyN +bch +esH +gGg +gGg +gGg +orm thg -kDx -kDx -kDx -cxw -oIu -irz -lrW +sEl +gGg +wEI +dpY +dpY +hOe +dpY dpY srb tyN @@ -50666,30 +50861,30 @@ bWg yjj uCO uCO -uCO +lcE kNb uCO iXB -qMR -qMR -qMR -qMR -qMR -bRC +uCO +uCO +uCO +uCO +uCO +uCO xGr qST rEw -vgo +xlo vgo vgo vgo vgo shx -kfB +vgo hrA kmh wvV -cim +vgo vgo fzt vGG @@ -50706,19 +50901,19 @@ mxT iZb niH mWu -jDL -ekx -aNM -aNM -aNM -aNM -aNM -aNM -aNM -aNM -aNM -aNM -ekx +rXa +sbN +vMp +vMp +eye +whb +whb +nWM +fvD +hWy +whb +whb +rgx dpN gSr nsC @@ -50893,23 +51088,23 @@ kxJ mBZ mBZ hRh -dWf +esN tgl -wVZ +tyN +bAT +fIb +gGg +ghW +ghW +oIb +rzG +sKa +jIc +jIc +dpY +dpY +hOe dpY -dVP -kDx -cfw -kDx -kDx -kDx -kDx -kDx -kDx -cxw -mjl -wEZ -lrW dpY trj tyN @@ -50920,13 +51115,11 @@ vYo ctR ctR rSQ -tzk -nYk +duy fwq fwq fwq gRV -axK dpY dpY dpY @@ -50936,17 +51129,19 @@ dpY dpY dpY dpY +dpY +dpY +yaf vAn +wLx +wLx +wLx vAn vAn -vAn -vAn -vAn -mxq swv bYG +mXR vAn -uUp vAn vAn wII @@ -50963,19 +51158,19 @@ vmD vmD vmD upQ -tVF -ekx +vmD +sSz lcL -aNM -aNM -aNM -aNM -aNM -aNM -aNM -aNM -aNM -ekx +xYJ +lEd +xYJ +hxz +fZX +xYJ +lcL +xYJ +lcL +sSz qeL mPQ qFh @@ -51150,23 +51345,23 @@ kxJ mBZ mBZ hRh -dWf +esN wPV -hCx +tyN +dhK +gTg +gGg +ghW +ghW +ghW +gGg +jIc +jIc +jIc dpY -dVP -kDx -nbW -qWy -kDx -kDx -kDx -kDx -kDx -cxw -mjl -wEZ -dLM +dpY +qIE +gek gek gek llC @@ -51178,60 +51373,60 @@ arI arI arI mpj -uKp gmQ dpY -hgl -mHk -mMx -gnS -kwS -kwo -kwo -kwo -kwS -jRd -jRd -jRd -cHE -cHE -cHE -cHE +icg +tzk +dpY +dpY +dpY +dpY +dpY +dpY +dpY +dpY +dpY +dpY +eAd +ybP cHE +wYz +xfo +wYz cHE ocK lxK hhf -cHE +dmU dUt hhf hhf hhf hhf -hhf -hhf +fQO hhf hhf hhf dLx dLx +hhf lxK -sAl -iyl +hhf +hhf vmD upQ -vmD +tVF ekx -aNM -aNM -aNM -aNM -aNM -aNM -aNM -aNM -aNM -aNM +vMr +vMr +vMr +vMr +wYw +pax +vMr +vMr +vMr +vMr ekx dNg cYi @@ -51407,25 +51602,22 @@ kxJ mBZ mBZ hRh -dWf +esN pkN -wVZ -dpY -dVP -kDx -kDx -nbW -xDq -xDq -xDq -xDq -xDq -lVM -mjl -wEZ -lrW +tyN +gGg +gGg +gGg +ghW +ghW +ghW +gGg +jIc +jIc +jIc dpY dpY +hOe dpY dpY dpY @@ -51433,67 +51625,70 @@ dpY dpY dpY dpY +sBh +bld dpY dpY uKp dpY dpY dpY -tTR -orC -gnS -kwS -kwo -kwo -kwo +lXb +dpY +nYk +pqC kwS -jRd -jRd -jRd -cHE -cHE -cHE -cHE +qQF +rzU +tRG +vDH +vSd +orC +mXm +sPS cHE +wYz +wYz +wYz cHE peH eGl prY -ekT moP +ekT hzD cSp nMG +tCJ +adg gsM xTr xnW -nIa -scb -kKO -ooM +eOG +hhf pJi -fQO +ooM iYg -lhG +fQO vmD upQ vmD ekx -aNM -aNM -aNM -aNM -aNM -aNM -aNM -aNM -aNM -aNM +wOa +hwp +wOa +wOa +xUi +wOa +wOa +wOa +hwp +wOa ekx rtf uCk rtf -aHp +com iKn eZf vkB @@ -51664,89 +51859,89 @@ kxJ mBZ mBZ hRh -dWf +esN wPV -wVZ -dpY +tyN gGg -bll -dUz -dUz -dUz -dUz -dUz -dUz -dUz -bll -tLf -cTc -lrW -kWG +gGg +hFt +ghW +ghW +ghW +hFt +jIc +jIc +jIc +lYg +dpY +hOe +vSU nyF nyF nyF nyF -cEZ +bRC nyF nyF nyF nyF nyF -aFn +dTH nyF nyF +kfB gup -ecb -bAT -kwS -kwS -kwo -kwo -kwo -kwS -oiy -jRd -jRd -qrR -kWc +dpY +oGN +kDx +kDx +tHk +csW +csW +csW +csW +csW +pLD +qNE +lBs kWc -sSN +xKE kWc kWc -oGN +xkF xHi doG -cHE rpv -qsI -qsI -oZN -cLc +iYf +iYf +iYf +iYf +iYf osF hXJ -qsI +cCZ qsI iYf uVa -mds -hhf +iYf +roD mzh -tBb +dLx vmD upQ vmD ekx -hZr -aNM -aNM -aNM -aNM -aNM -aNM -aNM -aNM -mMA -mnH +wOa +wOa +wOa +fnS +xUi +wOa +fnS +wOa +wOa +wOa +ekx eLq iNk eLq @@ -51921,24 +52116,23 @@ kxJ mBZ mBZ hRh -dWf +esN wPV -wVZ -dpY +tyN +rly lue -axK -dpY -aWL +gGg +ghW +ghW ghW rly jIc -dpY -lue +jIc +jIc wEZ wZu -wEZ -lrW -ybP +hOe +aFn hFZ kDx kDx @@ -51947,69 +52141,70 @@ tHk nzB kDx cxw -pqC +cjU kDx kDx kDx kDx hFZ -opn -jcH -gTA -kwS -kwo -kwo -kwo -sSz -jRd -jRd -jRd -mDv +qPc +dpY +oGN +pwj +tHk +nzB +kDx +kDx +kDx +kDx +kDx +cxw +ubU gMb gMb gMb gMb gMb -hSb -jWh +nAM +xbi iiU -cHE vcN -wLx -xqu -xqu -xqu -xqu -xqu +uIy syt -rKk -cHE -xfu -svo +syt +syt +syt +syt +syt +syt +syt +nIa hhf +svo +xfu xvF -oac +dLx vmD upQ vmD ekx -aNM -aNM -aNM -aNM -aNM -aNM -aNM -aNM -aNM -aNM +xQT +lSr +lSr +vMr +gvN +qOC +vMr +xQT +lSr +lSr ekx bfc lon bfc snn mBZ -vfH +fXS vfH bxQ vfH @@ -52194,8 +52389,7 @@ tyN fop tyN pXw -lrW -ybP +aFn kDx kDx kDx @@ -52209,57 +52403,58 @@ tHk csW csW csW +lGv qPc -opn -mQy -dhK -kwS -kwo -kwo -sKa -dGR -xtk -jRd -jRd -mDv +dpY +oGN +kDx +cfw +kDx +kDx +kDx +kDx +kDx +kDx +cxw +ubU gMb gMb gMb gMb gMb -hSb +nAM xbi qKL -cHE vcN -bBq +xjF gUa gUa gUa gUa gUa -pLB -rKk -cHE -cHE -mJW -hhf +gUa +gUa +gUa +uiG hhf +mJW +kKO +krn hhf kjA upQ -lhT +vmD ekx -aNM -aNM -aNM -aNM -aNM -aNM -aNM -aNM -aNM -sUb +cyn +fvA +hqb +vMr +wOa +wOa +vMr +cyn +fvA +hqb ekx vmD vwk @@ -52451,8 +52646,7 @@ tyN wEZ tyN iTX -hmu -ybP +aFn kDx kDx kDx @@ -52461,62 +52655,63 @@ cfw kDx kDx rxx -qPD +csW nzB kDx kDx kDx cxw -duy -lun -rzG -kwS -kwS -sSz -orm -xlu -uKM -sSz -yaf -qNE +qPc +xOg +oGN +pwj +cfw +kDx +kDx +tTR +kDx +kDx +kDx +cxw +uzm gMb gMb -qQF +qvM gMb gMb -aKj -xbi -qKL -uiG +otn +xZo +cim exV -bBq +xjF +gUa gUa gUa qHj gUa gUa pLB -cth +gUa uiG -cHE +hhf +buM buM -xQB -njE +hhf hhf fUs upQ tVF ekx -aNM -aNM -aNM -aNM -aNM -aNM -aNM -aNM -aNM -aNM +bjJ +azH +rsk +vMr +whQ +whQ +vMr +bjJ +azH +dvZ ekx fUs vwk @@ -52708,8 +52903,7 @@ tyN uud tyN bxX -hmu -ybP +aFJ kDx kDx kDx @@ -52723,39 +52917,40 @@ kDx kDx kDx kDx +kwo +qPc +dpY +oGN +kDx +cfw +kDx +kDx +kDx +kDx +kDx +kDx cxw -opn -qxp -snV -kwS -nGn -nGn -gTg -fIb -aDG -wWG -wWG -mDv +ubU gMb gMb gMb gMb gMb -rCb +nAM xbi qKL -cHE vcN -bBq +xjF gUa gUa gUa gUa gUa -pLB -rKk -cHE -cHE +gUa +gUa +gUa +uiG +ktH cHE cHE bMB @@ -52953,24 +53148,23 @@ qpC qpC hRh esN -wPV +bIO qzs hoB fwq kcJ -uoU -fwq -pKp +kOe +aha +sZZ tyN wEZ tyN -ePE -hmu -ybP -tHk +xqb +aKj +plN +csW csW csW -qPD nzB kDx kDx @@ -52981,51 +53175,52 @@ kDx kDx kDx cxw -opn -tqC -sEl -kwS -nGn -nGn -nGn -sSz -wWG -wWG -wWG -mDv +qPc +dpY +oGN +pwj +nbW +qWy +kDx +kDx +kDx +kDx +kDx +cxw +ubU gMb gMb gMb gMb gMb -hSb -jWh +nAM +xbi qKL -cHE vcN -uvy -xjF -xjF -xjF -xjF -xjF +peU hTr -rKk -cHE -sxm +hTr +hTr +hTr +hTr +hTr +hTr +hTr +oac +cGu +mKN gYy -thc uny hhf vmD hnk vmD rKm +pvX vmD vmD vmD -vmD -vmD +pvX vmD ezh vmD @@ -53212,66 +53407,66 @@ hRh esN pkN tyN -eLS -gqg -foz -tkJ +hiO +bDi +aPM +gvv pbx tyN tyN bDH tyN pid -lrW -ybP -cfw +aKj +gVZ kDx kDx kDx kDx +bYC rAZ -xlo kDx kDx kDx kDx kDx kDx -cxw -opn -isR -kwS -kwS -nGn -nGn -nGn -kwS -wWG -wWG -wWG -aNd -lht +kwo +qPc +dpY +oGN +kDx +kDx +nbW +xDq +xDq +xDq +xDq +xDq +wmy +qNE +dmm lht -rzU +eXm lht lht -icg +xkF hhf iOD -cHE gbc aYd aYd aYd +aYd fmo rKk +uvy rKk qbt -roD -rRC sEr +lPM fbL -lxK +fYa hhf lxK eAP @@ -53298,13 +53493,13 @@ lwj jwK nvN vfH -mza +yaz qKz rjL vfH sCk bcF -rpu +pEF vfH cWu nYD @@ -53469,22 +53664,21 @@ hRh esN wPV tyN -pUf +oDl mVM mVM -nmc -uQk +pha +rwK mQH tXB wEZ tFM -dpY -lrW -ybP +axK +aKX nbW xDq xDq -vwd +xDq qWy kDx kDx @@ -53495,28 +53689,29 @@ kDx kDx kDx cxw -aFJ -orC -gnS -kwS -nGn -nGn -nGn -kwS +mxq +dpY +lXN +tQa wWG +sAl wWG +sAl wWG +sAl +wWG +tQa +fXg +eFA cHE -cHE -gYy -xKE +unN eFA cHE -peH +inU hhf lgN -cHE rKk +cHE ljb xBe gqI @@ -53524,13 +53719,13 @@ heL mgE apO oSs +xWh hhf -shB +jkK dLx dLx dLx unN -cHE vmD uqV vmD @@ -53539,7 +53734,7 @@ vmD goh vmD vmD -jQT +vmD vmD wMh vmD @@ -53728,16 +53923,15 @@ wPV tyN leF leF -qdq +qKp leF -mQl +cXd tTm kiP rlR qWc wqq -kzV -ybP +aFn kDx kDx kDx @@ -53751,43 +53945,44 @@ kDx kDx kDx kDx -cxw -aFJ -mMx -gnS -kwS -nGn -nGn -nGn -kwS -wWG -wWG -wWG +kwo +qPc +dpY +dpY +dpY +dpY +dpY +dpY +dpY +dpY +dpY +dpY +dpY +faF cHE cHE -dgm -mvX -qKL cHE -ocK +cHE +cHE +uiX lxK hhf -cHE +rKk czx hhf hhf hhf hhf +fQO hhf hhf hhf -hhf +lxK soc bBk bBk bBk -bBk -cHE +cjC vmD uqV tVF @@ -53987,14 +54182,13 @@ kZz kZz kZz kZz -rMR +niE mQH tlj bKB imJ -dpY -nas -tRG +urD +aTa kDx kDx kDx @@ -54003,14 +54197,13 @@ cfw kDx kDx rHw -vwd +xDq qWy kDx kDx kDx cxw -opn -avq +qPc dpY dpY dpY @@ -54020,13 +54213,15 @@ dpY dpY dpY dpY +dpY +dkW aHG vAn -dFt -ubU -lGv vAn -mxq +vAn +vAn +vAn +vAn vAn vAn vAn @@ -54089,7 +54284,7 @@ gll uMf fCi qqh -fCi +vua fCi pdo hQD @@ -54240,18 +54435,17 @@ hRh esN wPV jAX -dwo -gqg -foz -gfn -oel +sPc +bDi +aPM +ilf +xuA mQH egI qmJ xad -dpY -dpY -ybP +urD +aFn kDx kDx kDx @@ -54265,13 +54459,14 @@ nbW xDq xDq xDq -lVM -opn +kWG +nZU +kHN gcr hHH -hHH -hHH -urD +ozU +ozU +ozU ozU ozU rCU @@ -54281,13 +54476,13 @@ jOm vgo vgo kVt -xZy +rWK bjC wXm vgo -uer xZy -mXR +ndN +xZy iRM xZy xZy @@ -54497,18 +54692,17 @@ hRh esN wPV tyN -dtB +uDq mVM mVM -tkJ +gvv dgE tyN tyN ggf tyN jsw -dpY -ybP +aFn hFZ kDx kDx @@ -54517,32 +54711,33 @@ nbW qWy kDx cxw -pgp +cEZ kDx kDx kDx kDx hFZ -gkp -gSJ -dpY -lue -dpY +oZN +tyN +qOJ +qzN +tIA uTG -dpY -dpY -lue -axK -dpY -vSd +uTG +uTG +tTg +svz +gKv +aoJ vAn -wII +nvH +dzr hWt hNd -egn vAn vAn -fDJ +vAn +vAn vAn wII swv @@ -54752,55 +54947,55 @@ mBZ mBZ hRh esN -wPV +bIO qzs -lgy -mUi -srn -gNi -rdT -dNM +wsX +fIt +hSO +pVY +gPw +lET tyN rYr tyN -fwq -fwq +urD +lXN skU fmN fmN fmN fmN -fmN -fiq +izJ fmN fmN fmN fmN -pwj +ecb fmN fmN -izJ -tzk -gSJ -xLu -xLu -xLu +lHG +fku +tyN +vGQ +vGQ +rmQ +vGQ +vGQ +vGQ +ser vGQ -rLL -xLu -xLu xLu fAJ fAJ -hpW -fAJ -rWD fAJ fAJ -uqt -wHf -qDG -wHf +yiq +cTx +xvv +xjD +xvv +xvv +xvv xJn uyy uyy @@ -55011,17 +55206,16 @@ hRh esN wPV tyN -fVg +nNY mEj mEj -tkJ +gvv dpY -ifY +paT tyN wJQ tyN -tem -cjU +urD dpY dpY dpY @@ -55037,27 +55231,28 @@ uKp dpY dpY dpY -tzk -gSJ -xLu -lVn +qvN +tyN +rAj +vGQ +rmQ qQD -rip -vou +vGQ +vGQ guG vaX xLu xJe -lJX -lJX -kCk -noZ -sBx -sMS +iku +plO fAJ -gxA -cUW -mpS +rWD +cTx +xvv +kWM +kWM +kWM +xvv uyy jaA hRK @@ -55271,49 +55466,49 @@ tyN mEj mEj mEj -soa +agP hcF jhO tyN lvi tyN -mVM -cjU -bFX -fPH +jTZ +aHH +xGc +aSV hEa -uzm -dpY -dpY -dpY -lue -xfo -dpY -axK -uKp -dpY -dpY -dpY -tzk -gSJ -xLu -nIj +uhj +brT +ozU +dFt +xtU +dii +iFw +eFh +eFh +kHN +aZM +nPF +tyN +vGQ +vGQ rmQ -rip -eZp -uIX -uIy +vGQ +vGQ +vGQ +ser +vGQ xLu sAI -kCk -kCk -kCk +sAI +lLe +eSw ton -fAJ -fAJ -fAJ +cTx +xvv +kHT roN -cUW +nIG vYB uyy feU @@ -55532,9 +55727,7 @@ tyN tyN tyN tyN -wPV -tyN -tyN +lvi tyN tyN tyN @@ -55542,36 +55735,38 @@ tyN tyN tyN xWB -lMf -tyN -jAX -tyN -tyN -tyN -tyN +bFX tyN -cCZ -mpj -gSJ -xLu +vou +vou +iyl +gUp +vou +vou +vou +vou +vou +vou +vGQ +rRC oRH -rAj +bWA bWA tgh uIX drx xLu -bch -omd +fAJ +fAJ omd -kCk -nJP -sBx -sMS fAJ -pqh +vyj +cTx +xvv +bbw +uzy tbT -oKe +xvv uyy uyy wql @@ -55797,38 +55992,38 @@ wPV wPV wPV wPV -sYv -sYv -hFL -sYv -wPV -wPV -wPV -wPV -bIO -tyN -uzm -hEa -gSJ -xLu -peU +dbm +rKn +eLM +nDE +dTK +vPH +jeG +njE +vou +mds +thc +vou +vGQ +vGQ +vGQ gKv -vMr -svz -abX -tIA +rCb +gKv +vGQ +vGQ xLu +xSi +eSw +pmP fAJ -fAJ -fAJ -xSn aEk -fAJ -fAJ -fAJ -iTf -cUW -oKe +cTx +xvv +eKC +kWM +kWM +xvv uyy uNy tzF @@ -56054,38 +56249,38 @@ esN esN esN esN -esN -esN -abZ -esN -esN -esN -esN -esN -wPV -tyN -tyN -tyN -gUp +unX +rKn +fAP +vPH +scb +vPH +vPH +jDG +gKG +shB +mJw +vou xLu +eZp xLu xLu -qjj xLu -qjj xLu xLu -jIy -sid +eZp +xLu fAJ -kyt -kCk -sBx -sMS fAJ -roN -cUW -vYB +fAJ +fAJ +tlT +kMo +tlT +pdj +lIW +pdj +pdj uyy tzF tzF @@ -56310,39 +56505,39 @@ nWT nWT nWT nWT -nWT -nWT -nWT -nWT -nWT -nWT -nWT -nWT -esN -bIO -wPV -wPV -wPV -ssm -imx -xLu -rOV +brL +unX +rKn +gkp +lMf +scb +rLL +vPH +kDO +vou +vou +vou +vou vXQ -xLu -cNz -ukI +fpg +rSr +rOV +vGX +uXw +rSr +fpg xLu pSt -mTs -kCk -kCk +tCO +aJH +hPp aqp -fAJ -fAJ -fAJ -aym +gSN +pfU +bFG +kpI tCO -oKe +giN uyy hpS lHu @@ -56565,41 +56760,41 @@ qpC qpC qpC qpC -qpC -qpC -qpC -qpC -qpC -qpC -qpC -qpC nWT nWT -esN -esN -esN -esN -esN -esN +brL unX -ifT -rXa -wmy -xLu +rKn +gSJ +qHC +lhG +nOV +vPH +jDG +gKG +mvX +fgN +vou +vXQ +vXQ gBQ -lPM +vXQ +vXQ +vXQ +gBQ +vXQ xLu -cui -cui -fAJ -aMk +xGl +xGl +xGl +xGl mOo -sBx -aGR -fAJ -qwW -cRF -qwW +xvv +iSK +xGl +xGl +xGl +xGl uyy bZE dYs @@ -56822,41 +57017,41 @@ qVo mBZ mBZ mBZ -mBZ -mBZ -mBZ -mBZ -mBZ -mBZ -mBZ -mBZ hRh nWT -nWT -nWT -nWT -nWT -nWT -esN +brL unX +rKn +hvY +mFy +cLc +dTj +eho +abX +vou +nIj +fiq +vou +vXQ +xQB +wrW ifT +mJG ifT -ifT -ifT -ifT -ifT -ifT -viN -viN -viN -viN -viN -viN -viN -aTO -uzy -kWM -cOP +wrW +xQB +xLu +xGl +xGl +xGl +xGl +mOo +fTZ +iSK +xGl +xGl +xGl +xGl uyy gES pQc @@ -57079,40 +57274,40 @@ mBZ mBZ mBZ mBZ -mBZ -mBZ -mBZ -mBZ -mBZ -mBZ -mBZ -mBZ -dgj -qpC -qpC -qpC -qpC -nWT +hRh nWT -esN -ssm -hUz -hUz -hUz -hUz -hUz -hUz -imx -viN -vXG -kuZ -qlc -viN +brL +unX +rKn +vou +vou +vou +vou +vou +vou +vou +vou +vou +vou +xLu +xLu +xLu +qjj +xLu +qjj +xLu +xLu +xLu +kCs +ygV +ygV +ygV +jOS iDE lXB -pHo ygV -aeO +ygV +ygV oOX uyy dQS @@ -57128,7 +57323,7 @@ pVb lkH xvA mvQ -lkH +ciZ lkH lkH hdY @@ -57137,17 +57332,17 @@ lkH fJI lkH gCy -mvQ +rUm lkH lkH lkH hdY -bby +pbh lkH lkH lkH ksd -sbN +ini vqQ ehw xeE @@ -57336,41 +57531,41 @@ mBZ mBZ mBZ mBZ -mBZ -mBZ -mBZ -mBZ -mBZ -mBZ -qVo -qVo -qVo -qVo -qVo -qVo -qVo hRh nWT -esN -cuG -cuG -cuG -cuG -cuG -cuG -esN -unX -viN -lmH +brL +dgm +cbS +hUz +hUz +hUz +hUz +jrW +hUz +hUz +hUz +hUz +hUz +hUz +hUz +nEM +hUz +hUz +hUz +hUz +pQt +rKn +xGl +xGl xGl -wqh -viN +xGl +mOo pgq iSK -oqI -gwQ -rpk -hJa +xGl +xGl +xGl +xGl uyy uyy uyy @@ -57404,7 +57599,7 @@ ffo igO fee ppB -nuX +fee fee fee fee @@ -57593,40 +57788,40 @@ mBZ mBZ mBZ mBZ -mBZ -mBZ -qVo -qVo -qVo -qVo -qVo -qVo -qVo -qVo -qVo -qVo -qVo hRh nWT -nWT -nWT -nWT -nWT -nWT -nWT -nWT +brL +esN +esN +esN +esN +esN +esN +esN +esN +esN +esN +esN +esN +esN +esN +cuG +cuG +cuG +cuG esN unX -viN -bNu -viN -viN -viN -jpU +rKn +xGl +xGl +xGl +kKd +mOo +pgq iSK -btQ -efa -rpk +xGl +xGl +xGl rrj nJG eJL @@ -57850,41 +58045,41 @@ qVo qVo qVo qVo -qVo -qVo -qVo -qVo -qVo -qVo -qVo -qVo -qVo -qVo -qVo -qVo -qVo -dgj -qpC -qpC -qpC -qpC -qpC -qpC +hRh +nWT +nWT +nWT +nWT +nWT +nWT +nWT +nWT +nWT +nWT +nWT +nWT +nWT +nWT +nWT +nWT +nWT +nWT nWT nWT esN +byk ycz -oSl -bUN -rdS -tHw +ygV +ygV +ygV +ygV aBm -pyX -dts -jsW -rpk -vgd -kbb +xvv +lXB +ygV +ygV +ygV +oOX nJG rPd hZe @@ -58029,34 +58224,8 @@ qVo qVo qVo qVo -"} -(151,1,1) = {" -qVo -qVo -qVo -qVo -qVo -qVo -qVo -qVo -qVo -qVo -qVo -qVo -qVo -qVo -qVo -qVo -qVo -qVo -qVo -qVo -qVo -qVo -qVo -qVo -qVo -qVo +"} +(151,1,1) = {" qVo qVo qVo @@ -58083,20 +58252,6 @@ qVo qVo qVo qVo -mBZ -mBZ -kxJ -mBZ -mBZ -mBZ -mBZ -mBZ -mBZ -mBZ -mBZ -mBZ -mBZ -mBZ qVo qVo qVo @@ -58125,23 +58280,63 @@ qVo qVo mBZ mBZ +kxJ +mBZ +mBZ +mBZ +mBZ +mBZ +mBZ +mBZ +mBZ +mBZ +mBZ +mBZ qVo qVo -hRh +qVo +qVo +qVo +qVo +qVo +qVo +qVo +qVo +dgj +qpC +qpC +qpC +qpC +qpC +qpC +qpC +qpC +qpC +qpC +qpC +qpC +qpC +qpC +qpC +qpC +qpC +qpC +nWT nWT esN unX -gFu -iFq -wHs -jFa -wHs -wHs +rKn +xGl +xGl +xGl +pgq +oAz +xGl mSh -wHs -vJi -hGi -xsI +xGl +xGl +xGl +xGl nJG bDv cEe @@ -58383,22 +58578,22 @@ qVo mBZ mBZ qVo -qVo hRh nWT esN unX -viN -viN -viN -viN -viN -viN -viN -aTO -viN -pdj -xvv +rKn +rKn +rKn +rKn +rKn +rKn +rKn +rKn +rKn +rKn +rKn +rKn nJG bDv bDv @@ -58640,7 +58835,6 @@ qVo qVo qVo qVo -qVo hRh nWT esN @@ -58652,10 +58846,11 @@ hUz hUz hUz hUz -imx -aDC -uDj -xvv +hUz +hUz +hUz +hUz +pQt nJG gXs bDv @@ -58706,12 +58901,12 @@ dle dle dle dle -hqJ +vNA rTr dle dle dle -bBG +xLy esN nWT nWT @@ -58897,7 +59092,6 @@ qVo qVo qVo qVo -qVo hRh nWT esN @@ -58909,10 +59103,11 @@ esN esN esN esN +esN +esN +esN +esN unX -viN -uOd -mux nJG pgv bDv @@ -58943,12 +59138,12 @@ bFc ini lPY lkH -bFc +gaz lkH lkH lkH pzU -bFc +qXc pzU lkH lkH @@ -59154,7 +59349,6 @@ qVo qVo qVo qVo -qVo hRh nWT nWT @@ -59165,11 +59359,12 @@ nWT nWT nWT nWT +nWT +nWT +nWT +nWT esN unX -viN -dct -qSz nJG nZI lHN @@ -59411,7 +59606,6 @@ qVo qVo qVo qVo -qVo dgj qpC qpC @@ -59420,13 +59614,14 @@ qpC qpC qpC qpC +qpC +nWT +nWT +nWT nWT nWT esN unX -viN -viN -viN nJG nJG nJG @@ -59679,11 +59874,11 @@ qVo qVo hRh nWT +nWT +nWT +nWT esN -cra -hUz -hUz -imx +unX nJG bDv aFl @@ -59696,7 +59891,7 @@ mQq nJG fRw nwy -fRw +nUc fYk tOZ aSJ @@ -59936,9 +60131,9 @@ qVo qVo hRh nWT -esN -esN -esN +nWT +nWT +nWT esN unX nJG @@ -60199,9 +60394,9 @@ nWT esN unX nJG -kbW +nnF qAJ -teh +kbW lTw kbW vSE @@ -60767,7 +60962,7 @@ bFf kMb kMb kMb -kcC +amE esN nWT nWT @@ -61187,10 +61382,10 @@ mBZ mBZ mBZ mBZ -mBZ -mBZ -mBZ -mBZ +qVo +qVo +qVo +qVo qVo qVo qVo @@ -61444,10 +61639,10 @@ mBZ mBZ mBZ mBZ -mBZ -mBZ -mBZ -mBZ +qVo +qVo +qVo +qVo qVo qVo qVo @@ -61701,22 +61896,22 @@ mBZ mBZ mBZ mBZ +qVo +qVo +qVo +qVo +qVo +qVo +qVo +qVo +qVo +qVo +qVo mBZ mBZ -mBZ -mBZ -mBZ -mBZ -mBZ -mBZ -mBZ -mBZ -mBZ -mBZ -mBZ -mBZ -mBZ -mBZ +qVo +qVo +qVo mBZ mBZ qVo @@ -61958,22 +62153,22 @@ mBZ mBZ mBZ mBZ +qVo +qVo +qVo +qVo +qVo +qVo +qVo +qVo +qVo +qVo +qVo mBZ mBZ -mBZ -mBZ -mBZ -mBZ -mBZ -mBZ -mBZ -mBZ -mBZ -mBZ -mBZ -mBZ -mBZ -mBZ +qVo +qVo +qVo mBZ mBZ qVo @@ -62215,22 +62410,22 @@ mBZ mBZ mBZ mBZ +qVo +qVo +qVo +qVo +qVo +qVo +qVo +qVo +qVo +qVo +qVo mBZ mBZ -mBZ -mBZ -mBZ -mBZ -mBZ -mBZ -mBZ -mBZ -mBZ -mBZ -mBZ -mBZ -mBZ -mBZ +qVo +qVo +qVo mBZ mBZ qVo @@ -62472,22 +62667,22 @@ mBZ mBZ mBZ mBZ +qVo +qVo +qVo +qVo +qVo +qVo +qVo +qVo +qVo +qVo +qVo mBZ mBZ -mBZ -mBZ -mBZ -mBZ -mBZ -mBZ -mBZ -mBZ -mBZ -mBZ -mBZ -mBZ -mBZ -mBZ +qVo +qVo +qVo mBZ mBZ qVo diff --git a/_maps/map_files/Sulaco/TGS_Sulaco.dmm b/_maps/map_files/Sulaco/TGS_Sulaco.dmm index f9a7f928fed44..83003bc90579c 100644 --- a/_maps/map_files/Sulaco/TGS_Sulaco.dmm +++ b/_maps/map_files/Sulaco/TGS_Sulaco.dmm @@ -69,11 +69,9 @@ /turf/open/floor/prison/whitegreen/corner, /area/sulaco/medbay) "aak" = ( -/obj/machinery/power/fusion_engine{ - name = "\improper S-52 fusion reactor #2" - }, /obj/structure/cable, /obj/effect/turf_decal/warning_stripes/thin, +/obj/machinery/power/fusion_engine/preset, /turf/open/floor/plating/mainship, /area/sulaco/engineering/engine) "aam" = ( @@ -82,14 +80,6 @@ "aan" = ( /turf/closed/wall/mainship/white, /area/sulaco/medbay/chemistry) -"aap" = ( -/obj/machinery/power/fusion_engine{ - name = "\improper S-52 fusion reactor #3" - }, -/obj/structure/cable, -/obj/effect/turf_decal/warning_stripes/thin, -/turf/open/floor/plating/mainship, -/area/sulaco/engineering/engine) "aar" = ( /obj/structure/closet/secure_closet/medical3, /obj/item/storage/surgical_tray, @@ -121,13 +111,11 @@ }, /area/sulaco/medbay/chemistry) "aat" = ( -/obj/machinery/power/fusion_engine{ - name = "\improper S-52 fusion reactor #5" - }, /obj/structure/cable, /obj/effect/turf_decal/warning_stripes/thin{ dir = 1 }, +/obj/machinery/power/fusion_engine/preset, /turf/open/floor/plating/mainship, /area/sulaco/engineering/engine) "aav" = ( @@ -312,16 +300,6 @@ /obj/item/reagent_containers/glass/beaker/bluespace, /turf/open/floor/prison/whitegreen/corner, /area/sulaco/medbay/chemistry) -"abn" = ( -/obj/machinery/power/fusion_engine{ - name = "\improper S-52 fusion reactor #6" - }, -/obj/structure/cable, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 1 - }, -/turf/open/floor/plating/mainship, -/area/sulaco/engineering/engine) "abo" = ( /obj/structure/cable, /obj/effect/landmark/start/job/medicalofficer, @@ -3148,14 +3126,6 @@ }, /turf/open/floor/plating/mainship, /area/sulaco/engineering/engine) -"arX" = ( -/obj/machinery/power/fusion_engine{ - name = "\improper S-52 fusion reactor #1" - }, -/obj/structure/cable, -/obj/effect/turf_decal/warning_stripes/thin, -/turf/open/floor/plating/mainship, -/area/sulaco/engineering/engine) "arY" = ( /turf/open/floor/prison/red{ dir = 8 @@ -4852,6 +4822,9 @@ /obj/effect/spawner/random/misc/table_lighting, /obj/item/weapon/chainofcommand, /obj/machinery/camera/autoname, +/obj/item/clothing/mask/cigarette/pipe{ + pixel_y = 5 + }, /turf/open/floor/wood, /area/sulaco/cap_office) "aAb" = ( @@ -7827,8 +7800,8 @@ "aRS" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door_control/mainship/mech{ - id = "mech_shutters_1"; - dir = 1 + dir = 1; + id = "mech_shutters_1" }, /turf/open/floor/prison, /area/sulaco/hangar/storage) @@ -7916,14 +7889,6 @@ /obj/structure/closet/emcloset, /turf/open/floor/prison/bright_clean, /area/sulaco/hangar) -"aSv" = ( -/obj/machinery/power/fusion_engine{ - name = "\improper S-52 fusion reactor #7" - }, -/obj/structure/cable, -/obj/effect/turf_decal/warning_stripes/thin, -/turf/open/floor/plating/mainship, -/area/sulaco/engineering/engine) "aSx" = ( /obj/machinery/door/airlock/multi_tile/mainship/research, /obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer1, @@ -7988,14 +7953,6 @@ }, /turf/open/floor/prison, /area/sulaco/hallway/lower_main_hall) -"aSV" = ( -/obj/machinery/power/fusion_engine{ - name = "\improper S-52 fusion reactor #8" - }, -/obj/structure/cable, -/obj/effect/turf_decal/warning_stripes/thin, -/turf/open/floor/plating/mainship, -/area/sulaco/engineering/engine) "aTb" = ( /obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer1, /obj/effect/decal/cleanable/dirt, @@ -8933,14 +8890,6 @@ /obj/machinery/firealarm, /turf/open/floor/prison, /area/sulaco/hallway/dropshipprep) -"baR" = ( -/obj/machinery/power/fusion_engine{ - name = "\improper S-52 fusion reactor #9" - }, -/obj/structure/cable, -/obj/effect/turf_decal/warning_stripes/thin, -/turf/open/floor/plating/mainship, -/area/sulaco/engineering/engine) "baS" = ( /obj/machinery/atmospherics/pipe/simple/yellow/hidden, /obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer1, @@ -9047,7 +8996,7 @@ /area/sulaco/hallway/dropshipprep) "bct" = ( /obj/structure/cable, -/obj/machinery/power/smes/buildable/empty, +/obj/machinery/power/smes/preset, /turf/open/floor/plating/mainship, /area/sulaco/engineering/engine) "bcD" = ( @@ -9732,6 +9681,7 @@ "bOG" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/power/apc/mainship, +/obj/structure/cable, /turf/open/floor/prison, /area/sulaco/hangar/storage) "bOX" = ( @@ -15712,10 +15662,10 @@ /turf/open/floor/prison/bright_clean, /area/sulaco/hangar) "jiY" = ( +/obj/machinery/door/firedoor/mainship, /obj/machinery/door/poddoor/mainship/mech{ - id = "mech_shutters_2" + id = "mech_shutters_3" }, -/obj/machinery/door/firedoor/mainship, /turf/open/floor/prison, /area/sulaco/hangar/storage) "jlB" = ( @@ -15734,8 +15684,6 @@ "jmy" = ( /obj/machinery/light/mainship, /obj/structure/bed/bunkbed, -/obj/effect/landmark/start/job/transportofficer, -/obj/effect/landmark/start/job/transportofficer, /turf/open/floor/mainship/black, /area/sulaco/mechpilotquarters) "jnn" = ( @@ -17436,8 +17384,8 @@ name = "Telecomms Window Control" }, /obj/item/toy/plush/rouny{ - pixel_y = 9; - pixel_x = -1 + pixel_x = -1; + pixel_y = 9 }, /turf/open/floor/prison, /area/sulaco/telecomms/office) @@ -18085,16 +18033,6 @@ }, /turf/open/floor/mainship/tcomms, /area/mainship/command/self_destruct) -"mkj" = ( -/obj/machinery/power/fusion_engine{ - name = "\improper S-52 fusion reactor #4" - }, -/obj/structure/cable, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 1 - }, -/turf/open/floor/plating/mainship, -/area/sulaco/engineering/engine) "mkk" = ( /obj/machinery/atmospherics/pipe/simple/yellow/hidden, /obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer1, @@ -19089,16 +19027,6 @@ /obj/machinery/robotic_cradle, /turf/open/floor/prison/whitegreen/corner, /area/sulaco/medbay) -"nCb" = ( -/obj/machinery/power/fusion_engine{ - name = "\improper S-52 fusion reactor #10" - }, -/obj/structure/cable, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 1 - }, -/turf/open/floor/plating/mainship, -/area/sulaco/engineering/engine) "nCl" = ( /obj/effect/turf_decal/warning_stripes/thin, /obj/structure/ship_ammo/cas/rocket/keeper, @@ -19630,16 +19558,6 @@ /obj/effect/ai_node, /turf/open/floor/prison, /area/sulaco/maintenance/upperdeck_AIcore_maint) -"okJ" = ( -/obj/machinery/power/fusion_engine{ - name = "\improper S-52 fusion reactor #11" - }, -/obj/structure/cable, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 1 - }, -/turf/open/floor/plating/mainship, -/area/sulaco/engineering/engine) "okM" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/manifold/cyan/hidden/layer1{ @@ -19803,7 +19721,11 @@ /turf/open/floor/mainship/tcomms, /area/mainship/command/self_destruct) "ovo" = ( -/turf/open/floor/mainship_hull/gray, +/obj/machinery/door/poddoor/mainship/mech{ + id = "mech_shutters_3" + }, +/obj/machinery/door/firedoor/mainship, +/turf/open/floor/prison, /area/sulaco/hangar/storage) "ovJ" = ( /obj/machinery/holopad{ @@ -20120,6 +20042,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ dir = 1 }, +/obj/effect/landmark/start/job/transportofficer, /turf/open/floor/prison, /area/mainship/living/pilotbunks) "oNb" = ( @@ -20135,7 +20058,9 @@ /area/sulaco/medbay) "oNf" = ( /obj/structure/cable, -/obj/machinery/power/apc/mainship, +/obj/machinery/power/apc/mainship{ + dir = 8 + }, /obj/machinery/camera/autoname{ dir = 8 }, @@ -21285,7 +21210,7 @@ /area/sulaco/bridge) "qpD" = ( /obj/machinery/door_control/mainship/mech{ - id = "mech_shutters_2" + id = "mech_shutters_3" }, /turf/open/floor/prison, /area/sulaco/hangar/storage) @@ -21911,7 +21836,6 @@ "rgO" = ( /obj/structure/bed/bunkbed, /obj/effect/landmark/start/job/mechpilot, -/obj/effect/landmark/start/job/mechpilot, /turf/open/floor/mainship/black{ dir = 6 }, @@ -22965,6 +22889,7 @@ /turf/closed/wall/mainship/gray, /area/sulaco/hangar/droppod) "sqc" = ( +/obj/effect/landmark/start/job/mechpilot, /turf/open/floor/mainship/black/corner{ dir = 4 }, @@ -23189,6 +23114,13 @@ /obj/structure/ship_ammo/cas/rocket/widowmaker, /turf/open/floor/prison, /area/sulaco/hangar/cas) +"sDv" = ( +/obj/machinery/door_control/mainship/mech{ + dir = 4; + id = "mech_shutters_3" + }, +/turf/open/floor/prison, +/area/sulaco/hangar/storage) "sDU" = ( /obj/machinery/cryopod/right, /turf/open/floor/prison/whitegreen/corner{ @@ -24344,16 +24276,6 @@ }, /turf/open/floor/prison/plate, /area/shuttle/distress/arrive_1) -"ubp" = ( -/obj/machinery/power/fusion_engine{ - name = "\improper S-52 fusion reactor #12" - }, -/obj/structure/cable, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 1 - }, -/turf/open/floor/plating/mainship, -/area/sulaco/engineering/engine) "ubQ" = ( /obj/effect/ai_node, /turf/open/floor/plating/mainship, @@ -26706,6 +26628,7 @@ /area/sulaco/hangar) "xgG" = ( /obj/machinery/camera/autoname, +/obj/effect/landmark/start/job/transportofficer, /turf/open/floor/prison, /area/mainship/living/pilotbunks) "xhY" = ( @@ -69118,7 +69041,7 @@ bYM bYM jiY jiY -jiY +ovo bYM bYM bYM @@ -69377,7 +69300,7 @@ exf exf exf lBh -jJa +sDv bYM qpD mCT @@ -71176,7 +71099,7 @@ mDu mDu mDu mDu -ovo +mDu ykt aeL bWI @@ -71432,8 +71355,8 @@ nzi mDu mDu mDu -ovo -ovo +mDu +mDu qHb aWo dpg @@ -71688,9 +71611,9 @@ aaa tZr mDu mDu -ovo -ovo -ovo +mDu +mDu +mDu ykt pWS ftU @@ -71945,8 +71868,8 @@ aaa aaa nzi mDu -ovo -ovo +mDu +mDu kOr kOr wwW @@ -72202,7 +72125,7 @@ aaa aaa nzi mDu -ovo +mDu kOr kOr iIH @@ -76208,13 +76131,13 @@ qrY aeq tAS nIK -arX +aak aqO -mkj +aat oQG -aSv +aak aqO -nCb +aat xnw apl apl @@ -76469,9 +76392,9 @@ aak aqO aat oQG -aSV +aak aqO -okJ +aat xnw apl mDu @@ -76722,13 +76645,13 @@ mDu mDu tBB nIK -aap +aak aqO -abn +aat oQG -baR +aak aqO -ubp +aat xnw apl mDu diff --git a/_maps/map_files/Theseus/TGS_Theseus.dmm b/_maps/map_files/Theseus/TGS_Theseus.dmm index 9f076fe40d29c..81c7030e379da 100644 --- a/_maps/map_files/Theseus/TGS_Theseus.dmm +++ b/_maps/map_files/Theseus/TGS_Theseus.dmm @@ -1665,6 +1665,19 @@ }, /turf/open/floor/mainship/mono, /area/mainship/command/self_destruct) +"axx" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, +/obj/structure/cable, +/turf/open/floor/mainship/sterile/side{ + dir = 1 + }, +/area/mainship/medical/lower_medical) "axU" = ( /obj/machinery/vending/uniform_supply, /turf/open/floor/mainship/mono, @@ -1990,6 +2003,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/effect/ai_node, /turf/open/floor/mainship/sterile/side{ dir = 1 }, @@ -3851,12 +3865,9 @@ /turf/open/floor/mainship/mono, /area/mainship/hallways/starboard_umbilical) "boX" = ( -/obj/structure/table/mainship/nometal, -/obj/item/healthanalyzer, -/obj/item/reagent_containers/glass/beaker/biomass, -/obj/item/storage/box/ids/dogtag, /obj/machinery/camera/autoname/mainship, -/obj/item/reagent_containers/glass/beaker/biomass, +/obj/machinery/computer/cloning_console/vats, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on, /turf/open/floor/mainship/sterile/side{ dir = 1 }, @@ -4003,16 +4014,16 @@ }, /area/mainship/shipboard/firing_range) "bqR" = ( -/obj/structure/cable, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 }, +/obj/structure/cable, /turf/open/floor/mainship/sterile/dark, /area/mainship/medical/lower_medical) "bqW" = ( @@ -7240,8 +7251,11 @@ /turf/open/floor/mainship/floor, /area/mainship/squads/delta) "cjV" = ( -/obj/machinery/cloning/vats, -/turf/open/floor/mainship/sterile/corner{ +/obj/machinery/computer/cloning_console/vats, +/obj/machinery/atmospherics/components/unary/vent_pump/layer1{ + on = 1 + }, +/turf/open/floor/mainship/sterile/side{ dir = 1 }, /area/mainship/medical/lower_medical) @@ -7952,11 +7966,17 @@ }, /area/mainship/living/officer_rnr) "dus" = ( -/obj/machinery/computer/cloning_console/vats, -/turf/open/floor/mainship/sterile/side{ - dir = 1 - }, -/area/mainship/medical/lower_medical) +/obj/structure/closet/secure_closet/guncabinet/mp_armory, +/obj/item/weapon/gun/rifle/standard_lmg, +/obj/item/ammo_magazine/standard_lmg, +/obj/item/ammo_magazine/standard_lmg, +/obj/item/weapon/gun/smg/m25, +/obj/item/ammo_magazine/smg/m25, +/obj/item/ammo_magazine/smg/m25, +/obj/item/ammo_magazine/smg/m25, +/obj/item/ammo_magazine/smg/m25, +/turf/open/space/basic, +/area/space) "dvk" = ( /obj/structure/closet, /obj/item/toy/plush/slime, @@ -8199,13 +8219,15 @@ }, /area/mainship/medical/cmo_office) "dKa" = ( -/obj/structure/cable, /obj/structure/disposalpipe/junction/flipped{ dir = 8 }, -/turf/open/floor/mainship/sterile/side{ - dir = 9 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, +/obj/structure/cable, +/turf/open/floor/mainship/sterile/dark, /area/mainship/medical/lower_medical) "dKG" = ( /obj/structure/window/framed/mainship/requisitions, @@ -8263,8 +8285,8 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 }, /turf/open/floor/mainship/sterile/dark, /area/mainship/medical/lower_medical) @@ -9156,10 +9178,7 @@ /turf/open/floor/plating/plating_catwalk, /area/mainship/hallways/bow_hallway) "fpV" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/layer1{ - dir = 1; - on = 1 - }, +/obj/machinery/cloning/vats, /turf/open/floor/mainship/sterile/side, /area/mainship/medical/lower_medical) "fqH" = ( @@ -14142,8 +14161,10 @@ }, /area/mainship/hull/port_hull) "ndj" = ( -/obj/machinery/light/mainship, -/turf/open/floor/mainship/sterile/side, +/obj/machinery/cloning/vats, +/turf/open/floor/mainship/sterile/corner{ + dir = 1 + }, /area/mainship/medical/lower_medical) "ndz" = ( /obj/structure/bed, @@ -14386,6 +14407,23 @@ /obj/structure/prop/mainship/sensor_computer2/sd, /turf/open/floor/mainship/tcomms, /area/mainship/command/self_destruct) +"nBH" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/machinery/door/airlock/mainship/medical/free_access, +/obj/machinery/door/firedoor/mainship, +/turf/open/floor/mainship/sterile/side{ + dir = 1 + }, +/area/mainship/medical/lower_medical) "nCj" = ( /obj/structure/bed/chair/office/dark, /turf/open/floor/mainship/sterile/dark, @@ -15297,6 +15335,10 @@ /obj/item/clothing/head/warning_cone, /turf/open/floor/mainship/mono, /area/mainship/hallways/hangar) +"pdH" = ( +/obj/machinery/computer/cloning_console/vats, +/turf/open/floor/mainship/sterile/side, +/area/mainship/medical/lower_medical) "peh" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 9 @@ -16025,11 +16067,8 @@ }, /area/mainship/living/commandbunks) "qmn" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 1 - }, -/obj/effect/ai_node, /obj/machinery/light/mainship, +/obj/machinery/cloning/vats, /turf/open/floor/mainship/sterile/side, /area/mainship/medical/lower_medical) "qmA" = ( @@ -16999,6 +17038,10 @@ dir = 1 }, /area/mainship/hallways/bow_hallway) +"rRE" = ( +/obj/structure/closet/secure_closet/guncabinet/emergency_combat_gear, +/turf/open/floor/mainship/sterile/side, +/area/mainship/medical/lower_medical) "rRW" = ( /obj/structure/table/mainship/nometal, /obj/item/binoculars, @@ -17499,12 +17542,15 @@ }, /area/mainship/hallways/bow_hallway) "sBz" = ( -/obj/machinery/door/airlock/multi_tile/mainship/medidoor{ - dir = 2; - name = "\improper Medical Bay" +/obj/structure/table/mainship/nometal, +/obj/item/healthanalyzer, +/obj/item/storage/box/ids/dogtag{ + pixel_x = -5; + pixel_y = 4 }, -/obj/machinery/door/firedoor/multi_tile{ - dir = 1 +/obj/item/reagent_containers/glass/beaker/biomass{ + pixel_x = 9; + pixel_y = 7 }, /turf/open/floor/mainship/sterile/side, /area/mainship/medical/lower_medical) @@ -18464,6 +18510,22 @@ }, /turf/open/floor/mainship/sterile/dark, /area/mainship/medical/lower_medical) +"ufX" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/cable, +/obj/effect/ai_node, +/turf/open/floor/mainship/sterile/side{ + dir = 9 + }, +/area/mainship/medical/lower_medical) "ugh" = ( /turf/open/floor/mainship/orange{ dir = 1 @@ -18722,6 +18784,10 @@ dir = 5 }, /area/mainship/medical/lower_medical) +"uEK" = ( +/obj/structure/window/framed/mainship/white, +/turf/open/floor/mainship/sterile/side, +/area/mainship/medical/lower_medical) "uEX" = ( /obj/structure/disposalpipe/segment/corner{ dir = 8 @@ -19280,8 +19346,8 @@ /area/mainship/hull/starboard_hull) "vyn" = ( /obj/item/toy/plush/rouny{ - pixel_y = 9; - pixel_x = -1 + pixel_x = -1; + pixel_y = 9 }, /obj/item/bedsheet/blue, /obj/structure/bed/chair/comfy/teal, @@ -51292,7 +51358,7 @@ aaa aaa aaa aaa -aaa +dus aaa aaa aaa @@ -52857,10 +52923,10 @@ pES hjE bjV biu +nSl wyX -bJG -yea -ost +nBH +uEK nSl bxw iZI @@ -53115,8 +53181,8 @@ bQZ bjV blj nSl -wyX -aJS +ndj +ufX sBz nSl fly @@ -53629,7 +53695,7 @@ aLX bjV biu nSl -dus +oxk bqR qmn nSl @@ -53887,8 +53953,8 @@ bjV biu nSl boX -aJS -ost +axx +pdH nga aRw jgp @@ -54402,7 +54468,7 @@ blj nSl xCj yea -ost +pdH nga hQt qgb @@ -54659,7 +54725,7 @@ biu nSl kFq aJS -ndj +rRE nSl uYN vmj @@ -54915,8 +54981,8 @@ bjV biu nSl nSl -aJS -sBz +nBH +nSl nSl gCW vmj diff --git a/_maps/map_files/Whiskey_Outpost/Whiskey_Outpost_v2.dmm b/_maps/map_files/Whiskey_Outpost/Whiskey_Outpost_v2.dmm index abbee4fd7d57a..da4663015ee77 100644 --- a/_maps/map_files/Whiskey_Outpost/Whiskey_Outpost_v2.dmm +++ b/_maps/map_files/Whiskey_Outpost/Whiskey_Outpost_v2.dmm @@ -726,9 +726,9 @@ /turf/open/floor/prison, /area/whiskey_outpost) "dr" = ( -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, /obj/structure/rack, /obj/machinery/light{ dir = 1 @@ -736,9 +736,9 @@ /turf/open/floor/plating, /area/whiskey_outpost) "dt" = ( -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, /obj/structure/rack, /turf/open/floor/plating, /area/whiskey_outpost/outside/east) @@ -1457,7 +1457,7 @@ /obj/structure/barricade/sandbags{ dir = 1 }, -/obj/item/weapon/gun/tl102/hsg_nest{ +/obj/item/weapon/gun/hsg_102/hsg_nest{ dir = 4 }, /obj/structure/platform{ @@ -1510,7 +1510,7 @@ /turf/open/floor/plating/asteroidfloor, /area/whiskey_outpost) "hu" = ( -/obj/item/weapon/gun/tl102/hsg_nest{ +/obj/item/weapon/gun/hsg_102/hsg_nest{ dir = 8 }, /obj/structure/platform{ @@ -1773,9 +1773,9 @@ /turf/open/floor/mainship/sterile/side, /area/whiskey_outpost) "iT" = ( -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, /obj/structure/rack, /turf/open/floor/plating, /area/whiskey_outpost/outside/west) @@ -2462,7 +2462,7 @@ /obj/structure/barricade/sandbags{ pixel_y = -6 }, -/obj/item/weapon/gun/tl102/hsg_nest{ +/obj/item/weapon/gun/hsg_102/hsg_nest{ dir = 8 }, /obj/structure/platform{ @@ -3876,9 +3876,9 @@ /area/whiskey_outpost/outside/south) "tB" = ( /obj/structure/rack, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, /turf/open/floor/plating/ground/dirt, /area/whiskey_outpost/outside/north) "tC" = ( @@ -4159,7 +4159,7 @@ /turf/open/floor/plating/ground/dirt, /area/whiskey_outpost/outside/south) "vh" = ( -/obj/item/weapon/gun/tl102/hsg_nest, +/obj/item/weapon/gun/hsg_102/hsg_nest, /turf/open/floor/plating/warning, /area/whiskey_outpost/outside/east) "vi" = ( @@ -4172,7 +4172,7 @@ /turf/open/floor/plating, /area/whiskey_outpost/outside/north) "vq" = ( -/obj/item/weapon/gun/tl102/hsg_nest, +/obj/item/weapon/gun/hsg_102/hsg_nest, /turf/open/floor/plating/warning, /area/whiskey_outpost/outside/west) "vr" = ( @@ -4491,9 +4491,9 @@ /area/whiskey_outpost) "xp" = ( /obj/structure/rack, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, /turf/open/floor/plating, /area/whiskey_outpost/outside/west) "xr" = ( @@ -4724,9 +4724,9 @@ /area/whiskey_outpost/outside/east) "yO" = ( /obj/structure/rack, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, /turf/open/floor/plating/asteroidfloor, /area/whiskey_outpost) "yP" = ( @@ -4849,7 +4849,7 @@ /turf/open/floor/plating/ground/dirt, /area/whiskey_outpost/outside/east) "zG" = ( -/obj/item/weapon/gun/tl102/hsg_nest, +/obj/item/weapon/gun/hsg_102/hsg_nest, /obj/structure/platform, /turf/open/floor/plating/asteroidwarning, /area/whiskey_outpost) @@ -5342,7 +5342,7 @@ /obj/structure/barricade/sandbags{ dir = 1 }, -/obj/item/weapon/gun/tl102/hsg_nest{ +/obj/item/weapon/gun/hsg_102/hsg_nest{ dir = 8 }, /obj/structure/platform{ @@ -5562,7 +5562,7 @@ /turf/open/liquid/water/river, /area/whiskey_outpost/outside/east) "Eq" = ( -/obj/item/weapon/gun/tl102/hsg_nest, +/obj/item/weapon/gun/hsg_102/hsg_nest, /turf/open/floor/plating/ground/dirt, /area/whiskey_outpost/outside/south) "Er" = ( @@ -5596,9 +5596,9 @@ /area/whiskey_outpost) "EK" = ( /obj/structure/rack, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, /turf/open/floor/plating/ground/dirt, /area/whiskey_outpost/outside/south) "EN" = ( @@ -5804,7 +5804,7 @@ /turf/open/floor/plating, /area/whiskey_outpost/outside/east) "GG" = ( -/obj/item/weapon/gun/tl102/hsg_nest, +/obj/item/weapon/gun/hsg_102/hsg_nest, /obj/structure/platform, /turf/open/floor/plating/warning, /area/whiskey_outpost) diff --git a/_maps/map_files/deltastation/deltastation.dmm b/_maps/map_files/deltastation/deltastation.dmm index 4c9820d279eac..cdd5b7a339872 100644 --- a/_maps/map_files/deltastation/deltastation.dmm +++ b/_maps/map_files/deltastation/deltastation.dmm @@ -1609,6 +1609,9 @@ /obj/structure/window/framed/colony/reinforced, /turf/open/floor/plating, /area/deltastation/engineering/atmos/mix) +"arC" = ( +/turf/open/floor/plating/icefloor/warnplate, +/area/shuttle/drop1/lz1) "arT" = ( /obj/structure/prop/vehicle/crawler, /obj/effect/decal/cleanable/dirt, @@ -18578,11 +18581,10 @@ /turf/open/floor/iron, /area/deltastation/service/hydroponics) "dOS" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/landinglight/lz1{ - dir = 1 - }, -/turf/open/floor/asteroidfloor, +/obj/machinery/floodlight/landing, +/obj/effect/turf_decal/warning_stripes, +/obj/structure/cable, +/turf/open/floor/mech_bay_recharge_floor, /area/deltastation/external/landingzone) "dPa" = ( /obj/structure/disposalpipe/trunk{ @@ -18716,11 +18718,6 @@ /obj/effect/turf_decal/warning_stripes/box/empty, /turf/open/floor/iron, /area/deltastation/cargo/warehouse) -"dQu" = ( -/turf/open/floor/plating/icefloor/warnplate{ - dir = 10 - }, -/area/shuttle/drop1/lz1) "dQx" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 8 @@ -27275,9 +27272,11 @@ /turf/open/floor/iron, /area/deltastation/maintenance/port/fore) "fyi" = ( -/obj/effect/attach_point/weapon/dropship1, -/turf/open/floor/plating, -/area/shuttle/drop1/lz1) +/obj/effect/decal/cleanable/dirt, +/obj/machinery/landinglight/lz1, +/obj/structure/cable, +/turf/open/floor/asteroidfloor, +/area/deltastation/external/landingzone) "fyj" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt, @@ -30762,7 +30761,8 @@ /turf/open/floor/plating, /area/deltastation/cargo/miningoffice) "ghS" = ( -/obj/effect/ai_node, +/obj/machinery/floodlight/landing, +/obj/effect/turf_decal/warning_stripes, /obj/machinery/landinglight/lz1{ dir = 8 }, @@ -32087,9 +32087,8 @@ /turf/open/floor/iron, /area/deltastation/command/heads_quarters/qm) "guZ" = ( -/obj/machinery/landinglight/lz1{ - dir = 1 - }, +/obj/machinery/landinglight/lz1, +/obj/structure/cable, /turf/open/floor/asteroidfloor, /area/deltastation/external/landingzone) "gvc" = ( @@ -33391,11 +33390,8 @@ /turf/open/floor/plating, /area/deltastation/service/library/abandoned) "gIk" = ( -/obj/effect/attach_point/weapon/dropship1{ - dir = 8 - }, /turf/open/floor/plating/icefloor/warnplate{ - dir = 8 + dir = 5 }, /area/shuttle/drop1/lz1) "gIm" = ( @@ -35001,9 +34997,10 @@ /turf/open/floor/iron/dark, /area/deltastation/command/heads_quarters/ce) "hao" = ( -/obj/machinery/landinglight/lz1, -/turf/open/floor/asteroidfloor, -/area/deltastation/external/landingzone) +/turf/open/floor/plating/icefloor/warnplate{ + dir = 1 + }, +/area/shuttle/drop1/lz1) "har" = ( /obj/structure/closet/secure_closet/personal, /obj/effect/turf_decal/tile/transparent/neutral/fourcorners, @@ -36319,6 +36316,11 @@ }, /turf/open/floor/plating, /area/deltastation/security/prison) +"hmF" = ( +/turf/open/floor/plating/icefloor/warnplate{ + dir = 6 + }, +/area/shuttle/drop1/lz1) "hmL" = ( /obj/effect/turf_decal/tile/transparent/yellow{ dir = 1 @@ -50615,10 +50617,12 @@ /turf/open/floor/iron/dark/textured_large, /area/deltastation/medical/cryo) "kpf" = ( -/obj/docking_port/stationary/marine_dropship/lz1, -/obj/docking_port/stationary/crashmode, -/turf/open/floor/plating, -/area/shuttle/drop1/lz1) +/obj/effect/decal/cleanable/dirt, +/obj/machinery/landinglight/lz1{ + dir = 4 + }, +/turf/open/floor/asteroidfloor, +/area/deltastation/external/landingzone) "kpj" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -60255,7 +60259,7 @@ /turf/open/floor/iron/edge, /area/deltastation/hallway/primary/central/aft) "mmf" = ( -/obj/machinery/camera/autoname/lz_camera, +/obj/effect/attach_point/weapon/dropship1, /turf/open/floor/plating, /area/shuttle/drop1/lz1) "mmr" = ( @@ -62655,13 +62659,9 @@ /turf/open/floor/iron, /area/deltastation/engineering/break_room) "mMC" = ( -/obj/machinery/floodlight/landing, -/obj/effect/turf_decal/warning_stripes, -/obj/machinery/landinglight/lz1{ - dir = 4 - }, -/turf/open/floor/mech_bay_recharge_floor, -/area/deltastation/external/landingzone) +/obj/machinery/camera/autoname/lz_camera, +/turf/open/floor/plating, +/area/shuttle/drop1/lz1) "mMI" = ( /obj/structure/prop/mainship/turretprop{ dir = 4; @@ -63904,13 +63904,9 @@ /turf/open/floor/iron, /area/deltastation/maintenance/disposal/incinerator) "nbj" = ( -/obj/machinery/floodlight/landing, -/obj/effect/turf_decal/warning_stripes, -/obj/machinery/landinglight/lz1{ - dir = 8 - }, -/turf/open/floor/asteroidfloor, -/area/deltastation/external/landingzone) +/obj/effect/attach_point/electronics/dropship1, +/turf/open/floor/plating, +/area/shuttle/drop1/lz1) "nbo" = ( /obj/effect/landmark/weed_node, /obj/effect/spawner/random/machinery/random_broken_computer/crewmonitor, @@ -66588,8 +66584,12 @@ /turf/open/floor/iron, /area/deltastation/hallway/primary/starboard) "nEs" = ( -/turf/open/floor/plating/icefloor/warnplate, -/area/shuttle/drop1/lz1) +/obj/effect/decal/cleanable/dirt, +/obj/machinery/landinglight/lz1{ + dir = 1 + }, +/turf/open/floor/asteroidfloor, +/area/deltastation/external/landingzone) "nEz" = ( /obj/structure/cable, /obj/effect/turf_decal/stripes/line, @@ -74166,8 +74166,11 @@ /turf/open/floor/iron/grimy, /area/deltastation/command/heads_quarters/hos) "phF" = ( +/obj/effect/attach_point/weapon/dropship1{ + dir = 8 + }, /turf/open/floor/plating/icefloor/warnplate{ - dir = 9 + dir = 8 }, /area/shuttle/drop1/lz1) "phG" = ( @@ -76217,6 +76220,13 @@ /obj/effect/spawner/random/engineering/toolbox, /turf/open/floor/iron, /area/deltastation/hallway/secondary/construction) +"pCk" = ( +/obj/machinery/landinglight/lz1{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/asteroidfloor, +/area/deltastation/external/landingzone) "pCl" = ( /obj/effect/turf_decal/stripes/corner, /obj/effect/decal/cleanable/dirt, @@ -76296,10 +76306,12 @@ /turf/open/floor/iron/kitchen_coldroom/freezerfloor, /area/storage/testroom) "pCO" = ( -/turf/open/floor/plating/icefloor/warnplate{ - dir = 1 +/obj/effect/ai_node, +/obj/machinery/landinglight/lz1{ + dir = 8 }, -/area/shuttle/drop1/lz1) +/turf/open/floor/asteroidfloor, +/area/deltastation/external/landingzone) "pCP" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/sandedge/corner2{ @@ -85455,11 +85467,13 @@ /turf/open/floor/gcircuit, /area/deltastation/science/xenobiology) "rsx" = ( -/obj/machinery/camera/autoname/lz_camera, -/turf/open/floor/plating/icefloor/warnplate{ +/obj/machinery/floodlight/landing, +/obj/effect/turf_decal/warning_stripes, +/obj/machinery/landinglight/lz1{ dir = 4 }, -/area/shuttle/drop1/lz1) +/turf/open/floor/mech_bay_recharge_floor, +/area/deltastation/external/landingzone) "rsC" = ( /obj/effect/spawner/random/machinery/status_display, /turf/closed/wall/r_wall, @@ -87345,12 +87359,11 @@ /turf/open/floor/iron, /area/deltastation/cargo/office) "rLQ" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/landinglight/lz1{ - dir = 4 +/obj/machinery/camera/autoname/lz_camera, +/turf/open/floor/plating/icefloor/warnplate{ + dir = 8 }, -/turf/open/floor/asteroidfloor, -/area/deltastation/external/landingzone) +/area/shuttle/drop1/lz1) "rMb" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -97766,7 +97779,8 @@ }, /area/deltastation/engineering/atmos/pumproom) "tRz" = ( -/obj/effect/attach_point/electronics/dropship1, +/obj/docking_port/stationary/marine_dropship/lz1, +/obj/docking_port/stationary/crashmode, /turf/open/floor/plating, /area/shuttle/drop1/lz1) "tRG" = ( @@ -99396,10 +99410,10 @@ /turf/open/floor/plating, /area/deltastation/tcommsat/server) "uin" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/landinglight/lz1, -/turf/open/floor/asteroidfloor, -/area/deltastation/external/landingzone) +/turf/open/floor/plating/icefloor/warnplate{ + dir = 9 + }, +/area/shuttle/drop1/lz1) "uit" = ( /obj/effect/turf_decal/tile/transparent/neutral/anticorner/contrasted{ dir = 8 @@ -101436,7 +101450,7 @@ "uDj" = ( /obj/machinery/camera/autoname/lz_camera, /turf/open/floor/plating/icefloor/warnplate{ - dir = 8 + dir = 4 }, /area/shuttle/drop1/lz1) "uDo" = ( @@ -109888,10 +109902,11 @@ /turf/open/floor/iron/half, /area/deltastation/security/office) "wkR" = ( -/turf/open/floor/plating/icefloor/warnplate{ - dir = 6 +/obj/machinery/landinglight/lz1{ + dir = 1 }, -/area/shuttle/drop1/lz1) +/turf/open/floor/asteroidfloor, +/area/deltastation/external/landingzone) "wkX" = ( /obj/effect/turf_decal/siding/yellow/corner{ dir = 8 @@ -112275,7 +112290,7 @@ /area/deltastation/command/bridge) "wIv" = ( /turf/open/floor/plating/icefloor/warnplate{ - dir = 5 + dir = 10 }, /area/shuttle/drop1/lz1) "wIx" = ( @@ -166626,7 +166641,7 @@ dfm xuY xuY xuY -vNR +xuY vNR vNR cSG @@ -166884,8 +166899,8 @@ xuY xuY dfm xuY -vNR -vNR +xuY +xuY cSG sbS vNR @@ -167142,7 +167157,7 @@ dfm xuY xuY xuY -vNR +xuY cSG sbS vNR @@ -167375,30 +167390,30 @@ vNR pCr dfm xuY -vXs -orp +dOS rTj rTj -rLQ +kpf rTj rTj rTj rTj rTj -rLQ +kpf rTj -mMC +rsx rTj rTj -rLQ +kpf rTj rTj -rLQ +kpf rTj rTj rTj rTj orp +xuY dfm cSG sbS @@ -167632,19 +167647,18 @@ vNR xoq xoq sfZ -bYh +fyi uin -phF wVi wVi wVi wVi wVi wVi -gIk +phF wVi wVi -uDj +rLQ wVi wVi wVi @@ -167654,8 +167668,9 @@ wVi wVi wVi wVi -dQu -guZ +wIv +wkR +xuY xuY cSG sbS @@ -167889,12 +167904,11 @@ vNR toH nZF aZA -vXs +guZ hao -pCO qgB +mMC mmf -fyi qgB qgB qgB @@ -167909,10 +167923,11 @@ qgB qgB qgB qgB -mmf +mMC qgB +arC nEs -dOS +xuY bqa cSG sbS @@ -168146,12 +168161,11 @@ vNR jOD gdc aZA -vXs -uin -pCO +fyi +hao qgB qgB -tRz +nbj qgB qgB qgB @@ -168168,8 +168182,9 @@ qgB qgB qgB qgB -nEs -guZ +arC +wkR +dfm dfm cSG sbS @@ -168403,9 +168418,8 @@ vNR toH xaf aZA -bYh +guZ hao -pCO qgB qgB qgB @@ -168425,8 +168439,9 @@ qgB qgB qgB qgB +arC nEs -dOS +xuY xuY cSG sbS @@ -168660,9 +168675,8 @@ vNR bPd bPd kZL -vXs -uin -pCO +fyi +hao qgB qgB qgB @@ -168682,8 +168696,9 @@ qgB qgB qgB qgB +arC nEs -dOS +dfm dfm cSG sbS @@ -168917,9 +168932,8 @@ vNR toH toH aZA -bYh -uin -pCO +fyi +hao qgB qgB qgB @@ -168929,7 +168943,7 @@ qgB qgB qgB qgB -kpf +tRz qgB qgB qgB @@ -168939,8 +168953,9 @@ qgB qgB qgB qgB +arC nEs -dOS +xuY xuY cSG sbS @@ -169174,9 +169189,8 @@ vNR npA toH sYK -vXs -uin -pCO +fyi +hao qgB qgB qgB @@ -169196,8 +169210,9 @@ qgB qgB qgB qgB +arC nEs -dOS +dfm dfm cSG sbS @@ -169431,9 +169446,8 @@ vNR toH xuo kZL -vXs +guZ hao -pCO qgB qgB qgB @@ -169453,8 +169467,9 @@ qgB qgB qgB qgB +arC nEs -dOS +dfm xuY cSG sbS @@ -169688,12 +169703,11 @@ vNR toH xuo kZL -bYh -uin -pCO +fyi +hao qgB qgB -tRz +nbj qgB qgB qgB @@ -169710,8 +169724,9 @@ qgB qgB qgB qgB -nEs -guZ +arC +pCk +xuY dfm cSG sbS @@ -169945,12 +169960,11 @@ vNR xuo toH sYK -vXs -uin -pCO +fyi +hao qgB +mMC mmf -fyi qgB qgB qgB @@ -169965,10 +169979,11 @@ qgB qgB qgB qgB -mmf +mMC qgB +arC nEs -dOS +xuY bqa cSG sbS @@ -170202,9 +170217,8 @@ vNR njf njf liB -bYh -hao -wIv +guZ +gIk wAz wAz wAz @@ -170214,7 +170228,7 @@ wAz wAz wAz wAz -rsx +uDj wAz wAz wAz @@ -170224,8 +170238,9 @@ wAz wAz wAz wAz +hmF wkR -guZ +xuY dfm cSG sbS @@ -170459,8 +170474,7 @@ vNf xuY dfm xuY -vXs -orp +dOS fcv exa fcv @@ -170470,8 +170484,8 @@ exa exa fcv exa +pCO ghS -nbj fcv exa fcv @@ -170484,6 +170498,7 @@ fcv fcv orp xuY +xuY cSG sbS fCY diff --git a/_maps/map_files/gelida_iv/gelida_iv.dmm b/_maps/map_files/gelida_iv/gelida_iv.dmm index d5e27274c00ad..0bb12620bc741 100644 --- a/_maps/map_files/gelida_iv/gelida_iv.dmm +++ b/_maps/map_files/gelida_iv/gelida_iv.dmm @@ -1704,9 +1704,6 @@ /obj/effect/turf_decal/warning_stripes/stripedsquare/tile/border, /turf/open/floor/mainship/stripesquare, /area/gelida/cavestructuretwo) -"beU" = ( -/turf/closed/mineral/smooth/darkfrostwall, -/area/gelida/caves/central_caves/garbledradio) "beW" = ( /obj/machinery/atmospherics/pipe/simple/green/hidden{ dir = 4 @@ -11247,6 +11244,10 @@ /obj/machinery/floodlight/colony, /turf/open/floor/plating/ground/desertdam/asphalt/cement, /area/gelida/outdoors/colony_streets/east_central_street) +"hsE" = ( +/obj/effect/landmark/lv624/fog_blocker/xeno_spawn, +/turf/closed/mineral/smooth/darkfrostwall/indestructible, +/area/gelida/outdoors/rock) "hsH" = ( /obj/item/storage/briefcase, /turf/open/floor/prison, @@ -14320,6 +14321,9 @@ /obj/effect/ai_node, /turf/open/floor/plating/ground/snow/layer0, /area/gelida/outdoors/colony_streets/north_east_street) +"juT" = ( +/turf/closed/mineral/smooth/darkfrostwall, +/area/gelida/outdoors/rock) "jvj" = ( /turf/open/floor/tile/yellow/patch, /area/gelida/indoors/a_block/corpo) @@ -15036,6 +15040,9 @@ /obj/effect/ai_node, /turf/open/floor/plating/ground/snow/layer1, /area/gelida/outdoors/colony_streets/north_street) +"jSF" = ( +/turf/closed/mineral/smooth/darkfrostwall, +/area/gelida/powergen) "jSP" = ( /obj/machinery/atmospherics/pipe/simple/green/hidden{ dir = 4 @@ -20120,6 +20127,10 @@ /obj/structure/prop/mainship/gelida/smallwire, /turf/open/floor/plating/ground/snow/layer1, /area/gelida/outdoors/colony_streets/east_central_street) +"nnp" = ( +/obj/effect/landmark/lv624/fog_blocker/xeno_spawn, +/turf/closed/mineral/smooth/darkfrostwall, +/area/gelida/outdoors/rock) "nnE" = ( /obj/effect/decal/cleanable/blood, /obj/machinery/light{ @@ -21887,10 +21898,6 @@ }, /turf/open/floor/prison/whitegreenfull2, /area/gelida/landing_zone_2) -"owj" = ( -/obj/effect/landmark/lv624/fog_blocker/xeno_spawn, -/turf/closed/mineral/smooth/darkfrostwall, -/area/gelida/caves/central_caves) "owm" = ( /obj/machinery/door/airlock/mainship/medical/glass{ dir = 1; @@ -24060,9 +24067,6 @@ /obj/machinery/atmospherics/pipe/simple/green/hidden, /turf/open/floor/prison/plate, /area/gelida/indoors/a_block/admin) -"pLW" = ( -/turf/closed/mineral/smooth/darkfrostwall, -/area/gelida/powergen) "pMg" = ( /obj/structure/flora/ausbushes/pointybush{ pixel_y = 12 @@ -25995,9 +25999,6 @@ /obj/effect/turf_decal/warning_stripes/nscenter, /turf/open/floor/wood, /area/gelida/indoors/a_block/fitness) -"raa" = ( -/turf/closed/mineral/smooth/darkfrostwall, -/area/gelida/caves/west_caves/garbledradio) "rai" = ( /obj/effect/landmark/weed_node, /turf/open/floor/plating/ground/snow/layer2, @@ -31557,11 +31558,6 @@ /obj/effect/landmark/weed_node, /turf/open/floor/prison, /area/gelida/indoors/a_block/dorms) -"uMH" = ( -/obj/effect/landmark/lv624/fog_blocker/xeno_spawn, -/obj/effect/landmark/weed_node, -/turf/open/floor/plating/ground/ice, -/area/gelida/caves/central_caves) "uMZ" = ( /obj/machinery/door/airlock/mainship/generic{ dir = 8; @@ -32389,10 +32385,6 @@ }, /turf/open/floor/mainship/stripesquare, /area/gelida/indoors/a_block/security) -"vqi" = ( -/obj/effect/landmark/lv624/fog_blocker/xeno_spawn, -/turf/closed/mineral/smooth/darkfrostwall, -/area/gelida/outdoors/rock) "vqz" = ( /obj/effect/spawner/random/engineering/structure/tank/waterweighted, /obj/structure/platform_decoration{ @@ -35666,9 +35658,6 @@ /obj/effect/turf_decal/warning_stripes/stripedsquare/tile/border, /turf/open/floor/mainship/stripesquare, /area/gelida/indoors/b_block/hydro) -"xIt" = ( -/turf/closed/mineral/smooth/darkfrostwall, -/area/gelida/outdoors/rock) "xIu" = ( /obj/structure/rack/nometal, /obj/item/frame/table{ @@ -36517,9 +36506,6 @@ "yiB" = ( /turf/closed/wall, /area/gelida/cavestructuretwo) -"yjx" = ( -/turf/open/floor/plating/ground/snow/layer1, -/area/gelida/caves/central_caves) "yjB" = ( /obj/item/stack/rods, /obj/structure/window_frame/colony, @@ -36837,87 +36823,87 @@ nsK "} (2,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS ndb ndb ndb @@ -37059,88 +37045,88 @@ nsK "} (3,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS ndb ndb ndb @@ -37281,89 +37267,89 @@ nsK "} (4,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +juT +juT +juT +juT +juT +juT +juT +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS ndb ndb ndb @@ -37503,88 +37489,88 @@ nsK "} (5,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +juT yiB yiB -xIt -xIt +juT +juT yiB yiB yiB -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS ndb ndb ndb @@ -37725,12 +37711,12 @@ nsK "} (6,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +juT +juT yiB dII ewI @@ -37738,77 +37724,77 @@ nyI gBm gZL yiB -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS ndb ndb ndb @@ -37947,11 +37933,11 @@ nsK "} (7,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +juT +juT yiB cDx dKf @@ -37961,75 +37947,75 @@ geP aPS gZL yiB -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT +juT +juT +cgS +cgS +cgS +juT +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS ndb ndb ndb @@ -38169,10 +38155,10 @@ nsK "} (8,1,1) = {" cgS -xIt -xIt -xIt -xIt +cgS +cgS +juT +juT yiB yiB cDx @@ -38184,73 +38170,73 @@ bgd hRV yiB yiB -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT sPY sPY -xIt -xIt -xIt -xIt -xIt -uew -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +cgS +cgS +juT +juT +uew +juT +juT +juT +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS ndb ndb ndb @@ -38391,9 +38377,9 @@ nsK "} (9,1,1) = {" cgS -xIt -xIt -xIt +cgS +juT +juT cmF bem iUh @@ -38407,72 +38393,72 @@ geP bua sUt ckC -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT sPY sPY agw -xIt -xIt -xIt -xIt +juT +juT +juT +juT uew uew uew uew uew uew -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +juT +juT +juT +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS ndb ndb ndb @@ -38613,8 +38599,8 @@ nsK "} (10,1,1) = {" cgS -xIt -xIt +cgS +juT cmF cmF bjn @@ -38630,40 +38616,40 @@ iUh sUt jBU ckC -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT bOD sPY sPY @@ -38683,19 +38669,19 @@ uew uew uew uew -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS ndb ndb ndb @@ -38835,8 +38821,8 @@ nsK "} (11,1,1) = {" cgS -xIt -xIt +cgS +juT cmF cmF bjn @@ -38853,38 +38839,38 @@ jua ckC ckC cmF -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT +juT +cgS +juT +juT sPY sPY sPY @@ -38905,19 +38891,19 @@ pLC xvz qFN jFo -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS ndb ndb ndb @@ -39057,8 +39043,8 @@ nsK "} (12,1,1) = {" cgS -xIt -xIt +juT +juT cmF cmF bjn @@ -39076,36 +39062,36 @@ dOs ckC dOs cmF -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT +juT +juT +juT +juT +juT cJC -xIt -xIt -xIt +juT +juT +juT sPY wJU sPY @@ -39127,18 +39113,18 @@ kUg pJc abp oqu -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +cgS +cgS +cgS +juT +juT +juT +cgS +juT +juT +juT +cgS ndb ndb ndb @@ -39279,7 +39265,7 @@ nsK "} (13,1,1) = {" cgS -xIt +juT cmF cmF cmF @@ -39300,24 +39286,24 @@ cmF cmF cmF cmF -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT +juT hLP hLP qxI @@ -39349,17 +39335,17 @@ hFv gHC qqv niX -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +juT uew -xIt -xIt -xIt +juT +juT +juT uew -xIt +juT ndb ndb ndb @@ -39501,8 +39487,8 @@ nsK "} (14,1,1) = {" cgS -xIt -xIt +juT +juT cmF cmF bjn @@ -39524,20 +39510,20 @@ anV cmF cmF cmF -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT +juT qxI qxI qxI @@ -39572,10 +39558,10 @@ lYx xPd fJd uew -xIt -xIt -xIt -xIt +juT +juT +juT +juT uew uew uew @@ -39723,8 +39709,8 @@ nsK "} (15,1,1) = {" cgS -xIt -xIt +juT +juT cmF cmF bem @@ -39748,16 +39734,16 @@ wpv cmF cmF cmF -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +juT +cgS +cgS +cgS +cgS +cgS +juT +juT xjB qxI qxI @@ -39795,8 +39781,8 @@ xPd uew uew uew -xIt -xIt +juT +juT uew uew eue @@ -39945,7 +39931,7 @@ nsK "} (16,1,1) = {" cgS -xIt +juT cmF cmF cmF @@ -39972,13 +39958,13 @@ cmF cmF wpv anV -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +juT +juT +juT hLP dag qxI @@ -40167,8 +40153,8 @@ nsK "} (17,1,1) = {" cgS -xIt -xIt +juT +juT cmF cmF bjn @@ -40195,10 +40181,10 @@ cmF cmF cmF anV -xIt -xIt -xIt -xIt +juT +juT +cgS +juT qxI qxI hLP @@ -40211,8 +40197,8 @@ qEf qxI xjB qxI -xIt -xIt +juT +juT cJC rfq rfq @@ -40389,10 +40375,10 @@ nsK "} (18,1,1) = {" cgS -xIt -xIt +cgS +juT cmF -xIt +juT yiB yiB aPS @@ -40404,7 +40390,7 @@ iUh aPS yiB yiB -xIt +juT ckC dOs cmF @@ -40418,9 +40404,9 @@ cmF wpv cmF cmF -xIt -xIt -xIt +juT +juT +juT qxI qxI qxI @@ -40428,18 +40414,18 @@ qxI qxI qxI qxI -cmF -uzr -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +qxI +qEf +juT +juT +juT +juT +juT +juT +juT +juT +juT +juT rih sPY sPY @@ -40611,11 +40597,11 @@ nsK "} (19,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt +cgS +juT +juT +juT +juT yiB cQx dUu @@ -40625,8 +40611,8 @@ iUh hgq hRV yiB -xIt -xIt +juT +juT ckC wpv dOs @@ -40650,18 +40636,18 @@ qxI qxI qxI amr -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT otX tWN sPY @@ -40833,11 +40819,11 @@ nsK "} (20,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +juT yiB yiB yiB @@ -40847,8 +40833,8 @@ gLz yiB yiB yiB -xIt -xIt +juT +juT cmF cmF cmF @@ -40869,21 +40855,21 @@ qxI yld qxI qxI -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT xbv rih sPY @@ -41055,11 +41041,11 @@ nsK "} (21,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt +cgS +juT +juT +juT +juT yiB lmN lUi @@ -41069,8 +41055,8 @@ sWh hsw kuB yiB -xIt -xIt +juT +juT cmF cmF cmF @@ -41090,23 +41076,23 @@ qxI qxI qxI qxI -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT otX tWN rih @@ -41277,8 +41263,8 @@ nsK "} (22,1,1) = {" cgS -xIt -xIt +juT +juT yiB yiB yiB @@ -41292,7 +41278,7 @@ wgu fTM yiB yiB -xIt +juT cmF cmF wpv @@ -41310,30 +41296,30 @@ pvC qxI qxI qxI -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT otX otX rih -xIt -xIt +juT +juT eue tzc eue @@ -41346,8 +41332,8 @@ ndb tzc tzc uew -xIt -xIt +juT +juT uew uew uew @@ -41499,7 +41485,7 @@ nsK "} (23,1,1) = {" cgS -xIt +juT yiB yiB aHZ @@ -41514,7 +41500,7 @@ upW aUs sWh yiB -xIt +juT cmF cmF cmF @@ -41531,37 +41517,37 @@ cmF uzr cmF qxI -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT rih rih -xIt -xIt -xIt +juT +juT +juT tzc tzc tzc -xIt -xIt -xIt +juT +juT +juT eue tzc oWT @@ -41569,7 +41555,7 @@ tzc uew uew uew -xIt +juT uew kZp uew @@ -41721,7 +41707,7 @@ nsK "} (24,1,1) = {" cgS -xIt +juT yiB aeZ aNR @@ -41753,38 +41739,38 @@ cmF uzr cmF qxI -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT +juT +juT +juT +juT rih otX -xIt -xIt -xIt +juT +juT +juT tzc xPx eue -xIt -xIt -xIt -xIt +juT +juT +juT +juT tzc uew uew @@ -41943,8 +41929,8 @@ nsK "} (25,1,1) = {" cgS -xIt -xIt +juT +juT sWh cZX upW @@ -41976,36 +41962,36 @@ uzr cmF qxI amr -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT +juT qxI qxI xjB -xIt +juT rih otX tWN rih -xIt +juT tzc tzc eue tzc tzc -xIt -xIt +juT +juT eue tzc uew @@ -42165,8 +42151,8 @@ nsK "} (26,1,1) = {" cgS -xIt -xIt +cgS +juT apd apA bAh @@ -42199,17 +42185,17 @@ qxI qxI qxI qxI -anV -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +hLP +juT +juT +juT +cgS +cgS +cgS +cgS +juT +juT +juT qxI xjB qxI @@ -42387,8 +42373,8 @@ nsK "} (27,1,1) = {" cgS -xIt -xIt +juT +juT sZZ upW upW @@ -42424,12 +42410,12 @@ qxI qxI qxI qxI -xIt -xIt -xIt -xIt -xIt -xIt +juT +cgS +cgS +juT +juT +juT hLP qxI qxI @@ -42609,7 +42595,7 @@ nsK "} (28,1,1) = {" cgS -xIt +juT yiB atX axk @@ -42646,10 +42632,10 @@ hLP hLP qxI qxI -xIt -xIt -xIt -xIt +juT +juT +juT +juT hLP qxI qxI @@ -42660,7 +42646,7 @@ qxI qxI xjB cJC -cmF +qxI rih otX rih @@ -42831,7 +42817,7 @@ nsK "} (29,1,1) = {" cgS -xIt +juT yiB yiB apd @@ -42884,8 +42870,8 @@ qxI cJC rih rih -xIt -xIt +juT +juT eue tzc uew @@ -43053,8 +43039,8 @@ nsK "} (30,1,1) = {" cgS -xIt -xIt +juT +juT yiB sWh cLZ @@ -43068,7 +43054,7 @@ dkT kuB yiB yiB -xIt +juT cmF cmF cmF @@ -43103,11 +43089,11 @@ mPF qxI qxI cJC -xIt -xIt -xIt -xIt -xIt +juT +juT +juT +juT +juT bPS tzc uew @@ -43275,9 +43261,9 @@ nsK "} (31,1,1) = {" cgS -xIt -xIt -xIt +cgS +juT +juT yiB dhv yiB @@ -43289,8 +43275,8 @@ yiB yiB yiB yiB -xIt -xIt +juT +juT cmF cmF cmF @@ -43302,8 +43288,8 @@ cmF anV anV anV -xIt -xIt +juT +juT anV anV qxI @@ -43322,14 +43308,14 @@ qxI xjB qxI qxI -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +juT +juT +cgS +juT +juT +juT tzc eue tzc @@ -43497,23 +43483,23 @@ nsK "} (32,1,1) = {" cgS -xIt -xIt +cgS +juT jBU cmF njJ ckC -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +juT +juT +juT +juT +juT +juT +juT +juT +juT cmF dOs cmF @@ -43521,15 +43507,15 @@ cmF cmF cmF anV -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -wpv +juT +juT +juT +juT +juT +juT +juT +juT +xjB qxI qxI qxI @@ -43543,13 +43529,13 @@ qxI xjB qxI qxI -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +juT +juT tzc tzc tzc @@ -43719,39 +43705,39 @@ nsK "} (33,1,1) = {" cgS -xIt -xIt +cgS +juT ckC ckC njJ anV -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT wpv cmF cmF wpv cmF cmF -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT qxI qxI qxI @@ -43762,15 +43748,15 @@ ugu qEf qxI qxI -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +juT +juT +cgS +cgS +cgS +cgS +juT tzc tzc eue @@ -43941,40 +43927,40 @@ nsK "} (34,1,1) = {" cgS -xIt -xIt +cgS +juT cmF arf njJ -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT cmF cmF cmF cmF cmF cmF -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT qxI qxI dao @@ -43982,17 +43968,17 @@ qxI xjB qxI qEf -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT tzc rai eue @@ -44163,39 +44149,39 @@ nsK "} (35,1,1) = {" cgS -xIt -xIt +juT +juT cmF cmF eeT -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT cmF cmF cmF cmF -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT qxI qxI qxI @@ -44203,17 +44189,17 @@ qxI qxI qxI hLP -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT tzc tzc eue @@ -44385,58 +44371,58 @@ nsK "} (36,1,1) = {" cgS -xIt +juT anV cmF cmF eFS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT cmF wpv cmF -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT +juT qxI qxI xjB qxI qxI qxI -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT tzc eue eue @@ -44607,37 +44593,37 @@ nsK "} (37,1,1) = {" cgS -xIt +juT anV wpv dOs eeT -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT cmF cmF cmF -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT qxI qxI qxI @@ -44645,21 +44631,21 @@ qxI qxI qxI qxI -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT tzc eue eue @@ -44829,59 +44815,59 @@ nsK "} (38,1,1) = {" cgS -xIt +juT cmF cmF wpv eeT -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT dOs cmF cmF -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT amr qxI qxI qxI qxI amr -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT tzc tzc eue @@ -45051,60 +45037,60 @@ nsK "} (39,1,1) = {" cgS -xIt -xIt +juT +juT wpv cmF eeT cmF -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT cmF cmF cmF -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT qxI qxI qxI qxI qxI qxI -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT tzc tzc tzc @@ -45273,60 +45259,60 @@ nsK "} (40,1,1) = {" cgS -xIt -xIt +cgS +juT cmF cmF eeT cmF -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT cmF cmF wpv cmF -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +cgS +cgS +cgS +cgS +cgS +cgS +juT qxI qxI qxI xjB qxI qxI -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT tzc bPS tzc @@ -45495,61 +45481,61 @@ nsK "} (41,1,1) = {" cgS -xIt -xIt +cgS +juT cmF cmF eeT cmF uzr -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +cgS +cgS +juT +juT cmF cmF cmF cmF cmF -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +cgS +cgS +cgS +cgS +cgS +cgS +juT qxI qxI qxI qxI qxI -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT tzc tzc uew @@ -45717,61 +45703,61 @@ nsK "} (42,1,1) = {" cgS -xIt -xIt -xIt +cgS +juT +juT cmF eeT cmF gNS cmF -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +cgS +cgS +cgS +cgS +cgS +juT cmF cmF wpv cmF cmF cmF -xIt -xIt -xIt -xIt -xIt -xIt -xIt -raa +juT +cgS +cgS +cgS +cgS +cgS +juT +juT qxI xjB qxI qxI -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT tzc xPx uew @@ -45939,61 +45925,61 @@ nsK "} (43,1,1) = {" cgS -xIt -xIt -xIt +cgS +cgS +juT swg eeT eeT fEZ gKU -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +cgS +juT cmF cmF cmF cmF cmF cmF -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +cgS +cgS +cgS +cgS +cgS +juT qxI qxI qxI qxI qxI -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT tzc tzc uew @@ -46161,61 +46147,61 @@ nsK "} (44,1,1) = {" cgS -xIt -xIt -xIt -xIt +cgS +cgS +juT +juT cmF cmF uzr eeT cmF -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +juT cmF wpv cmF cmF cmF cmF -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +cgS +juT qxI qxI qxI xjB qxI -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT eue uew kZp @@ -46383,61 +46369,61 @@ nsK "} (45,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +juT +juT cmF pvC eeT cmF cmF -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +juT +juT dOs cmF dOs cmF wpv cmF -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +cgS +cgS +cgS +cgS +juT +juT qxI qxI qxI qxI qxI -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT uew uew uew @@ -46605,36 +46591,36 @@ nsK "} (46,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +juT cmF uzr eeT dOs cmF cmF -xIt -xIt -xIt -xIt -xIt -xIt +juT +cgS +cgS +cgS +juT +juT cmF cmF fyL wpv cmF -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +cgS +cgS +cgS +cgS +cgS +juT +juT qxI qxI xjB @@ -46642,24 +46628,24 @@ qxI qxI hLP hLP -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT uew uew esd @@ -46827,36 +46813,36 @@ nsK "} (47,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +juT +juT uzr gKU wpv cmF wpv -xIt -xIt -xIt -xIt -xIt -xIt +juT +cgS +cgS +cgS +cgS +juT uGF uGF uGF uGF loD -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +cgS +cgS +cgS +cgS +cgS +juT +juT cYz kNR cYz @@ -46866,22 +46852,22 @@ cYz ubb cYz tJs -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT tzc uew uew @@ -47049,35 +47035,35 @@ nsK "} (48,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +juT +juT qzH uGF uGF uGF -xIt -xIt -xIt -xIt -xIt -xIt +juT +cgS +cgS +cgS +juT +juT uGF gfl uGF uGF -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +cgS +cgS +juT cYz cYz cYz @@ -47089,22 +47075,22 @@ cYz cYz cYz cYz -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT kZp kZp uew @@ -47271,40 +47257,40 @@ nsK "} (49,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +juT qzH uGF gfl uGF -xIt -xIt -xIt -xIt -xIt +juT +cgS +cgS +juT +juT uGF uGF uGF uGF uGF -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +cgS +cgS +cgS +cgS +cgS +juT +juT cYz cYz cYz cYz -xIt +juT gkC cYz cYz @@ -47312,21 +47298,21 @@ cYz cYz cYz cYz -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT uew uew uew @@ -47493,41 +47479,41 @@ nsK "} (50,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +juT +juT qzH uGF uGF uGF -xIt -xIt -xIt -xIt +juT +cgS +cgS +juT uGF uGF uGF uGF uGF -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +cgS +cgS +juT cYz ubb cYz cYz ubb -xIt -xIt +juT +juT cYz cYz ubb @@ -47535,20 +47521,20 @@ cYz dIF cYz ubb -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT kZp iiB uew @@ -47715,62 +47701,62 @@ nsK "} (51,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +juT loD qzH gfl uGF uGF -xIt -xIt -xIt -xIt +juT +cgS +juT +juT xEg uGF gfl xEg -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +juT cYz cYz cYz cYz cYz -xIt -xIt -xIt -xIt +juT +juT +juT +juT cYz cYz cYz cYz cYz cYz -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT uew uew uew @@ -47937,62 +47923,62 @@ nsK "} (52,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +juT loD qzH uGF uGF gfl -xIt -xIt -xIt +juT +cgS +juT loD gfl uGF uGF -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT cYz cYz ubb cYz cYz -xIt -xIt -xIt -xIt -xIt +juT +cgS +cgS +juT +juT tJs cYz cYz cYz cYz tJs -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT uew uew uew @@ -48159,62 +48145,62 @@ nsK "} (53,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +juT loD qzH asP uGF uGF -xIt -xIt -xIt +juT +cgS +juT loD uGF uGF uGF -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT cYz cYz cYz cYz cYz -xIt -xIt -xIt -xIt -xIt -vqi +juT +cgS +cgS +cgS +juT +nnp oHy oHy eVB oHy -qTf -qTf -uMH -vqi -vqi -vqi -vqi -vqi -vqi -xIt -xIt -xIt -xIt +oHy +oHy +pwZ +nnp +nnp +nnp +hsE +hsE +hsE +cgS +cgS +cgS +juT uew kZp uew @@ -48381,45 +48367,45 @@ nsK "} (54,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +juT +juT qzH uGF uGF uGF -xIt -xIt -xIt +juT +juT +juT uGF uGF uGF loD -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT tJs cYz dIF tJs -xIt -xIt -xIt -xIt -xIt -xIt -vqi +juT +juT +cgS +cgS +cgS +cgS +nnp cYz cYz cYz @@ -48429,14 +48415,14 @@ cYz cYz cYz cYz -xIt -xIt -xIt -vqi -xIt -xIt -xIt -xIt +juT +juT +cgS +hsE +cgS +cgS +cgS +juT uew uew kZp @@ -48603,45 +48589,45 @@ nsK "} (55,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +juT uGF qzH uGF uGF uGF uGF -xIt +juT ntJ uGF gfl uGF -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT cYz cYz cYz cYz -xIt -xIt -xIt -xIt -xIt -xIt -vqi +juT +cgS +cgS +cgS +cgS +cgS +nnp cYz cYz gkC @@ -48652,13 +48638,13 @@ cYz gkC cYz cYz -xIt -xIt -vqi -xIt -xIt -xIt -xIt +juT +cgS +hsE +cgS +cgS +cgS +juT uew uew uew @@ -48825,13 +48811,13 @@ nsK "} (56,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +juT +juT qzH uGF xEg @@ -48841,29 +48827,29 @@ uGF ntJ uGF xEg -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT cYz ubb cYz cYz -xIt -xIt -xIt -xIt -xIt -xIt -vqi +juT +juT +cgS +cgS +cgS +cgS +nnp cYz cYz gkC @@ -48874,13 +48860,13 @@ cYz cYz cYz cYz -xIt -xIt -vqi -xIt -xIt -xIt -xIt +juT +juT +hsE +cgS +cgS +cgS +juT kZp uew rSi @@ -49047,13 +49033,13 @@ nsK "} (57,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +juT +juT qzH xEg uGF @@ -49062,31 +49048,31 @@ uGF uGF bFY uGF -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT gkC cYz cYz cYz cYz cYz -xIt -xIt -xIt -xIt -xIt -vqi -xIt +juT +cgS +cgS +cgS +cgS +nnp +juT cYz cYz cYz @@ -49097,12 +49083,12 @@ cYz ubb cYz cYz -xIt -vqi -xIt -xIt -xIt -xIt +juT +hsE +cgS +cgS +cgS +juT uew uew kTM @@ -49269,46 +49255,46 @@ nsK "} (58,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +juT qzH qzH gfl uGF uGF -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +juT +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT cYz cYz cYz cYz cYz cYz -xIt -xIt -xIt -xIt -xIt -vqi -xIt +juT +cgS +cgS +cgS +cgS +hsE +juT cYz ubb cYz @@ -49319,12 +49305,12 @@ hDd cYz cYz cYz -xIt -vqi -xIt -xIt -xIt -xIt +juT +hsE +cgS +cgS +cgS +juT uew iiB skK @@ -49491,32 +49477,32 @@ nsK "} (59,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +juT qzH gfl uGF uGF -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT cYz cYz cYz @@ -49524,13 +49510,13 @@ ubb cYz ubb cYz -xIt -xIt -xIt -xIt -xIt -vqi -xIt +juT +cgS +cgS +cgS +cgS +hsE +juT cYz cYz cYz @@ -49541,12 +49527,12 @@ ubb cYz tJs cYz -xIt -vqi -xIt -xIt -xIt -xIt +juT +nnp +juT +juT +juT +juT uew uew kTM @@ -49713,32 +49699,32 @@ nsK "} (60,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +juT +juT qzH uGF uGF uGF -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT cYz cYz tJs @@ -49746,14 +49732,14 @@ cYz cYz cYz cYz -xIt -xIt -xIt -xIt -xIt -vqi -xIt -xIt +juT +cgS +cgS +cgS +cgS +hsE +cgS +juT cYz cYz cYz @@ -49766,8 +49752,8 @@ cYz cYz aQR gkC -xIt -xIt +juT +juT eue tzc kZp @@ -49935,48 +49921,48 @@ nsK "} (61,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +juT uGF qzH uGF uGF uGF -xIt -xIt -vqi -vqi -vqi -vqi -vqi -vqi -vqi -vqi -vqi -vqi -vqi -vqi -vqi -vqi -xIt +juT +cgS +hsE +nnp +nnp +nnp +nnp +nnp +nnp +nnp +nnp +nnp +nnp +nnp +hsE +nnp +juT cYz cYz cYz cYz cYz cYz -xIt -xIt -xIt -xIt -xIt -vqi -xIt -xIt -xIt +juT +juT +juT +cgS +cgS +hsE +cgS +juT +juT cYz cYz cYz @@ -50157,20 +50143,20 @@ nsK "} (62,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +juT uGF qzH uGF uGF uGF -xIt -xIt -vqi -xIt +juT +cgS +nnp +juT cqM fPM cqM @@ -50180,11 +50166,11 @@ cqM cqM fPM fPM -xIt -xIt -vqi -xIt -xIt +juT +juT +nnp +juT +juT cYz cYz ubb @@ -50192,13 +50178,13 @@ cYz cYz cYz cYz -xIt -xIt -xIt -vqi -xIt -xIt -xIt +juT +juT +cgS +hsE +cgS +cgS +juT gkC cYz ubb @@ -50211,7 +50197,7 @@ ubb oHy ubb cYz -yjx +bcB tzc eue tzc @@ -50379,19 +50365,19 @@ nsK "} (63,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +juT uGF qzH uGF xEg -xIt -xIt -xIt -vqi +juT +juT +juT +nnp cqM cqM fPM @@ -50405,8 +50391,8 @@ fPM cqM fPM hXS -xIt -xIt +juT +juT cYz ubb cYz @@ -50415,12 +50401,12 @@ cYz ubb cYz cYz -xIt -xIt -vqi -xIt -xIt -xIt +juT +juT +nnp +cgS +cgS +juT ubb cYz cYz @@ -50433,7 +50419,7 @@ cYz oHy cYz cYz -yjx +bcB rai eue tzc @@ -50601,17 +50587,17 @@ nsK "} (64,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt +cgS +cgS +juT +juT +juT uGF qzH asP uGF -xIt -xIt +juT +juT cqM hXI cqM @@ -50639,10 +50625,10 @@ cYz cYz cYz cYz -vqi -xIt -xIt -xIt +nnp +juT +juT +juT cYz cYz cYz @@ -50651,7 +50637,7 @@ gkC cYz ubb cYz -xIt +juT oHy cYz ubb @@ -50823,17 +50809,17 @@ nsK "} (65,1,1) = {" cgS -xIt -xIt -xIt +cgS +cgS +juT xEg uGF uGF fZP uGF -xIt -xIt -xIt +juT +juT +juT cqM hXS egm @@ -50862,9 +50848,9 @@ cYz cYz ubb nue -vqi -vqi -qTf +nnp +nnp +oHy oHy nue oHy @@ -50872,11 +50858,11 @@ pwZ oHy oHy nue -vqi -vqi -vqi -xIt -xIt +nnp +nnp +nnp +juT +juT eue tzc mXU @@ -51045,17 +51031,17 @@ nsK "} (66,1,1) = {" cgS -xIt -xIt -xIt +cgS +juT +juT qzH qzH qzH qzH -xIt -xIt -xIt -xIt +juT +juT +cgS +juT cqM hXI dwS @@ -51076,9 +51062,9 @@ fPM pxr ubb cYz -beU -xIt -xIt +juT +juT +juT cYz ubb cYz @@ -51093,12 +51079,12 @@ cYz cYz cYz cYz -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +juT eue eue tzc @@ -51267,17 +51253,17 @@ nsK "} (67,1,1) = {" cgS -xIt -xIt +cgS +juT uGF qzH gfl uGF -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +juT fPM hXS cqM @@ -51294,14 +51280,14 @@ mJj fPM ivx cqM -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +juT +juT +juT +cgS +juT +juT cYz ubb cYz @@ -51314,13 +51300,13 @@ tJs cYz cYz cYz -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +cgS +juT eue rai tzc @@ -51489,18 +51475,18 @@ nsK "} (68,1,1) = {" cgS -xIt -xIt +cgS +juT uGF qzH uGF uGF -xIt -xIt -xIt -xIt -xIt -xIt +juT +cgS +cgS +cgS +juT +juT hXS gVM cqM @@ -51517,15 +51503,15 @@ fPM ivx cqM cqM -xIt -xIt +juT +juT cqM -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +juT +juT +juT cYz cYz cYz @@ -51535,14 +51521,14 @@ cYz cQd cYz cYz -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +cgS +cgS +juT eue eue eue @@ -51711,17 +51697,17 @@ nsK "} (69,1,1) = {" cgS -xIt -xIt +cgS +juT uGF qzH uGF -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +juT iqm igB ivx @@ -51740,15 +51726,15 @@ oBs iqm iqm iqm -xIt +juT etT cqM -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +juT +juT tJs cYz ubb @@ -51757,15 +51743,15 @@ cYz cYz cYz ubb -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT eue rai sWa @@ -51933,17 +51919,17 @@ nsK "} (70,1,1) = {" cgS -xIt -xIt +cgS +juT uGF qzH uGF -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +juT +juT +juT +juT iqm laA cqM @@ -51966,28 +51952,28 @@ laA cqM fPM cqM -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +juT +cgS +juT +juT cYz cYz cYz cYz cYz cYz -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT eue tzc sWa @@ -52155,16 +52141,16 @@ nsK "} (71,1,1) = {" cgS -xIt -xIt +cgS +juT uGF qzH uGF uGF -xIt -xIt +juT +juT fVm -xIt +juT fPM iqm fPM @@ -52188,28 +52174,28 @@ fPM fXJ elo cqM -xIt +juT qaM -xIt -xIt -xIt -xIt -xIt +juT +cgS +cgS +juT +juT cYz tJs cYz cYz -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT tzc tzc pOe @@ -52377,14 +52363,14 @@ nsK "} (72,1,1) = {" cgS -xIt -xIt -xIt +cgS +juT +juT qzH gfl uGF uGF -xIt +juT cqM elo fPM @@ -52412,26 +52398,26 @@ cqM etT etT qaW -xIt -xIt -xIt -xIt -xIt -cYz -cYz -cYz -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +juT +juT +juT +cYz +cYz +cYz +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT kZp tzc vaE @@ -52599,8 +52585,8 @@ nsK "} (73,1,1) = {" cgS -xIt -xIt +juT +juT uGF qzH vwm @@ -52634,26 +52620,26 @@ fPM fXJ cqM cqM -xIt +juT iqm iqm -xIt +juT cYz cYz ubb -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT uew uew vaE @@ -52821,7 +52807,7 @@ nsK "} (74,1,1) = {" cgS -xIt +juT uGF uGF ewO @@ -52863,19 +52849,19 @@ nyC cYz cYz tJs -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT uew uew vaE @@ -53043,7 +53029,7 @@ nsK "} (75,1,1) = {" cgS -xIt +juT uGF uGF qzH @@ -53085,18 +53071,18 @@ cfP pxr ubb cYz -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT uew uew kZp @@ -53265,7 +53251,7 @@ nsK "} (76,1,1) = {" cgS -xIt +juT uGF gfl qzH @@ -53303,21 +53289,21 @@ iqm iqm cqM fPM -xIt -xIt +juT +juT pxr ubb -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT uew uew uew @@ -53487,7 +53473,7 @@ nsK "} (77,1,1) = {" cgS -xIt +juT uGF uGF qzH @@ -53526,19 +53512,19 @@ qih cqM icv iqm -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT uew uew uew @@ -53709,7 +53695,7 @@ nsK "} (78,1,1) = {" cgS -xIt +juT uGF uGF qzH @@ -53717,7 +53703,7 @@ bVM cqM dwS eoI -xIt +juT umB cqM hNx @@ -53740,7 +53726,7 @@ lBr iqm cqM cqM -pLW +jSF cqM pXd qes @@ -53748,21 +53734,21 @@ qkR fPM cqM fPM -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT +juT uew uew uew @@ -53931,15 +53917,15 @@ nsK "} (79,1,1) = {" cgS -xIt +juT uGF gfl aEE bVQ cqM fPM -xIt -xIt +juT +juT bdt dwS nyC @@ -53962,29 +53948,29 @@ dwS iqm cqM cqM -pLW -pLW +jSF +jSF pXd qhP qkR cqM lBr lBr -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT uew uew uew @@ -54153,15 +54139,15 @@ nsK "} (80,1,1) = {" cgS -xIt +juT uGF uGF qzH xEg cqM -xIt -xIt -xIt +juT +juT +juT fPM fPM nyC @@ -54192,22 +54178,22 @@ eqT cqM fPM fPM -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT uew uew vaE @@ -54382,7 +54368,7 @@ qzH gfl cqM cqM -xIt +juT rCQ cqM cqM @@ -54414,22 +54400,22 @@ eqT dwS fPM iqm -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT bcB tzc vaE @@ -54602,11 +54588,11 @@ loD uGF qzH qzH -xIt -xIt -xIt -xIt -xIt +juT +juT +juT +juT +juT kDZ iqm fPM @@ -54636,22 +54622,22 @@ cqM etT icv iqm -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +cgS +juT +juT +juT +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT ubb bcB eZJ @@ -54819,17 +54805,17 @@ nsK "} (83,1,1) = {" cgS -xIt -xIt +juT +juT uGF uGF eNo uGF -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +juT +juT iqm cqM iJR @@ -54858,21 +54844,21 @@ cqM fPM fPM iqm -xIt -xIt -xIt +juT +juT +juT ubb cYz cYz -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +juT +cgS +cgS +cgS +cgS +juT +juT tJs cYz bcB @@ -55041,16 +55027,16 @@ nsK "} (84,1,1) = {" cgS -xIt -xIt +cgS +juT uGF gfl qzH uGF loD -xIt -xIt -xIt +juT +cgS +juT icv iqm laA @@ -55080,20 +55066,20 @@ fPM cqM iqm iqm -xIt -xIt +juT +juT cYz cYz cYz cYz tVH cYz -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +juT +juT cYz cYz ubb @@ -55263,16 +55249,16 @@ nsK "} (85,1,1) = {" cgS -xIt -xIt +cgS +juT uGF vwm ewO uGF uGF -xIt -xIt -xIt +juT +juT +juT lBr iqm cqM @@ -55311,10 +55297,10 @@ tJs tVH ubb cYz -xIt -xIt -xIt -xIt +juT +juT +juT +juT cYz ubb cYz @@ -55485,15 +55471,15 @@ nsK "} (86,1,1) = {" cgS -xIt -xIt +cgS +juT uGF gfl qzH uGF gfl loD -xIt +juT fPM gZd iqm @@ -55534,8 +55520,8 @@ eeF tPt tPt cYz -xIt -xIt +juT +juT cYz cYz cYz @@ -55707,8 +55693,8 @@ nsK "} (87,1,1) = {" cgS -xIt -xIt +cgS +juT uGF gfl ewO @@ -55749,8 +55735,8 @@ tPt gpF tPt tPt -xIt -xIt +juT +juT tJs tVH ubb @@ -55929,8 +55915,8 @@ nsK "} (88,1,1) = {" cgS -xIt -xIt +cgS +juT uGF uGF qzH @@ -55971,10 +55957,10 @@ cYz cYz cYz cYz -xIt -xIt -xIt -xIt +juT +juT +juT +juT cYz cYz cYz @@ -56151,8 +56137,8 @@ nsK "} (89,1,1) = {" cgS -xIt -xIt +juT +juT asP gfl qzH @@ -56193,11 +56179,11 @@ fPM ubb cYz cYz -xIt -xIt -xIt -xIt -xIt +juT +cgS +cgS +juT +juT cYz ubb cYz @@ -56373,7 +56359,7 @@ nsK "} (90,1,1) = {" cgS -xIt +juT uGF uGF uGF @@ -56413,12 +56399,12 @@ gVM qoT cYz cYz -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +juT +cgS +cgS +juT cYz ubb cYz @@ -56426,8 +56412,8 @@ ubb cYz cYz cYz -xIt -xIt +juT +juT cYz cYz bcB @@ -56595,7 +56581,7 @@ nsK "} (91,1,1) = {" cgS -xIt +juT uGF uGF uGF @@ -56632,25 +56618,25 @@ hXS cqM fPM fPM -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +juT +juT +cgS +juT +juT +juT +juT cYz cYz ubb cYz cYz cYz -xIt -xIt -xIt -xIt +juT +juT +juT +juT cYz bcB bBz @@ -56817,8 +56803,8 @@ nsK "} (92,1,1) = {" cgS -xIt -xIt +juT +juT uGF gfl qzH @@ -56852,14 +56838,14 @@ iqm pVA igB iqm -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +juT +cgS +cgS +cgS +juT +juT tJs cYz tVH @@ -56867,12 +56853,12 @@ cYz cYz tJs cYz -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +juT +cgS +cgS +juT cYz bcB ujh @@ -57039,7 +57025,7 @@ nsK "} (93,1,1) = {" cgS -xIt +juT uGF uGF uGF @@ -57074,13 +57060,13 @@ cqM fPM igB iqm -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +cgS +cgS +cgS +cgS +cgS +juT cYz cYz ubb @@ -57088,13 +57074,13 @@ tVH cYz ubb cYz -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +cgS +juT ubb cYz ujh @@ -57261,7 +57247,7 @@ nsK "} (94,1,1) = {" cgS -xIt +juT gfl uGF uGF @@ -57295,28 +57281,28 @@ iqm cqM etT igB -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +cgS +cgS +juT cYz cYz cYz tVH cYz -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +juT +cgS +cgS +cgS +cgS +cgS +juT cYz cYz ujh @@ -57483,13 +57469,13 @@ nsK "} (95,1,1) = {" cgS -xIt -xIt +juT +juT uGF xEg uGF uGF -xIt +juT cqM cqM cqM @@ -57517,29 +57503,29 @@ iqm iqm pVA igB -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +cgS +cgS +cgS +cgS +cgS +cgS +juT cYz ubb cYz -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT ubb jlM eZJ @@ -57705,14 +57691,14 @@ nsK "} (96,1,1) = {" cgS -xIt -xIt -xIt +cgS +juT +juT uGF uGF -xIt -xIt -xIt +juT +juT +juT eqT cqM fPM @@ -57739,29 +57725,29 @@ iqm iqm cqM igB -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -cYz -cYz -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +cgS +cgS +cgS +cgS +juT +juT +juT +cYz +cYz +juT +juT +cgS +juT +juT +juT +juT +cgS +cgS +cgS +cgS +cgS +juT cYz jlM wGX @@ -57927,15 +57913,15 @@ nsK "} (97,1,1) = {" cgS -xIt -xIt -xIt +cgS +cgS +juT gfl uGF uGF -xIt -xIt -xIt +juT +juT +juT lBr cqM iqm @@ -57961,29 +57947,29 @@ iqm iqm pVA igB -xIt -xIt -xIt -xIt -xIt -xIt +juT +cgS +cgS +cgS +juT +juT cYz cYz cYz cYz -xIt -xIt -xIt -xIt +juT +juT +cgS +juT cYz cYz -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +cgS +juT ubb jlM wGX @@ -58149,29 +58135,29 @@ nsK "} (98,1,1) = {" cgS -xIt -xIt -xIt +cgS +cgS +juT uGF uGF gfl loD -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +juT +juT +juT +juT +juT +juT fPM iqm -xIt -xIt -xIt -xIt -vqi -vqi +juT +juT +juT +juT +nnp +nnp igB igB hXS @@ -58180,33 +58166,33 @@ hXS nMT igB igB -vqi -vqi -vqi -xIt -xIt -xIt -xIt -xIt +nnp +nnp +nnp +juT +cgS +cgS +cgS +juT cYz cYz cYz cYz ubb cYz -xIt -xIt -xIt +juT +juT +juT cYz ubb cYz -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +juT +juT jlM wGX nwP @@ -58371,28 +58357,28 @@ nsK "} (99,1,1) = {" cgS -xIt -xIt -xIt +cgS +cgS +juT gfl uGF uGF uGF loD -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +cgS +cgS +cgS +cgS +cgS +juT +juT +juT +juT +cgS +cgS +juT +juT uGF fPM fPM @@ -58402,14 +58388,14 @@ fPM ubb fPM iqm -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +juT +juT +juT cYz tJs ubb @@ -58423,12 +58409,12 @@ cYz cYz cYz cYz -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +juT jlM iJc jlM @@ -58593,27 +58579,27 @@ nsK "} (100,1,1) = {" cgS -xIt -xIt -xIt +cgS +cgS +juT xEg gfl uGF uGF asP -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT uGF gfl uGF @@ -58625,11 +58611,11 @@ cYz cYz tJs iqm -xIt -xIt -xIt -xIt -xIt +juT +juT +juT +juT +juT cYz cYz cYz @@ -58646,11 +58632,11 @@ cYz cYz cYz ubb -xIt -xIt -xIt -xIt -xIt +juT +juT +juT +cgS +juT jlM wGX jSq @@ -58815,27 +58801,27 @@ nsK "} (101,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt +cgS +cgS +juT +juT +juT uGF gfl uGF -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT uGF uGF uGF @@ -58870,9 +58856,9 @@ ubb cYz cYz cYz -xIt -xIt -xIt +juT +juT +juT jlM wGX ujh @@ -59037,26 +59023,26 @@ nsK "} (102,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +juT +juT uGF uGF uGF uGF -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT uGF uGF vwm @@ -59078,7 +59064,7 @@ ubb cYz cYz cYz -xIt +juT cYz ubb cYz @@ -59093,8 +59079,8 @@ cYz cYz tJs ubb -xIt -xIt +juT +juT jlM wGX ujh @@ -59259,31 +59245,31 @@ nsK "} (103,1,1) = {" cgS -xIt -xIt -xIt -xIt +cgS +cgS +cgS +juT uGF gfl uGF uGF gfl uGF -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +juT +juT +juT +juT +juT +cgS +cgS +juT uGF gfl uGF uGF -owj +hsE uGF uGF kST @@ -59299,14 +59285,14 @@ gkC cYz cYz ubb -xIt -xIt -xIt +juT +juT +juT cYz cYz -xIt -xIt -xIt +juT +juT +juT ubb cYz cYz @@ -59316,7 +59302,7 @@ cYz cYz cYz cYz -xIt +juT jlM rsf bBz @@ -59481,11 +59467,11 @@ nsK "} (104,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +juT +juT xEg uGF uGF @@ -59497,10 +59483,10 @@ uGF uGF gfl uGF -xIt -xIt -xIt -xIt +juT +juT +cgS +juT uGF uGF uGF @@ -59520,17 +59506,17 @@ oHy cYz cYz cYz -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +juT +juT +juT +juT +juT ubb cYz -xIt +juT cYz cYz ubb @@ -59703,13 +59689,13 @@ nsK "} (105,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +juT +juT +juT uGF uGF uGF @@ -59720,10 +59706,10 @@ uGF uGF uGF uGF -xIt -xIt -xIt -xIt +juT +cgS +juT +juT xEg uGF gfl @@ -59740,20 +59726,20 @@ cYz cYz pwZ cYz -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT +juT +juT +juT cYz cYz ubb @@ -59925,14 +59911,14 @@ nsK "} (106,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT uGF uGF gfl @@ -59942,12 +59928,12 @@ uGF gfl gfl uGF -xIt -xIt -xIt -xIt -xIt -xIt +juT +cgS +cgS +juT +juT +juT uGF qTf xEg @@ -59961,21 +59947,21 @@ ubb cYz tJs oHy -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT ubb cYz cYz @@ -60147,14 +60133,14 @@ nsK "} (107,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT uGF xEg gfl @@ -60164,14 +60150,14 @@ xEg uGF uGF xEg -xIt -xIt -xIt -xIt -xIt -xIt -xIt -vqi +juT +juT +cgS +cgS +cgS +juT +juT +nnp uGF uGF cYz @@ -60182,26 +60168,26 @@ cYz cYz cYz cYz -vqi -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +nnp +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT cYz ubb -xIt +juT bcB bcB bBz @@ -60369,13 +60355,13 @@ nsK "} (108,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +juT uGF uGF uGF @@ -60387,14 +60373,14 @@ uGF uGF uGF uGF -xIt -xIt -xIt -xIt -xIt -xIt -vqi -xIt +juT +cgS +cgS +cgS +cgS +cgS +nnp +juT uGF cYz cYz @@ -60403,28 +60389,28 @@ cYz cYz cYz cYz -xIt -vqi -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +nnp +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT +juT +juT +juT bBz ujh ujh @@ -60591,13 +60577,13 @@ nsK "} (109,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +juT loD uGF gfl @@ -60609,14 +60595,14 @@ uGF uGF uGF loD -xIt -xIt -xIt -xIt -xIt -xIt -vqi -xIt +juT +cgS +cgS +cgS +cgS +cgS +hsE +juT uGF rvq gkC @@ -60624,31 +60610,31 @@ gkC cYz ubb cYz -xIt -xIt -vqi -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +hsE +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT +juT ilb cZN ilb @@ -60813,13 +60799,13 @@ nsK "} (110,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +juT loD uGF uGF @@ -60831,14 +60817,14 @@ uGF uGF gfl loD -xIt -xIt -xIt -xIt -xIt -xIt -vqi -xIt +juT +cgS +cgS +cgS +cgS +cgS +hsE +juT uGF cYz gkC @@ -60846,30 +60832,30 @@ gkC cYz cYz cYz -xIt -xIt -vqi -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +cgS +hsE +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT ilb ilb nSG @@ -61035,14 +61021,14 @@ nsK "} (111,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT uGF gfl uGF @@ -61053,44 +61039,44 @@ uGF uGF uGF uGF -xIt -xIt -xIt -xIt -xIt -xIt -vqi -xIt -xIt +juT +juT +cgS +cgS +cgS +cgS +hsE +juT +juT cYz cYz cYz cYz ubb cYz -xIt -xIt -vqi -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +cgS +hsE +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT +juT ilb ilb ilb @@ -61257,14 +61243,14 @@ nsK "} (112,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT uGF uGF uGF @@ -61276,41 +61262,41 @@ uGF gfl uGF uGF -xIt -xIt -xIt -xIt -xIt -vqi -vqi -vqi -vqi +juT +cgS +cgS +cgS +cgS +hsE +hsE +nnp +nnp oHy oHy eVB oHy oHy -vqi -vqi -vqi -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +nnp +hsE +hsE +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT +juT ilb ilb ilb @@ -61479,14 +61465,14 @@ nsK "} (113,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT loD xEg uGF @@ -61498,39 +61484,39 @@ uGF xEg uGF uGF -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -cYz -cYz -cYz -cYz -cYz -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT +cYz +cYz +cYz +cYz +cYz +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT ilb ilb vby @@ -61701,14 +61687,14 @@ nsK "} (114,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT loD uGF uGF @@ -61720,38 +61706,38 @@ uGF uGF uGF uGF -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT cYz tJs cYz ubb -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT +juT ilb ilb juQ @@ -61923,15 +61909,15 @@ nsK "} (115,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT loD uGF uGF @@ -61943,35 +61929,35 @@ vwm uGF gfl uGF -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -cYz -cYz -cYz -cYz -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +juT +cYz +cYz +cYz +cYz +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT tyz ilb ilb @@ -62145,17 +62131,17 @@ nsK "} (116,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT +juT uGF uGF uGF @@ -62166,33 +62152,33 @@ uGF uGF gfl uGF -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +cgS +cgS +cgS +cgS +cgS +cgS +juT cYz cYz ubb gkC -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT tyz tyz ilb @@ -62367,17 +62353,17 @@ nsK "} (117,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT uGF uGF uGF @@ -62388,33 +62374,33 @@ uGF uGF uGF uGF -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +cgS +juT +juT ubb cYz cYz gkC -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT tyz tyz tyz @@ -62589,19 +62575,19 @@ nsK "} (118,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT +juT uGF uGF gfl @@ -62611,32 +62597,32 @@ gfl uGF uGF uGF -xIt -xIt -xIt -xIt -xIt -xIt +juT +cgS +cgS +cgS +cgS +juT cYz cYz cYz ubb -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT jIg tyz tyz @@ -62811,21 +62797,21 @@ nsK "} (119,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT +juT uGF xEg uGF @@ -62833,32 +62819,32 @@ uGF uGF uGF xEg -xIt -xIt -xIt -xIt -xIt -xIt -cYz -cYz -cYz -cYz -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +juT +juT +cYz +cYz +cYz +cYz +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT qHh qHh lyG @@ -63033,22 +63019,22 @@ nsK "} (120,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT uGF uGF uGF @@ -63056,31 +63042,31 @@ gfl uGF uGF uGF -xIt -xIt -xIt -xIt -cYz -cYz -cYz -cYz -cYz -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +juT +juT +cYz +cYz +cYz +cYz +cYz +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT qHh qHh lyG @@ -63255,21 +63241,21 @@ nsK "} (121,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT uGF uGF uGF @@ -63279,31 +63265,31 @@ uGF uGF uGF uGF -xIt -xIt +juT +juT cYz tJs cYz ubb tJs -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT lyG uYy uYy @@ -63477,25 +63463,25 @@ nsK "} (122,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT uGF uGF gfl -xIt +juT uGF uGF uGF @@ -63507,26 +63493,26 @@ gfl cYz cYz cYz -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT uYy uYy uYy @@ -63699,26 +63685,26 @@ nsK "} (123,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT uGF uGF uGF -xIt -xIt +juT +juT uGF uGF uGF @@ -63729,27 +63715,27 @@ uGF cYz cYz ubb -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT uYy uYy uYy @@ -63921,27 +63907,27 @@ nsK "} (124,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT gfl uGF uGF -xIt -xIt -xIt +juT +juT +juT xEg uGF uGF @@ -63950,28 +63936,28 @@ uGF uGF xEg cYz -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT uYy uYy uYy @@ -64143,57 +64129,57 @@ nsK "} (125,1,1) = {" cgS -xIt -xIt -xIt -xIt -vqi -vqi -vqi -vqi -vqi -vqi -vqi -vqi -vqi -vqi +cgS +cgS +cgS +cgS +hsE +hsE +hsE +hsE +hsE +hsE +hsE +nnp +nnp +nnp qTf qTf qTf -vqi -vqi -xIt -xIt -xIt -xIt +nnp +nnp +cgS +juT +juT +juT uGF uGF uGF gfl uGF gfl -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT uYy uxf uYy @@ -64365,58 +64351,58 @@ nsK "} (126,1,1) = {" cgS -xIt -xIt -xIt -xIt -vqi -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +hsE +cgS +cgS +cgS +juT +juT +juT +juT lnR jqf jqf jqf uLt -xIt -vqi -xIt -xIt -xIt -xIt -xIt +juT +hsE +cgS +cgS +cgS +juT +juT jqf jqf jqf jqf jqf -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT uYy uxf uYy @@ -64587,15 +64573,15 @@ nsK "} (127,1,1) = {" cgS -xIt -xIt -xIt -xIt -vqi -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +hsE +cgS +cgS +juT +juT jqf jqf jqf @@ -64604,41 +64590,41 @@ jqf lnR jqf jqf -xIt -vqi -xIt -xIt -xIt -xIt -xIt -xIt +juT +hsE +cgS +cgS +cgS +cgS +juT +juT jqf lnR jqf jqf kjD -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT uYy uYy uYy @@ -64809,14 +64795,14 @@ nsK "} (128,1,1) = {" cgS -xIt -xIt -xIt -xIt -vqi -xIt -xIt -xIt +cgS +cgS +cgS +cgS +hsE +cgS +cgS +juT jqf uLt jqf @@ -64826,40 +64812,40 @@ jqf jqf jqf uLt -xIt -vqi -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +hsE +cgS +cgS +cgS +cgS +cgS +juT +juT jqf uLt jqf kjD kTt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT uxf uYy uYy @@ -65031,14 +65017,14 @@ nsK "} (129,1,1) = {" cgS -xIt -xIt -xIt -xIt -vqi -xIt -xIt -xIt +cgS +cgS +cgS +cgS +hsE +cgS +juT +juT jqf jqf jqf @@ -65048,39 +65034,39 @@ jqf jqf lnR jqf -xIt -vqi -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +hsE +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT jqf jqf jqf ihG kjD -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT uYy uYy uYy @@ -65253,13 +65239,13 @@ nsK "} (130,1,1) = {" cgS -xIt -xIt -xIt -xIt -vqi -xIt -xIt +cgS +cgS +cgS +cgS +hsE +cgS +juT jqf lnR jqf @@ -65270,38 +65256,38 @@ iKs iKs jqf jqf -xIt -vqi -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +hsE +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT jqf jqf aoY kjD kjD -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT uYy uYy uYy @@ -65475,13 +65461,13 @@ nsK "} (131,1,1) = {" cgS -xIt -xIt -xIt -xIt -vqi -xIt -xIt +cgS +cgS +cgS +cgS +hsE +cgS +juT jqf jqf jqf @@ -65492,37 +65478,37 @@ iKs ldC jqf jqf -xIt -vqi -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +nnp +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT jqf lnR kjD kjD kjD -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT uYy uYy uYy @@ -65697,14 +65683,14 @@ nsK "} (132,1,1) = {" cgS -xIt -xIt -xIt -xIt -vqi -xIt -xIt -xIt +cgS +cgS +cgS +cgS +hsE +cgS +juT +juT jqf lnR jqf @@ -65715,36 +65701,36 @@ jqf jqf jqf jqf -vqi -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +nnp +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT jqf jqf kjD kjD aoY -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT xKP uYy uxf @@ -65919,13 +65905,13 @@ nsK "} (133,1,1) = {" cgS -xIt -xIt -xIt -xIt -vqi -xIt -xIt +cgS +cgS +cgS +cgS +hsE +cgS +juT jqf jqf jqf @@ -65938,35 +65924,35 @@ jqf lnR jqf laW -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +juT lnR jqf kjD aoY kjD -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT uYy uYy pKS @@ -66141,14 +66127,14 @@ nsK "} (134,1,1) = {" cgS -xIt -xIt -xIt -xIt -vqi -xIt -xIt -xIt +cgS +cgS +cgS +cgS +hsE +cgS +juT +juT jqf uLt gGl @@ -66161,33 +66147,33 @@ uLt jqf laW jqf -xIt -xIt -xIt -xIt -xIt -vqi -vqi -vqi -vqi +juT +cgS +cgS +cgS +cgS +hsE +hsE +nnp +nnp laW tOc tOc tOc tOc -vqi -vqi -vqi -vqi -vqi -vqi -vqi -vqi -xIt -xIt -xIt -xIt -xIt +nnp +hsE +hsE +hsE +hsE +hsE +hsE +hsE +cgS +cgS +cgS +cgS +juT uYy uYy uYy @@ -66363,13 +66349,13 @@ nsK "} (135,1,1) = {" cgS -xIt -xIt -xIt -xIt -vqi -xIt -xIt +cgS +cgS +cgS +cgS +hsE +cgS +juT jqf jqf jqf @@ -66383,33 +66369,33 @@ jqf lnR laW iKs -xIt -xIt -xIt -xIt -xIt -vqi -xIt -xIt -xIt -xIt +juT +cgS +cgS +cgS +cgS +hsE +cgS +cgS +juT +juT kjD kjD kjD aoY -xIt -xIt -xIt -xIt -xIt -xIt -xIt -vqi -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +cgS +cgS +hsE +cgS +cgS +cgS +cgS +juT uYy uYy uxf @@ -66585,13 +66571,13 @@ nsK "} (136,1,1) = {" cgS -xIt -xIt -xIt -xIt -vqi -xIt -xIt +cgS +cgS +cgS +cgS +hsE +cgS +juT jqf lnR jqf @@ -66605,33 +66591,33 @@ jqf jqf laW jqf -xIt -xIt -xIt -xIt -xIt -vqi -xIt -xIt -xIt -xIt +juT +cgS +cgS +cgS +cgS +hsE +cgS +cgS +cgS +juT kTt aoY kjD kjD kTt -xIt -xIt -xIt -xIt -xIt -xIt -vqi -xIt -xIt -xIt -xIt -xIt +juT +cgS +cgS +cgS +cgS +cgS +hsE +cgS +cgS +cgS +cgS +juT uYy uxf uYy @@ -66807,14 +66793,14 @@ nsK "} (137,1,1) = {" cgS -xIt -xIt -xIt -xIt -vqi -vqi -vqi -vqi +cgS +cgS +cgS +cgS +hsE +hsE +nnp +nnp laW laW laW @@ -66827,33 +66813,33 @@ laW prh laW lnR -xIt -xIt -xIt -xIt -xIt -vqi -xIt -xIt -xIt -xIt +juT +cgS +cgS +cgS +cgS +hsE +cgS +cgS +cgS +juT kjD kjD kjD aoY kjD -xIt -xIt -xIt -xIt -xIt -xIt -vqi -xIt -xIt -xIt -xIt -xIt +juT +juT +juT +cgS +cgS +cgS +hsE +cgS +cgS +cgS +cgS +juT uYy uYy uYy @@ -67029,15 +67015,15 @@ nsK "} (138,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT jqf lnR jqf @@ -67049,33 +67035,33 @@ jqf jqf jqf jqf -xIt -xIt -xIt -xIt -xIt -vqi -xIt -xIt -xIt -xIt -xIt +juT +cgS +cgS +cgS +cgS +hsE +cgS +cgS +cgS +juT +juT kjD kjD kjD aoY kjD kjD -xIt -xIt -xIt -xIt -vqi -xIt -xIt -xIt -xIt -xIt +juT +cgS +cgS +cgS +hsE +cgS +cgS +cgS +cgS +juT uYy uYy uYy @@ -67251,15 +67237,15 @@ nsK "} (139,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT jqf jqf jqf @@ -67271,33 +67257,33 @@ jqf jqf jqf iKs -xIt -xIt -xIt -xIt -xIt -vqi -xIt -xIt -xIt -xIt -xIt +juT +cgS +cgS +cgS +cgS +hsE +cgS +cgS +cgS +cgS +juT kjD kjD kjD kjD gLO aoY -xIt -xIt -xIt -xIt -vqi -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +nnp +juT +juT +juT +juT +juT uYy uYy uYy @@ -67473,15 +67459,15 @@ nsK "} (140,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT jqf lnR jqf @@ -67493,17 +67479,17 @@ jqf jqf lnR jqf -xIt -xIt -xIt -xIt -xIt -vqi -xIt -xIt -xIt -xIt -xIt +juT +cgS +cgS +cgS +cgS +hsE +cgS +cgS +cgS +cgS +juT kjD kjD kjD @@ -67511,10 +67497,10 @@ kjD kjD kjD kjD -xIt -xIt -xIt -vqi +juT +juT +juT +nnp kjD tzY tzY @@ -67695,16 +67681,16 @@ nsK "} (141,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT jqf jqf jqf @@ -67714,19 +67700,19 @@ lnR jqf jqf lnR -xIt -xIt -xIt -xIt -xIt -xIt -vqi -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +cgS +hsE +cgS +cgS +cgS +cgS +juT +juT aoY kjD kjD @@ -67734,8 +67720,8 @@ aoY ihG kjD kjD -xIt -xIt +juT +juT tOc kjD kjD @@ -67917,16 +67903,16 @@ nsK "} (142,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT jqf lnR jqf @@ -67937,18 +67923,18 @@ jqf jqf jqf jqf -xIt -xIt -xIt -xIt -xIt -vqi -xIt -xIt -xIt -xIt -xIt -xIt +juT +cgS +cgS +cgS +cgS +hsE +cgS +cgS +cgS +cgS +cgS +juT kjD kjD kjD @@ -67956,7 +67942,7 @@ kjD kjD kjD kjD -xIt +juT kjD tOc aoY @@ -68139,17 +68125,17 @@ nsK "} (143,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT uLt jqf lnR @@ -68159,18 +68145,18 @@ uLt lnR jqf jqf -xIt -xIt -xIt -xIt -xIt -vqi -xIt -xIt -xIt -xIt -xIt -xIt +juT +cgS +cgS +cgS +cgS +hsE +cgS +cgS +cgS +cgS +juT +juT kjD kjD kTt @@ -68361,37 +68347,37 @@ nsK "} (144,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT jqf jqf jqf jqf jqf jqf -xIt -xIt -xIt -xIt -xIt -xIt -xIt -vqi -xIt -xIt -xIt -xIt -xIt +juT +juT +juT +cgS +cgS +cgS +cgS +hsE +cgS +cgS +juT +juT +juT jqf kjD kjD @@ -68583,43 +68569,43 @@ nsK "} (145,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT jqf jqf lnR jqf jqf -xIt -xIt -xIt -xIt -xIt -xIt -xIt -vqi -xIt -xIt -xIt +juT +cgS +cgS +cgS +cgS +cgS +cgS +hsE +cgS +juT +juT uLt jqf jqf aoY kjD kTt -xIt -xIt +juT +juT kjD kjD kjD @@ -68805,51 +68791,51 @@ nsK "} (146,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT +juT jqf jqf -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -vqi -xIt -xIt +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +hsE +juT +juT jqf jqf jqf jqf kjD -xIt -xIt -xIt -xIt -xIt +juT +juT +juT +juT +juT kjD kjD kjD -vqi -xIt -xIt -xIt +nnp +juT +juT +juT tzY tzY cIQ @@ -69027,52 +69013,52 @@ nsK "} (147,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT jqf jqf jqf lnR -xIt -xIt -xIt -xIt -xIt -xIt -xIt -vqi -vqi +juT +cgS +cgS +cgS +cgS +cgS +cgS +hsE +nnp laW laW prh laW prh tOc -vqi -vqi -vqi -vqi -vqi -vqi +nnp +hsE +hsE +hsE +nnp +nnp tOc -vqi -vqi -xIt -xIt -xIt -xIt +nnp +nnp +cgS +cgS +juT +juT tzY cIQ cIQ @@ -69249,52 +69235,52 @@ nsK "} (148,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT jqf lnR jqf jqf -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +juT jqf jqf jqf jqf jqf -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +cgS +juT +juT +juT +cgS +cgS +cgS +cgS +juT tzY cIQ cIQ @@ -69471,52 +69457,52 @@ nsK "} (149,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT jqf jqf jqf jqf jqf -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +cgS +cgS +juT jqf jqf jqf lnR jqf -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT cIQ cIQ cIQ @@ -69693,52 +69679,52 @@ nsK "} (150,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT jqf jqf uLt jqf jqf uLt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +juT +juT +juT jqf lnR jqf jqf -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT tzY tzY bzm @@ -69915,53 +69901,53 @@ nsK "} (151,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT jqf lnR jqf jqf jqf jqf -xIt -xIt -xIt -xIt +juT +cgS +cgS +juT jqf uLt jqf jqf uLt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT tzY cIQ jIg @@ -70137,53 +70123,53 @@ nsK "} (152,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT jqf jqf jqf lnR jqf jqf -xIt -xIt -xIt -xIt +juT +juT +juT +juT lnR jqf jqf jqf -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT tzY cIQ jIg @@ -70359,52 +70345,52 @@ nsK "} (153,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT jqf qcB jqf jqf jqf jqf -xIt -xIt +juT +juT jqf jqf jqf jqf -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT tzY tzY cIQ @@ -70581,21 +70567,21 @@ nsK "} (154,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT jqf iKs iKs @@ -70609,24 +70595,24 @@ jqf jqf nYL jqf -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT tzY tzY qDM @@ -70803,20 +70789,20 @@ nsK "} (155,1,1) = {" cgS -xIt -xIt -xIt -vqi -vqi -vqi -vqi -vqi -vqi -vqi -vqi -vqi -vqi -vqi +cgS +cgS +cgS +hsE +hsE +hsE +hsE +hsE +hsE +hsE +hsE +hsE +hsE +nnp laW laW prQ @@ -70832,24 +70818,24 @@ jqf jqf jqf jqf -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT +juT +juT +cgS +cgS +cgS +cgS +cgS +juT +juT tzY cIQ jIg @@ -71025,20 +71011,20 @@ nsK "} (156,1,1) = {" cgS -xIt -xIt -xIt -vqi -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +hsE +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT jqf gGl jqf @@ -71054,23 +71040,23 @@ jqf jqf lnR jqf -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +cgS +cgS +juT +juT kjD kjD -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +juT +cgS +cgS +juT +juT sCz tzY cIQ @@ -71247,19 +71233,19 @@ nsK "} (157,1,1) = {" cgS -xIt -xIt -xIt -vqi -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +hsE +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT jqf jqf jqf @@ -71268,8 +71254,8 @@ laW lnR jqf jqf -xIt -xIt +juT +juT jqf jqf jqf @@ -71277,21 +71263,21 @@ jqf jqf jqf jqf -xIt -xIt -xIt -xIt -xIt -xIt +juT +cgS +cgS +cgS +cgS +juT kjD aoY kjD kjD kjD -xIt -xIt -xIt -xIt +juT +juT +juT +juT tzY tzY cIQ @@ -71469,18 +71455,18 @@ nsK "} (158,1,1) = {" cgS -xIt -xIt -xIt -vqi -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +hsE +cgS +cgS +cgS +cgS +juT +juT +juT +juT jqf ntZ jqf @@ -71489,29 +71475,29 @@ ldC laW jqf wnr -xIt -xIt -xIt -xIt -xIt +juT +juT +juT +juT +juT jqf jqf jqf lnR jqf -xIt -xIt -xIt -vqi -vqi -vqi +juT +juT +cgS +hsE +hsE +nnp tOc tOc tOc tOc tOc -vqi -vqi +nnp +nnp kjD kjD cIQ @@ -71691,15 +71677,15 @@ nsK "} (159,1,1) = {" cgS -xIt -xIt -xIt -vqi -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +hsE +cgS +cgS +cgS +juT +juT jqf uLt jqf @@ -71711,22 +71697,22 @@ jqf mYK jqf uLt -xIt -xIt -xIt -xIt -xIt -xIt +juT +cgS +cgS +cgS +juT +juT uLt jqf jqf jqf uLt -xIt -xIt -vqi -xIt -xIt +juT +juT +hsE +juT +juT kTt kjD aoY @@ -71913,14 +71899,14 @@ nsK "} (160,1,1) = {" cgS -xIt -xIt -xIt -vqi -xIt -xIt -xIt -xIt +cgS +cgS +cgS +hsE +cgS +cgS +cgS +juT jqf jqf jqf @@ -71931,23 +71917,23 @@ jqf qSw lnR laW -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +juT +cgS +cgS +cgS +cgS +juT jqf jqf jqf jqf jqf jqf -xIt -vqi -xIt +juT +nnp +juT kjD kjD kjD @@ -72135,14 +72121,14 @@ nsK "} (161,1,1) = {" cgS -xIt -xIt -xIt -vqi -xIt -xIt -xIt -xIt +cgS +cgS +cgS +hsE +cgS +cgS +juT +juT lnR jqf jqf @@ -72152,23 +72138,23 @@ jqf lnR jqf jqf -vqi -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +nnp +juT +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT jqf jqf lnR jqf jqf kjD -vqi +nnp kjD kjD kjD @@ -72357,13 +72343,13 @@ nsK "} (162,1,1) = {" cgS -xIt -xIt -xIt -vqi -xIt -xIt -xIt +cgS +cgS +cgS +hsE +cgS +juT +juT jqf jqf jqf @@ -72372,19 +72358,19 @@ lnR jqf jqf jqf -xIt -xIt -vqi -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +nnp +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT jqf jqf jqf @@ -72579,12 +72565,12 @@ nsK "} (163,1,1) = {" cgS -xIt -xIt -xIt -vqi -xIt -xIt +cgS +cgS +cgS +hsE +cgS +juT jqf lnR jqf @@ -72593,21 +72579,21 @@ drL jqf jqf jqf -xIt -xIt -xIt -vqi -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +hsE +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT jqf uLt jqf @@ -72624,8 +72610,8 @@ kjD cpa ihG kjD -xIt -xIt +juT +juT tzY tzY ilb @@ -72801,12 +72787,12 @@ nsK "} (164,1,1) = {" cgS -xIt -xIt -xIt -vqi -xIt -xIt +cgS +cgS +cgS +hsE +cgS +juT jqf jqf jqf @@ -72815,22 +72801,22 @@ jqf jqf jqf jqf -xIt -xIt -xIt -vqi -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +hsE +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT jqf kjD aoY @@ -72845,9 +72831,9 @@ kjD kjD tOc kjD -xIt -xIt -xIt +juT +juT +juT tzY cIQ ilb @@ -73023,12 +73009,12 @@ nsK "} (165,1,1) = {" cgS -xIt -xIt -xIt -vqi -xIt -xIt +cgS +cgS +cgS +hsE +cgS +juT uLt lnR jqf @@ -73038,22 +73024,22 @@ jqf jqf jqf jqf -xIt -xIt -vqi -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +cgS +hsE +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT kjD kjD tOc @@ -73063,13 +73049,13 @@ kjD kjD kjD kjD -xIt -xIt -vqi -xIt -xIt -xIt -xIt +juT +juT +nnp +juT +juT +cgS +juT tzY cIQ jIg @@ -73245,13 +73231,13 @@ nsK "} (166,1,1) = {" cgS -xIt -xIt -xIt -vqi -xIt -xIt -xIt +cgS +cgS +cgS +hsE +cgS +juT +juT jqf jqf jqf @@ -73260,38 +73246,38 @@ jqf jqf lnR jqf -xIt -xIt -vqi -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +cgS +hsE +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT kjD tOc aoY kjD kjD -xIt +juT kjD -xIt -xIt -xIt -vqi -xIt -xIt -xIt -xIt +juT +juT +cgS +hsE +cgS +cgS +cgS +juT cIQ sCz jIg @@ -73467,14 +73453,14 @@ nsK "} (167,1,1) = {" cgS -xIt -xIt -xIt -vqi -xIt -xIt -xIt -xIt +cgS +cgS +cgS +hsE +cgS +cgS +juT +juT jqf pyu uLt @@ -73482,39 +73468,39 @@ lnR jqf uLt jqf -xIt -xIt -vqi -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +cgS +hsE +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT kjD tOc kjD kjD kTt -xIt -xIt -xIt -xIt -xIt -vqi -xIt -xIt -xIt -xIt -xIt +juT +juT +juT +cgS +cgS +hsE +cgS +cgS +cgS +juT +juT tzY tyz pKS @@ -73689,55 +73675,55 @@ nsK "} (168,1,1) = {" cgS -xIt -xIt -xIt -vqi -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +hsE +cgS +cgS +cgS +juT +juT jqf jqf jqf jqf jqf -xIt -xIt -xIt -vqi -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +hsE +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT tOc tOc cpa -vqi -vqi -vqi -vqi -vqi -vqi -vqi -xIt -xIt -xIt -xIt -xIt -xIt +nnp +nnp +hsE +hsE +hsE +hsE +hsE +cgS +cgS +cgS +cgS +juT +juT ndb ilb pKS @@ -73911,55 +73897,55 @@ nsK "} (169,1,1) = {" cgS -xIt -xIt -xIt -vqi -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +hsE +cgS +cgS +cgS +cgS +juT +juT jqf jqf jqf -xIt -xIt -xIt -xIt -vqi -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +juT +juT +cgS +cgS +hsE +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +juT +juT +juT +juT +juT +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS ndb ndb pKS @@ -74133,55 +74119,55 @@ nsK "} (170,1,1) = {" cgS -xIt -xIt -xIt -vqi -vqi -vqi -vqi -vqi -vqi -vqi -vqi -vqi -vqi -vqi -vqi -vqi -vqi -vqi -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +hsE +hsE +hsE +hsE +hsE +hsE +nnp +nnp +nnp +nnp +nnp +hsE +hsE +hsE +hsE +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS ndb pKS pKS @@ -74355,55 +74341,55 @@ nsK "} (171,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS ndb ndb ndb @@ -74577,55 +74563,55 @@ nsK "} (172,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS ndb ndb ndb @@ -74799,55 +74785,55 @@ nsK "} (173,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS ndb ndb ndb @@ -75021,55 +75007,55 @@ nsK "} (174,1,1) = {" cgS -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt -xIt +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS +cgS ndb ndb ndb diff --git a/_maps/map_files/icy_caves/icy_caves.dmm b/_maps/map_files/icy_caves/icy_caves.dmm index acdd457eb01af..705a317d8ef4d 100644 --- a/_maps/map_files/icy_caves/icy_caves.dmm +++ b/_maps/map_files/icy_caves/icy_caves.dmm @@ -413,7 +413,7 @@ /turf/open/floor/tile/dark, /area/icy_caves/outpost/security) "bS" = ( -/turf/closed/mineral/smooth/darkfrostwall, +/turf/closed/mineral/smooth/darkfrostwall/indestructible, /area/icy_caves/caves/northern) "bU" = ( /obj/structure/cable, @@ -572,7 +572,7 @@ /turf/closed/wall/r_wall, /area/icy_caves/caves/northwestmonorail/breakroom) "cK" = ( -/turf/closed/mineral/smooth/darkfrostwall, +/turf/closed/mineral/smooth/darkfrostwall/indestructible, /area/icy_caves/caves/northwestmonorail) "cL" = ( /obj/structure/monorail, @@ -2155,9 +2155,6 @@ /obj/machinery/vending/security, /turf/open/floor/prison/bright_clean/two, /area/icy_caves/caves/northwestmonorail) -"mv" = ( -/turf/closed/mineral/smooth/darkfrostwall, -/area/space) "mw" = ( /obj/structure/bookcase/manuals/research_and_development, /obj/machinery/light{ @@ -2835,7 +2832,7 @@ /obj/machinery/door/poddoor/timed_late/containment/landing_zone{ dir = 2 }, -/turf/closed/mineral/smooth/darkfrostwall, +/turf/closed/mineral/smooth/darkfrostwall/indestructible, /area/icy_caves/outpost/outside) "qg" = ( /obj/structure/closet/secure_closet/miner, @@ -4356,7 +4353,7 @@ /turf/open/floor/wood, /area/icy_caves/outpost/dorms) "xa" = ( -/turf/closed/mineral/smooth/darkfrostwall, +/turf/closed/mineral/smooth/darkfrostwall/indestructible, /area/icy_caves/caves/west) "xc" = ( /obj/machinery/atmospherics/pipe/simple/green/hidden{ @@ -7385,7 +7382,7 @@ /turf/open/floor/tile/dark, /area/icy_caves/outpost/refinery) "LY" = ( -/turf/closed/mineral/smooth/darkfrostwall, +/turf/closed/mineral/smooth/darkfrostwall/indestructible, /area/icy_caves/outpost/outside) "LZ" = ( /obj/machinery/atmospherics/pipe/manifold/green/hidden{ @@ -7433,7 +7430,7 @@ /turf/open/floor/plating, /area/icy_caves/outpost/mining/east) "Ml" = ( -/turf/closed/mineral/smooth/darkfrostwall, +/turf/closed/mineral/smooth/darkfrostwall/indestructible, /area/icy_caves/outpost/LZ1) "Mm" = ( /obj/effect/turf_decal/warning_stripes/thin{ @@ -7449,7 +7446,7 @@ /area/icy_caves/outpost/medbay) "Mr" = ( /obj/effect/landmark/lv624/fog_blocker/xeno_spawn, -/turf/closed/mineral/smooth/darkfrostwall, +/turf/closed/mineral/smooth/darkfrostwall/indestructible, /area/icy_caves/caves/rock) "Ms" = ( /obj/machinery/door/poddoor/timed_late/containment/landing_zone/lz2, @@ -7964,7 +7961,7 @@ /area/icy_caves/caves/east) "OU" = ( /obj/structure/sign/double/barsign/carp, -/turf/closed/mineral/smooth/darkfrostwall, +/turf/closed/mineral/smooth/darkfrostwall/indestructible, /area/icy_caves/caves/rock) "OZ" = ( /obj/structure/cargo_container/gorg, @@ -8695,7 +8692,7 @@ /obj/machinery/door/poddoor/timed_late/containment/landing_zone{ dir = 2 }, -/turf/closed/mineral/smooth/darkfrostwall, +/turf/closed/mineral/smooth/darkfrostwall/indestructible, /area/icy_caves/outpost/LZ1) "Tg" = ( /obj/machinery/light/small{ @@ -9070,7 +9067,7 @@ /area/icy_caves/caves/northwestmonorail) "Vd" = ( /obj/machinery/door/poddoor/timed_late/containment/landing_zone/lz2, -/turf/closed/mineral/smooth/darkfrostwall, +/turf/closed/mineral/smooth/darkfrostwall/indestructible, /area/icy_caves/caves) "Ve" = ( /obj/machinery/atmospherics/pipe/simple/green/hidden, @@ -9376,7 +9373,7 @@ /obj/machinery/door/poddoor/timed_late/containment/landing_zone{ dir = 2 }, -/turf/closed/mineral/smooth/darkfrostwall, +/turf/closed/mineral/smooth/darkfrostwall/indestructible, /area/icy_caves/caves) "Wx" = ( /turf/open/floor/plating/ground/snow/layer2, @@ -9558,7 +9555,7 @@ /obj/machinery/door/poddoor/timed_late/containment/landing_zone/lz2{ dir = 1 }, -/turf/closed/mineral/smooth/darkfrostwall, +/turf/closed/mineral/smooth/darkfrostwall/indestructible, /area/icy_caves/caves) "Xp" = ( /obj/structure/cable, @@ -9744,7 +9741,7 @@ /turf/open/floor/plating, /area/icy_caves/outpost/security) "Yf" = ( -/turf/closed/mineral/smooth/darkfrostwall, +/turf/closed/mineral/smooth/darkfrostwall/indestructible, /area/icy_caves/caves) "Yi" = ( /obj/machinery/computer/intel_computer, @@ -9800,7 +9797,7 @@ /obj/machinery/door/poddoor/timed_late/containment/landing_zone/lz2{ dir = 2 }, -/turf/closed/mineral/smooth/darkfrostwall, +/turf/closed/mineral/smooth/darkfrostwall/indestructible, /area/icy_caves/caves) "Yy" = ( /obj/structure/bed/roller, @@ -10058,7 +10055,7 @@ }, /area/icy_caves/outpost/LZ2) "ZP" = ( -/turf/closed/mineral/smooth/darkfrostwall, +/turf/closed/mineral/smooth/darkfrostwall/indestructible, /area/icy_caves/caves/rock) "ZR" = ( /turf/closed/wall/r_wall, @@ -10090,7 +10087,7 @@ /area/icy_caves/outpost/refinery) "ZY" = ( /obj/machinery/door/poddoor/timed_late/containment/landing_zone, -/turf/closed/mineral/smooth/darkfrostwall, +/turf/closed/mineral/smooth/darkfrostwall/indestructible, /area/icy_caves/caves) "ZZ" = ( /obj/structure/morgue{ @@ -10260,9 +10257,9 @@ EM MN MN MN -mv -mv -mv +EM +EM +EM ZP ZP ZP @@ -10416,9 +10413,9 @@ EM MN Qb MN -mv -mv -mv +EM +EM +EM ZP ZP ZP @@ -10572,9 +10569,9 @@ EM MN MN MN -mv -mv -mv +EM +EM +EM ZP ZP ZP @@ -10725,12 +10722,12 @@ EM "} (5,1,1) = {" EM -mv -mv -mv -mv -mv -mv +EM +EM +EM +EM +EM +EM ZP ZP ZP @@ -10881,12 +10878,12 @@ EM "} (6,1,1) = {" EM -mv -mv -mv -mv -mv -mv +EM +EM +EM +EM +EM +EM ZP ZP ZP diff --git a/_maps/map_files/oscar_outpost/oscar_outpost.dmm b/_maps/map_files/oscar_outpost/oscar_outpost.dmm index d873a9adb2b32..4384c613e13d9 100644 --- a/_maps/map_files/oscar_outpost/oscar_outpost.dmm +++ b/_maps/map_files/oscar_outpost/oscar_outpost.dmm @@ -1139,7 +1139,7 @@ /turf/open/floor/plating/ground/dirtgrassborder/corner2, /area/oscar_outpost/village/fairgrounds) "hX" = ( -/obj/item/weapon/gun/tl102/hsg_nest{ +/obj/item/weapon/gun/hsg_102/hsg_nest{ dir = 8 }, /turf/open/floor/plating/ground/dirt2, @@ -1367,29 +1367,29 @@ /turf/open/floor/tile/dark, /area/oscar_outpost) "jw" = ( -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, /obj/effect/ai_node, /turf/open/floor/plating/ground/dirt2, /area/oscar_outpost/village/fairgrounds) @@ -1453,7 +1453,7 @@ /turf/open/floor/tile/dark, /area/oscar_outpost/base) "jS" = ( -/obj/item/weapon/gun/tl102/hsg_nest{ +/obj/item/weapon/gun/hsg_102/hsg_nest{ dir = 8 }, /turf/open/floor/plating/ground/dirt2, @@ -2449,29 +2449,29 @@ /turf/open/floor/plating/ground/dirt, /area/oscar_outpost/outside/road) "qZ" = ( -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, /obj/structure/barricade/sandbags{ name = "trench lining"; pixel_y = -7 @@ -2615,29 +2615,29 @@ /turf/open/floor/tile/dark, /area/oscar_outpost) "rP" = ( -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, /obj/structure/barricade/sandbags{ dir = 4; name = "trench lining"; @@ -3029,7 +3029,7 @@ /turf/open/floor, /area/oscar_outpost/village/south) "uA" = ( -/obj/item/weapon/gun/tl102/hsg_nest{ +/obj/item/weapon/gun/hsg_102/hsg_nest{ dir = 1; pixel_y = 7 }, @@ -3387,29 +3387,29 @@ /turf/open/floor/plating/ground/dirt, /area/oscar_outpost/village/fairgrounds) "xd" = ( -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, /turf/open/floor/plating/ground/dirt2, /area/oscar_outpost/village/fairgrounds) "xe" = ( @@ -3625,7 +3625,7 @@ /turf/open/floor/plating/ground/dirt2, /area/oscar_outpost/outside/underground) "yn" = ( -/obj/item/weapon/gun/tl102/hsg_nest{ +/obj/item/weapon/gun/hsg_102/hsg_nest{ dir = 1; pixel_y = 7 }, @@ -6761,7 +6761,7 @@ /turf/open/floor, /area/oscar_outpost/village) "Md" = ( -/obj/item/weapon/gun/tl102/hsg_nest{ +/obj/item/weapon/gun/hsg_102/hsg_nest{ dir = 4 }, /obj/structure/cable, diff --git a/_maps/map_files/slumbridge/slumbridge.dmm b/_maps/map_files/slumbridge/slumbridge.dmm index 37065f95594e4..0ce27b6e43838 100644 --- a/_maps/map_files/slumbridge/slumbridge.dmm +++ b/_maps/map_files/slumbridge/slumbridge.dmm @@ -18,6 +18,12 @@ /obj/effect/ai_node, /turf/open/floor/marking/asteroidwarning, /area/slumbridge/outside/northwest/nearlz) +"abi" = ( +/obj/structure/platform/rockcliff/icycliff{ + dir = 5 + }, +/turf/closed/mineral/smooth/darkfrostwall/indestructible, +/area/slumbridge/caves/rock) "abr" = ( /obj/structure/closet/wardrobe/orange, /turf/open/floor/prison/plate, @@ -52,12 +58,6 @@ /obj/effect/landmark/corpsespawner/engineer/regular, /turf/open/floor/plating, /area/slumbridge/inside/engi/engine) -"adD" = ( -/obj/structure/prop/mainship/hangar_stencil/two, -/turf/open/floor/tile/dark/yellow2{ - dir = 10 - }, -/area/slumbridge/landingzonetwo) "adG" = ( /obj/structure/table, /obj/item/reagent_containers/glass/bottle/ammonia, @@ -1355,13 +1355,6 @@ /obj/effect/ai_node, /turf/open/floor/plating/ground/concrete, /area/slumbridge/outside/northeast) -"beC" = ( -/obj/machinery/computer/shuttle/shuttle_control/dropship, -/obj/structure/table/mainship, -/turf/open/floor/tile/dark/red2{ - dir = 1 - }, -/area/slumbridge/landingzoneone) "beH" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/gibspawner/human, @@ -2114,14 +2107,6 @@ "bDN" = ( /turf/open/floor/stairs/rampbottom, /area/slumbridge/outside/northeast/bridges) -"bDO" = ( -/obj/structure/platform/metalplatform{ - dir = 4 - }, -/turf/open/floor/tile/dark/yellow2{ - dir = 6 - }, -/area/slumbridge/landingzonetwo) "bDT" = ( /obj/effect/spawner/random/misc/structure/supplycrate/normalweighted, /turf/open/floor/plating, @@ -2566,6 +2551,12 @@ /obj/structure/flora/ausbushes/fullgrass, /turf/open/ground/grass/weedable, /area/slumbridge/outside/southeast) +"bSw" = ( +/obj/structure/platform/rockcliff/icycliff{ + dir = 1 + }, +/turf/closed/mineral/smooth/darkfrostwall/indestructible, +/area/slumbridge/caves/rock) "bSF" = ( /turf/open/floor/bcircuit, /area/slumbridge/inside/engi/engineroom) @@ -4153,9 +4144,6 @@ /obj/structure/cable, /turf/open/floor/plating/asteroidfloor, /area/slumbridge/outside/northeast/bridges) -"ddg" = ( -/turf/closed/mineral/smooth/darkfrostwall, -/area/slumbridge/caves/rock) "ddk" = ( /obj/effect/spawner/random/misc/structure/supplycrate/secureweighted, /turf/open/floor/marking/bot, @@ -5558,6 +5546,12 @@ }, /turf/open/floor/plating/ground/mars/random/cave/darker, /area/slumbridge/outside/northeast) +"ekp" = ( +/obj/structure/platform/rockcliff/icycliff{ + dir = 9 + }, +/turf/closed/mineral/smooth/darkfrostwall/indestructible, +/area/slumbridge/caves/rock) "ekz" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/green/hidden, @@ -11677,12 +11671,6 @@ /obj/effect/ai_node, /turf/open/floor/plating/ground/concrete, /area/slumbridge/outside/northeast) -"iKb" = ( -/obj/machinery/computer/shuttle/shuttle_control/dropship, -/obj/structure/table/mainship, -/obj/structure/cable, -/turf/open/floor/plating/ground/snow, -/area/slumbridge/landingzonetwo) "iKz" = ( /obj/structure/barricade/snow{ dir = 8 @@ -11890,10 +11878,6 @@ }, /turf/open/floor/tile/green/greentaupe, /area/slumbridge/inside/medical/surgery) -"iSc" = ( -/obj/effect/landmark/patrol_point/som/som_11, -/turf/open/floor/tile/dark/yellow2, -/area/slumbridge/landingzonetwo) "iSw" = ( /obj/structure/window_frame/wood, /turf/open/floor/wood/variable, @@ -13145,12 +13129,6 @@ /obj/structure/cable, /turf/open/floor, /area/slumbridge/inside/engi/south) -"jPl" = ( -/obj/structure/platform/rockcliff/icycliff{ - dir = 5 - }, -/turf/closed/mineral/smooth/darkfrostwall, -/area/slumbridge/caves/rock) "jPE" = ( /obj/machinery/atmospherics/pipe/simple/green/hidden{ dir = 5 @@ -14110,12 +14088,6 @@ /obj/structure/cable, /turf/open/floor/plating/ground/mars/random/cave/darker, /area/slumbridge/caves/mining) -"kCD" = ( -/obj/structure/platform/rockcliff/icycliff{ - dir = 6 - }, -/turf/closed/mineral/smooth/darkfrostwall, -/area/slumbridge/caves/rock) "kCH" = ( /obj/structure/bed/chair{ dir = 4 @@ -15045,12 +15017,6 @@ }, /turf/open/floor/asteroidfloor, /area/slumbridge/landingzoneone) -"ljW" = ( -/obj/machinery/door/poddoor/timed_late/containment/landing_zone/lz2{ - dir = 2 - }, -/turf/closed/mineral/smooth/darkfrostwall, -/area/slumbridge/caves/rock/nearlz) "lka" = ( /obj/structure/prop/mainship/telecomms/hub, /turf/open/floor/mainship/tcomms, @@ -15902,12 +15868,6 @@ /obj/effect/landmark/weed_node, /turf/open/floor/tile/white, /area/slumbridge/inside/colony/southerndome) -"lOS" = ( -/obj/structure/platform/rockcliff/icycliff{ - dir = 9 - }, -/turf/closed/mineral/smooth/darkfrostwall, -/area/slumbridge/caves/rock) "lOZ" = ( /obj/effect/landmark/lv624/fog_blocker/xeno_spawn, /obj/effect/landmark/xeno_resin_door, @@ -18307,6 +18267,11 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood, /area/slumbridge/inside/colony/dorms) +"nCu" = ( +/turf/open/floor/tile/dark/yellow2{ + dir = 10 + }, +/area/slumbridge/landingzonetwo) "nCw" = ( /obj/machinery/light, /turf/open/floor, @@ -18743,6 +18708,12 @@ /obj/effect/ai_node, /turf/open/floor/prison/kitchen, /area/slumbridge/inside/colony/kitchen) +"nSK" = ( +/obj/structure/stairs/seamless/edge{ + dir = 8 + }, +/turf/open/floor/tile/dark, +/area/slumbridge/landingzonetwo) "nTb" = ( /obj/machinery/atmospherics/pipe/simple/green/hidden{ dir = 5 @@ -21678,6 +21649,10 @@ /obj/effect/landmark/weed_node, /turf/open/floor/plating/ground/snow/layer0, /area/slumbridge/outside/southwest) +"qdz" = ( +/obj/structure/prop/mainship/hangar_stencil/two, +/turf/open/floor/tile/dark, +/area/slumbridge/landingzonetwo) "qdH" = ( /obj/machinery/atmospherics/pipe/simple/green/hidden, /obj/structure/cable, @@ -22458,6 +22433,12 @@ }, /turf/open/floor/plating/ground/snow, /area/slumbridge/outside/southwest/nearlz) +"qFO" = ( +/obj/structure/stairs/seamless{ + dir = 4 + }, +/turf/open/floor/tile/dark, +/area/slumbridge/landingzonetwo) "qFT" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/green/hidden{ @@ -25821,6 +25802,10 @@ /obj/structure/cable, /turf/open/floor/tile/green/greentaupe, /area/slumbridge/inside/hydrotreatment) +"tak" = ( +/obj/effect/landmark/patrol_point/som/som_11, +/turf/open/floor/tile/dark, +/area/slumbridge/landingzonetwo) "taC" = ( /obj/structure/rock/basalt/pile, /turf/open/floor/plating/ground/mars/random/cave, @@ -26434,10 +26419,6 @@ }, /turf/open/floor/plating/fake_space, /area/slumbridge/outside/southeast) -"tyJ" = ( -/obj/structure/prop/mainship/hangar_stencil/two, -/turf/open/floor/tile/dark/yellow2, -/area/slumbridge/landingzonetwo) "tzA" = ( /obj/structure/disposalpipe/junction/flipped{ dir = 4 @@ -26644,6 +26625,12 @@ /obj/machinery/atmospherics/pipe/simple/green/hidden, /turf/open/floor/tile/blue, /area/slumbridge/inside/houses/surgery/garbledradio) +"tGR" = ( +/obj/structure/platform/rockcliff/icycliff{ + dir = 6 + }, +/turf/closed/mineral/smooth/darkfrostwall/indestructible, +/area/slumbridge/caves/rock) "tGX" = ( /obj/structure/rock/basalt/pile/alt, /obj/effect/ai_node, @@ -28088,12 +28075,6 @@ /obj/effect/landmark/weed_node, /turf/open/floor/tile/bar, /area/slumbridge/inside/houses/recreational) -"uPi" = ( -/obj/structure/platform/rockcliff/icycliff{ - dir = 1 - }, -/turf/closed/mineral/smooth/darkfrostwall, -/area/slumbridge/caves/rock) "uPr" = ( /obj/effect/landmark/corpsespawner/scientist, /obj/effect/turf_decal/tracks/wheels/bloody{ @@ -28482,6 +28463,11 @@ /obj/machinery/atmospherics/pipe/manifold/green/hidden, /turf/open/floor/tile/white, /area/slumbridge/inside/medical/southern) +"veW" = ( +/obj/structure/table/mainship, +/obj/machinery/computer/shuttle/shuttle_control/dropship, +/turf/open/floor/tile/dark/red2, +/area/slumbridge/landingzoneone) "vfe" = ( /obj/effect/landmark/corpsespawner/engineer/regular, /turf/open/floor, @@ -29454,6 +29440,12 @@ "vNL" = ( /turf/open/floor/plating/ground/desertdam/asphalt, /area/slumbridge/outside/northeast) +"vNM" = ( +/obj/structure/prop/mainship/hangar_stencil/two, +/turf/open/floor/tile/dark/yellow2{ + dir = 8 + }, +/area/slumbridge/landingzonetwo) "vOb" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/green/hidden{ @@ -31267,10 +31259,6 @@ "wYo" = ( /turf/open/liquid/lava/single, /area/slumbridge/inside/prison/outside) -"wYt" = ( -/obj/machinery/door/poddoor/timed_late/containment/landing_zone/lz2, -/turf/closed/mineral/smooth/darkfrostwall, -/area/slumbridge/caves/rock/nearlz) "wYT" = ( /obj/machinery/atmospherics/pipe/simple/green/hidden, /obj/structure/cable, @@ -33780,13 +33768,13 @@ vqW vqW vdE vqW -ddg -ddg +vyM +vyM vqW -ddg -ddg -ddg -ddg +vyM +vyM +vyM +vyM vqW vdE vqW @@ -33831,7 +33819,7 @@ tUr tUr tUr xvW -vyM +xvW vyM "} (6,1,1) = {" @@ -33946,9 +33934,9 @@ vqW vqW vqW vqW -ddg -ddg -ddg +vyM +vyM +vyM vqW vqW vqW @@ -33962,14 +33950,14 @@ vqW vqW vqW vqW -ddg -ddg -ddg -ddg -ddg -ddg -ddg -ddg +vyM +vyM +vyM +vyM +vyM +vyM +vyM +vyM vdE vqW vqW @@ -34011,9 +33999,9 @@ pjL pjL pjL pjL +pjL xvW vyM -vyM "} (7,1,1) = {" dHe @@ -34114,9 +34102,9 @@ fqe lJL lJL lJL -ddg -ddg -ddg +vyM +vyM +vyM vqW vqW vqW @@ -34128,10 +34116,10 @@ vqW vqW vqW vqW -ddg -ddg -ddg -ddg +vyM +vyM +vyM +vyM vqW vqW vqW @@ -34144,10 +34132,10 @@ vqW vqW vqW vqW -ddg -ddg -ddg -ddg +vyM +vyM +vyM +vyM vqW vqW vdE @@ -34190,11 +34178,11 @@ pzJ fBt pzJ ffG -adD +vNM +nCu pjL xvW vyM -vyM "} (8,1,1) = {" dHe @@ -34294,29 +34282,29 @@ ycB lJL lJL lJL -ddg -ddg -ddg -ddg +vyM +vyM +vyM +vyM vqW vqW vqW vqW -ddg -ddg -ddg -ddg +vyM +vyM +vyM +vyM vqW vqW vqW vqW -ddg +vyM vqW vqW vqW vqW vqW -ddg +vyM vqW vqW vqW @@ -34371,11 +34359,11 @@ sfW sfW sfW sfW +sfW fVX pjL xvW vyM -vyM "} (9,1,1) = {" dHe @@ -34477,14 +34465,14 @@ dHe dHe vyM vyM -ddg -ddg -ddg -ddg -ddg -ddg -ddg -ddg +vyM +vyM +vyM +vyM +vyM +vyM +vyM +vyM vqW vqW vqW @@ -34496,15 +34484,15 @@ vqW vqW vqW vqW -ddg -ddg -ddg +vyM +vyM +vyM vqW vqW vqW -ddg -ddg -ddg +vyM +vyM +vyM vqW vdE vqW @@ -34514,8 +34502,8 @@ vdE vqW vqW vqW -ddg -ddg +vyM +vyM vqW vqW skd @@ -34552,11 +34540,11 @@ wia wia tqd sfW +sfW yiz pjL xvW vyM -vyM "} (10,1,1) = {" dHe @@ -34658,12 +34646,12 @@ uSb uSb vyM vyM -ddg -ddg -ddg -ddg -ddg -ddg +vyM +vyM +vyM +vyM +vyM +vyM vqW vqW vqW @@ -34675,32 +34663,32 @@ vqW vqW vqW vqW -ddg -ddg -ddg -ddg -ddg -ddg -ddg -ddg -ddg -ddg +vyM +vyM +vyM +vyM +vyM +vyM +vyM +vyM +vyM +vyM skd vdE vqW vqW skd -ddg -ddg -ddg -ddg -ddg -ddg +vyM +vyM +vyM +vyM +vyM +vyM skd vqW vqW skd -ljW +xvW pjL ooG ooG @@ -34733,11 +34721,11 @@ iTj gWB vBZ cUJ +sfW yiz pjL xvW vyM -vyM "} (11,1,1) = {" dHe @@ -34839,10 +34827,10 @@ uSb uSb uSb vyM -ddg -ddg -ddg -ddg +vyM +vyM +vyM +vyM vqW vqW vqW @@ -34856,11 +34844,11 @@ vqW vqW vqW skd -ddg -ddg -ddg -ddg -ddg +vyM +vyM +vyM +vyM +vyM skd skd skd @@ -34876,12 +34864,12 @@ skd skd skd skd -ddg +vyM vqW vqW vqW skd -ljW +xvW pjL ooG ooG @@ -34914,11 +34902,11 @@ iEk oXX vBZ sfW +sfW yiz pjL xvW vyM -vyM "} (12,1,1) = {" dHe @@ -35021,8 +35009,8 @@ uSb uSb vyM vyM -ddg -ddg +vyM +vyM vqW vqW vqW @@ -35062,7 +35050,7 @@ vqW vqW vqW skd -ljW +xvW pjL pjL ahF @@ -35095,11 +35083,11 @@ iEk oXX vBZ sfW +sfW fVX pjL xvW vyM -vyM "} (13,1,1) = {" dHe @@ -35202,8 +35190,8 @@ uSb uSb uSb vyM -ddg -ddg +vyM +vyM vqW vqW vqW @@ -35213,7 +35201,7 @@ vqW vqW vqW skd -ddg +vyM vqW vqW vqW @@ -35243,8 +35231,8 @@ vqW vdE vqW skd -wYt -ljW +tUr +xvW pjL ooG ooG @@ -35276,11 +35264,11 @@ iEk oXX vBZ iPr +sfW yiz pjL xvW vyM -vyM "} (14,1,1) = {" dHe @@ -35383,9 +35371,9 @@ uSb uSb uSb vyM -ddg -ddg -ddg +vyM +vyM +vyM vqW vqW vqW @@ -35394,9 +35382,9 @@ skd skd skd skd -ddg -ddg -ddg +vyM +vyM +vyM vqW vqW vqW @@ -35425,7 +35413,7 @@ vqW vqW vqW lFL -ljW +xvW pjL ooG ooG @@ -35457,11 +35445,11 @@ iEk oXX khO uSH +sfW yiz pjL xvW vyM -vyM "} (15,1,1) = {" dHe @@ -35565,8 +35553,8 @@ uSb uSb vyM vyM -ddg -ddg +vyM +vyM vqW vqW skd @@ -35577,7 +35565,7 @@ skd skd skd skd -ddg +vyM vqW vqW vqW @@ -35599,7 +35587,7 @@ vqW vqW vqW vqW -ddg +vyM vqW vqW vqW @@ -35638,11 +35626,11 @@ iEk oXX khO uSH +sfW yiz pjL xvW vyM -vyM "} (16,1,1) = {" dHe @@ -35746,8 +35734,8 @@ uSb uSb uSb vyM -ddg -ddg +vyM +vyM jbT jbT bHk @@ -35780,7 +35768,7 @@ skd vqW vqW skd -ddg +vyM vqW vqW vqW @@ -35819,11 +35807,11 @@ iEk oXX khO uSH +sfW fVX pjL xvW vyM -vyM "} (17,1,1) = {" dHe @@ -35928,7 +35916,7 @@ uSb uSb vyM vyM -ddg +vyM bYo bYo bYo @@ -35953,16 +35941,16 @@ vqW vqW vqW skd -ddg +vyM skd skd -ddg +vyM skd -ddg -ddg +vyM +vyM skd -ddg -ddg +vyM +vyM vqW vqW vqW @@ -36000,11 +35988,11 @@ iEk oXX vBZ sfW -iSc +tak +yiz pjL xvW vyM -vyM "} (18,1,1) = {" dHe @@ -36134,15 +36122,15 @@ vqW vqW vqW skd -ddg -ddg +vyM +vyM skd -ddg -ddg -ddg -ddg -ddg -ddg +vyM +vyM +vyM +vyM +vyM +vyM skd vqW vdE @@ -36181,11 +36169,11 @@ iEk oXX vBZ sfW +sfW yiz pjL xvW vyM -vyM "} (19,1,1) = {" dHe @@ -36315,15 +36303,15 @@ bLr vqW vqW skd -ddg -ddg -ddg -ddg -ddg +vyM +vyM +vyM +vyM +vyM skd -ddg -ddg -ddg +vyM +vyM +vyM skd vdE vqW @@ -36362,11 +36350,11 @@ iEk oXX vBZ sfW +sfW yiz pjL xvW vyM -vyM "} (20,1,1) = {" dHe @@ -36497,13 +36485,13 @@ tKZ vqW skd skd -ddg -ddg -ddg -ddg -ddg -ddg -ddg +vyM +vyM +vyM +vyM +vyM +vyM +vyM skd vqW vqW @@ -36543,11 +36531,11 @@ nxw wpm vBZ sfW +sfW fVX pjL xvW vyM -vyM "} (21,1,1) = {" dHe @@ -36678,20 +36666,20 @@ tKZ vqW skd skd -ddg -ddg +vyM +vyM skd -ddg -ddg -ddg -ddg +vyM +vyM +vyM +vyM skd vqW vqW vqW vqW skd -ljW +xvW pjL ooG ooG @@ -36724,11 +36712,11 @@ qWU qWU tqd sfW -tyJ +qdz +yiz pjL xvW vyM -vyM "} (22,1,1) = {" dHe @@ -36859,12 +36847,12 @@ tKZ vqW vqW skd -ddg +vyM skd vqW skd skd -ddg +vyM skd skd vqW @@ -36872,7 +36860,7 @@ vdE vqW skd skd -ljW +xvW pjL ooG ooG @@ -36905,11 +36893,11 @@ sfW sfW sfW sfW +sfW yiz pjL xvW vyM -vyM "} (23,1,1) = {" dHe @@ -37052,8 +37040,8 @@ vqW vqW vqW skd -ddg -ljW +vyM +xvW pjL ooG ooG @@ -37085,12 +37073,12 @@ egI egI egI egI -egI -bDO +nSK +qFO +qFO pjL xvW vyM -vyM "} (24,1,1) = {" dHe @@ -37233,8 +37221,8 @@ vqW vqW vqW skd -ddg -ljW +vyM +xvW pjL ooG ooG @@ -37267,11 +37255,11 @@ ooG ooG ooG ooG +ooG bPI pjL xvW vyM -vyM "} (25,1,1) = {" dHe @@ -37414,8 +37402,8 @@ vqW vqW vqW skd -ddg -ljW +vyM +xvW pjL pjL ahF @@ -37443,16 +37431,16 @@ ooG ooG ooG aEa -gGN -iKb -gGN -gGN +ooG +ooG +ooG +ooG +ooG ooG ooG pjL xvW vyM -vyM "} (26,1,1) = {" dHe @@ -37596,8 +37584,8 @@ vqW vqW skd skd -wYt -ljW +tUr +xvW pjL fnu fnu @@ -37624,16 +37612,16 @@ fnu fnu fnu ooG -nrN -pjL -pjL -uUd -pjL -pjL +gGN +gGN +gGN +gGN +ooG +ooG +ooG pjL xvW vyM -vyM "} (27,1,1) = {" dHe @@ -37759,9 +37747,9 @@ vTh oSy nmr bIq -lOS -ddg -ddg +ekp +vyM +vyM skd vqW vqW @@ -37777,8 +37765,8 @@ vqW vqW vqW skd -ddg -ljW +vyM +xvW pjL pjL kYx @@ -37807,13 +37795,13 @@ kwy ooG gGN pjL -kfE -ddr -cCV +pjL +uUd +pjL +pjL +pjL pjL xvW -tUr -vyM vyM "} (28,1,1) = {" @@ -37940,9 +37928,9 @@ alt mmJ nmr lRi -uPi -ddg -ddg +bSw +vyM +vyM skd vqW vqW @@ -37960,7 +37948,7 @@ vqW vqW skd lFL -ljW +xvW pjL sfW akB @@ -37987,14 +37975,14 @@ fnu plp ooG gGN -pbh -cCV +pjL +kfE +ddr cCV -aVn pjL xvW -vyM -vyM +tUr +tUr vyM "} (29,1,1) = {" @@ -38032,7 +38020,7 @@ bkz bkz nwg aWu -beC +qKi qYu aTh bYh @@ -38121,14 +38109,14 @@ alt qNF nmr lRi -jPl -ddg -ddg +abi +vyM +vyM vqW vqW vqW skd -ddg +vyM skd skd vqW @@ -38141,7 +38129,7 @@ vqW vqW vqW skd -ljW +xvW pjL sfW pTB @@ -38171,7 +38159,7 @@ gGN pbh cCV cCV -cCV +aVn pjL xvW vyM @@ -38215,7 +38203,7 @@ nwg aWu qKi nHt -qKi +veW bYh fjl kSa @@ -38303,26 +38291,26 @@ qNF nmr uvc oge -jPl -ddg +abi +vyM vqW vqW vqW skd -ddg +vyM skd skd vqW vqW vqW vqW -ddg +vyM vdE vqW vdE vqW skd -ljW +xvW pjL sfW pTB @@ -38349,10 +38337,10 @@ cgP fLs ooG nrN -pjL -pjL -pjL -pjL +pbh +cCV +cCV +cCV pjL xvW vyM @@ -38490,20 +38478,20 @@ jbT jbT vqW skd -ddg -ddg +vyM +vyM skd vqW vqW vqW vqW -ddg +vyM vqW vqW vqW vqW skd -ljW +xvW pjL sfW pTB @@ -38531,11 +38519,11 @@ kwy ooG gGN pjL -ljW -wYt -wYt -wYt -wYt +pjL +pjL +pjL +pjL +xvW vyM vyM vyM @@ -38671,20 +38659,20 @@ bYo bYo bLr bHk -ddg -ddg +vyM +vyM skd vqW vqW vqW vqW -ddg -ddg +vyM +vyM vqW vqW vqW -ddg -ljW +vyM +xvW pjL sfW icx @@ -38712,11 +38700,11 @@ fnu gGN gGN pjL -ljW -ddg -ddg -ddg -ddg +xvW +tUr +tUr +tUr +tUr vyM vyM vyM @@ -38853,19 +38841,19 @@ bYo bYo bYo wCj -ddg +vyM skd vqW vqW vqW -ddg -ddg -ddg +vyM +vyM +vyM vqW vqW vqW skd -ljW +xvW pjL pjL xWP @@ -38893,11 +38881,11 @@ fnu nde pjL pjL -ljW -ddg -ddg -ddg -ddg +xvW +vyM +vyM +vyM +vyM vyM vyM vyM @@ -39034,20 +39022,20 @@ bYo bYo bYo yhc -ddg +vyM skd vqW vqW vqW -ddg +vyM skd -ddg +vyM vqW vqW vqW skd -wYt -ljW +tUr +xvW pjL fnu wAW @@ -39073,12 +39061,12 @@ plp kwy gGN pjL -ljW -wYt -ddg -ddg -ddg -ddg +xvW +tUr +vyM +vyM +vyM +vyM vyM vyM vyM @@ -39215,20 +39203,20 @@ bYo lFH bYo bYo -uPi +bSw skd vqW vqW vqW skd skd -ddg +vyM vqW vqW vqW skd -ddg -ljW +vyM +xvW pjL lKA sfW @@ -39254,12 +39242,12 @@ gGN gGN gGN pjL -ljW -ddg -ddg -ddg -ddg -ddg +xvW +vyM +vyM +vyM +vyM +vyM vyM vyM vyM @@ -39398,18 +39386,18 @@ bYo bYo yhc bHk -ddg +vyM vqW vqW skd skd -ddg -ddg +vyM +vyM vqW vqW vqW -ddg -ljW +vyM +xvW pjL sfW sfW @@ -39435,12 +39423,12 @@ pjL pjL pjL pjL -ljW -ddg -ddg -ddg -ddg -ddg +xvW +vyM +vyM +vyM +vyM +vyM vyM vyM vyM @@ -39579,18 +39567,18 @@ bYo bYo bYo bYo -jPl +abi vqW vqW skd -ddg -ddg +vyM +vyM skd vdE vqW vqW skd -ljW +xvW pjL pLY sfW @@ -39613,15 +39601,15 @@ sfW fKN pjL pjL -ljW -wYt -wYt -wYt -ddg -ddg -ddg -ddg -ddg +xvW +tUr +tUr +tUr +vyM +vyM +vyM +vyM +vyM vyM vyM vyM @@ -39764,14 +39752,14 @@ bYo bLr vqW skd -ddg -ddg +vyM +vyM skd skd vdE vqW skd -ljW +xvW pjL ckW sfW @@ -39793,16 +39781,16 @@ jhV jhV jhV pjL -ljW -wYt -ddg -ddg -ddg -ddg -ddg -ddg -ddg -ddg +xvW +tUr +vyM +vyM +vyM +vyM +vyM +vyM +vyM +vyM vyM vyM vyM @@ -39946,13 +39934,13 @@ qCL bLr skd skd -ddg -ddg +vyM +vyM skd vqW vqW bHk -ljW +xvW pjL pjL pbh @@ -39974,16 +39962,16 @@ pjL pjL pjL pjL -ljW -ddg -ddg -ddg -ddg -ddg -ddg -ddg -ddg -ddg +xvW +vyM +vyM +vyM +vyM +vyM +vyM +vyM +vyM +vyM vyM vyM vyM @@ -40125,11 +40113,11 @@ bYo lFH qCL qCL -jPl +abi skd -ddg -ddg -ddg +vyM +vyM +vyM vqW rEK qCL @@ -40153,18 +40141,18 @@ mAd mAd mAd mAd -wYt -wYt -ljW -ddg -ddg -ddg -ddg -ddg -ddg -ddg -ddg -ddg +tUr +tUr +xvW +vyM +vyM +vyM +vyM +vyM +vyM +vyM +vyM +vyM vyM vyM vyM @@ -40309,8 +40297,8 @@ qCL qCL yhc skd -ddg -ddg +vyM +vyM rEK qCL qCL @@ -40335,17 +40323,17 @@ qCL qCL qCL qCL -ddg -ddg -ddg -ddg -ddg -ddg -ddg -ddg -ddg -ddg -ddg +vyM +vyM +vyM +vyM +vyM +vyM +vyM +vyM +vyM +vyM +vyM vyM vyM vyM @@ -40490,8 +40478,8 @@ qCL qCL qCL wCj -ddg -kCD +vyM +tGR qCL qCL qCL @@ -40516,17 +40504,17 @@ qCL qCL qCL qCL -ddg -ddg -ddg -ddg -ddg -ddg -ddg -ddg -ddg -ddg -ddg +vyM +vyM +vyM +vyM +vyM +vyM +vyM +vyM +vyM +vyM +vyM vyM vyM vyM @@ -40698,16 +40686,16 @@ iIa qCL qCL qCL -ddg -ddg -ddg -ddg -ddg -ddg -ddg -ddg -ddg -ddg +vyM +vyM +vyM +vyM +vyM +vyM +vyM +vyM +vyM +vyM vyM vyM vyM @@ -40879,16 +40867,16 @@ qCL qCL qCL qCL -ddg -ddg -ddg -ddg -ddg -ddg -ddg -ddg -ddg -ddg +vyM +vyM +vyM +vyM +vyM +vyM +vyM +vyM +vyM +vyM vyM vyM vyM @@ -41060,16 +41048,16 @@ qCL qCL iIa qCL -ddg -ddg -ddg -ddg -ddg -ddg -ddg -ddg -ddg -ddg +vyM +vyM +vyM +vyM +vyM +vyM +vyM +vyM +vyM +vyM vyM vyM vyM @@ -41242,15 +41230,15 @@ qCL qCL qCL qCL -ddg -ddg -ddg -ddg -ddg -ddg -ddg -ddg -ddg +vyM +vyM +vyM +vyM +vyM +vyM +vyM +vyM +vyM vyM vyM vyM @@ -41424,14 +41412,14 @@ oyi iIa qCL qCL -ddg -ddg -ddg -ddg -ddg -ddg -ddg -ddg +vyM +vyM +vyM +vyM +vyM +vyM +vyM +vyM vyM vyM vyM @@ -41605,14 +41593,14 @@ qCL oyi qCL qCL -ddg -ddg -ddg -ddg -ddg -ddg -ddg -ddg +vyM +vyM +vyM +vyM +vyM +vyM +vyM +vyM vyM vyM vyM @@ -41786,14 +41774,14 @@ qCL qCL qCL qCL -ddg -ddg -ddg -ddg -ddg -ddg -ddg -ddg +vyM +vyM +vyM +vyM +vyM +vyM +vyM +vyM vyM vyM vyM @@ -41968,13 +41956,13 @@ gIw qCL qCL qCL -ddg -ddg -ddg -ddg -ddg -ddg -ddg +vyM +vyM +vyM +vyM +vyM +vyM +vyM vyM vyM vyM @@ -42149,14 +42137,14 @@ gIw iIa qCL qCL -ddg -ddg -ddg -ddg -ddg -ddg -ddg -ddg +vyM +vyM +vyM +vyM +vyM +vyM +vyM +vyM vyM vyM "} @@ -42331,13 +42319,13 @@ qCL qCL qCL qCL -ddg -ddg -ddg -ddg -ddg -ddg -ddg +vyM +vyM +vyM +vyM +vyM +vyM +vyM vyM vyM "} @@ -42512,13 +42500,13 @@ qCL qCL qCL qCL -ddg -ddg -ddg -ddg -ddg -ddg -ddg +vyM +vyM +vyM +vyM +vyM +vyM +vyM vyM vyM "} @@ -42693,13 +42681,13 @@ bYo bYo bYo bYo -ddg -ddg -ddg -ddg -ddg -ddg -ddg +vyM +vyM +vyM +vyM +vyM +vyM +vyM vyM vyM "} @@ -42874,13 +42862,13 @@ bYo lFH bYo bYo -ddg -ddg -ddg -ddg -ddg -ddg -ddg +vyM +vyM +vyM +vyM +vyM +vyM +vyM vyM vyM "} @@ -43055,13 +43043,13 @@ bYo bYo bYo bYo -ddg -ddg -ddg -ddg -ddg -ddg -ddg +vyM +vyM +vyM +vyM +vyM +vyM +vyM vyM vyM "} @@ -43236,12 +43224,12 @@ bYo bYo bYo bYo -ddg -ddg -ddg -ddg -ddg -ddg +vyM +vyM +vyM +vyM +vyM +vyM vyM vyM vyM @@ -43417,12 +43405,12 @@ bYo bYo bYo bYo -ddg -ddg -ddg -ddg -ddg -ddg +vyM +vyM +vyM +vyM +vyM +vyM vyM vyM vyM @@ -43598,12 +43586,12 @@ bYo bYo bYo bYo -ddg -ddg -ddg -ddg -ddg -ddg +vyM +vyM +vyM +vyM +vyM +vyM vyM vyM vyM @@ -43779,12 +43767,12 @@ lFH bYo bYo bYo -ddg -ddg -ddg -ddg -ddg -ddg +vyM +vyM +vyM +vyM +vyM +vyM vyM vyM vyM @@ -43961,10 +43949,10 @@ bYo bYo lFH bYo -ddg -ddg -ddg -ddg +vyM +vyM +vyM +vyM vyM vyM vyM @@ -44141,11 +44129,11 @@ bYo bYo bYo bYo -ddg -ddg -ddg -ddg -ddg +vyM +vyM +vyM +vyM +vyM vyM vyM vyM @@ -44322,11 +44310,11 @@ bYo bYo bYo bYo -ddg -ddg -ddg -ddg -ddg +vyM +vyM +vyM +vyM +vyM vyM vyM vyM @@ -44503,11 +44491,11 @@ bYo bYo bYo bYo -ddg -ddg -ddg -ddg -ddg +vyM +vyM +vyM +vyM +vyM vyM vyM vyM @@ -44683,12 +44671,12 @@ qRS lFH bYo bYo -ddg -ddg -ddg -ddg -ddg -ddg +vyM +vyM +vyM +vyM +vyM +vyM vyM vyM vyM @@ -44864,12 +44852,12 @@ qRS bYo bYo bYo -ddg -ddg -ddg -ddg -ddg -ddg +vyM +vyM +vyM +vyM +vyM +vyM vyM vyM vyM @@ -45045,12 +45033,12 @@ ocz bYo bYo bYo -ddg -ddg -ddg -ddg -ddg -ddg +vyM +vyM +vyM +vyM +vyM +vyM vyM vyM vyM @@ -45226,12 +45214,12 @@ xxj bYo bYo bYo -ddg -ddg -ddg -ddg -ddg -ddg +vyM +vyM +vyM +vyM +vyM +vyM vyM vyM vyM @@ -45406,12 +45394,12 @@ evR qRS bYo bYo -ddg -ddg -ddg -ddg -ddg -ddg +vyM +vyM +vyM +vyM +vyM +vyM vyM vyM vyM @@ -45586,13 +45574,13 @@ xWi evR qRS qRS -ddg -ddg -ddg -ddg -ddg -ddg -ddg +vyM +vyM +vyM +vyM +vyM +vyM +vyM vyM vyM vyM @@ -45767,13 +45755,13 @@ evR evR qRS qRS -ddg -ddg -ddg -ddg -ddg -ddg -ddg +vyM +vyM +vyM +vyM +vyM +vyM +vyM vyM vyM vyM @@ -45948,13 +45936,13 @@ lRi rfs xxj qRS -ddg -ddg -ddg -ddg -ddg -ddg -ddg +vyM +vyM +vyM +vyM +vyM +vyM +vyM vyM vyM vyM @@ -46129,13 +46117,13 @@ lRi rfs qRS qRS -ddg -ddg -ddg -ddg -ddg -ddg -ddg +vyM +vyM +vyM +vyM +vyM +vyM +vyM vyM vyM vyM @@ -46310,13 +46298,13 @@ qRS lRi qRS qRS -ddg -ddg -ddg -ddg -ddg -ddg -ddg +vyM +vyM +vyM +vyM +vyM +vyM +vyM vyM vyM vyM @@ -46491,13 +46479,13 @@ uvc rfs qRS qRS -ddg -ddg -ddg -ddg -ddg -ddg -ddg +vyM +vyM +vyM +vyM +vyM +vyM +vyM vyM vyM vyM @@ -46672,13 +46660,13 @@ lRi rfs xxj qRS -ddg -ddg -ddg -ddg -ddg -ddg -ddg +vyM +vyM +vyM +vyM +vyM +vyM +vyM vyM vyM vyM @@ -46854,12 +46842,12 @@ qRS ocz qRS qRS -ddg -ddg -ddg -ddg -ddg -ddg +vyM +vyM +vyM +vyM +vyM +vyM vyM vyM vyM @@ -47035,12 +47023,12 @@ qRS qRS qRS qRS -ddg -ddg -ddg -ddg -ddg -ddg +vyM +vyM +vyM +vyM +vyM +vyM vyM vyM vyM @@ -47215,14 +47203,14 @@ rfs qRS qRS qRS -ddg -ddg -ddg -ddg -ddg -ddg -ddg -ddg +vyM +vyM +vyM +vyM +vyM +vyM +vyM +vyM vyM vyM vyM @@ -47395,15 +47383,15 @@ nmr qRS qRS qRS -ddg -ddg -ddg -ddg -ddg -ddg -ddg -ddg -ddg +vyM +vyM +vyM +vyM +vyM +vyM +vyM +vyM +vyM vyM vyM vyM @@ -47576,15 +47564,15 @@ nmr qRS qRS xxj -ddg -ddg -ddg -ddg -ddg -ddg -ddg -ddg -ddg +vyM +vyM +vyM +vyM +vyM +vyM +vyM +vyM +vyM vyM vyM vyM @@ -47758,14 +47746,14 @@ nmr dkI rfs rfs -ddg -ddg -ddg -ddg -ddg -ddg -ddg -ddg +vyM +vyM +vyM +vyM +vyM +vyM +vyM +vyM vyM vyM vyM @@ -47939,15 +47927,15 @@ nmr dkI rfs lRi -ddg -ddg -ddg -ddg -ddg -ddg -ddg -ddg -ddg +vyM +vyM +vyM +vyM +vyM +vyM +vyM +vyM +vyM vyM vyM vyM @@ -48120,15 +48108,15 @@ dkI dkI qRS lRi -ddg -ddg -ddg -ddg -ddg -ddg -ddg -ddg -ddg +vyM +vyM +vyM +vyM +vyM +vyM +vyM +vyM +vyM vyM vyM vyM @@ -48302,14 +48290,14 @@ qRS rfs rfs lRi -ddg -ddg -ddg -ddg -ddg -ddg -ddg -ddg +vyM +vyM +vyM +vyM +vyM +vyM +vyM +vyM vyM vyM vyM @@ -48484,13 +48472,13 @@ uAZ uiq qRS qRS -ddg -ddg -ddg -ddg -ddg -ddg -ddg +vyM +vyM +vyM +vyM +vyM +vyM +vyM vyM vyM vyM @@ -48665,13 +48653,13 @@ qRS lRi rfs lRi -ddg -ddg -ddg -ddg -ddg -ddg -ddg +vyM +vyM +vyM +vyM +vyM +vyM +vyM vyM vyM vyM @@ -48847,13 +48835,13 @@ rfs lRi qRS qRS -ddg -ddg -ddg -ddg -ddg -ddg -ddg +vyM +vyM +vyM +vyM +vyM +vyM +vyM vyM vyM "} @@ -49028,13 +49016,13 @@ qRS lRi rfs qRS -ddg -ddg -ddg -ddg -ddg -ddg -ddg +vyM +vyM +vyM +vyM +vyM +vyM +vyM vyM vyM "} @@ -49211,11 +49199,11 @@ rfs qRS hZV rfs -ddg -ddg -ddg -ddg -ddg +vyM +vyM +vyM +vyM +vyM vyM vyM "} @@ -49392,11 +49380,11 @@ rfs lRi uvc qRS -ddg -ddg -ddg -ddg -ddg +vyM +vyM +vyM +vyM +vyM vyM vyM "} @@ -49574,10 +49562,10 @@ qRS qRS uvc rfs -ddg -ddg -ddg -ddg +vyM +vyM +vyM +vyM vyM vyM "} @@ -49756,9 +49744,9 @@ ceW uvc qRS lRi -ddg -ddg -ddg +vyM +vyM +vyM vyM vyM "} @@ -49938,8 +49926,8 @@ rfs lRi lJC lRi -ddg -ddg +vyM +vyM vyM vyM "} @@ -50119,7 +50107,7 @@ lRi qRS qRS lRi -ddg +vyM vyM vyM vyM @@ -50300,7 +50288,7 @@ lRi rfs lRi lRi -ddg +vyM vyM vyM vyM diff --git a/_maps/modularmaps/EORG/cs_office.dmm b/_maps/modularmaps/EORG/cs_office.dmm index 9d41e0d703e48..617bd70f0ddde 100644 --- a/_maps/modularmaps/EORG/cs_office.dmm +++ b/_maps/modularmaps/EORG/cs_office.dmm @@ -2260,7 +2260,7 @@ /turf/open/floor/stairs, /area/deathmatch) "ZD" = ( -/turf/closed/brock, +/turf/closed/mineral/smooth/basalt, /area/deathmatch) "ZF" = ( /obj/structure/table, diff --git a/_maps/modularmaps/big_red/bigredatmosvar2.dmm b/_maps/modularmaps/big_red/bigredatmosvar2.dmm index 78dd5fa6c8c1c..b264398de35f8 100644 --- a/_maps/modularmaps/big_red/bigredatmosvar2.dmm +++ b/_maps/modularmaps/big_red/bigredatmosvar2.dmm @@ -618,7 +618,7 @@ "JO" = ( /obj/structure/cryofeed, /turf/open/floor/engine, -/area/bigredv2/outside/filtration_plant) +/area/space) "JQ" = ( /obj/effect/ai_node, /turf/open/floor/plating/ground/mars/random/sand, @@ -688,7 +688,7 @@ name = "\improper coolant feed" }, /turf/open/floor/engine, -/area/bigredv2/outside/filtration_plant) +/area/space) "PY" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/weed_node, diff --git a/_maps/modularmaps/big_red/bigredatmosvar3.dmm b/_maps/modularmaps/big_red/bigredatmosvar3.dmm index 0e6ea86b47153..28f8253b9e1dc 100644 --- a/_maps/modularmaps/big_red/bigredatmosvar3.dmm +++ b/_maps/modularmaps/big_red/bigredatmosvar3.dmm @@ -364,7 +364,7 @@ "wk" = ( /obj/structure/cryofeed, /turf/open/floor/engine, -/area/bigredv2/outside/filtration_plant) +/area/space) "wY" = ( /obj/machinery/atmospherics/pipe/simple/green/hidden{ dir = 5 @@ -416,7 +416,7 @@ name = "\improper coolant feed" }, /turf/open/floor/engine, -/area/bigredv2/outside/filtration_plant) +/area/space) "yj" = ( /obj/effect/spawner/random/misc/structure/broken_window/colonyspawn, /obj/structure/sign/safety/vent, diff --git a/_maps/modularmaps/big_red/bigredatmosvar4.dmm b/_maps/modularmaps/big_red/bigredatmosvar4.dmm index 617e2d707c66d..b7c84fc725f47 100644 --- a/_maps/modularmaps/big_red/bigredatmosvar4.dmm +++ b/_maps/modularmaps/big_red/bigredatmosvar4.dmm @@ -505,7 +505,7 @@ /area/bigredv2/outside/se) "Uj" = ( /turf/open/liquid/water/river, -/area/bigredv2/caves/rock) +/area/space) "Uu" = ( /obj/structure/nuke_disk_candidate, /turf/open/floor, diff --git a/_maps/modularmaps/big_red/bigredatmosvar5.dmm b/_maps/modularmaps/big_red/bigredatmosvar5.dmm index 25bf8c17ac076..d3c1e24e3307c 100644 --- a/_maps/modularmaps/big_red/bigredatmosvar5.dmm +++ b/_maps/modularmaps/big_red/bigredatmosvar5.dmm @@ -766,7 +766,7 @@ "OG" = ( /obj/structure/cryofeed, /turf/open/floor/bcircuit/anim, -/area/bigredv2/outside/filtration_plant) +/area/space) "Qe" = ( /obj/effect/landmark/weed_node, /turf/open/floor/asteroidfloor, @@ -898,7 +898,7 @@ name = "\improper coolant feed" }, /turf/open/floor/bcircuit/anim, -/area/bigredv2/outside/filtration_plant) +/area/space) "WO" = ( /obj/effect/landmark/lv624/fog_blocker, /obj/effect/landmark/weed_node, diff --git a/_maps/modularmaps/big_red/bigredatmosvar6.dmm b/_maps/modularmaps/big_red/bigredatmosvar6.dmm index 16dc9d747d6ed..7a29b99425d4a 100644 --- a/_maps/modularmaps/big_red/bigredatmosvar6.dmm +++ b/_maps/modularmaps/big_red/bigredatmosvar6.dmm @@ -387,7 +387,7 @@ /area/bigredv2/outside/se) "zz" = ( /turf/open/liquid/water/river, -/area/bigredv2/caves/rock) +/area/space) "zI" = ( /obj/structure/cable, /obj/effect/decal/cleanable/dirt, diff --git a/_maps/modularmaps/oscaroutpost/oscarnorthvar1.dmm b/_maps/modularmaps/oscaroutpost/oscarnorthvar1.dmm index 446d920a733f7..7edd580102042 100644 --- a/_maps/modularmaps/oscaroutpost/oscarnorthvar1.dmm +++ b/_maps/modularmaps/oscaroutpost/oscarnorthvar1.dmm @@ -1,6 +1,6 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "ad" = ( -/obj/item/weapon/gun/tl102/hsg_nest/sandless{ +/obj/item/weapon/gun/hsg_102/hsg_nest/sandless{ dir = 4 }, /turf/open/floor/plating/ground/dirt2, @@ -84,36 +84,36 @@ "aT" = ( /obj/structure/table/rusticwoodentable, /obj/machinery/light, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, /turf/open/floor, /area/oscar_outpost) "aU" = ( @@ -191,7 +191,7 @@ /turf/open/floor/plating/ground/dirt2, /area/oscar_outpost/outside/northwest) "bx" = ( -/obj/item/weapon/gun/tl102/hsg_nest{ +/obj/item/weapon/gun/hsg_102/hsg_nest{ dir = 1; pixel_y = 7 }, @@ -413,29 +413,29 @@ /turf/open/floor/plating/ground/dirtgrassborder/corner, /area/oscar_outpost/outside/east) "dV" = ( -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, /obj/structure/barricade/sandbags{ name = "trench lining"; pixel_y = -7 @@ -468,7 +468,7 @@ /turf/open/floor, /area/oscar_outpost) "ez" = ( -/obj/item/weapon/gun/tl102/hsg_nest{ +/obj/item/weapon/gun/hsg_102/hsg_nest{ dir = 1; pixel_y = 7 }, @@ -484,26 +484,26 @@ "eE" = ( /obj/structure/table/mainship, /obj/item/tool/pen, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, /turf/open/floor, /area/oscar_outpost) "eF" = ( @@ -556,7 +556,7 @@ name = "trench lining"; pixel_y = 6 }, -/obj/item/weapon/gun/tl102/hsg_nest, +/obj/item/weapon/gun/hsg_102/hsg_nest, /turf/open/floor/plating/ground/dirt2, /area/oscar_outpost/outside/west) "eW" = ( @@ -620,29 +620,29 @@ }, /area/oscar_outpost/outside/east) "fA" = ( -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, /obj/structure/barricade/sandbags{ dir = 1; name = "trench lining"; @@ -895,29 +895,29 @@ }, /area/oscar_outpost) "jd" = ( -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, /obj/structure/barricade/sandbags{ name = "trench lining"; pixel_y = -7 @@ -1041,29 +1041,29 @@ /turf/open/ground/grass, /area/oscar_outpost/outside/west) "ly" = ( -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, /obj/structure/barricade/sandbags{ dir = 8; name = "trench lining"; @@ -1300,7 +1300,7 @@ /turf/open/floor/plating/ground/dirt2, /area/oscar_outpost/outside/northeast) "ow" = ( -/obj/item/weapon/gun/tl102/hsg_nest{ +/obj/item/weapon/gun/hsg_102/hsg_nest{ dir = 1; pixel_y = 7 }, @@ -1545,13 +1545,13 @@ }, /area/oscar_outpost/outside/northeast) "pQ" = ( -/obj/item/weapon/gun/tl102/hsg_nest/sandless{ +/obj/item/weapon/gun/hsg_102/hsg_nest/sandless{ dir = 4 }, /turf/open/floor/plating/ground/dirt2, /area/oscar_outpost/outside/northwest) "pU" = ( -/obj/item/weapon/gun/tl102/hsg_nest/sandless{ +/obj/item/weapon/gun/hsg_102/hsg_nest/sandless{ dir = 8 }, /turf/open/floor/plating/ground/dirt2, @@ -1786,7 +1786,7 @@ /turf/open/floor/plating/ground/dirt2, /area/oscar_outpost/outside/north) "tl" = ( -/obj/item/weapon/gun/tl102/hsg_nest, +/obj/item/weapon/gun/hsg_102/hsg_nest, /turf/open/floor/plating/ground/dirt2, /area/oscar_outpost/outside/east) "tm" = ( @@ -1854,7 +1854,7 @@ /turf/open/floor/plating/ground/dirt, /area/oscar_outpost/outside/road) "uB" = ( -/obj/item/weapon/gun/tl102/hsg_nest/sandless{ +/obj/item/weapon/gun/hsg_102/hsg_nest/sandless{ dir = 1 }, /turf/open/floor/engine/cult{ @@ -1873,7 +1873,7 @@ }, /area/oscar_outpost) "uN" = ( -/obj/item/weapon/gun/tl102/hsg_nest/sandless{ +/obj/item/weapon/gun/hsg_102/hsg_nest/sandless{ dir = 4 }, /obj/structure/barricade/metal{ @@ -1977,7 +1977,7 @@ }, /area/oscar_outpost) "wr" = ( -/obj/item/weapon/gun/tl102/hsg_nest/sandless{ +/obj/item/weapon/gun/hsg_102/hsg_nest/sandless{ dir = 8 }, /obj/structure/barricade/metal{ @@ -2065,7 +2065,7 @@ }, /area/oscar_outpost/outside/northeast) "xh" = ( -/obj/item/weapon/gun/tl102/hsg_nest/sandless{ +/obj/item/weapon/gun/hsg_102/hsg_nest/sandless{ dir = 1 }, /obj/structure/barricade/metal{ @@ -2184,29 +2184,29 @@ /turf/open/floor, /area/oscar_outpost) "zh" = ( -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, /turf/open/floor/engine/cult{ dir = 2 }, @@ -2244,7 +2244,7 @@ name = "trench lining"; pixel_y = 1 }, -/obj/item/weapon/gun/tl102/hsg_nest/sandless{ +/obj/item/weapon/gun/hsg_102/hsg_nest/sandless{ dir = 4 }, /turf/open/floor/plating/ground/dirt2, @@ -2876,7 +2876,7 @@ /turf/open/floor/plating/ground/dirt, /area/oscar_outpost/outside/north) "FW" = ( -/obj/item/weapon/gun/tl102/hsg_nest/sandless{ +/obj/item/weapon/gun/hsg_102/hsg_nest/sandless{ dir = 8 }, /turf/open/floor/plating/ground/dirt2, @@ -3166,29 +3166,29 @@ }, /area/oscar_outpost/outside/road) "JN" = ( -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, /obj/structure/barricade/sandbags{ dir = 8; name = "trench lining"; @@ -3239,7 +3239,7 @@ name = "trench lining"; pixel_y = 1 }, -/obj/item/weapon/gun/tl102/hsg_nest/sandless{ +/obj/item/weapon/gun/hsg_102/hsg_nest/sandless{ dir = 8 }, /turf/open/floor/plating/ground/dirt2, @@ -3349,7 +3349,7 @@ /turf/open/floor, /area/oscar_outpost) "Lj" = ( -/obj/item/weapon/gun/tl102/hsg_nest, +/obj/item/weapon/gun/hsg_102/hsg_nest, /turf/open/floor/plating/ground/dirt2, /area/oscar_outpost/outside/west) "Lu" = ( @@ -3436,7 +3436,7 @@ /turf/open/floor/plating/ground/dirt2, /area/oscar_outpost/outside/west) "Mq" = ( -/obj/item/weapon/gun/tl102/hsg_nest{ +/obj/item/weapon/gun/hsg_102/hsg_nest{ dir = 1; pixel_y = 7 }, @@ -3710,7 +3710,7 @@ }, /area/oscar_outpost) "PI" = ( -/obj/item/weapon/gun/tl102/hsg_nest{ +/obj/item/weapon/gun/hsg_102/hsg_nest{ dir = 1; pixel_y = 7 }, @@ -3745,29 +3745,29 @@ }, /area/oscar_outpost/outside/northeast) "PQ" = ( -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, /turf/open/floor/plating/ground/dirt2, /area/oscar_outpost/outside/northeast) "PU" = ( @@ -3812,29 +3812,29 @@ /turf/open/floor/plating/ground/dirt2, /area/oscar_outpost/outside/east) "Qu" = ( -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, /obj/structure/barricade/sandbags{ dir = 1; name = "trench lining"; @@ -4467,29 +4467,29 @@ /turf/open/floor/plating/ground/dirt2, /area/oscar_outpost/outside/north) "Zu" = ( -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, /turf/open/floor/plating/ground/dirt2, /area/oscar_outpost/outside/northwest) "Zz" = ( @@ -4498,29 +4498,29 @@ /turf/open/floor/plating/ground/dirt2, /area/oscar_outpost/outside/northwest) "ZD" = ( -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, /obj/structure/barricade/sandbags{ dir = 4; name = "trench lining"; diff --git a/_maps/modularmaps/oscaroutpost/oscarnorthvar2.dmm b/_maps/modularmaps/oscaroutpost/oscarnorthvar2.dmm index f60d2ca7bf816..583fb87c41747 100644 --- a/_maps/modularmaps/oscaroutpost/oscarnorthvar2.dmm +++ b/_maps/modularmaps/oscaroutpost/oscarnorthvar2.dmm @@ -119,34 +119,34 @@ name = "trench lining"; pixel_y = 10 }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, /turf/open/floor/plating/ground/dirt2, @@ -276,7 +276,7 @@ name = "trench lining"; pixel_y = 1 }, -/obj/item/weapon/gun/tl102/hsg_nest{ +/obj/item/weapon/gun/hsg_102/hsg_nest{ dir = 8; name = "\improper T37 Medium Machinegun" }, @@ -360,55 +360,55 @@ /area/oscar_outpost) "dd" = ( /obj/structure/rack, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, /turf/open/floor/engine/cult{ @@ -701,55 +701,55 @@ /turf/open/floor/plating/ground/dirt2, /area/oscar_outpost/outside/road) "fP" = ( -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, /turf/open/floor/plating/ground/dirt2, @@ -1053,7 +1053,7 @@ name = "trench lining"; pixel_y = 1 }, -/obj/item/weapon/gun/tl102/hsg_nest{ +/obj/item/weapon/gun/hsg_102/hsg_nest{ dir = 8; name = "\improper T37 Medium Machinegun" }, @@ -1115,7 +1115,7 @@ name = "trench lining"; pixel_y = 1 }, -/obj/item/weapon/gun/tl102/hsg_nest/sandless{ +/obj/item/weapon/gun/hsg_102/hsg_nest/sandless{ dir = 4 }, /turf/open/floor/plating/ground/dirt2, @@ -1798,52 +1798,52 @@ name = "trench lining"; pixel_y = 10 }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, /turf/open/floor/plating/ground/dirt2, @@ -2040,14 +2040,14 @@ name = "trench lining"; pixel_y = 10 }, -/obj/item/weapon/gun/tl102/hsg_nest{ +/obj/item/weapon/gun/hsg_102/hsg_nest{ dir = 1; name = "\improper T37 Medium Machinegun" }, /turf/open/floor/plating/ground/dirt2, /area/oscar_outpost/outside/northwest) "tz" = ( -/obj/item/weapon/gun/tl102/hsg_nest{ +/obj/item/weapon/gun/hsg_102/hsg_nest{ dir = 1; pixel_y = 7 }, @@ -2183,34 +2183,34 @@ name = "trench lining"; pixel_y = 10 }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, /obj/structure/barricade/sandbags{ @@ -2318,7 +2318,7 @@ /turf/open/floor/plating/ground/dirt, /area/oscar_outpost/outside/north) "wf" = ( -/obj/item/weapon/gun/tl102/hsg_nest{ +/obj/item/weapon/gun/hsg_102/hsg_nest{ dir = 8; name = "\improper T37 Medium Machinegun" }, @@ -2456,7 +2456,7 @@ /obj/structure/barricade/metal{ dir = 1 }, -/obj/item/weapon/gun/tl102/hsg_nest{ +/obj/item/weapon/gun/hsg_102/hsg_nest{ dir = 1; name = "\improper T37 Medium Machinegun" }, @@ -2837,7 +2837,7 @@ /turf/open/floor/plating/ground/dirt, /area/oscar_outpost/outside/north) "Bo" = ( -/obj/item/weapon/gun/tl102/hsg_nest/sandless{ +/obj/item/weapon/gun/hsg_102/hsg_nest/sandless{ dir = 4 }, /turf/open/floor/plating/ground/dirt2, @@ -2956,7 +2956,7 @@ /turf/open/floor, /area/oscar_outpost) "Dg" = ( -/obj/item/weapon/gun/tl102/hsg_nest{ +/obj/item/weapon/gun/hsg_102/hsg_nest{ dir = 1; pixel_y = 7 }, @@ -3023,52 +3023,52 @@ name = "trench lining"; pixel_y = 10 }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, /turf/open/floor/plating/ground/dirt2, @@ -3081,7 +3081,7 @@ /turf/open/floor/mainship/sterile, /area/oscar_outpost) "Dm" = ( -/obj/item/weapon/gun/tl102/hsg_nest{ +/obj/item/weapon/gun/hsg_102/hsg_nest{ dir = 1; pixel_y = 7 }, @@ -3172,7 +3172,7 @@ name = "trench lining"; pixel_y = 1 }, -/obj/item/weapon/gun/tl102/hsg_nest{ +/obj/item/weapon/gun/hsg_102/hsg_nest{ dir = 1; pixel_y = 7 }, @@ -3241,40 +3241,40 @@ name = "trench lining"; pixel_y = 10 }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, /turf/open/floor/plating/ground/dirt2, @@ -3327,7 +3327,7 @@ /turf/open/floor/plating/ground/dirt2, /area/oscar_outpost/outside/north) "FM" = ( -/obj/item/weapon/gun/tl102/hsg_nest{ +/obj/item/weapon/gun/hsg_102/hsg_nest{ dir = 4; name = "\improper T37 Medium Machinegun" }, @@ -3416,7 +3416,7 @@ /turf/open/liquid/water/river, /area/oscar_outpost/outside/north) "GR" = ( -/obj/item/weapon/gun/tl102/hsg_nest{ +/obj/item/weapon/gun/hsg_102/hsg_nest{ dir = 1; pixel_y = 7 }, @@ -3606,34 +3606,34 @@ name = "trench lining"; pixel_y = 10 }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, /obj/structure/barricade/sandbags{ @@ -3880,7 +3880,7 @@ /turf/open/floor/plating/ground/dirt2, /area/oscar_outpost/outside/west) "Mj" = ( -/obj/item/weapon/gun/tl102/hsg_nest{ +/obj/item/weapon/gun/hsg_102/hsg_nest{ dir = 1; pixel_y = 7 }, @@ -4296,7 +4296,7 @@ }, /area/oscar_outpost/outside/east) "Pn" = ( -/obj/item/weapon/gun/tl102/hsg_nest{ +/obj/item/weapon/gun/hsg_102/hsg_nest{ dir = 8; name = "\improper T37 Medium Machinegun" }, @@ -4331,43 +4331,43 @@ /area/oscar_outpost/outside/northwest) "PF" = ( /obj/structure/table/mainship, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/weapon/gun/tl102{ +/obj/item/weapon/gun/hsg_102{ name = "\improper T37 Medium Machinegun" }, -/obj/item/weapon/gun/tl102{ +/obj/item/weapon/gun/hsg_102{ name = "\improper T37 Medium Machinegun" }, /obj/machinery/light{ @@ -4395,67 +4395,67 @@ name = "trench lining"; pixel_y = 1 }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, /turf/open/floor/plating/ground/dirt2, @@ -4517,55 +4517,55 @@ /turf/open/floor/plating/ground/dirt2, /area/oscar_outpost/outside/north) "QH" = ( -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, /obj/effect/ai_node, @@ -4734,7 +4734,7 @@ }, /area/oscar_outpost) "RD" = ( -/obj/item/weapon/gun/tl102/hsg_nest{ +/obj/item/weapon/gun/hsg_102/hsg_nest{ name = "\improper T37 Medium Machinegun" }, /turf/open/floor/plating/ground/dirt2, @@ -4745,40 +4745,40 @@ name = "trench lining"; pixel_y = 10 }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, /turf/open/floor/plating/ground/dirt2, /area/oscar_outpost/outside/east) "Sh" = ( -/obj/item/weapon/gun/tl102/hsg_nest{ +/obj/item/weapon/gun/hsg_102/hsg_nest{ dir = 1; pixel_y = 7 }, @@ -4943,7 +4943,7 @@ /turf/open/floor/plating/ground/dirt2, /area/oscar_outpost/outside/west) "Ug" = ( -/obj/item/weapon/gun/tl102/hsg_nest{ +/obj/item/weapon/gun/hsg_102/hsg_nest{ dir = 8; name = "\improper T37 Medium Machinegun" }, @@ -5138,7 +5138,7 @@ /turf/open/floor/plating/ground/dirtgrassborder/corner, /area/oscar_outpost/outside/west) "WC" = ( -/obj/item/weapon/gun/tl102/hsg_nest{ +/obj/item/weapon/gun/hsg_102/hsg_nest{ dir = 4; name = "\improper T37 Medium Machinegun" }, @@ -5207,34 +5207,34 @@ name = "trench lining"; pixel_y = 10 }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, /turf/open/floor/plating/ground/dirt2, @@ -5388,19 +5388,19 @@ /turf/open/floor, /area/oscar_outpost) "Yh" = ( -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, /turf/open/floor/plating/ground/dirt2, @@ -5463,20 +5463,20 @@ /turf/open/floor/plating/ground/dirt2, /area/oscar_outpost/outside/north) "YM" = ( -/obj/item/weapon/gun/tl102/hsg_nest/sandless{ +/obj/item/weapon/gun/hsg_102/hsg_nest/sandless{ dir = 4 }, /turf/open/floor/plating/ground/dirt2, /area/oscar_outpost/outside/northeast) "YO" = ( -/obj/item/weapon/gun/tl102/hsg_nest{ +/obj/item/weapon/gun/hsg_102/hsg_nest{ dir = 1; pixel_y = 7 }, /turf/open/floor/plating/ground/dirt2, /area/oscar_outpost/outside/north) "YT" = ( -/obj/item/weapon/gun/tl102/hsg_nest{ +/obj/item/weapon/gun/hsg_102/hsg_nest{ name = "\improper T37 Medium Machinegun" }, /turf/open/floor/plating/ground/dirt2, @@ -5598,80 +5598,80 @@ /turf/open/floor, /area/oscar_outpost) "Zu" = ( -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, /turf/open/floor/plating/ground/dirt2, /area/oscar_outpost/outside/northwest) "Zz" = ( -/obj/item/ammo_magazine/tl102, -/obj/item/ammo_magazine/tl102, -/obj/item/ammo_magazine/tl102, -/obj/item/ammo_magazine/tl102, -/obj/item/ammo_magazine/tl102, -/obj/item/ammo_magazine/tl102, -/obj/item/ammo_magazine/tl102, -/obj/item/ammo_magazine/tl102, -/obj/item/ammo_magazine/tl102, -/obj/item/ammo_magazine/tl102, -/obj/item/ammo_magazine/tl102, -/obj/item/ammo_magazine/tl102, -/obj/item/ammo_magazine/tl102, -/obj/item/ammo_magazine/tl102, -/obj/item/ammo_magazine/tl102, -/obj/item/ammo_magazine/tl102, -/obj/item/ammo_magazine/tl102, -/obj/item/ammo_magazine/tl102, -/obj/item/ammo_magazine/tl102, -/obj/item/ammo_magazine/tl102, +/obj/item/ammo_magazine/hsg_102, +/obj/item/ammo_magazine/hsg_102, +/obj/item/ammo_magazine/hsg_102, +/obj/item/ammo_magazine/hsg_102, +/obj/item/ammo_magazine/hsg_102, +/obj/item/ammo_magazine/hsg_102, +/obj/item/ammo_magazine/hsg_102, +/obj/item/ammo_magazine/hsg_102, +/obj/item/ammo_magazine/hsg_102, +/obj/item/ammo_magazine/hsg_102, +/obj/item/ammo_magazine/hsg_102, +/obj/item/ammo_magazine/hsg_102, +/obj/item/ammo_magazine/hsg_102, +/obj/item/ammo_magazine/hsg_102, +/obj/item/ammo_magazine/hsg_102, +/obj/item/ammo_magazine/hsg_102, +/obj/item/ammo_magazine/hsg_102, +/obj/item/ammo_magazine/hsg_102, +/obj/item/ammo_magazine/hsg_102, +/obj/item/ammo_magazine/hsg_102, /obj/structure/barricade/sandbags{ dir = 4; name = "trench lining"; diff --git a/_maps/modularmaps/oscaroutpost/oscarnorthvar3.dmm b/_maps/modularmaps/oscaroutpost/oscarnorthvar3.dmm index 7676a305ae11a..8adcf95936aa9 100644 --- a/_maps/modularmaps/oscaroutpost/oscarnorthvar3.dmm +++ b/_maps/modularmaps/oscaroutpost/oscarnorthvar3.dmm @@ -220,34 +220,34 @@ /turf/open/ground/grass, /area/oscar_outpost/outside/northwest) "bn" = ( -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, /turf/open/floor/plating/ground/dirt2, @@ -597,55 +597,55 @@ /area/oscar_outpost/outside/northeast) "dd" = ( /obj/structure/rack, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, /turf/open/floor/engine/cult{ @@ -1032,55 +1032,55 @@ /turf/open/floor/plating/ground/dirt2, /area/oscar_outpost/outside/road) "fP" = ( -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, /turf/open/floor/plating/ground/dirt2, @@ -1781,7 +1781,7 @@ /turf/open/ground/grass, /area/oscar_outpost/outside/west) "ll" = ( -/obj/item/weapon/gun/tl102/hsg_nest/sandless{ +/obj/item/weapon/gun/hsg_102/hsg_nest/sandless{ dir = 4 }, /turf/open/floor/plating/ground/dirt2, @@ -1948,7 +1948,7 @@ /turf/open/floor/plating/ground/dirt2, /area/oscar_outpost/outside/northwest) "mR" = ( -/obj/item/weapon/gun/tl102/hsg_nest/sandless{ +/obj/item/weapon/gun/hsg_102/hsg_nest/sandless{ dir = 1; pixel_y = -5 }, @@ -2729,52 +2729,52 @@ /turf/open/floor/plating/ground/dirt2, /area/oscar_outpost/outside/northwest) "rw" = ( -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, /turf/open/floor/plating/ground/dirt2, @@ -2932,7 +2932,7 @@ /obj/structure/platform/trench{ dir = 1 }, -/obj/item/weapon/gun/tl102/hsg_nest/sandless{ +/obj/item/weapon/gun/hsg_102/hsg_nest/sandless{ dir = 1; pixel_y = -5 }, @@ -3143,34 +3143,34 @@ }, /area/oscar_outpost/outside/northwest) "vg" = ( -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, /turf/open/floor/plating/ground/dirt2, @@ -3256,7 +3256,7 @@ /turf/open/ground/grass, /area/oscar_outpost/outside/east) "wf" = ( -/obj/item/weapon/gun/tl102/hsg_nest/sandless{ +/obj/item/weapon/gun/hsg_102/hsg_nest/sandless{ dir = 8; name = "\improper T37 Medium Machinegun" }, @@ -3397,7 +3397,7 @@ /obj/structure/barricade/metal{ dir = 1 }, -/obj/item/weapon/gun/tl102/hsg_nest/sandless{ +/obj/item/weapon/gun/hsg_102/hsg_nest/sandless{ dir = 1 }, /turf/open/floor/engine/cult{ @@ -3903,7 +3903,7 @@ /turf/open/floor/plating, /area/oscar_outpost/outside/north) "Bo" = ( -/obj/item/weapon/gun/tl102/hsg_nest/sandless{ +/obj/item/weapon/gun/hsg_102/hsg_nest/sandless{ dir = 4 }, /turf/open/floor/plating/ground/dirt2, @@ -4156,7 +4156,7 @@ /turf/open/floor, /area/oscar_outpost) "Dg" = ( -/obj/item/weapon/gun/tl102/hsg_nest/sandless{ +/obj/item/weapon/gun/hsg_102/hsg_nest/sandless{ dir = 1; pixel_y = -5 }, @@ -4225,52 +4225,52 @@ /turf/open/floor/wood, /area/oscar_outpost) "Dk" = ( -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, /turf/open/floor/plating/ground/dirt2, @@ -4331,7 +4331,7 @@ }, /area/oscar_outpost/outside/northeast) "DB" = ( -/obj/item/weapon/gun/tl102/hsg_nest/sandless{ +/obj/item/weapon/gun/hsg_102/hsg_nest/sandless{ dir = 1; pixel_y = -5 }, @@ -4523,40 +4523,40 @@ /turf/closed/wall/r_wall, /area/oscar_outpost) "Fu" = ( -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, /turf/open/floor/plating/ground/dirt2, @@ -4611,7 +4611,7 @@ /turf/open/floor/plating/ground/dirt2, /area/oscar_outpost/outside/north) "FM" = ( -/obj/item/weapon/gun/tl102/hsg_nest/sandless{ +/obj/item/weapon/gun/hsg_102/hsg_nest/sandless{ dir = 4; name = "\improper T37 Medium Machinegun" }, @@ -4719,7 +4719,7 @@ /turf/open/floor/plating/ground/dirtgrassborder/corner, /area/oscar_outpost/outside/northeast) "GR" = ( -/obj/item/weapon/gun/tl102/hsg_nest/sandless{ +/obj/item/weapon/gun/hsg_102/hsg_nest/sandless{ dir = 1; pixel_y = -5 }, @@ -5000,34 +5000,34 @@ /turf/open/floor/plating/ground/dirtgrassborder, /area/oscar_outpost/outside/northwest) "IT" = ( -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, /turf/open/floor/plating/ground/dirt2, @@ -5133,7 +5133,7 @@ /turf/open/floor/plating/ground/dirt2, /area/oscar_outpost/outside/northeast) "Kp" = ( -/obj/item/weapon/gun/tl102/hsg_nest/sandless{ +/obj/item/weapon/gun/hsg_102/hsg_nest/sandless{ dir = 1; pixel_y = -5 }, @@ -5917,7 +5917,7 @@ }, /area/oscar_outpost/outside/east) "Pn" = ( -/obj/item/weapon/gun/tl102/hsg_nest/sandless{ +/obj/item/weapon/gun/hsg_102/hsg_nest/sandless{ dir = 8; name = "\improper T37 Medium Machinegun" }, @@ -5955,43 +5955,43 @@ /area/oscar_outpost) "PF" = ( /obj/structure/table/mainship, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/weapon/gun/tl102{ +/obj/item/weapon/gun/hsg_102{ name = "\improper T37 Medium Machinegun" }, -/obj/item/weapon/gun/tl102{ +/obj/item/weapon/gun/hsg_102{ name = "\improper T37 Medium Machinegun" }, /obj/machinery/light{ @@ -6026,67 +6026,67 @@ }, /area/oscar_outpost/outside/northwest) "PM" = ( -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, /turf/open/floor/plating/ground/dirt2, @@ -6359,7 +6359,7 @@ /turf/open/floor/mainship/sterile, /area/oscar_outpost) "RA" = ( -/obj/item/weapon/gun/tl102/hsg_nest/sandless{ +/obj/item/weapon/gun/hsg_102/hsg_nest/sandless{ dir = 1; pixel_y = -5 }, @@ -6376,7 +6376,7 @@ }, /area/oscar_outpost) "RD" = ( -/obj/item/weapon/gun/tl102/hsg_nest/sandless, +/obj/item/weapon/gun/hsg_102/hsg_nest/sandless, /turf/open/floor/plating/ground/dirt2, /area/oscar_outpost/outside/west) "RL" = ( @@ -6406,34 +6406,34 @@ }, /area/oscar_outpost/outside/east) "Sd" = ( -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, /turf/open/floor/plating/ground/dirt2, @@ -6673,7 +6673,7 @@ /turf/open/ground/grass, /area/oscar_outpost/outside/east) "Ug" = ( -/obj/item/weapon/gun/tl102/hsg_nest/sandless{ +/obj/item/weapon/gun/hsg_102/hsg_nest/sandless{ dir = 8; name = "\improper T37 Medium Machinegun" }, @@ -6858,7 +6858,7 @@ /turf/open/floor/plating/ground/dirtgrassborder/corner, /area/oscar_outpost/outside/west) "WC" = ( -/obj/item/weapon/gun/tl102/hsg_nest/sandless{ +/obj/item/weapon/gun/hsg_102/hsg_nest/sandless{ dir = 4; name = "\improper T37 Medium Machinegun" }, @@ -6894,34 +6894,34 @@ /turf/open/floor/plating/ground/dirt2, /area/oscar_outpost/outside/east) "Xn" = ( -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, /turf/open/floor/plating/ground/dirt2, @@ -7021,19 +7021,19 @@ /turf/open/floor, /area/oscar_outpost) "Yh" = ( -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, /turf/open/floor/plating/ground/dirt2, @@ -7075,13 +7075,13 @@ }, /area/oscar_outpost/outside/northwest) "YM" = ( -/obj/item/weapon/gun/tl102/hsg_nest/sandless{ +/obj/item/weapon/gun/hsg_102/hsg_nest/sandless{ dir = 4 }, /turf/open/floor/plating/ground/dirt2, /area/oscar_outpost/outside/northeast) "YT" = ( -/obj/item/weapon/gun/tl102/hsg_nest/sandless, +/obj/item/weapon/gun/hsg_102/hsg_nest/sandless, /turf/open/floor/plating/ground/dirt2, /area/oscar_outpost/outside/east) "YV" = ( @@ -7177,80 +7177,80 @@ }, /area/oscar_outpost/outside/road) "Zu" = ( -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, -/obj/item/ammo_magazine/tl102{ +/obj/item/ammo_magazine/hsg_102{ name = "T37 MMG ammunition box (10x28mm tungsten rounds)" }, /turf/open/floor/plating/ground/dirt2, /area/oscar_outpost/outside/northwest) "Zz" = ( -/obj/item/ammo_magazine/tl102, -/obj/item/ammo_magazine/tl102, -/obj/item/ammo_magazine/tl102, -/obj/item/ammo_magazine/tl102, -/obj/item/ammo_magazine/tl102, -/obj/item/ammo_magazine/tl102, -/obj/item/ammo_magazine/tl102, -/obj/item/ammo_magazine/tl102, -/obj/item/ammo_magazine/tl102, -/obj/item/ammo_magazine/tl102, -/obj/item/ammo_magazine/tl102, -/obj/item/ammo_magazine/tl102, -/obj/item/ammo_magazine/tl102, -/obj/item/ammo_magazine/tl102, -/obj/item/ammo_magazine/tl102, -/obj/item/ammo_magazine/tl102, -/obj/item/ammo_magazine/tl102, -/obj/item/ammo_magazine/tl102, -/obj/item/ammo_magazine/tl102, -/obj/item/ammo_magazine/tl102, +/obj/item/ammo_magazine/hsg_102, +/obj/item/ammo_magazine/hsg_102, +/obj/item/ammo_magazine/hsg_102, +/obj/item/ammo_magazine/hsg_102, +/obj/item/ammo_magazine/hsg_102, +/obj/item/ammo_magazine/hsg_102, +/obj/item/ammo_magazine/hsg_102, +/obj/item/ammo_magazine/hsg_102, +/obj/item/ammo_magazine/hsg_102, +/obj/item/ammo_magazine/hsg_102, +/obj/item/ammo_magazine/hsg_102, +/obj/item/ammo_magazine/hsg_102, +/obj/item/ammo_magazine/hsg_102, +/obj/item/ammo_magazine/hsg_102, +/obj/item/ammo_magazine/hsg_102, +/obj/item/ammo_magazine/hsg_102, +/obj/item/ammo_magazine/hsg_102, +/obj/item/ammo_magazine/hsg_102, +/obj/item/ammo_magazine/hsg_102, +/obj/item/ammo_magazine/hsg_102, /turf/open/floor/plating/ground/dirt2, /area/oscar_outpost/outside/west) "ZB" = ( diff --git a/_maps/modularmaps/oscaroutpost/oscarnorthvar4.dmm b/_maps/modularmaps/oscaroutpost/oscarnorthvar4.dmm index eed7f3f8b9e63..adf274436d4ad 100644 --- a/_maps/modularmaps/oscaroutpost/oscarnorthvar4.dmm +++ b/_maps/modularmaps/oscaroutpost/oscarnorthvar4.dmm @@ -1,6 +1,6 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "ad" = ( -/obj/item/weapon/gun/tl102/hsg_nest/sandless{ +/obj/item/weapon/gun/hsg_102/hsg_nest/sandless{ dir = 4 }, /turf/open/floor/plating/ground/dirt2, @@ -76,36 +76,36 @@ "aT" = ( /obj/structure/table/rusticwoodentable, /obj/machinery/light, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, /turf/open/floor, /area/oscar_outpost) "aU" = ( @@ -174,7 +174,7 @@ /turf/open/floor/plating/ground/dirtgrassborder/corner, /area/oscar_outpost/outside/northeast) "bx" = ( -/obj/item/weapon/gun/tl102/hsg_nest/sandless{ +/obj/item/weapon/gun/hsg_102/hsg_nest/sandless{ dir = 1; pixel_y = -5 }, @@ -485,26 +485,26 @@ "eE" = ( /obj/structure/table/mainship, /obj/item/tool/pen, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, /turf/open/floor, /area/oscar_outpost) "eF" = ( @@ -1396,7 +1396,7 @@ /turf/open/ground/grass, /area/oscar_outpost/outside/east) "ow" = ( -/obj/item/weapon/gun/tl102/hsg_nest/sandless{ +/obj/item/weapon/gun/hsg_102/hsg_nest/sandless{ dir = 1; pixel_y = -5 }, @@ -1666,13 +1666,13 @@ }, /area/oscar_outpost/outside/northeast) "pQ" = ( -/obj/item/weapon/gun/tl102/hsg_nest/sandless{ +/obj/item/weapon/gun/hsg_102/hsg_nest/sandless{ dir = 4 }, /turf/open/floor/plating/ground/dirt2, /area/oscar_outpost/outside/northwest) "pU" = ( -/obj/item/weapon/gun/tl102/hsg_nest/sandless{ +/obj/item/weapon/gun/hsg_102/hsg_nest/sandless{ dir = 8 }, /turf/open/floor/plating/ground/dirt2, @@ -2049,7 +2049,7 @@ /turf/open/floor/plating/ground/dirt2, /area/oscar_outpost/outside/north) "tl" = ( -/obj/item/weapon/gun/tl102/hsg_nest/sandless, +/obj/item/weapon/gun/hsg_102/hsg_nest/sandless, /turf/open/floor/plating/ground/dirt2, /area/oscar_outpost/outside/east) "tm" = ( @@ -2170,7 +2170,7 @@ }, /area/oscar_outpost) "uN" = ( -/obj/item/weapon/gun/tl102/hsg_nest/sandless{ +/obj/item/weapon/gun/hsg_102/hsg_nest/sandless{ dir = 4 }, /obj/structure/barricade/metal{ @@ -2330,7 +2330,7 @@ /turf/open/ground/grass, /area/oscar_outpost/outside/west) "wr" = ( -/obj/item/weapon/gun/tl102/hsg_nest/sandless{ +/obj/item/weapon/gun/hsg_102/hsg_nest/sandless{ dir = 8 }, /obj/structure/barricade/metal{ @@ -2415,7 +2415,7 @@ }, /area/oscar_outpost/outside/northeast) "xh" = ( -/obj/item/weapon/gun/tl102/hsg_nest/sandless{ +/obj/item/weapon/gun/hsg_102/hsg_nest/sandless{ dir = 1; pixel_y = -5 }, @@ -2533,29 +2533,29 @@ /turf/open/floor, /area/oscar_outpost) "zh" = ( -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, /turf/open/floor/engine/cult{ dir = 2 }, @@ -2588,7 +2588,7 @@ }, /area/oscar_outpost/outside/northeast) "zF" = ( -/obj/item/weapon/gun/tl102/hsg_nest/sandless{ +/obj/item/weapon/gun/hsg_102/hsg_nest/sandless{ dir = 4 }, /turf/open/floor/plating/ground/dirt2, @@ -3263,7 +3263,7 @@ /turf/open/floor/plating/ground/dirt, /area/oscar_outpost/outside/north) "FW" = ( -/obj/item/weapon/gun/tl102/hsg_nest/sandless{ +/obj/item/weapon/gun/hsg_102/hsg_nest/sandless{ dir = 8 }, /turf/open/floor/plating/ground/dirt2, @@ -3636,7 +3636,7 @@ }, /area/oscar_outpost) "Kj" = ( -/obj/item/weapon/gun/tl102/hsg_nest/sandless{ +/obj/item/weapon/gun/hsg_102/hsg_nest/sandless{ dir = 8 }, /turf/open/floor/plating/ground/dirt2, @@ -3744,7 +3744,7 @@ /turf/open/floor, /area/oscar_outpost) "Lj" = ( -/obj/item/weapon/gun/tl102/hsg_nest/sandless, +/obj/item/weapon/gun/hsg_102/hsg_nest/sandless, /turf/open/floor/plating/ground/dirt2, /area/oscar_outpost/outside/west) "Lk" = ( @@ -4329,7 +4329,7 @@ }, /area/oscar_outpost) "PI" = ( -/obj/item/weapon/gun/tl102/hsg_nest/sandless{ +/obj/item/weapon/gun/hsg_102/hsg_nest/sandless{ dir = 1; pixel_y = -5 }, @@ -4381,29 +4381,29 @@ }, /area/oscar_outpost/outside/northeast) "PQ" = ( -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, /turf/open/floor/plating/ground/dirt2, /area/oscar_outpost/outside/northeast) "PU" = ( @@ -4452,29 +4452,29 @@ /turf/closed/wall, /area/oscar_outpost/outside/west) "Qu" = ( -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, /turf/open/floor/plating/ground/dirt2, /area/oscar_outpost/outside/west) "Qz" = ( @@ -5260,7 +5260,7 @@ /turf/open/floor/tile/dark, /area/oscar_outpost) "YO" = ( -/obj/item/weapon/gun/tl102/hsg_nest/sandless{ +/obj/item/weapon/gun/hsg_102/hsg_nest/sandless{ dir = 1; pixel_y = -5 }, @@ -5321,29 +5321,29 @@ /turf/open/ground/grass, /area/oscar_outpost/outside/northeast) "Zu" = ( -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, /turf/open/floor/plating/ground/dirt2, /area/oscar_outpost/outside/northwest) "Zz" = ( @@ -5376,29 +5376,29 @@ /turf/open/floor/plating/ground/dirt2, /area/oscar_outpost/outside/east) "ZD" = ( -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, -/obj/item/ammo_magazine/tl102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, +/obj/item/ammo_magazine/hsg_102/hsg_nest, /turf/open/floor/plating/ground/dirt2, /area/oscar_outpost/outside/east) "ZE" = ( diff --git a/code/__DEFINES/admin.dm b/code/__DEFINES/admin.dm index b93e1c87b6025..828b937a8046d 100644 --- a/code/__DEFINES/admin.dm +++ b/code/__DEFINES/admin.dm @@ -43,8 +43,9 @@ #define R_DBRANKS (1<<13) #define R_RUNTIME (1<<14) #define R_LOG (1<<15) +#define R_POLLS (1<<16) -#define R_EVERYTHING (1<<16)-1 //the sum of all other rank permissions, used for +EVERYTHING +#define R_EVERYTHING (ALL) //the sum of all other rank permissions, used for +EVERYTHING #define ADMIN_QUE(user) "(?)" #define ADMIN_FLW(user) "(FLW)" diff --git a/code/__DEFINES/ai.dm b/code/__DEFINES/ai.dm index 4930dc40ca895..d2612d736dc83 100644 --- a/code/__DEFINES/ai.dm +++ b/code/__DEFINES/ai.dm @@ -46,6 +46,8 @@ #define TARGET_HUMAN (1<<2) #define TARGET_XENO (1<<3) #define TARGET_UNMANNED_VEHICLE (1<<4) +#define TARGET_FRIENDLY_XENO (1<<5) +#define TARGET_HOSTILE (ALL &~ TARGET_FRIENDLY_XENO) #define MAX_NODE_RANGE 15 #define PATHFINDER_MAX_TRIES 200 diff --git a/code/__DEFINES/cooldowns.dm b/code/__DEFINES/cooldowns.dm index 4831c7bf47ea1..5f849a9e07aff 100644 --- a/code/__DEFINES/cooldowns.dm +++ b/code/__DEFINES/cooldowns.dm @@ -52,6 +52,8 @@ #define COOLDOWN_TRY_TTS "cooldown_try_tts" #define COOLDOWN_EVASION_ACTIVATION "cooldown_evasion_activation" #define COOLDOWN_TANK_SWIVEL "tank_turret_swivel" +#define COOLDOWN_WHISTLE_BLOW "cooldown_whistle_blow" +#define COOLDOWN_WHISTLE_WARCRY "cooldown_whistle_warcry" //Mecha cooldowns #define COOLDOWN_MECHA "mecha" diff --git a/code/__DEFINES/dcs/signals.dm b/code/__DEFINES/dcs/signals.dm index dc81c0ae2637f..99dd0755d1f66 100755 --- a/code/__DEFINES/dcs/signals.dm +++ b/code/__DEFINES/dcs/signals.dm @@ -67,6 +67,9 @@ #define COMSIG_GLOB_CAS_LASER_CREATED "!cas_laser_sent" #define COMSIG_GLOB_RAILGUN_LASER_CREATED "!railgun_laser_sent" +//Sent when a supply beacon is activated +#define COMSIG_GLOB_SUPPLY_BEACON_CREATED "!supply_beacon_created" + //Signals for shuttle #define COMSIG_GLOB_SHUTTLE_TAKEOFF "!shuttle_take_off" @@ -107,12 +110,14 @@ #define COMSIG_GLOB_CAMPAIGN_DROPBLOCKER_DISABLED "!campaign_dropblocker_disabled" ///Override code for NT base rescue mission #define COMSIG_GLOB_CAMPAIGN_NT_OVERRIDE_CODE "!campaign_nt_override_code" -///Campaign asset obtained for the first time -#define COMSIG_CAMPAIGN_NEW_ASSET "campaign_new_asset" -///Campaign asset activation successful -#define COMSIG_CAMPAIGN_ASSET_ACTIVATION "campaign_asset_activation" -///Campaign asset disabler activated -#define COMSIG_CAMPAIGN_DISABLER_ACTIVATION "campaign_disabler_activation" +///Code computer starts running +#define COMSIG_GLOB_CAMPAIGN_NT_OVERRIDE_RUNNING "!campaign_nt_override_running" +///Code computer stops running +#define COMSIG_GLOB_CAMPAIGN_NT_OVERRIDE_STOP_RUNNING "!campaign_nt_override_stop_running" +///Campaign OB beacon deployed +#define COMSIG_GLOB_CAMPAIGN_OB_BEACON_ACTIVATION "!campaign_ob_beacon_activation" +///Campaign OB beacon going off +#define COMSIG_GLOB_CAMPAIGN_OB_BEACON_TRIGGERED "!campaign_ob_beacon_triggered" ////////////////////////////////////////////////////////////////// // /datum/component signals @@ -1090,3 +1095,10 @@ #define COMSIG_CAVE_INTERFERENCE_CHECK "cave_interference_check" //! Cave comms interference check signal. +//Campaign signals +///Campaign asset obtained for the first time +#define COMSIG_CAMPAIGN_NEW_ASSET "campaign_new_asset" +///Campaign asset activation successful +#define COMSIG_CAMPAIGN_ASSET_ACTIVATION "campaign_asset_activation" +///Campaign asset disabler activated +#define COMSIG_CAMPAIGN_DISABLER_ACTIVATION "campaign_disabler_activation" diff --git a/code/__DEFINES/dcs/signals/signals_hud.dm b/code/__DEFINES/dcs/signals/signals_hud.dm new file mode 100644 index 0000000000000..d2c86ffc6c388 --- /dev/null +++ b/code/__DEFINES/dcs/signals/signals_hud.dm @@ -0,0 +1 @@ +#define COMSIG_XENOMORPH_UPDATE_ICONS "xenomorph_update_icons" diff --git a/code/__DEFINES/icon_smoothing.dm b/code/__DEFINES/icon_smoothing.dm index 3a53bcb459dae..033235546899a 100644 --- a/code/__DEFINES/icon_smoothing.dm +++ b/code/__DEFINES/icon_smoothing.dm @@ -70,6 +70,7 @@ #define SMOOTH_GROUP_BASALT S_TURF(38) #define SMOOTH_GROUP_RIVER S_TURF(39) #define SMOOTH_GROUP_ICE_WALL S_TURF(40) +#define SMOOTH_GROUP_SAND S_TURF(41) #define MAX_S_TURF SMOOTH_GROUP_ICE_WALL //Always match this value with the one above it. diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm index f5603faa7952a..b904d9c623965 100755 --- a/code/__DEFINES/is_helpers.dm +++ b/code/__DEFINES/is_helpers.dm @@ -269,6 +269,8 @@ GLOBAL_VAR_INIT(refid_filter, TYPEID(filter(type="angular_blur"))) #define isearthpillar(A) (istype(A, /obj/structure/earth_pillar)) +#define isbarricade(A) (istype(A, /obj/structure/barricade)) + //Assemblies #define isassembly(O) (istype(O, /obj/item/assembly)) diff --git a/code/__DEFINES/layers.dm b/code/__DEFINES/layers.dm index 7324c18a3cb66..2046c2032d72e 100644 --- a/code/__DEFINES/layers.dm +++ b/code/__DEFINES/layers.dm @@ -28,6 +28,8 @@ #define FLOOR_PLANE -5 #define GAME_PLANE -4 +///Slightly above the game plane but does not catch mouse clicks. Useful for certain visuals that should be clicked through, like seethrough trees +#define SEETHROUGH_PLANE -2 #define BLACKNESS_PLANE 0 //To keep from conflicts with SEE_BLACKNESS internals @@ -245,3 +247,28 @@ #define SPLASHSCREEN_LAYER 9999 #define SPLASHSCREEN_PLANE 9999 + +// Lummox I swear to god I will find you +// NOTE! You can only ever have planes greater then -10000, if you add too many with large offsets you will brick multiz +// Same can be said for large multiz maps. Tread carefully mappers +#define HIGHEST_EVER_PLANE 10000 +/// The range unique planes can be in +/// Try and keep this to a nice whole number, so it's easy to look at a plane var and know what's going on +#define PLANE_RANGE (HIGHEST_EVER_PLANE - LOWEST_EVER_PLANE) + +///Plane master controller keys +#define PLANE_MASTERS_GAME "plane_masters_game" +#define PLANE_MASTERS_NON_MASTER "plane_masters_non_master" +#define PLANE_MASTERS_COLORBLIND "plane_masters_colorblind" + +//Plane master critical flags +//Describes how different plane masters behave when they are being culled for performance reasons +/// This plane master will not go away if its layer is culled. useful for preserving effects +#define PLANE_CRITICAL_DISPLAY (1<<0) +/// This plane master will temporarially remove relays to all other planes +/// Allows us to retain the effects of a plane while cutting off the changes it makes +#define PLANE_CRITICAL_NO_RELAY (1<<1) +/// We assume this plane master has a render target starting with *, it'll be removed, forcing it to render in place +#define PLANE_CRITICAL_CUT_RENDER (1<<2) + +#define PLANE_CRITICAL_FUCKO_PARALLAX (PLANE_CRITICAL_DISPLAY|PLANE_CRITICAL_NO_RELAY|PLANE_CRITICAL_CUT_RENDER) diff --git a/code/__DEFINES/monitor.dm b/code/__DEFINES/monitor.dm index e57d7ca622679..b0297bb936c89 100644 --- a/code/__DEFINES/monitor.dm +++ b/code/__DEFINES/monitor.dm @@ -52,7 +52,7 @@ GLOBAL_VAR_INIT(xeno_stat_multiplicator_buff, 1) ///50% is the maximum buff that xeno can receive -#define MAXIMUM_XENO_BUFF_POSSIBLE 1.5 +#define MAXIMUM_XENO_BUFF_POSSIBLE 1.5 #define MAX_SPAWNABLE_MOB_PER_PLAYER 0.15 //So for 50 players, each spawner can generate 7 mobs -#define SPAWN_RATE_PER_PLAYER 36 //For each player, the time between two consecutive spawns is reduced by 36 ticks. So for 35 players, it's one mob every minute +#define SPAWN_RATE_PER_PLAYER 72 //For each player, the time between two consecutive spawns is reduced by 72ticks. So for 35 players, it's one mob every 30 seconds diff --git a/code/__DEFINES/skills.dm b/code/__DEFINES/skills.dm index 8fc7ccb7ac72a..ea5dcd37c2513 100644 --- a/code/__DEFINES/skills.dm +++ b/code/__DEFINES/skills.dm @@ -71,16 +71,16 @@ #define SKILL_CONSTRUCTION_METAL 1 //metal barricade construction (CT) #define SKILL_CONSTRUCTION_PLASTEEL 2 //plasteel barricade,(RO, SL) #define SKILL_CONSTRUCTION_ADVANCED 3 //windows and girder construction (combat engi, CO) -#define SKILL_CONSTRUCTION_MASTER 4 //building machine&computer frames (MT, CE) -#define SKILL_CONSTRUCTION_INHUMAN 5 //Early synth level. +#define SKILL_CONSTRUCTION_EXPERT 4 //building machine&computer frames (MT, CE) +#define SKILL_CONSTRUCTION_MASTER 5 //Early synth level. // engineer skill #define SKILL_ENGINEER_DEFAULT 0 #define SKILL_ENGINEER_METAL 1 //metal barricade repair && c4 use #define SKILL_ENGINEER_PLASTEEL 2 //plasteel barricade repair #define SKILL_ENGINEER_ENGI 3 //hacking&&planet engine fixing&&apc building (combat engi) -#define SKILL_ENGINEER_MASTER 4 //Telecomms fixing, faster engine fixing (ST) -#define SKILL_ENGINEER_INHUMAN 5 //Early synth level. +#define SKILL_ENGINEER_EXPERT 4 //Telecomms fixing, faster engine fixing (ST) +#define SKILL_ENGINEER_MASTER 5 //CSE, Early synth level. //higher levels give faster engine repair. //medical skill diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm index f23ede7990ecb..27841df1059aa 100644 --- a/code/__DEFINES/traits.dm +++ b/code/__DEFINES/traits.dm @@ -195,7 +195,8 @@ #define TRAIT_SEE_IN_DARK "see_in_dark" //Able to see in dark #define TRAIT_MUTED "muted" //target is mute and can't speak #define TRAIT_TURRET_HIDDEN "turret_hidden" //target gets passed over by turrets choosing a victim -#define TRAIT_MOB_ICON_UPDATE_BLOCKED "icon_blocked" //target should not update its icon_state +///The target xenomorph's wound overlays won't be visible +#define TRAIT_XENOMORPH_INVISIBLE_BLOOD "invisible_blood" #define TRAIT_VALHALLA_XENO "valhalla_xeno" #define TRAIT_BULWARKED_TURF "bulwarked_turf" // turf is affected by bulwark ability @@ -258,3 +259,6 @@ //regress and caste swap UI #define TRAIT_CASTE_SWAP "caste_swap" #define TRAIT_REGRESSING "regressing" + +///Pauses campaign mission timer +#define CAMPAIGN_MISSION_TIMER_PAUSED "campaign_mission_timer_paused" diff --git a/code/__HELPERS/_planes.dm b/code/__HELPERS/_planes.dm new file mode 100644 index 0000000000000..769c4283ea626 --- /dev/null +++ b/code/__HELPERS/_planes.dm @@ -0,0 +1,88 @@ +// This file contains helper macros for plane operations +// See the planes section of Visuals.md for more detail, but essentially +// When we render multiz, we do it by placing all atoms on lower levels on well, lower planes +// This is done with stacks of plane masters (things we use to apply effects to planes) +// These macros exist to facilitate working with this system, and other associated small bits + +/// Takes an atom to change the plane of, a new plane value, and something that can be used as a reference to a z level as input +/// Modifies the new value to match the plane we actually want. Note, if you pass in an already offset plane the offsets will add up +/// Use PLANE_TO_TRUE() to avoid this +#define SET_PLANE(thing, new_value, z_reference) (thing.plane = MUTATE_PLANE(new_value, z_reference)) + +/// Takes a plane and a z reference, and offsets the plane by the mutation +/// The SSmapping.max_plane_offset bit here is technically redundant, but saves a bit of work in the base case +/// And the base case is important to me. Non multiz shouldn't get hit too bad by this code +#define MUTATE_PLANE(new_value, z_reference) ((SSmapping.max_plane_offset) ? GET_NEW_PLANE(new_value, GET_TURF_PLANE_OFFSET(z_reference)) : (new_value)) + +/// Takes a z reference that we are unsure of, sanity checks it +/// Returns either its offset, or 0 if it's not a valid ref +/// Will return the reference's PLANE'S offset if we can't get anything out of the z level. We do our best +#define GET_TURF_PLANE_OFFSET(z_reference) ((SSmapping.max_plane_offset && isatom(z_reference)) ? (z_reference.z ? GET_Z_PLANE_OFFSET(z_reference.z) : PLANE_TO_OFFSET(z_reference.plane)) : 0) +/// Essentially just an unsafe version of GET_TURF_PLANE_OFFSET() +/// Takes a z value we returns its offset with a list lookup +/// Will runtime during parts of init. Be careful :) +#define GET_Z_PLANE_OFFSET(z) (SSmapping.z_level_to_plane_offset[z]) + +/// Takes a plane to offset, and the multiplier to use, and well, does the offsetting +/// Respects a blacklist we use to remove redundant plane masters, such as hud objects +#define GET_NEW_PLANE(new_value, multiplier) (SSmapping.plane_offset_blacklist?["[new_value]"] ? new_value : (new_value) - (PLANE_RANGE * (multiplier))) + +// Now for the more niche things + +/// Takes an object, new plane, and multipler, and offsets the plane +/// This is for cases where you have a multipler precalculated, and just want to use it +/// Often an optimization, sometimes a necessity +#define SET_PLANE_W_SCALAR(thing, new_value, multiplier) (thing.plane = GET_NEW_PLANE(new_value, multiplier)) + + +/// Implicit plane set. We take the turf from the object we're changing the plane of, and use ITS z as a spokesperson for our plane value +#define SET_PLANE_IMPLICIT(thing, new_value) SET_PLANE_EXPLICIT(thing, new_value, thing) + +// This is an unrolled and optimized version of SET_PLANE, for use anywhere where you are unsure of a source's "turfness" +// We do also try and guess at what the thing's z level is, even if it's not a z +// The plane is cached to allow for fancy stuff to be eval'd once, rather then often +#define SET_PLANE_EXPLICIT(thing, new_value, source) \ + do {\ + if(SSmapping.max_plane_offset) {\ + var/_cached_plane = new_value;\ + var/turf/_our_turf = get_turf(source);\ + if(_our_turf){\ + thing.plane = GET_NEW_PLANE(_cached_plane, GET_Z_PLANE_OFFSET(_our_turf.z));\ + }\ + else if(source) {\ + thing.plane = GET_NEW_PLANE(_cached_plane, PLANE_TO_OFFSET(source.plane));\ + }\ + else {\ + thing.plane = _cached_plane;\ + }\ + }\ + else {\ + thing.plane = new_value;\ + }\ + }\ + while (FALSE) + +// Now for macros that exist to get info from SSmapping +// Mostly about details of planes, or z levels + +/// Takes a z level, gets the lowest plane offset in its "stack" +#define GET_LOWEST_STACK_OFFSET(z) ((SSmapping.max_plane_offset) ? SSmapping.z_level_to_lowest_plane_offset[z] : 0) +/// Takes a plane, returns the canonical, unoffset plane it represents +#define PLANE_TO_TRUE(plane) ((SSmapping.plane_offset_to_true) ? SSmapping.plane_offset_to_true["[plane]"] : plane) +/// Takes a plane, returns the offset it uses +#define PLANE_TO_OFFSET(plane) ((SSmapping.plane_to_offset) ? SSmapping.plane_to_offset["[plane]"] : plane) +/// Takes a plane, returns TRUE if it is of critical priority, FALSE otherwise +#define PLANE_IS_CRITICAL(plane) ((SSmapping.plane_to_offset) ? !!SSmapping.critical_planes["[plane]"] : FALSE) +/// Takes a true plane, returns the offset planes that would canonically represent it +#define TRUE_PLANE_TO_OFFSETS(plane) ((SSmapping.true_to_offset_planes) ? SSmapping.true_to_offset_planes["[plane]"] : list(plane)) +/// Takes a render target and an offset, returns a canonical render target string for it +#define OFFSET_RENDER_TARGET(render_target, offset) (_OFFSET_RENDER_TARGET(render_target, SSmapping.render_offset_blacklist?["[render_target]"] ? 0 : offset)) +/// Helper macro for the above +/// Honestly just exists to make the pattern of render target strings more readable +#define _OFFSET_RENDER_TARGET(render_target, offset) ("[(render_target)] #[(offset)]") + +// Known issues: +// Potentially too much client load? Hard to tell due to not having a potato pc to hand. +// This is solvable with lowspec preferences, which would not be hard to implement +// Player popups will now render their effects, like overlay lights. this is fixable, but I've not gotten to it +// I think overlay lights can render on the wrong z layer. s fucked diff --git a/code/__HELPERS/ai.dm b/code/__HELPERS/ai.dm index b76e590ef397b..27a6ed832d39b 100644 --- a/code/__HELPERS/ai.dm +++ b/code/__HELPERS/ai.dm @@ -60,6 +60,8 @@ return var/atom/nearest_target var/shorter_distance = distance + 1 + // Cache it in case we need it twice + var/list/nearby_xeno_list if(target_flags & TARGET_HUMAN) for(var/mob/living/nearby_human AS in cheap_get_humans_near(source, distance)) if(nearby_human.stat == DEAD || nearby_human.faction == attacker_faction || nearby_human.alpha <= SCOUT_CLOAK_RUN_ALPHA) @@ -68,7 +70,8 @@ nearest_target = nearby_human shorter_distance = get_dist(source, nearby_human) //better to recalculate than to save the var if(target_flags & TARGET_XENO) - for(var/mob/nearby_xeno AS in cheap_get_xenos_near(source, shorter_distance - 1)) + nearby_xeno_list = cheap_get_xenos_near(source, shorter_distance - 1) + for(var/mob/nearby_xeno AS in nearby_xeno_list) if(source.issamexenohive(nearby_xeno)) continue if(nearby_xeno.stat == DEAD || nearby_xeno.alpha <= HUNTER_STEALTH_RUN_ALPHA) @@ -92,6 +95,21 @@ if(!(get_dist(source, nearby_vehicle) < shorter_distance)) continue nearest_target = nearby_vehicle + if(target_flags & TARGET_FRIENDLY_XENO) + if(!nearby_xeno_list) + nearby_xeno_list = cheap_get_xenos_near(source, shorter_distance - 1) + for(var/mob/nearby_xeno AS in nearby_xeno_list) + if(source == nearby_xeno) + continue + if(!nearby_xeno.client) + continue + if(!source.issamexenohive(nearby_xeno)) + continue + if(nearby_xeno.stat == DEAD) + continue + if(get_dist(source, nearby_xeno) < shorter_distance) + nearest_target = nearby_xeno + shorter_distance = get_dist(source, nearby_xeno) return nearest_target /** diff --git a/code/__HELPERS/type2type.dm b/code/__HELPERS/type2type.dm index 83496fdb3eab7..87d29611f390f 100644 --- a/code/__HELPERS/type2type.dm +++ b/code/__HELPERS/type2type.dm @@ -173,6 +173,8 @@ . += "[seperator]+RUNTIME" if(rights & R_LOG) . += "[seperator]+LOG" + if(rights & R_POLLS) + . += "[seperator]+POLLS" /proc/ui_style2icon(ui_style) diff --git a/code/_globalvars/bitfields.dm b/code/_globalvars/bitfields.dm index dcd42120d6d1e..961a3cf7f1d46 100644 --- a/code/_globalvars/bitfields.dm +++ b/code/_globalvars/bitfields.dm @@ -15,7 +15,8 @@ GLOBAL_LIST_INIT(bitfields, list( "SPAWN" = R_SPAWN, "DBRANKS" = R_DBRANKS, "RUNTIME" = R_RUNTIME, - "LOG" = R_LOG + "LOG" = R_LOG, + "POLLS" = R_POLLS ), "machine_stat" = list( "BROKEN" = BROKEN, diff --git a/code/_globalvars/lists/flavor_misc.dm b/code/_globalvars/lists/flavor_misc.dm index 760be8338137e..46f31d14c6d6b 100644 --- a/code/_globalvars/lists/flavor_misc.dm +++ b/code/_globalvars/lists/flavor_misc.dm @@ -232,6 +232,8 @@ GLOBAL_LIST_INIT(campaign_perk_icon_types, list( )) GLOBAL_LIST_INIT(campaign_loadout_item_icon_types, list( + "default", + "empty", "light_armour_shield", "medium_armour_shield", "heavy_armour_shield", @@ -258,6 +260,29 @@ GLOBAL_LIST_INIT(campaign_loadout_item_icon_types, list( "pistol", "smg", "construction", + "tx55", + "m25", + "m240", + "m1911c", + "rt3", + "88m4", + "v11", + "t19", + "t90", + "sg29", + "t18", + "t12", + "alf51b", + "tx11", + "sshotgun", + "tx15", + "t160", + "t60", + "v34", + "ak47", + "v41", + "rpg", + "t35", )) GLOBAL_LIST_INIT(minimap_icons, init_minimap_icons()) diff --git a/code/_onclick/hud/hud.dm b/code/_onclick/hud/hud.dm index ef8b33b1dd50e..0df65aa09be5b 100644 --- a/code/_onclick/hud/hud.dm +++ b/code/_onclick/hud/hud.dm @@ -59,7 +59,11 @@ var/atom/movable/screen/action_button/hide_toggle/hide_actions_toggle var/action_buttons_hidden = 0 - var/list/atom/movable/screen/plane_master/plane_masters = list() // see "appearance_flags" in the ref, assoc list of "[plane]" = object + /// Assoc list of key => "plane master groups" + /// This is normally just the main window, but it'll occasionally contain things like spyglasses windows + var/list/datum/plane_master_group/master_groups = list() + /// see "appearance_flags" in the ref, assoc list of "[plane]" = object + var/list/atom/movable/screen/plane_master/plane_masters = list() // List of weakrefs to objects that we add to our screen that we don't expect to DO anything // They typically use * in their render target. They exist solely so we can reuse them, @@ -75,6 +79,15 @@ plane_masters["[instance.plane]"] = instance instance.backdrop(mymob) + var/datum/plane_master_group/main/main_group = new(PLANE_GROUP_MAIN) + main_group.attach_to(src) + +/datum/hud/proc/should_use_scale() + return should_sight_scale(mymob.sight) + +/datum/hud/proc/should_sight_scale(sight_flags) + return (sight_flags & (SEE_TURFS | SEE_OBJS)) != SEE_TURFS + /datum/hud/Destroy() if(mymob.hud_used == src) mymob.hud_used = null @@ -139,6 +152,25 @@ return ..() +/// Creates the required plane masters to fill out new z layers (because each "level" of multiz gets its own plane master set) +/datum/hud/proc/build_plane_groups(starting_offset, ending_offset) + for(var/group_key in master_groups) + var/datum/plane_master_group/group = master_groups[group_key] + group.build_plane_masters(starting_offset, ending_offset) + +/// Returns the plane master that matches the input plane from the passed in group +/datum/hud/proc/get_plane_master(plane, group_key = PLANE_GROUP_MAIN) + var/plane_key = "[plane]" + var/datum/plane_master_group/group = master_groups[group_key] + return group.plane_masters[plane_key] + +/// Returns a list of all plane masters that match the input true plane, drawn from the passed in group (ignores z layer offsets) +/datum/hud/proc/get_true_plane_masters(true_plane, group_key = PLANE_GROUP_MAIN) + var/list/atom/movable/screen/plane_master/masters = list() + for(var/plane in TRUE_PLANE_TO_OFFSETS(true_plane)) + masters += get_plane_master(plane, group_key) + return masters + /mob/proc/create_mob_hud() if(!client || hud_used) return diff --git a/code/_onclick/hud/radial.dm b/code/_onclick/hud/radial.dm index 9822401ebea53..8335c2732d301 100644 --- a/code/_onclick/hud/radial.dm +++ b/code/_onclick/hud/radial.dm @@ -292,7 +292,7 @@ GLOBAL_LIST_EMPTY(radial_menus) Choices should be a list where list keys are movables or text used for element names and return value and list values are movables/icons/images used for element icons */ -/proc/show_radial_menu(mob/user, atom/anchor, list/choices, uniqueid, radius, datum/callback/custom_check, require_near = FALSE, tooltips = FALSE) +/proc/show_radial_menu(mob/user, atom/anchor, list/choices, uniqueid, radius, datum/callback/custom_check, require_near = FALSE, tooltips = FALSE, angle_override) if(!user || !anchor || !length(choices)) return if(!uniqueid) @@ -302,6 +302,8 @@ GLOBAL_LIST_EMPTY(radial_menus) return var/datum/radial_menu/menu = new + if(angle_override) + menu.min_angle = angle_override GLOB.radial_menus[uniqueid] = menu if(radius) menu.radius = radius diff --git a/code/_onclick/hud/rendering/plane_master.dm b/code/_onclick/hud/rendering/_plane_master.dm similarity index 57% rename from code/_onclick/hud/rendering/plane_master.dm rename to code/_onclick/hud/rendering/_plane_master.dm index 1c85b345fa58d..570e12b650f62 100644 --- a/code/_onclick/hud/rendering/plane_master.dm +++ b/code/_onclick/hud/rendering/_plane_master.dm @@ -17,12 +17,142 @@ ///reference to render relay screen object to avoid backdropping multiple times var/atom/movable/render_plane_relay/relay + /// If our plane master allows for offsetting + /// Mostly used for planes that really don't need to be duplicated, like the hud planes + var/allows_offsetting = TRUE + /// Our offset from our "true" plane, see below + var/offset + /// When rendering multiz, lower levels get their own set of plane masters + /// Real plane here represents the "true" plane value of something, ignoring the offset required to handle lower levels + var/real_plane + + /// list of current relays this plane is utilizing to render + var/list/atom/movable/render_plane_relay/relays = list() + + /// If this plane master should be hidden from the player at roundstart + /// We do this so PMs can opt into being temporary, to reduce load on clients + var/start_hidden = FALSE + /// If this plane master is being forced to hide. + /// Hidden PMs will dump ANYTHING relayed or drawn onto them. Be careful with this + /// Remember: a hidden plane master will dump anything drawn directly to it onto the output render. It does NOT hide its contents + /// Use alpha for that + var/force_hidden = FALSE + + /// If this plane should be scaled by multiz + /// Planes with this set should NEVER be relay'd into each other, as that will cause visual fuck + var/multiz_scaled = TRUE + + /// Bitfield that describes how this plane master will render if its z layer is being "optimized" + /// If a plane master is NOT critical, it will be completely dropped if we start to render outside a client's multiz boundary prefs + /// Of note: most of the time we will relay renders to non critical planes in this stage. so the plane master will end up drawing roughly "in order" with its friends + /// This is NOT done for parallax and other problem children, because the rules of BLEND_MULTIPLY appear to not behave as expected :( + /// This will also just make debugging harder, because we do fragile things in order to ensure things operate as epected. I'm sorry + /// Compile time + /// See [code\__DEFINES\layers.dm] for our bitflags + var/critical = NONE + + /// If this plane master is outside of our visual bounds right now + var/is_outside_bounds = FALSE + /atom/movable/screen/plane_master/proc/Show(override) alpha = override || show_alpha +/// Shows a plane master to the passed in mob +/// Override this to apply unique effects and such +/// Returns TRUE if the call is allowed, FALSE otherwise +/atom/movable/screen/plane_master/proc/show_to(mob/mymob) + SHOULD_CALL_PARENT(TRUE) + if(force_hidden) + return FALSE + + var/client/our_client = mymob?.canon_client + // Alright, let's get this out of the way + // Mobs can move z levels without their client. If this happens, we need to ensure critical display settings are respected + // This is done here. Mild to severe pain but it's nessesary + if(check_outside_bounds()) + if(!(critical & PLANE_CRITICAL_DISPLAY)) + return FALSE + if(!our_client) + return TRUE + our_client.screen += src + + if(!(critical & PLANE_CRITICAL_NO_RELAY)) + our_client.screen += relays + return TRUE + return TRUE + + if(!our_client) + return TRUE + + our_client.screen += src + our_client.screen += relays + return TRUE + +/// Hook to allow planes to work around is_outside_bounds +/// Return false to allow a show, true otherwise +/atom/movable/screen/plane_master/proc/check_outside_bounds() + return is_outside_bounds + /atom/movable/screen/plane_master/proc/Hide(override) alpha = override || hide_alpha +/// Hides a plane master from the passeed in mob +/// Do your effect cleanup here +/atom/movable/screen/plane_master/proc/hide_from(mob/oldmob) + SHOULD_CALL_PARENT(TRUE) + var/client/their_client = oldmob?.client + if(!their_client) + return + their_client.screen -= src + their_client.screen -= relays + +/// Forces this plane master to hide, until unhide_plane is called +/// This allows us to disable unused PMs without breaking anything else +/atom/movable/screen/plane_master/proc/hide_plane(mob/cast_away) + force_hidden = TRUE + hide_from(cast_away) + +/// Disables any forced hiding, allows the plane master to be used as normal +/atom/movable/screen/plane_master/proc/unhide_plane(mob/enfold) + force_hidden = FALSE + show_to(enfold) + +/atom/movable/screen/plane_master/proc/outside_bounds(mob/relevant) + if(force_hidden || is_outside_bounds) + return + is_outside_bounds = TRUE + // If we're of critical importance, AND we're below the rendering layer + if(critical & PLANE_CRITICAL_DISPLAY) + // We here assume that your render target starts with * + if(critical & PLANE_CRITICAL_CUT_RENDER && render_target) + render_target = copytext_char(render_target, 2) + if(!(critical & PLANE_CRITICAL_NO_RELAY)) + return + var/client/our_client = relevant.client + if(our_client) + for(var/atom/movable/render_plane_relay/relay as anything in relays) + our_client.screen -= relay + + return + hide_from(relevant) + +/atom/movable/screen/plane_master/proc/inside_bounds(mob/relevant) + is_outside_bounds = FALSE + if(critical & PLANE_CRITICAL_DISPLAY) + // We here assume that your render target starts with * + if(critical & PLANE_CRITICAL_CUT_RENDER && render_target) + render_target = "*[render_target]" + + if(!(critical & PLANE_CRITICAL_NO_RELAY)) + return + var/client/our_client = relevant.client + if(our_client) + for(var/atom/movable/render_plane_relay/relay as anything in relays) + our_client.screen += relay + + return + show_to(relevant) + //Why do plane masters need a backdrop sometimes? Read https://secure.byond.com/forum/?post=2141928 //Trust me, you need one. Period. If you don't think you do, you're doing something extremely wrong. /atom/movable/screen/plane_master/proc/backdrop(mob/mymob) @@ -80,6 +210,13 @@ return add_filter("eye_blur", 1, gauss_blur_filter(clamp(mymob.eye_blurry * 0.1, 0.6, 3))) +//Holds the seethrough versions (done using image overrides) of large objects. Mouse transparent, so you can click through them. +/atom/movable/screen/plane_master/seethrough + name = "Seethrough" + plane = SEETHROUGH_PLANE + mouse_opacity = MOUSE_OPACITY_TRANSPARENT + render_relay_plane = RENDER_PLANE_GAME + /** * Plane master handling byond internal blackness * vars are set as to replicate behavior when rendering to other planes diff --git a/code/_onclick/hud/rendering/plane_master_group.dm b/code/_onclick/hud/rendering/plane_master_group.dm new file mode 100644 index 0000000000000..322b1c3f62b57 --- /dev/null +++ b/code/_onclick/hud/rendering/plane_master_group.dm @@ -0,0 +1,205 @@ +/// Datum that represents one "group" of plane masters +/// So all the main window planes would be in one, all the spyglass planes in another +/// Etc +/datum/plane_master_group + /// Our key in the group list on /datum/hud + /// Should be unique for any group of plane masters in the world + var/key + /// Our parent hud + var/datum/hud/our_hud + /// List in the form "[plane]" = object, the plane masters we own + var/list/atom/movable/screen/plane_master/plane_masters = list() + /// The visual offset we are currently using + var/active_offset = 0 + /// What, if any, submap we render onto + var/map = "" + /// Controls the screen_loc that owned plane masters will use when generating relays. Due to a Byond bug, relays using the CENTER positional loc + /// Will be improperly offset + var/relay_loc = "CENTER" + +/datum/plane_master_group/New(key, map = "") + . = ..() + src.key = key + src.map = map + build_plane_masters(0, SSmapping.max_plane_offset) + +/datum/plane_master_group/Destroy() + orphan_hud() + QDEL_LIST_ASSOC_VAL(plane_masters) + return ..() + +/// Display a plane master group to some viewer, so show all our planes to it +/datum/plane_master_group/proc/attach_to(datum/hud/viewing_hud) + if(viewing_hud.master_groups[key]) + stack_trace("Hey brother, our key [key] is already in use by a plane master group on the passed in hud, belonging to [viewing_hud.mymob]. Ya fucked up, why are there dupes") + return + + our_hud = viewing_hud + our_hud.master_groups[key] = src + show_hud() + transform_lower_turfs(our_hud, active_offset) + +/// Hide the plane master from its current hud, fully clear it out +/datum/plane_master_group/proc/orphan_hud() + if(our_hud) + our_hud.master_groups -= key + hide_hud() + our_hud = null + +/// Well, refresh our group, mostly useful for plane specific updates +/datum/plane_master_group/proc/refresh_hud() + hide_hud() + show_hud() + +/// Fully regenerate our group, resetting our planes to their compile time values +/datum/plane_master_group/proc/rebuild_hud() + hide_hud() + rebuild_plane_masters() + show_hud() + transform_lower_turfs(our_hud, active_offset) + +/// Regenerate our plane masters, this is useful if we don't have a mob but still want to rebuild. Such in the case of changing the screen_loc of relays +/datum/plane_master_group/proc/rebuild_plane_masters() + QDEL_LIST_ASSOC_VAL(plane_masters) + build_plane_masters(0, SSmapping.max_plane_offset) + +/datum/plane_master_group/proc/hide_hud() + for(var/thing in plane_masters) + var/atom/movable/screen/plane_master/plane = plane_masters[thing] + plane.hide_from(our_hud.mymob) + +/datum/plane_master_group/proc/show_hud() + for(var/thing in plane_masters) + var/atom/movable/screen/plane_master/plane = plane_masters[thing] + show_plane(plane) + +/// This is mostly a proc so it can be overriden by popups, since they have unique behavior they want to do +/datum/plane_master_group/proc/show_plane(atom/movable/screen/plane_master/plane) + plane.show_to(our_hud.mymob) + +/// Nice wrapper for the "[]"ing +/datum/plane_master_group/proc/get_plane(plane) + return plane_masters["[plane]"] + +/// Returns a list of all the plane master types we want to create +/datum/plane_master_group/proc/get_plane_types() + return subtypesof(/atom/movable/screen/plane_master) - /atom/movable/screen/plane_master/rendering_plate + +/// Actually generate our plane masters, in some offset range (where offset is the z layers to render to, because each "layer" in a multiz stack gets its own plane master cube) +/datum/plane_master_group/proc/build_plane_masters(starting_offset, ending_offset) + for(var/atom/movable/screen/plane_master/mytype as anything in get_plane_types()) + for(var/plane_offset in starting_offset to ending_offset) + if(plane_offset != 0 && !initial(mytype.allows_offsetting)) + continue + var/atom/movable/screen/plane_master/instance = new mytype(null, null, src, plane_offset) + plane_masters["[instance.plane]"] = instance + prep_plane_instance(instance) + +/// Similarly, exists so subtypes can do unique behavior to planes on creation +/datum/plane_master_group/proc/prep_plane_instance(atom/movable/screen/plane_master/instance) + return + +// It would be nice to setup parallaxing for stairs and things when doing this +// So they look nicer. if you can't it's all good, if you think you can sanely look at monster's work +// It's hard, and potentially expensive. be careful +/datum/plane_master_group/proc/transform_lower_turfs(datum/hud/source, new_offset, use_scale = TRUE) + // Check if this feature is disabled for the client, in which case don't use scale. + var/mob/our_mob = our_hud?.mymob + + // No offset? piss off + if(!SSmapping.max_plane_offset) + return + + active_offset = new_offset + + // Each time we go "down" a visual z level, we'll reduce the scale by this amount + // Chosen because mothblocks liked it, didn't cause motion sickness while also giving a sense of height + var/scale_by = 0.965 + scale_by = 1 + + var/list/offsets = list() + + // We accept negatives so going down "zooms" away the drop above as it goes + for(var/offset in -SSmapping.max_plane_offset to SSmapping.max_plane_offset) + + // No transformations if we're landing ON you + if(offset == 0) + offsets += null + continue + + var/scale = scale_by ** (offset) + var/matrix/multiz_shrink = matrix() + multiz_shrink.Scale(scale) + offsets += multiz_shrink + + // So we can talk in 1 -> max_offset * 2 + 1, rather then -max_offset -> max_offset + var/offset_offset = SSmapping.max_plane_offset + 1 + + for(var/plane_key in plane_masters) + var/atom/movable/screen/plane_master/plane = plane_masters[plane_key] + if(!plane.allows_offsetting) + continue + + var/visual_offset = plane.offset - new_offset + + // Basically uh, if we're showing something down X amount of levels, or up any amount of levels + if(plane.is_outside_bounds) + plane.inside_bounds(our_mob) + + if(!plane.multiz_scaled) + continue + + if(plane.force_hidden || plane.is_outside_bounds || visual_offset < 0) + // We don't animate here because it should be invisble, but we do mark because it'll look nice + plane.transform = offsets[visual_offset + offset_offset] + continue + + animate(plane, transform = offsets[visual_offset + offset_offset], 0.05 SECONDS, easing = LINEAR_EASING) + +/// Holds plane masters for popups, like camera windows +/// Note: We do not scale this plane, even though we could +/// This is because it's annoying to get turfs to position inside it correctly +/// If you wanna try someday feel free, but I can't manage it +/datum/plane_master_group/popup + +/// This is janky as hell but since something changed with CENTER positioning after build 1614 we have to switch to the bandaid LEFT,TOP positioning +/// using LEFT,TOP *at* or *before* 1614 will result in another broken offset for cameras +#define MAX_CLIENT_BUILD_WITH_WORKING_SECONDARY_MAPS 1614 + +/datum/plane_master_group/popup/attach_to(datum/hud/viewing_hud) + // If we're about to display this group to a mob who's client is more recent than the last known version with working CENTER, then we need to remake the relays + // with the correct screen_loc using the relay override + if(viewing_hud.mymob?.client?.byond_build > MAX_CLIENT_BUILD_WITH_WORKING_SECONDARY_MAPS) + relay_loc = "LEFT,TOP" + rebuild_plane_masters() + return ..() + +#undef MAX_CLIENT_BUILD_WITH_WORKING_SECONDARY_MAPS + +/datum/plane_master_group/popup/transform_lower_turfs(datum/hud/source, new_offset, use_scale = TRUE) + return ..(source, new_offset, FALSE) + +/// Holds the main plane master +/datum/plane_master_group/main + +/datum/plane_master_group/main/transform_lower_turfs(datum/hud/source, new_offset, use_scale = TRUE) + if(use_scale) + return ..(source, new_offset, source.should_use_scale()) + return ..() + +/// Hudless group. Exists for testing +/datum/plane_master_group/hudless + var/mob/our_mob + +/datum/plane_master_group/hudless/Destroy() + . = ..() + our_mob = null + +/datum/plane_master_group/hudless/hide_hud() + for(var/thing in plane_masters) + var/atom/movable/screen/plane_master/plane = plane_masters[thing] + plane.hide_from(our_mob) + +/// This is mostly a proc so it can be overriden by popups, since they have unique behavior they want to do +/datum/plane_master_group/hudless/show_plane(atom/movable/screen/plane_master/plane) + plane.show_to(our_mob) diff --git a/code/_onclick/hud/screen_objects/menu_text_objects.dm b/code/_onclick/hud/screen_objects/menu_text_objects.dm index c64cfc1935f1d..3140f75885286 100644 --- a/code/_onclick/hud/screen_objects/menu_text_objects.dm +++ b/code/_onclick/hud/screen_objects/menu_text_objects.dm @@ -159,6 +159,6 @@ /atom/movable/screen/text/lobby/clickable/polls/Click() . = ..() var/mob/new_player/player = hud.mymob - player.handle_playeR_DBRANKSing() + player.handle_playeR_POLLSing() fetch_polls() diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm index 3d9aba509bc6b..9e3030d152f8b 100644 --- a/code/controllers/subsystem/mapping.dm +++ b/code/controllers/subsystem/mapping.dm @@ -23,6 +23,31 @@ SUBSYSTEM_DEF(mapping) var/list/reservation_ready = list() var/clearing_reserved_turfs = FALSE + /// List of z level (as number) -> plane offset of that z level + /// Used to maintain the plane cube + var/list/z_level_to_plane_offset = list() + /// List of z level (as number) -> list of all z levels vertically connected to ours + /// Useful for fast grouping lookups and such + var/list/z_level_to_stack = list() + /// List of z level (as number) -> The lowest plane offset in that z stack + var/list/z_level_to_lowest_plane_offset = list() + // This pair allows for easy conversion between an offset plane, and its true representation + // Both are in the form "input plane" -> output plane(s) + /// Assoc list of string plane values to their true, non offset representation + var/list/plane_offset_to_true + /// Assoc list of true string plane values to a list of all potential offset planess + var/list/true_to_offset_planes + /// Assoc list of string plane to the plane's offset value + var/list/plane_to_offset + /// List of planes that do not allow for offsetting + var/list/plane_offset_blacklist + /// List of render targets that do not allow for offsetting + var/list/render_offset_blacklist + /// List of plane masters that are of critical priority + var/list/critical_planes + /// The largest plane offset we've generated so far + var/max_plane_offset = 0 + // Z-manager stuff var/ground_start // should only be used for maploading-related tasks var/list/z_list diff --git a/code/controllers/subsystem/persistence.dm b/code/controllers/subsystem/persistence.dm index ceffa80a8e66a..ebae5ca79ae24 100644 --- a/code/controllers/subsystem/persistence.dm +++ b/code/controllers/subsystem/persistence.dm @@ -356,7 +356,7 @@ SUBSYSTEM_DEF(persistence) /obj/item/ammo_magazine/rocket/recoilless/smoke = 16, /obj/item/ammo_magazine/rocket/recoilless/plasmaloss = 16, /obj/structure/closet/crate/mortar_ammo/mlrs_kit = 2, - /obj/item/storage/box/mlrs_rockets_gas = 4, + /obj/item/storage/box/mlrs_rockets/gas = 4, ) /datum/season_datum/weapons/guns/heavy_explosions diff --git a/code/controllers/subsystem/silo.dm b/code/controllers/subsystem/silo.dm index 2c30db274d011..672f8cb5a8853 100644 --- a/code/controllers/subsystem/silo.dm +++ b/code/controllers/subsystem/silo.dm @@ -27,7 +27,9 @@ SUBSYSTEM_DEF(silo) current_larva_spawn_rate *= SSmonitor.gamestate == SHIPSIDE ? 3 : 1 current_larva_spawn_rate *= SSticker.mode.silo_scaling //We scale the rate based on the current ratio of humans to xenos - current_larva_spawn_rate *= clamp(round((active_humans / active_xenos) / (LARVA_POINTS_REGULAR / xeno_job.job_points_needed), 0.01), 0.5, 1) + var/current_human_to_xeno_ratio = active_humans / active_xenos + var/optimal_human_to_xeno_ratio = xeno_job.job_points_needed / LARVA_POINTS_REGULAR + current_larva_spawn_rate *= clamp(current_human_to_xeno_ratio / optimal_human_to_xeno_ratio , 0.7, 1) current_larva_spawn_rate += larva_spawn_rate_temporary_buff diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm index b6d4001c1a830..505ab205d1991 100644 --- a/code/controllers/subsystem/vote.dm +++ b/code/controllers/subsystem/vote.dm @@ -273,10 +273,12 @@ SUBSYSTEM_DEF(vote) var/datum/map_config/VM = config.maplist[GROUND_MAP][map] if(!VM.voteweight) continue + if(VM.map_name == SSmapping.configs[GROUND_MAP].map_name) //Current map is not votable + continue if(next_gamemode.whitelist_ground_maps) if(!(VM.map_name in next_gamemode.whitelist_ground_maps)) continue - else if(next_gamemode.blacklist_ground_maps) //can't blacklist and whitelist for the same map + else if(next_gamemode.blacklist_ground_maps) //Can't blacklist and whitelist for the same map if(VM.map_name in next_gamemode.blacklist_ground_maps) continue if(VM.config_max_users || VM.config_min_users) diff --git a/code/datums/components/beacon.dm b/code/datums/components/beacon.dm index 7a6403512c424..6727bbf9d14a4 100644 --- a/code/datums/components/beacon.dm +++ b/code/datums/components/beacon.dm @@ -128,6 +128,7 @@ user.show_message(span_notice("The [source] beeps and states, \"Your current coordinates were registered by the supply console. LONGITUDE [location.x]. LATITUDE [location.y]. Area ID: [get_area(source)]\""), EMOTE_AUDIBLE, span_notice("The [source] vibrates but you can not hear it!")) beacon_datum = new /datum/supply_beacon("[user.name] + [A]", get_turf(source), user.faction) RegisterSignal(beacon_datum, COMSIG_QDELETING, PROC_REF(clean_beacon_datum)) + SEND_GLOBAL_SIGNAL(COMSIG_GLOB_SUPPLY_BEACON_CREATED, src) source.update_appearance() ///Deactivates the beacon diff --git a/code/datums/components/deployable_item.dm b/code/datums/components/deployable_item.dm index 1e785206548fa..f3704670019b8 100644 --- a/code/datums/components/deployable_item.dm +++ b/code/datums/components/deployable_item.dm @@ -6,13 +6,16 @@ var/undeploy_time = 0 ///Typepath that the item deploys into. Can be anything but an item so far. The preffered type is /obj/machinery/deployable since it was built for this. var/obj/deploy_type + ///Any extra checks required when trying to deploy this item + var/datum/callback/deploy_check_callback -/datum/component/deployable_item/Initialize(_deploy_type, _deploy_time, _undeploy_time) +/datum/component/deployable_item/Initialize(_deploy_type, _deploy_time, _undeploy_time, _deploy_check_callback) if(!isitem(parent)) return COMPONENT_INCOMPATIBLE deploy_type = _deploy_type deploy_time = _deploy_time undeploy_time = _undeploy_time + deploy_check_callback = _deploy_check_callback var/obj/item/attached_item = parent if(CHECK_BITFIELD(attached_item.item_flags, DEPLOY_ON_INITIALIZE)) @@ -52,6 +55,8 @@ var/list/modifiers = params2list(params) if(!modifiers["ctrl"] || modifiers["right"] || get_turf(user) == location || !(user.Adjacent(object)) || !location) return + if(deploy_check_callback && !deploy_check_callback.Invoke(user, location)) + return INVOKE_ASYNC(src, PROC_REF(finish_deploy), parent, user, location) return COMSIG_KB_ACTIVATED diff --git a/code/datums/components/seethrough_mob.dm b/code/datums/components/seethrough_mob.dm new file mode 100644 index 0000000000000..ab040fe95874e --- /dev/null +++ b/code/datums/components/seethrough_mob.dm @@ -0,0 +1,133 @@ +///A component that lets you turn your character transparent in order to see and click through yourself. +/datum/component/seethrough_mob + ///The atom that enables our dark magic + var/atom/movable/render_source_atom + ///The fake version of ourselves + var/image/trickery_image + ///Which alpha do we animate towards? + var/target_alpha + ///How long our faze in/out takes + var/animation_time + ///Does this object let clicks from players its transparent to pass through it + var/clickthrough + ///Is the seethrough effect currently active + var/is_active + ///The mob's original render_target value + var/initial_render_target_value + ///This component's personal uid + var/personal_uid + +/datum/component/seethrough_mob/Initialize(target_alpha = 100, animation_time = 0.5 SECONDS, clickthrough = TRUE) + . = ..() + + if(!ismob(parent)) + return COMPONENT_INCOMPATIBLE + + src.target_alpha = target_alpha + src.animation_time = animation_time + src.clickthrough = clickthrough + src.is_active = FALSE + src.render_source_atom = new() + + var/static/uid = 0 + uid++ + src.personal_uid = uid + + render_source_atom.appearance_flags |= ( RESET_COLOR | RESET_TRANSFORM | KEEP_APART) + + render_source_atom.vis_flags |= (VIS_INHERIT_ID | VIS_INHERIT_PLANE | VIS_INHERIT_LAYER) + + render_source_atom.render_source = "*transparent_bigmob[personal_uid]" + + var/datum/action/ability/xeno_action/toggle_seethrough/action = new(src) + action.give_action(parent) + +/datum/component/seethrough_mob/Destroy(force) + QDEL_NULL(render_source_atom) + return ..() + +///Set up everything we need to trick the client and keep it looking normal for everyone else +/datum/component/seethrough_mob/proc/trick_mob() + SIGNAL_HANDLER + + var/mob/fool = parent + var/icon/current_mob_icon = icon(fool.icon, fool.icon_state) + render_source_atom.pixel_x = -fool.pixel_x + render_source_atom.pixel_y = ((current_mob_icon.Height() - 32) * 0.5) + render_source_atom.name = "seethrough" //So our name is not just "movable" when looking at VVs + + initial_render_target_value = fool.render_target + fool.render_target = "*transparent_bigmob[personal_uid]" + fool.vis_contents.Add(render_source_atom) + + trickery_image = new(render_source_atom) + trickery_image.loc = render_source_atom + trickery_image.override = TRUE + + trickery_image.pixel_x = 0 + trickery_image.pixel_y = 0 + + if(clickthrough) + //Special plane so we can click through the overlay + SET_PLANE_EXPLICIT(trickery_image, SEETHROUGH_PLANE, fool) + + fool.client.images += trickery_image + + animate(trickery_image, alpha = target_alpha, time = animation_time) + + RegisterSignal(fool, COMSIG_MOB_LOGOUT, PROC_REF(on_client_disconnect)) + +///Remove the screen object and make us appear solid to ourselves again +/datum/component/seethrough_mob/proc/untrick_mob() + var/mob/fool = parent + animate(trickery_image, alpha = 255, time = animation_time) + UnregisterSignal(fool, COMSIG_MOB_LOGOUT) + + //after playing the fade-in animation, remove the image and the trick atom + addtimer(CALLBACK(src, PROC_REF(clear_image), trickery_image, fool.client), animation_time) + +///Remove the image and the trick atom +/datum/component/seethrough_mob/proc/clear_image(image/removee, client/remove_from) + var/atom/movable/atom_parent = parent + atom_parent.vis_contents -= render_source_atom + atom_parent.render_target = initial_render_target_value + remove_from?.images -= removee + remove_from.mob.update_appearance(UPDATE_ICON) + +///Effect is disabled when they log out because client gets deleted +/datum/component/seethrough_mob/proc/on_client_disconnect() + SIGNAL_HANDLER + + var/mob/fool = parent + UnregisterSignal(fool, COMSIG_MOB_LOGOUT) + clear_image(trickery_image, fool.client) + +/datum/component/seethrough_mob/proc/toggle_active(datum/action/ability) + is_active = !is_active + if(is_active) + trick_mob() + ability.set_toggle(TRUE) + else + untrick_mob() + ability.set_toggle(FALSE) + +/datum/action/ability/xeno_action/toggle_seethrough + name = "Toggle Seethrough" + desc = "Allows you to see behind your massive body and click through it." + action_icon = 'icons/Xeno/actions.dmi' + action_icon_state = "xenohide" + cooldown_duration = 1 SECONDS + use_state_flags = ABILITY_USE_LYING + action_type = ACTION_TOGGLE + +/datum/action/ability/xeno_action/toggle_seethrough/action_activate(atom/t) + . = ..() + var/datum/component/seethrough_mob/transparency = target + transparency.toggle_active(src) + add_cooldown() + +/datum/action/ability/xeno_action/toggle_seethrough/Destroy() + var/datum/component/seethrough_mob/transparency = target + if(transparency.is_active) + transparency.untrick_mob() + return ..() diff --git a/code/datums/gamemodes/_game_mode.dm b/code/datums/gamemodes/_game_mode.dm index 48dee56f0a005..66ac37d4d4ced 100644 --- a/code/datums/gamemodes/_game_mode.dm +++ b/code/datums/gamemodes/_game_mode.dm @@ -388,6 +388,8 @@ GLOBAL_LIST_INIT(bioscan_locations, list( parts += "[GLOB.round_statistics.howitzer_shells_fired] howitzer shells were fired." if(GLOB.round_statistics.rocket_shells_fired) parts += "[GLOB.round_statistics.rocket_shells_fired] rocket artillery shells were fired." + if(GLOB.round_statistics.obs_fired) + parts += "[GLOB.round_statistics.obs_fired] orbital bombardements were fired." if(GLOB.round_statistics.total_human_deaths[FACTION_TERRAGOV]) parts += "[GLOB.round_statistics.total_human_deaths[FACTION_TERRAGOV]] people were killed, among which [GLOB.round_statistics.total_human_revives[FACTION_TERRAGOV]] were revived and [GLOB.round_statistics.total_human_respawns] respawned. For a [(GLOB.round_statistics.total_human_revives[FACTION_TERRAGOV] / max(GLOB.round_statistics.total_human_deaths[FACTION_TERRAGOV], 1)) * 100]% revival rate and a [(GLOB.round_statistics.total_human_respawns / max(GLOB.round_statistics.total_human_deaths[FACTION_TERRAGOV], 1)) * 100]% respawn rate." if(SSevacuation.human_escaped) diff --git a/code/datums/gamemodes/campaign/campaign_mission.dm b/code/datums/gamemodes/campaign/campaign_mission.dm index 7eb5731f46631..15a50058ddd73 100644 --- a/code/datums/gamemodes/campaign/campaign_mission.dm +++ b/code/datums/gamemodes/campaign/campaign_mission.dm @@ -21,7 +21,7 @@ MISSION_HOSTILE_FACTION = 0, ) ///Any mission behavior flags - var/mission_flags = null + var/mission_flags = NONE ///faction that chose the mission var/starting_faction ///faction that did not choose the mission @@ -77,7 +77,7 @@ /// Timer used to calculate how long till mission ends var/game_timer ///The length of time until mission ends, if timed - var/max_game_time = null + var/max_game_time = 0 ///Whether the max game time has been reached var/max_time_reached = FALSE ///Delay before the mission actually starts @@ -207,7 +207,7 @@ if(max_time_reached) items += "Mission status: Mission complete" items += "" - else if(game_timer) + else items += "Mission time remaining: [mission_end_countdown()]" items += "" @@ -255,16 +255,35 @@ ///sets up the timer for the mission /datum/campaign_mission/proc/set_mission_timer() - if(!iscampaigngamemode(SSticker.mode)) + if(game_timer) return - game_timer = addtimer(VARSET_CALLBACK(src, max_time_reached, TRUE), max_game_time, TIMER_STOPPABLE) +///Pauses the gametimer, recording the remaining time left in max_game_time +/datum/campaign_mission/proc/pause_mission_timer(trait_source = TRAIT_GENERIC) + if(!trait_source) + trait_source = TRAIT_GENERIC + ADD_TRAIT(src, CAMPAIGN_MISSION_TIMER_PAUSED, trait_source) + if(!game_timer) + return + max_game_time = timeleft(game_timer) + deltimer(game_timer) + game_timer = null + +///Attempts to resume the gametimer +/datum/campaign_mission/proc/resume_mission_timer(trait_source = TRAIT_GENERIC, forced = FALSE) + REMOVE_TRAIT(src, CAMPAIGN_MISSION_TIMER_PAUSED, trait_source) + if(!forced && HAS_TRAIT(src, CAMPAIGN_MISSION_TIMER_PAUSED)) + return + set_mission_timer() + ///accesses the timer for status panel /datum/campaign_mission/proc/mission_end_countdown() - if(max_time_reached) - return "Mission finished" - var/eta = timeleft(game_timer) * 0.1 + //if(max_time_reached) + // return "Mission finished" + if(!game_timer && HAS_TRAIT(src, CAMPAIGN_MISSION_TIMER_PAUSED)) + return "Timer paused" + var/eta = game_timer ? (timeleft(game_timer) * 0.1) : (max_game_time * 0.1) if(eta > 0) return "[(eta / 60) % 60]:[add_leading(num2text(eta % 60), 2, "0")]" @@ -503,3 +522,10 @@ RegisterSignal(new_mech, COMSIG_QDELETING, TYPE_PROC_REF(/datum/campaign_mission, remove_mission_object)) map_text_broadcast(mech_faction, override_message ? override_message : "[total_count] mechs have been deployed for this mission.", "Mechs available") + +///Returns the current mission, if its the campaign gamemode +/proc/get_current_mission() + if(!iscampaigngamemode(SSticker.mode)) + return null + var/datum/game_mode/hvh/campaign/mode = SSticker.mode + return mode.current_mission diff --git a/code/datums/gamemodes/campaign/faction_stats.dm b/code/datums/gamemodes/campaign/faction_stats.dm index 01e4e82a22d7f..49f01727408d8 100644 --- a/code/datums/gamemodes/campaign/faction_stats.dm +++ b/code/datums/gamemodes/campaign/faction_stats.dm @@ -66,6 +66,7 @@ GLOBAL_LIST_INIT(campaign_mission_pool, list( /datum/campaign_mission/tdm/mech_wars = 12, /datum/campaign_mission/destroy_mission/supply_raid = 15, /datum/campaign_mission/destroy_mission/base_rescue = 12, + /datum/campaign_mission/raiding_base = 6, ), FACTION_SOM = list( /datum/campaign_mission/tdm/orion = 10, @@ -216,6 +217,11 @@ GLOBAL_LIST_INIT(campaign_mission_pool, list( faction_assets[new_asset] = new new_asset(src) RegisterSignals(faction_assets[new_asset], list(COMSIG_CAMPAIGN_ASSET_ACTIVATION, COMSIG_CAMPAIGN_DISABLER_ACTIVATION), PROC_REF(force_update_static_data)) +///Removes an asset from a faction entirely +/datum/faction_stats/proc/remove_asset(datum/campaign_asset/removed_asset) + if(faction_assets[removed_asset]) + QDEL_NULL(faction_assets[removed_asset]) + ///handles post mission wrap up for the faction /datum/faction_stats/proc/mission_end(datum/source, datum/campaign_mission/completed_mission, winning_faction) SIGNAL_HANDLER @@ -258,6 +264,8 @@ GLOBAL_LIST_INIT(campaign_mission_pool, list( if(human_mob.job.job_cost) //We don't refund ally roles human_mob.job.add_job_positions(1) qdel(human_mob) + if(!ghost) //if they ghosted already + return var/datum/game_mode/mode = SSticker.mode mode.player_respawn(ghost) //auto open the respawn screen diff --git a/code/datums/gamemodes/campaign/individual_stats.dm b/code/datums/gamemodes/campaign/individual_stats.dm index 599553536a107..57ae70628ea08 100644 --- a/code/datums/gamemodes/campaign/individual_stats.dm +++ b/code/datums/gamemodes/campaign/individual_stats.dm @@ -1,3 +1,6 @@ +#define TAB_LOADOUT "Loadout" +#define TAB_PERKS "Perks" + /datum/individual_stats interaction_flags = INTERACT_UI_INTERACT var/owner_ckey @@ -17,6 +20,10 @@ var/list/datum/outfit_holder/loadouts = list() ///The faction associated with these stats var/faction + ///Currently selected UI category tab + var/selected_tab = TAB_LOADOUT + ///Currently selected UI job tab + var/selected_job /datum/individual_stats/New(mob/living/carbon/new_mob, new_faction, new_currency) . = ..() @@ -173,92 +180,78 @@ data["current_job"] = istype(living_user) ? living_user.job.title : null data["currency"] = currency - //perk stuff - var/list/perks_data = list() - for(var/job in perks_by_job) - for(var/datum/perk/perk AS in GLOB.campaign_perks_by_role[job]) - var/list/perk_data = list() - perk_data["name"] = perk.name - perk_data["job"] = job - perk_data["type"] = perk.type - perk_data["desc"] = perk.desc - perk_data["requirements"] = perk.req_desc - perk_data["cost"] = perk.unlock_cost - perk_data["icon"] = perk.ui_icon - perk_data["currently_active"] = !!(perk in perks_by_job[job]) - perks_data += list(perk_data) - data["perks_data"] = perks_data - - //loadout stuff + if(selected_tab != TAB_LOADOUT) + return data + //This cannot be static data due to the limitations on how frequently static data can be updated, and clicking on loadout options requires a data update. var/list/equipped_loadouts_data = list() //items currently equipped to ALL job outfits var/list/available_loadouts_data = list() //all available AND purchasable loadout options var/list/outfit_cost_data = list() //Current cost of all outfits - for(var/job in loadouts) - var/datum/outfit_holder/outfit = loadouts[job] - - var/list/outfit_cost_list = list() - outfit_cost_list["job"] = job - outfit_cost_list["outfit_cost"] = outfit.loadout_cost - outfit_cost_data += list(outfit_cost_list) - - for(var/slot in outfit.equipped_things) - var/datum/loadout_item/loadout_item = outfit.equipped_things[slot] - if(!loadout_item) - continue - var/list/equipped_item_ui_data = list() //slot + equipped item data - var/list/current_loadout_item_data = list() //equipped item data - current_loadout_item_data["name"] = loadout_item.name - current_loadout_item_data["job"] = outfit.role - current_loadout_item_data["slot"] = GLOB.inventory_slots_to_string["[loadout_item.item_slot]"] - current_loadout_item_data["type"] = loadout_item.type - current_loadout_item_data["desc"] = loadout_item.desc - current_loadout_item_data["purchase_cost"] = loadout_item.purchase_cost - current_loadout_item_data["unlock_cost"] = loadout_item.unlock_cost - current_loadout_item_data["valid_choice"] = loadout_item.item_checks(outfit) - current_loadout_item_data["icon"] = loadout_item.ui_icon - current_loadout_item_data["quantity"] = loadout_item.quantity - current_loadout_item_data["requirements"] = loadout_item.req_desc - current_loadout_item_data["unlocked"] = TRUE - - equipped_item_ui_data["item_type"] = current_loadout_item_data - equipped_item_ui_data["slot"] = slot - equipped_item_ui_data["slot_text"] = GLOB.inventory_slots_to_string["[slot]"] - - equipped_loadouts_data += list(equipped_item_ui_data) - - for(var/slot in outfit.available_list) - for(var/datum/loadout_item/loadout_item AS in outfit.available_list[slot]) - var/list/available_loadout_item_data = list() - available_loadout_item_data["name"] = loadout_item.name - available_loadout_item_data["job"] = outfit.role - available_loadout_item_data["slot"] = GLOB.inventory_slots_to_string["[loadout_item.item_slot]"] - available_loadout_item_data["type"] = loadout_item.type - available_loadout_item_data["desc"] = loadout_item.desc - available_loadout_item_data["purchase_cost"] = loadout_item.purchase_cost - available_loadout_item_data["unlock_cost"] = loadout_item.unlock_cost - available_loadout_item_data["valid_choice"] = loadout_item.item_checks(outfit) - available_loadout_item_data["icon"] = loadout_item.ui_icon - available_loadout_item_data["quantity"] = loadout_item.quantity - available_loadout_item_data["requirements"] = loadout_item.req_desc - available_loadout_item_data["unlocked"] = TRUE - available_loadouts_data += list(available_loadout_item_data) - - for(var/slot in outfit.purchasable_list) - for(var/datum/loadout_item/loadout_item AS in outfit.purchasable_list[slot]) - var/list/purchasable_loadout_item_data = list() - purchasable_loadout_item_data["name"] = loadout_item.name - purchasable_loadout_item_data["job"] = outfit.role - purchasable_loadout_item_data["slot"] = GLOB.inventory_slots_to_string["[loadout_item.item_slot]"] - purchasable_loadout_item_data["type"] = loadout_item.type - purchasable_loadout_item_data["desc"] = loadout_item.desc - purchasable_loadout_item_data["purchase_cost"] = loadout_item.purchase_cost - purchasable_loadout_item_data["unlock_cost"] = loadout_item.unlock_cost - purchasable_loadout_item_data["valid_choice"] = loadout_item.item_checks(outfit) - purchasable_loadout_item_data["icon"] = loadout_item.ui_icon - purchasable_loadout_item_data["quantity"] = loadout_item.quantity - purchasable_loadout_item_data["requirements"] = loadout_item.req_desc - purchasable_loadout_item_data["unlocked"] = FALSE - available_loadouts_data += list(purchasable_loadout_item_data) + + var/datum/outfit_holder/outfit = loadouts[selected_job] + + var/list/outfit_cost_list = list() + outfit_cost_list["job"] = selected_job + outfit_cost_list["outfit_cost"] = outfit.loadout_cost + outfit_cost_data += list(outfit_cost_list) + + for(var/slot in outfit.equipped_things) + var/datum/loadout_item/loadout_item = outfit.equipped_things[slot] + if(!loadout_item) + continue + var/list/equipped_item_ui_data = list() //slot + equipped item data + var/list/current_loadout_item_data = list() //equipped item data + current_loadout_item_data["name"] = loadout_item.name + current_loadout_item_data["job"] = outfit.role + current_loadout_item_data["slot"] = GLOB.inventory_slots_to_string["[loadout_item.item_slot]"] + current_loadout_item_data["type"] = loadout_item.type + current_loadout_item_data["desc"] = loadout_item.desc + current_loadout_item_data["purchase_cost"] = loadout_item.purchase_cost + current_loadout_item_data["unlock_cost"] = loadout_item.unlock_cost + current_loadout_item_data["valid_choice"] = loadout_item.item_checks(outfit) + current_loadout_item_data["icon"] = loadout_item.ui_icon + current_loadout_item_data["quantity"] = loadout_item.quantity + current_loadout_item_data["requirements"] = loadout_item.req_desc + current_loadout_item_data["unlocked"] = TRUE + + equipped_item_ui_data["item_type"] = current_loadout_item_data + equipped_item_ui_data["slot"] = slot + equipped_item_ui_data["slot_text"] = GLOB.inventory_slots_to_string["[slot]"] + + equipped_loadouts_data += list(equipped_item_ui_data) + + for(var/slot in outfit.available_list) + for(var/datum/loadout_item/loadout_item AS in outfit.available_list[slot]) + var/list/available_loadout_item_data = list() + available_loadout_item_data["name"] = loadout_item.name + available_loadout_item_data["job"] = outfit.role + available_loadout_item_data["slot"] = GLOB.inventory_slots_to_string["[loadout_item.item_slot]"] + available_loadout_item_data["type"] = loadout_item.type + available_loadout_item_data["desc"] = loadout_item.desc + available_loadout_item_data["purchase_cost"] = loadout_item.purchase_cost + available_loadout_item_data["unlock_cost"] = loadout_item.unlock_cost + available_loadout_item_data["valid_choice"] = loadout_item.item_checks(outfit) + available_loadout_item_data["icon"] = loadout_item.ui_icon + available_loadout_item_data["quantity"] = loadout_item.quantity + available_loadout_item_data["requirements"] = loadout_item.req_desc + available_loadout_item_data["unlocked"] = TRUE + available_loadouts_data += list(available_loadout_item_data) + + for(var/slot in outfit.purchasable_list) + for(var/datum/loadout_item/loadout_item AS in outfit.purchasable_list[slot]) + var/list/purchasable_loadout_item_data = list() + purchasable_loadout_item_data["name"] = loadout_item.name + purchasable_loadout_item_data["job"] = outfit.role + purchasable_loadout_item_data["slot"] = GLOB.inventory_slots_to_string["[loadout_item.item_slot]"] + purchasable_loadout_item_data["type"] = loadout_item.type + purchasable_loadout_item_data["desc"] = loadout_item.desc + purchasable_loadout_item_data["purchase_cost"] = loadout_item.purchase_cost + purchasable_loadout_item_data["unlock_cost"] = loadout_item.unlock_cost + purchasable_loadout_item_data["valid_choice"] = loadout_item.item_checks(outfit) + purchasable_loadout_item_data["icon"] = loadout_item.ui_icon + purchasable_loadout_item_data["quantity"] = loadout_item.quantity + purchasable_loadout_item_data["requirements"] = loadout_item.req_desc + purchasable_loadout_item_data["unlocked"] = FALSE + available_loadouts_data += list(purchasable_loadout_item_data) data["equipped_loadouts_data"] = equipped_loadouts_data data["available_loadouts_data"] = available_loadouts_data @@ -283,6 +276,21 @@ data["faction"] = faction data["jobs"] = valid_jobs + var/list/perks_data = list() + for(var/job in perks_by_job) + for(var/datum/perk/perk AS in GLOB.campaign_perks_by_role[job]) + var/list/perk_data = list() + perk_data["name"] = perk.name + perk_data["job"] = job + perk_data["type"] = perk.type + perk_data["desc"] = perk.desc + perk_data["requirements"] = perk.req_desc + perk_data["cost"] = perk.unlock_cost + perk_data["icon"] = perk.ui_icon + perk_data["currently_active"] = !!(perk in perks_by_job[job]) + perks_data += list(perk_data) + data["perks_data"] = perks_data + return data /datum/individual_stats/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) @@ -297,6 +305,23 @@ var/mob/living/user = usr switch(action) + if("set_selected_tab") + var/new_tab = params["new_selected_tab"] + if(new_tab != TAB_LOADOUT && new_tab != TAB_PERKS) + return + selected_tab = new_tab + user.playsound_local(user, 'sound/effects/menu_click.ogg', 50) + return TRUE + if("set_selected_job") + var/new_job = params["new_selected_job"] + if(!new_job) + return + selected_job = new_job + user.playsound_local(user, 'sound/effects/menu_click.ogg', 50) + return TRUE + if("play_ding") + user.playsound_local(user, 'sound/effects/menu_click.ogg', 50) //just for the consistant experience + return TRUE if("unlock_perk") var/unlocked_perk = text2path(params["selected_perk"]) if(!unlocked_perk) @@ -306,6 +331,7 @@ var/datum/perk/perk = GLOB.campaign_perk_list[unlocked_perk] if(!purchase_perk(perk, user)) return + ui.send_full_update() user.playsound_local(user, 'sound/effects/menu_click.ogg', 50) return TRUE if("equip_item") @@ -385,4 +411,14 @@ if(!stats) return stats.current_mob = owner //taking over ssd's creates a mismatch + //we have to update selected tab/job so we load the correct data for the UI + if(!isliving(owner)) + stats.selected_job = stats.valid_jobs[1] + else + var/mob/living/living_owner = owner + stats.selected_job = living_owner.job.title + stats.selected_tab = TAB_LOADOUT stats.interact(owner) + +#undef TAB_LOADOUT +#undef TAB_PERKS diff --git a/code/datums/gamemodes/campaign/loadout_items.dm b/code/datums/gamemodes/campaign/loadout_items.dm index 5b32383d75de8..44b7748efa7bb 100644 --- a/code/datums/gamemodes/campaign/loadout_items.dm +++ b/code/datums/gamemodes/campaign/loadout_items.dm @@ -45,7 +45,7 @@ GLOBAL_LIST_INIT(campaign_loadout_items_by_role, init_campaign_loadout_items_by_ ///Typepath of the actual item this datum represents var/obj/item/item_typepath ///UI icon for this item - var/ui_icon = "heavy_armour" //placeholder + var/ui_icon = "default" ///inventory slot it is intended to go into var/item_slot ///Behavior flags for loadout items diff --git a/code/datums/gamemodes/campaign/loadout_items/SOM/back_slot.dm b/code/datums/gamemodes/campaign/loadout_items/SOM/back_slot.dm index e22345ef36c27..ba3dde9517317 100644 --- a/code/datums/gamemodes/campaign/loadout_items/SOM/back_slot.dm +++ b/code/datums/gamemodes/campaign/loadout_items/SOM/back_slot.dm @@ -67,6 +67,7 @@ desc = "This backpack holds 4 RPGs, in addition to a V-71 RPG launcher. Equipped with radioactive and incendiary warheads, \ the V-71 is incredibly effective at softening up or flushing out organic targets, making them easy prey to finish off. Has a draw delay." req_desc = "Requires a suit with a Mithridatius environmental protection module." + ui_icon = "rpg" purchase_cost = 50 quantity = 2 item_typepath = /obj/item/storage/holster/backholster/rpg/som/war_crimes @@ -77,6 +78,7 @@ name = "HEAT RPG bag" desc = "Unlocked for free with the Heavy weapon specialisation perk. This backpack holds 4 high explosive anti armor RPGs, in addition to a V-71 RPG launcher. Deals significant damage against vehicles and mechs, but will also generally devastate human victims in a pinch. \ Has a draw delay and has poor accuracy against human targets." + ui_icon = "rpg" unlock_cost = 300 purchase_cost = 100 loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_UNLOCKABLE diff --git a/code/datums/gamemodes/campaign/loadout_items/SOM/belt.dm b/code/datums/gamemodes/campaign/loadout_items/SOM/belt.dm index 346714ab01e23..15c53b6e0201a 100644 --- a/code/datums/gamemodes/campaign/loadout_items/SOM/belt.dm +++ b/code/datums/gamemodes/campaign/loadout_items/SOM/belt.dm @@ -13,7 +13,7 @@ ) /datum/loadout_item/belt/som_sparepouch - name = "standard utility pouch" + name = "Utility pouch" desc = "A small, lightweight pouch that can be clipped onto armor or your belt to provide additional storage for miscellaneous gear or box and drum magazines. Made from genuine SOM leather." item_typepath = /obj/item/storage/belt/sparepouch/som jobs_supported = list(SOM_SQUAD_MARINE) @@ -31,7 +31,7 @@ jobs_supported = list(SOM_SQUAD_ENGINEER) /datum/loadout_item/belt/som_grenades - name = "S16 grenade rig" + name = "Grenade rig" desc = "A simple harness system available in many configurations. This version is designed to carry bulk quantities of grenades." ui_icon = "grenade" item_typepath = /obj/item/storage/belt/grenade/som @@ -52,10 +52,10 @@ wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_BELT) /datum/loadout_item/belt/som_burst_pistol - name = "V-11 extended" + name = "V-11e" desc = "The standard sidearm used by the Sons of Mars. A reliable and simple weapon that is often seen on the export market on the outer colonies. \ Typically chambered in 9mm armor piercing rounds. This one is configures for burstfire, and loaded with extended mags." - ui_icon = "pistol" + ui_icon = "v11" item_typepath = /obj/item/storage/holster/belt/pistol/m4a3/som jobs_supported = list(SOM_SQUAD_MARINE, SOM_SQUAD_VETERAN) @@ -73,7 +73,7 @@ name = "Sawn-off shotgun" desc = "A double barreled shotgun whose barrel has been artificially shortened to reduce range for further CQC potiential. Extremely powerful at close range, but is very difficult to handle." req_desc = "Requires a VX-42 culverin or VX-33 caliver with powerpack." - ui_icon = "shotgun" + ui_icon = "sshotgun" item_typepath = /obj/item/weapon/gun/shotgun/double/sawn jobs_supported = list(SOM_SQUAD_VETERAN) item_whitelist = list( diff --git a/code/datums/gamemodes/campaign/loadout_items/SOM/feet.dm b/code/datums/gamemodes/campaign/loadout_items/SOM/feet.dm index ca2aa20cbee37..07e24d77b20e2 100644 --- a/code/datums/gamemodes/campaign/loadout_items/SOM/feet.dm +++ b/code/datums/gamemodes/campaign/loadout_items/SOM/feet.dm @@ -1,5 +1,5 @@ /datum/loadout_item/feet/som_boots - name = "S11 combat shoes" + name = "Combat shoes" desc = "Shoes with origins dating back to the old mining colonies. These were made for more than just walking." item_typepath = /obj/item/clothing/shoes/marine/som/knife jobs_supported = list(SOM_SQUAD_MARINE, SOM_SQUAD_CORPSMAN, SOM_SQUAD_ENGINEER, SOM_SQUAD_VETERAN, SOM_SQUAD_LEADER, SOM_FIELD_COMMANDER) diff --git a/code/datums/gamemodes/campaign/loadout_items/SOM/gloves.dm b/code/datums/gamemodes/campaign/loadout_items/SOM/gloves.dm index eab590e997956..508e26911656f 100644 --- a/code/datums/gamemodes/campaign/loadout_items/SOM/gloves.dm +++ b/code/datums/gamemodes/campaign/loadout_items/SOM/gloves.dm @@ -6,7 +6,7 @@ loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE /datum/loadout_item/gloves/som_veteran_gloves - name = "SOM veteran gloves" + name = "Veteran gloves" desc = "Gloves with origins dating back to the old mining colonies. These ones seem tougher than normal." item_typepath = /obj/item/clothing/gloves/marine/som/veteran jobs_supported = list(SOM_SQUAD_VETERAN, SOM_SQUAD_LEADER) diff --git a/code/datums/gamemodes/campaign/loadout_items/SOM/head.dm b/code/datums/gamemodes/campaign/loadout_items/SOM/head.dm index fb8b8600f6af5..3b69a4d64855a 100644 --- a/code/datums/gamemodes/campaign/loadout_items/SOM/head.dm +++ b/code/datums/gamemodes/campaign/loadout_items/SOM/head.dm @@ -20,20 +20,20 @@ loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE /datum/loadout_item/helmet/gorgon - name = "Gorgon pattern helmet" + name = "Gorgon helmet" desc = "Made for use with Gorgon pattern assault armor, providing superior protection. Typically seen on SOM leaders or their most elite combat units." item_typepath = /obj/item/clothing/head/modular/som/leader jobs_supported = list(SOM_SQUAD_LEADER) loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE /datum/loadout_item/helmet/gorgon/fc - name = "Gorgon pattern helmet" + name = "Gorgon helmet" desc = "Made for use with Gorgon pattern assault armor, providing superior protection. This one has gold markings indicating it belongs to a high ranking field officer." item_typepath = /obj/item/clothing/head/modular/som/leader/officer jobs_supported = list(SOM_FIELD_COMMANDER) /datum/loadout_item/helmet/som_surt - name = "Hades Helmet System" + name = "Hades Helmet" desc = "A standard combat helmet with a Hades fireproof module." req_desc = "Requires a suit with a Hades module." item_typepath = /obj/item/clothing/head/modular/som/hades @@ -41,7 +41,7 @@ item_whitelist = list(/obj/item/clothing/suit/modular/som/heavy/pyro = ITEM_SLOT_OCLOTHING) /datum/loadout_item/helmet/som_tyr - name = "Lorica Helmet System" + name = "Lorica Helmet" desc = "A bulky helmet paired with the 'Lorica' armor module, designed for outstanding protection at the cost of significant weight and reduced flexibility. \ Substantial additional armor improves protection against all damage." req_desc = "Requires a suit with a Lorica module." @@ -59,7 +59,7 @@ item_whitelist = list(/obj/item/clothing/suit/modular/som/heavy/mithridatius = ITEM_SLOT_OCLOTHING) /datum/loadout_item/helmet/som_engineer - name = "Engineering helmet" + name = "Engineer helmet" desc = "A specialised helmet designed for use by combat engineers. Its main feature being an integrated welding mask." item_typepath = /obj/item/clothing/head/modular/som/engineer jobs_supported = list(SOM_SQUAD_ENGINEER) diff --git a/code/datums/gamemodes/campaign/loadout_items/SOM/pockets.dm b/code/datums/gamemodes/campaign/loadout_items/SOM/pockets.dm index b12593df41778..e19db1484355a 100644 --- a/code/datums/gamemodes/campaign/loadout_items/SOM/pockets.dm +++ b/code/datums/gamemodes/campaign/loadout_items/SOM/pockets.dm @@ -16,7 +16,7 @@ jobs_supported = list(SOM_SQUAD_LEADER, SOM_FIELD_COMMANDER) /datum/loadout_item/r_pocket/som_support_grenades - name = "Support grenades" + name = "Support nades" desc = "A pouch carrying a set of six standard support grenades. Includes smoke grenades of both lethal and nonlethal varieties, as well as stun grenades." ui_icon = "grenade" item_typepath = /obj/item/storage/pouch/grenade/som/combat_patrol @@ -24,14 +24,14 @@ loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE /datum/loadout_item/r_pocket/som_standard_grenades - name = "Standard grenades" + name = "Standard nades" desc = "A pouch carrying a set of six standard offensive grenades. Contains HE and incendiary grenades." ui_icon = "grenade" item_typepath = /obj/item/storage/pouch/grenade/som/standard jobs_supported = list(SOM_SQUAD_MARINE, SOM_SQUAD_CORPSMAN, SOM_SQUAD_VETERAN, SOM_SQUAD_LEADER, SOM_FIELD_COMMANDER) /datum/loadout_item/r_pocket/war_crime_grenades - name = "Warcrime grenades" + name = "Warcrime nades" desc = "A pouch carrying a set of rad and satrapine grenades. Extremely hazardous." ui_icon = "grenade" req_desc = "Requires a suit with a Mithridatius environmental protection module." @@ -74,7 +74,7 @@ wearer.equip_to_slot_or_del(new /obj/item/stack/barbed_wire/full, SLOT_IN_R_POUCH) /datum/loadout_item/r_pocket/som_magazine - name = "Magazine pouch-P" + name = "Mag pouch-P" desc = "A pouch containing three ammo magazines. Will contain a primary ammo type where applicable." ui_icon = "grenade" item_typepath = /obj/item/storage/pouch/magazine/large/som @@ -123,21 +123,21 @@ loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE /datum/loadout_item/l_pocket/som_support_grenades - name = "Support grenades" + name = "Support nades" desc = "A pouch carrying a set of six standard support grenades. Includes smoke grenades of both lethal and nonlethal varieties, as well as stun grenades." ui_icon = "grenade" item_typepath = /obj/item/storage/pouch/grenade/som/combat_patrol jobs_supported = list(SOM_SQUAD_MARINE, SOM_SQUAD_CORPSMAN, SOM_SQUAD_ENGINEER, SOM_SQUAD_VETERAN, SOM_SQUAD_LEADER, SOM_FIELD_COMMANDER) /datum/loadout_item/l_pocket/som_standard_grenades - name = "Standard grenades" + name = "Standard nades" desc = "A pouch carrying a set of six standard offensive grenades. Contains HE and incendiary grenades." ui_icon = "grenade" item_typepath = /obj/item/storage/pouch/grenade/som/standard jobs_supported = list(SOM_SQUAD_MARINE, SOM_SQUAD_CORPSMAN, SOM_SQUAD_ENGINEER, SOM_SQUAD_VETERAN, SOM_SQUAD_LEADER, SOM_FIELD_COMMANDER) /datum/loadout_item/l_pocket/war_crime_grenades - name = "Warcrime grenades" + name = "Warcrime nades" desc = "A pouch carrying a set of rad and satrapine grenades. Extremely hazardous." ui_icon = "grenade" req_desc = "Requires a suit with a Mithridatius environmental protection module." @@ -180,7 +180,7 @@ wearer.equip_to_slot_or_del(new /obj/item/stack/barbed_wire/full, SLOT_IN_L_POUCH) /datum/loadout_item/l_pocket/som_magazine - name = "Magazine pouch-S" + name = "Mag pouch-S" desc = "A pouch containing three ammo magazines. Will contain a secondary ammo type where applicable." ui_icon = "grenade" item_typepath = /obj/item/storage/pouch/magazine/large/som diff --git a/code/datums/gamemodes/campaign/loadout_items/SOM/suit.dm b/code/datums/gamemodes/campaign/loadout_items/SOM/suit.dm index c8d588b8e02cd..2a7519abb9b1a 100644 --- a/code/datums/gamemodes/campaign/loadout_items/SOM/suit.dm +++ b/code/datums/gamemodes/campaign/loadout_items/SOM/suit.dm @@ -1,5 +1,5 @@ /datum/loadout_item/suit_slot/som_light_shield - name = "Light Aegis armor" + name = "L Aegis armor" desc = "M-11 scout armor with a Aegis shield module. Provides excellent mobility but lower protection." ui_icon = "light_armour_shield" item_typepath = /obj/item/clothing/suit/modular/som/light/shield @@ -41,7 +41,7 @@ item_whitelist = list(/obj/item/blink_drive = ITEM_SLOT_BACK) /datum/loadout_item/suit_slot/som_medium_shield - name = "Medium Aegis armor" + name = "M Aegis armor" desc = "M-21 battle armor with a Aegis shield module. Provides balanced mobility and protection." ui_icon = "medium_armour_shield" item_typepath = /obj/item/clothing/suit/modular/som/shield @@ -74,7 +74,7 @@ wearer.equip_to_slot_or_del(new /obj/item/stack/barbed_wire/half_stack, SLOT_IN_SUIT) /datum/loadout_item/suit_slot/som_heavy_shield - name = "Heavy Aegis armor" + name = "H Aegis armor" desc = "M-31 combat armor with a Aegis shield module. Provides excellent protection but lower mobility." ui_icon = "heavy_armour_shield" item_typepath = /obj/item/clothing/suit/modular/som/heavy/shield @@ -101,7 +101,7 @@ loadout_item_flags = null /datum/loadout_item/suit_slot/som_heavy_surt - name = "Heavy Hades armor" + name = "H Hades armor" desc = "M-31 combat armor with a Hades fireproof module. Provides excellent protection and almost total fire immunity, but has poor mobility." ui_icon = "heavy_armour" req_desc = "Requires a V-62 incinerator." @@ -110,7 +110,7 @@ item_whitelist = list(/obj/item/weapon/gun/flamer/som/mag_harness = ITEM_SLOT_SUITSTORE) /datum/loadout_item/suit_slot/som_heavy_tyr - name = "Heavy Lorica armor" + name = "H Lorica armor" desc = "M-31 combat armor with a Lorica extra armor module. Provides incredible protection at the cost of further reduced mobility." ui_icon = "lorica" req_desc = "Requires a boarding axe primary weapon." @@ -143,7 +143,7 @@ jobs_supported = list(SOM_FIELD_COMMANDER) /datum/loadout_item/suit_slot/som_heavy_mimir - name = "Heavy Mith armor" + name = "H Mith armor" desc = "M-31 combat armor with a Mithridatius 'Mith' environmental protection module. Provides excellent armor and total immunity to chemical attacks, and improved radiological protection. Has lower mobility." req_desc = "Requires a helmet with a Mithridatius environmental protection module." ui_icon = "heavy_armour" @@ -155,7 +155,7 @@ //engineer /datum/loadout_item/suit_slot/som_engineer - name = "Medium armor" + name = "M armor" desc = "M-21 battle armor with engineering storage. Provides balanced armor and mobility." ui_icon = "medium_armour" item_typepath = /obj/item/clothing/suit/modular/som/engineer @@ -170,14 +170,14 @@ wearer.equip_to_slot_or_del(new /obj/item/stack/barbed_wire/half_stack, SLOT_IN_SUIT) /datum/loadout_item/suit_slot/som_engineer/light - name = "Light armor" + name = "L armor" desc = "M-11 scout armor with engineering storage. Provides excellent mobility but lower protection." ui_icon = "light_armour" item_typepath = /obj/item/clothing/suit/modular/som/light/engineer //medic /datum/loadout_item/suit_slot/som_medic - name = "Medium armor" + name = "M armor" desc = "M-21 battle armor with medical storage. Provides balanced armor and mobility." ui_icon = "medium_armour" item_typepath = /obj/item/clothing/suit/modular/som/medic @@ -189,7 +189,7 @@ wearer.equip_to_slot_or_del(new /obj/item/defibrillator, SLOT_IN_SUIT) /datum/loadout_item/suit_slot/som_medic/light - name = "Light armor" + name = "L armor" desc = "M-11 scout armor with medical storage. Provides excellent mobility but lower protection." ui_icon = "light_armour" item_typepath = /obj/item/clothing/suit/modular/som/light/medic diff --git a/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/engineer.dm b/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/engineer.dm index 0539a62c34c5c..eb0b672426edd 100644 --- a/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/engineer.dm +++ b/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/engineer.dm @@ -57,7 +57,7 @@ desc = "Equipped with a mag harness and laser sight. The MPi-KM is a modern reproduction based off several variants of kalashnikov type rifles used during the original Martian rebellion. \ These weapons were already ancient at that time, and their continued use by the SOM speaks more to their cultural legacy than any tactical benefits. \ Despite having relatively poor mobility and handling, it never the less has fearsome firepower and good capacity, ensuring it stays a relevant weapon choice for the SOM. Uses 7.62x39mm ammunition." - ui_icon = "ballistic" + ui_icon = "ak47" item_typepath = /obj/item/weapon/gun/rifle/mpi_km/black/magharness /datum/loadout_item/suit_store/main_gun/som_engineer/mpi/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) @@ -82,7 +82,7 @@ It combines good mobility and managable handling with fearsome stopping power and a tremendous rate of fire, making the V-34 an exceptionally deadly weapon at close range. \ With poor falloff and accuracy, it is a poor weapon outside of close range, and its mobility lacks compared to some other close range weapons like the V-21. \ Uses 7.62x39mm ammunition." - ui_icon = "ballistic" + ui_icon = "v34" item_typepath = /obj/item/weapon/gun/rifle/som_carbine/black/standard /datum/loadout_item/suit_store/main_gun/som_engineer/carbine/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) diff --git a/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/field_commander.dm b/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/field_commander.dm index f8f8fe148a64f..d5189ff12ac83 100644 --- a/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/field_commander.dm +++ b/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/field_commander.dm @@ -34,7 +34,7 @@ /datum/loadout_item/suit_store/main_gun/som_field_commander/standard_rifle/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) @@ -58,7 +58,7 @@ /datum/loadout_item/suit_store/main_gun/som_field_commander/smg/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) @@ -83,7 +83,7 @@ /datum/loadout_item/suit_store/main_gun/som_field_commander/volkite_charger/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) @@ -107,7 +107,7 @@ /datum/loadout_item/suit_store/main_gun/som_field_commander/volkite_caliver/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) @@ -124,12 +124,12 @@ Passed down the generations and lovingly maintained as a family heirloom, \ its use on modern battlefields is an idiosyncratic example of the SOM's persistant desire to maintain a link to their cultural past, more than any possible tactical reason. \ Despite having relatively poor mobility and handling, it never the less has fearsome firepower and good capacity, ensuring it stays a relevant weapon choice for the SOM. Uses 7.62x39mm ammunition." - ui_icon = "ballistic" + ui_icon = "ak47" item_typepath = /obj/item/weapon/gun/rifle/mpi_km/grenadier /datum/loadout_item/suit_store/main_gun/som_field_commander/mpi/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) @@ -147,12 +147,12 @@ It combines good mobility and managable handling with fearsome stopping power and a tremendous rate of fire, making the V-34 an exceptionally deadly weapon at close range. \ With poor falloff and accuracy, it is a poor weapon outside of close range, and its mobility lacks compared to some other close range weapons like the V-21. \ Uses 7.62x39mm ammunition." - ui_icon = "ballistic" + ui_icon = "v34" item_typepath = /obj/item/weapon/gun/rifle/som_carbine/mag_harness /datum/loadout_item/suit_store/main_gun/som_field_commander/carbine/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) @@ -180,7 +180,7 @@ wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign/som, SLOT_IN_ACCESSORY) - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return if(istype(wearer.belt, /obj/item/storage/holster/belt/pistol/m4a3/som)) wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_BACKPACK) diff --git a/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/medic.dm b/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/medic.dm index 927f3a32397c4..7bbece10d3be4 100644 --- a/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/medic.dm +++ b/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/medic.dm @@ -43,7 +43,7 @@ desc = "Equipped with a mag harness and laser sight. The MPi-KM is a modern reproduction based off several variants of kalashnikov type rifles used during the original Martian rebellion. \ These weapons were already ancient at that time, and their continued use by the SOM speaks more to their cultural legacy than any tactical benefits. \ Despite having relatively poor mobility and handling, it never the less has fearsome firepower and good capacity, ensuring it stays a relevant weapon choice for the SOM. Uses 7.62x39mm ammunition." - ui_icon = "ballistic" + ui_icon = "ak47" item_typepath = /obj/item/weapon/gun/rifle/mpi_km/black/magharness /datum/loadout_item/suit_store/main_gun/som_medic/mpi/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) @@ -67,7 +67,7 @@ It combines good mobility and managable handling with fearsome stopping power and a tremendous rate of fire, making the V-34 an exceptionally deadly weapon at close range. \ With poor falloff and accuracy, it is a poor weapon outside of close range, and its mobility lacks compared to some other close range weapons like the V-21. \ Uses 7.62x39mm ammunition." - ui_icon = "ballistic" + ui_icon = "v34" item_typepath = /obj/item/weapon/gun/rifle/som_carbine/black/standard /datum/loadout_item/suit_store/main_gun/som_medic/carbine/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) diff --git a/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/squad_leader.dm b/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/squad_leader.dm index 343c97cc3d18b..97e19c10f09b5 100644 --- a/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/squad_leader.dm +++ b/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/squad_leader.dm @@ -34,7 +34,7 @@ /datum/loadout_item/suit_store/main_gun/som_squad_leader/standard_rifle/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) @@ -58,7 +58,7 @@ /datum/loadout_item/suit_store/main_gun/som_squad_leader/smg/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) @@ -83,7 +83,7 @@ /datum/loadout_item/suit_store/main_gun/som_squad_leader/volkite_charger/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) @@ -107,7 +107,7 @@ /datum/loadout_item/suit_store/main_gun/som_squad_leader/volkite_caliver/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) @@ -124,12 +124,12 @@ Passed down the generations and lovingly maintained as a family heirloom, \ its use on modern battlefields is an idiosyncratic example of the SOM's persistant desire to maintain a link to their cultural past, more than any possible tactical reason. \ Despite having relatively poor mobility and handling, it never the less has fearsome firepower and good capacity, ensuring it stays a relevant weapon choice for the SOM. Uses 7.62x39mm ammunition." - ui_icon = "ballistic" + ui_icon = "ak47" item_typepath = /obj/item/weapon/gun/rifle/mpi_km/grenadier /datum/loadout_item/suit_store/main_gun/som_squad_leader/mpi/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) @@ -147,12 +147,12 @@ It combines good mobility and managable handling with fearsome stopping power and a tremendous rate of fire, making the V-34 an exceptionally deadly weapon at close range. \ With poor falloff and accuracy, it is a poor weapon outside of close range, and its mobility lacks compared to some other close range weapons like the V-21. \ Uses 7.62x39mm ammunition." - ui_icon = "ballistic" + ui_icon = "v34" item_typepath = /obj/item/weapon/gun/rifle/som_carbine/mag_harness /datum/loadout_item/suit_store/main_gun/som_squad_leader/carbine/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) diff --git a/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/standard.dm b/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/standard.dm index ca5f57d20f2b1..da1de837f2261 100644 --- a/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/standard.dm +++ b/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/standard.dm @@ -5,7 +5,7 @@ . = ..() if(!ammo_type) return - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return if(istype(wearer.belt, /obj/item/storage/holster/belt/pistol/m4a3/som)) //if we have a backpack and pistol belt, we just load more ammo in the back wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) @@ -35,7 +35,7 @@ /datum/loadout_item/suit_store/main_gun/som_marine/standard_rifle/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) @@ -73,12 +73,12 @@ desc = "Equipped with a red dot sight and underbarrel grenade launcher. The MPi-KM is a modern reproduction based off several variants of kalashnikov type rifles used during the original Martian rebellion. \ These weapons were already ancient at that time, and their continued use by the SOM speaks more to their cultural legacy than any tactical benefits. \ Despite having relatively poor mobility and handling, it never the less has fearsome firepower and good capacity, ensuring it stays a relevant weapon choice for the SOM. Uses 7.62x39mm ammunition." - ui_icon = "ballistic" + ui_icon = "ak47" item_typepath = /obj/item/weapon/gun/rifle/mpi_km/black/grenadier /datum/loadout_item/suit_store/main_gun/som_marine/mpi_grenadier/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) @@ -95,12 +95,12 @@ It combines good mobility and managable handling with fearsome stopping power and a tremendous rate of fire, making the V-34 an exceptionally deadly weapon at close range. \ With poor falloff and accuracy, it is a poor weapon outside of close range, and its mobility lacks compared to some other close range weapons like the V-21. \ Uses 7.62x39mm ammunition." - ui_icon = "ballistic" + ui_icon = "v34" item_typepath = /obj/item/weapon/gun/rifle/som_carbine/black/standard /datum/loadout_item/suit_store/main_gun/som_marine/carbine/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) @@ -128,7 +128,7 @@ /datum/loadout_item/suit_store/main_gun/som_marine/smg/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) @@ -177,7 +177,7 @@ /datum/loadout_item/suit_store/main_gun/som_marine/standard_shotgun/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_BACKPACK) @@ -207,16 +207,15 @@ /datum/loadout_item/suit_store/main_gun/som_marine/flamer/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) if(!istype(wearer.back, /obj/item/storage/backpack/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/large/X/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/large/X/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/large/X/som, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/som_marine/flamer/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) @@ -237,7 +236,7 @@ /datum/loadout_item/suit_store/main_gun/som_marine/smg_and_shield/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) wearer.equip_to_slot_or_del(new /obj/item/weapon/shield/riot/marine/som, SLOT_L_HAND) - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return ..() wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new /obj/item/tool/weldingtool/largetank, SLOT_IN_BACKPACK) @@ -276,20 +275,19 @@ name = "V-41" desc = "Equipped with a red dot sight, extended barrel and bipod. The V-41 is a large man portable machine used by the SOM, allowing for sustained, accurate suppressive firepower at the cost of mobility and handling. \ Commonly seen where their preferred tactics of fast, mobile aggression is ill suited. Has impressive ranged damage application as a static weapon. Uses 10x26mm Caseless ammunition." - ui_icon = "ballistic" + ui_icon = "v41" item_typepath = /obj/item/weapon/gun/rifle/som_mg/standard /datum/loadout_item/suit_store/main_gun/som_marine/machinegunner/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_BACKPACK) if(!istype(wearer.back, /obj/item/storage/backpack/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/som_marine/machinegunner/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) @@ -313,7 +311,7 @@ /datum/loadout_item/suit_store/main_gun/som_marine/volkite_charger/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) @@ -350,7 +348,7 @@ wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_ACCESSORY) - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/som, SLOT_IN_BACKPACK) @@ -368,3 +366,49 @@ wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary/som, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/combat, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/som_marine/suppressed_rifle + name = "V-31-suppressed" + desc = "Equipped with a mag harness, suppressor, vertical grip and integrated micro rail launcher. The V-31 is the principal ballistic weapon for the SOM. \ + It has good mobility and handling and a good rate of fire, but tends to favour closer range fighting compared to many TGMC equivilents. \ + The rail launcher electromagnetically launches a variety of 10 gauge airbursting grenades. Extremely effective when used correctly, their fixed fuse time makes them entirely ineffective at very close or far ranges. \ + Managing engagement range is thus vital for maximising the effectiveness of this weapon. \ + This particular example is a less common variant intended for stealthy operations, where its quietness and lack of muzzle flash can help get the jump on unsuspecting opponents. \ + Uses 10x24mm caseless ammunition and 10 gauge micro grenades." + ui_icon = "ballistic" + item_typepath = /obj/item/weapon/gun/rifle/som/suppressed + +/datum/loadout_item/suit_store/main_gun/som_marine/suppressed_rifle/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + if(!isstorage(wearer.back)) + return + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + if(!istype(wearer.back, /obj/item/storage/backpack/satchel)) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/som_marine/suppressed_rifle/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/cluster, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/smoke_burst, SLOT_IN_ACCESSORY) + +/datum/loadout_item/suit_store/main_gun/som_marine/suppressed_rifle/enhanced + name = "V-31-suppressed+" + desc = "Equipped with a mag harness, suppressor, vertical grip and integrated micro rail launcher. The V-31 is the principal ballistic weapon for the SOM. \ + It has good mobility and handling and a good rate of fire, but tends to favour closer range fighting compared to many TGMC equivilents. \ + The rail launcher electromagnetically launches a variety of 10 gauge airbursting grenades. Extremely effective when used correctly, their fixed fuse time makes them entirely ineffective at very close or far ranges. \ + Managing engagement range is thus vital for maximising the effectiveness of this weapon. \ + This particular example is a less common variant intended for stealthy operations, where its quietness and lack of muzzle flash can help get the jump on unsuspecting opponents. \ + Uses a mix of standard and AP 10x24mm caseless ammunition, and 10 gauge micro grenades." + loadout_item_flags = NONE + secondary_ammo_type = /obj/item/ammo_magazine/rifle/som/ap + +/datum/loadout_item/suit_store/main_gun/som_marine/suppressed_rifle/enhanced/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) + return ..() diff --git a/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/veteran.dm b/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/veteran.dm index b931fdce0513d..83332e2d9fd1b 100644 --- a/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/veteran.dm +++ b/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage/veteran.dm @@ -34,7 +34,7 @@ /datum/loadout_item/suit_store/main_gun/som_veteran/standard_rifle/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) @@ -66,7 +66,7 @@ /datum/loadout_item/suit_store/main_gun/som_veteran/smg/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) @@ -135,7 +135,7 @@ /datum/loadout_item/suit_store/main_gun/som_veteran/volkite_charger/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) @@ -166,7 +166,7 @@ /datum/loadout_item/suit_store/main_gun/som_veteran/volkite_caliver/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK) @@ -191,12 +191,12 @@ Passed down the generations and lovingly maintained as a family heirloom, \ its use on modern battlefields is an idiosyncratic example of the SOM's persistant desire to maintain a link to their cultural past, more than any possible tactical reason. \ Despite having relatively poor mobility and handling, it never the less has fearsome firepower and good capacity, ensuring it stays a relevant weapon choice for the SOM. Uses 7.62x39mm ammunition." - ui_icon = "ballistic" + ui_icon = "ak47" item_typepath = /obj/item/weapon/gun/rifle/mpi_km/grenadier /datum/loadout_item/suit_store/main_gun/som_veteran/mpi/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mpi_km/extended, SLOT_IN_BACKPACK) @@ -214,12 +214,12 @@ It combines good mobility and managable handling with fearsome stopping power and a tremendous rate of fire, making the V-34 an exceptionally deadly weapon at close range. \ With poor falloff and accuracy, it is a poor weapon outside of close range, and its mobility lacks compared to some other close range weapons like the V-21. \ Uses 7.62x39mm ammunition." - ui_icon = "ballistic" + ui_icon = "v34" item_typepath = /obj/item/weapon/gun/rifle/som_carbine/mag_harness /datum/loadout_item/suit_store/main_gun/som_veteran/carbine/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) @@ -318,7 +318,7 @@ wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/som/incendiary, SLOT_IN_R_POUCH) wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_R_POUCH) - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/rad, SLOT_IN_BACKPACK) @@ -351,7 +351,7 @@ wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, SLOT_IN_ACCESSORY) wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_ACCESSORY) - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) diff --git a/code/datums/gamemodes/campaign/loadout_items/_TGMC/back_slot.dm b/code/datums/gamemodes/campaign/loadout_items/_TGMC/back_slot.dm index 9873cb9a97bcf..cdf0e77cafa80 100644 --- a/code/datums/gamemodes/campaign/loadout_items/_TGMC/back_slot.dm +++ b/code/datums/gamemodes/campaign/loadout_items/_TGMC/back_slot.dm @@ -4,6 +4,7 @@ /datum/loadout_item/back/empty name = "no backpack" desc = "" + ui_icon = "empty" loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE jobs_supported = list( SQUAD_MARINE, @@ -85,7 +86,7 @@ The SH-35 is the most commonly used shotgun of the TGMC. With good mobility and handling, it has unparalleled close range power when using buckshot. Able to kill or maim all but the most heavily armored targets with a single well aimmed blast. \ When using flechette rounds, it can provide surprisingly powerful long range damage with good penetration, although its low rate of fire means its sustained damage is relatively poor. \ Uses 12 gauge shells." - ui_icon = "shotgun" + ui_icon = "t35" purchase_cost = 25 item_typepath = /obj/item/weapon/gun/shotgun/pump/t35/standard jobs_supported = list(SQUAD_MARINE, SQUAD_LEADER) @@ -100,6 +101,7 @@ desc = "Unlocked for free with the Heavy weapon specialisation perk. This backpack holds 4 67mm high explosive anti mech shells, in addition to a recoiless rifle. \ The recoiless rifle is a powerful support weapon that deals significant damage against heavily armored mechs or vehicles, \ but will generally devastate any human target unfortunate enough to be hit in a pinch. Has a draw delay and has poor accuracy against human targets." + ui_icon = "t160" unlock_cost = 300 purchase_cost = 100 loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_UNLOCKABLE @@ -150,6 +152,7 @@ name = "Rocket bag" desc = "This backpack holds 4 67mm shells, in addition to a recoiless rifle. \ A powerful ranged weapon with a wide area of effect, the recoiless rifle is a powerful support weapon that can severely wound whole groups of opponents in a single shot. Has a draw delay." + ui_icon = "t160" purchase_cost = 100 quantity = 2 item_typepath = /obj/item/storage/holster/backholster/rpg/low_impact diff --git a/code/datums/gamemodes/campaign/loadout_items/_TGMC/belt.dm b/code/datums/gamemodes/campaign/loadout_items/_TGMC/belt.dm index 6969809237ca2..a84775408f085 100644 --- a/code/datums/gamemodes/campaign/loadout_items/_TGMC/belt.dm +++ b/code/datums/gamemodes/campaign/loadout_items/_TGMC/belt.dm @@ -4,6 +4,7 @@ /datum/loadout_item/belt/empty name = "no belt" desc = "" + ui_icon = "empty" loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE jobs_supported = list( SQUAD_MARINE, @@ -35,10 +36,13 @@ /obj/item/weapon/gun/rifle/standard_smartmachinegun/patrol = ITEM_SLOT_SUITSTORE, /obj/item/weapon/gun/minigun/smart_minigun/motion_detector = ITEM_SLOT_SUITSTORE, /obj/item/weapon/gun/flamer/big_flamer/marinestandard/wide = ITEM_SLOT_SUITSTORE, + /obj/item/weapon/gun/standard_mmg/machinegunner = ITEM_SLOT_SUITSTORE, + /obj/item/weapon/gun/rifle/standard_gpmg/machinegunner = ITEM_SLOT_SUITSTORE, + /obj/item/weapon/gun/shotgun/pump/t35/standard = ITEM_SLOT_SUITSTORE, ) /datum/loadout_item/belt/sparepouch - name = "G8 storage pouch" + name = "G8 pouch" desc = "A small, lightweight pouch that can be clipped onto Armat Systems M3 Pattern armor or your belt to provide additional storage for miscellaneous gear or box and drum magazines." item_typepath = /obj/item/storage/belt/sparepouch jobs_supported = list(SQUAD_MARINE) @@ -63,9 +67,14 @@ name = "SMG-25 holster" desc = "The M276 is the standard load-bearing equipment of the TGMC. It consists of a modular belt with various clips. \ This version is designed for the SMG-25, and features a larger frame to support the gun. Due to its unorthodox design, it isn't a very common sight, and is only specially issued." - ui_icon = "smg" + ui_icon = "m25" item_typepath = /obj/item/storage/holster/m25 jobs_supported = list(SQUAD_MARINE) + item_whitelist = list( + /obj/item/weapon/gun/smg/m25/magharness = ITEM_SLOT_SUITSTORE, + /obj/item/weapon/gun/flamer/big_flamer/marinestandard/wide = ITEM_SLOT_SUITSTORE, + /obj/item/weapon/gun/standard_mmg/machinegunner = ITEM_SLOT_SUITSTORE, + ) /datum/loadout_item/belt/smg_holster/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/m25/holstered(wearer), SLOT_IN_HOLSTER) @@ -110,7 +119,7 @@ name = "P-1911A1-C pistol" desc = "The P-1911A1-C is a custom modified pistol with impressive stopping power for its size. \ Light and easy to use one handed, it suffers from a small magazine size and no auto eject feature. Comes in a holster that fits on your waist or armor. Uses .45 ACP ammunition." - ui_icon = "pistol" + ui_icon = "m1911c" item_typepath = /obj/item/storage/holster/belt/pistol/m4a3/fieldcommander jobs_supported = list(FIELD_COMMANDER) item_blacklist = list(/obj/item/storage/holster/belt/pistol/m4a3/fieldcommander = ITEM_SLOT_SUITSTORE) @@ -119,7 +128,7 @@ /datum/loadout_item/belt/so_pistol name = "RT-3 pistol" desc = "An RT-3 target pistol, a common sight throughout the bubble and the standard sidearm for noncombat roles in the TGMC. Comes in a holster to fit on your waist. uses 9mm caseless ammunition." - ui_icon = "pistol" + ui_icon = "rt3" item_typepath = /obj/item/storage/holster/belt/pistol/m4a3/officer jobs_supported = list(STAFF_OFFICER) diff --git a/code/datums/gamemodes/campaign/loadout_items/_TGMC/ears.dm b/code/datums/gamemodes/campaign/loadout_items/_TGMC/ears.dm index 2b0445be2f267..86c8613a0f4a1 100644 --- a/code/datums/gamemodes/campaign/loadout_items/_TGMC/ears.dm +++ b/code/datums/gamemodes/campaign/loadout_items/_TGMC/ears.dm @@ -5,6 +5,7 @@ /datum/loadout_item/ears/empty name = "no headset" desc = "" + ui_icon = "empty" loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE jobs_supported = list( SQUAD_MARINE, diff --git a/code/datums/gamemodes/campaign/loadout_items/_TGMC/eyes.dm b/code/datums/gamemodes/campaign/loadout_items/_TGMC/eyes.dm index fac5906985782..fdf9f54baa04b 100644 --- a/code/datums/gamemodes/campaign/loadout_items/_TGMC/eyes.dm +++ b/code/datums/gamemodes/campaign/loadout_items/_TGMC/eyes.dm @@ -4,6 +4,7 @@ /datum/loadout_item/eyes/empty name = "no eyewear" desc = "" + ui_icon = "empty" loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE jobs_supported = list( SQUAD_MARINE, @@ -39,7 +40,7 @@ loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE /datum/loadout_item/eyes/mesons - name = "Optical meson scanner" + name = "Meson scanner" desc = "Used to shield the user's eyes from harmful electromagnetic emissions, also used as general safety goggles. \ Not adequate as welding protection. Allows the user to see structural information about their surroundings." item_typepath = /obj/item/clothing/glasses/meson diff --git a/code/datums/gamemodes/campaign/loadout_items/_TGMC/feet.dm b/code/datums/gamemodes/campaign/loadout_items/_TGMC/feet.dm index 62ee57a02f844..235a1cce951e8 100644 --- a/code/datums/gamemodes/campaign/loadout_items/_TGMC/feet.dm +++ b/code/datums/gamemodes/campaign/loadout_items/_TGMC/feet.dm @@ -5,6 +5,7 @@ /datum/loadout_item/feet/empty name = "no footwear" desc = "" + ui_icon = "empty" loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE jobs_supported = list( SQUAD_MARINE, @@ -34,13 +35,13 @@ loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE /datum/loadout_item/feet/marine_brown_boots - name = "Brown combat boots" + name = "Brown boots" desc = "Standard issue combat boots for combat scenarios or combat situations. All combat, all the time." item_typepath = /obj/item/clothing/shoes/marine/brown/full jobs_supported = list(SQUAD_MARINE, SQUAD_CORPSMAN, SQUAD_ENGINEER, SQUAD_SMARTGUNNER, SQUAD_LEADER, FIELD_COMMANDER, STAFF_OFFICER, CAPTAIN) /datum/loadout_item/feet/white_dress - name = "White dress shoes" + name = "Dress shoes" desc = "Fancy white shoes to go with your white dress uniform. Do not come with a combat knife." item_typepath = /obj/item/clothing/shoes/white jobs_supported = list(SQUAD_MARINE, SQUAD_CORPSMAN, SQUAD_ENGINEER, SQUAD_SMARTGUNNER, SQUAD_LEADER, FIELD_COMMANDER, STAFF_OFFICER, CAPTAIN) diff --git a/code/datums/gamemodes/campaign/loadout_items/_TGMC/gloves.dm b/code/datums/gamemodes/campaign/loadout_items/_TGMC/gloves.dm index ba80a309e78e2..a843259d36831 100644 --- a/code/datums/gamemodes/campaign/loadout_items/_TGMC/gloves.dm +++ b/code/datums/gamemodes/campaign/loadout_items/_TGMC/gloves.dm @@ -4,6 +4,7 @@ /datum/loadout_item/gloves/empty name = "no gloves" desc = "" + ui_icon = "empty" loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE jobs_supported = list( SQUAD_MARINE, @@ -33,7 +34,7 @@ loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE /datum/loadout_item/gloves/marine_black_gloves - name = "Black combat gloves" + name = "Blk combat gloves" desc = "Standard issue marine tactical gloves but black! It reads: 'knit by Marine Widows Association'." item_typepath = /obj/item/clothing/gloves/marine/black jobs_supported = list(SQUAD_MARINE, SQUAD_CORPSMAN, SQUAD_SMARTGUNNER, SQUAD_LEADER, FIELD_COMMANDER) @@ -45,7 +46,7 @@ jobs_supported = list(SQUAD_MARINE, SQUAD_CORPSMAN, SQUAD_SMARTGUNNER, SQUAD_LEADER, FIELD_COMMANDER) /datum/loadout_item/gloves/white_dress - name = "White dress gloves" + name = "Dress gloves" desc = "Fancy white gloves to go with your white dress uniform." item_typepath = /obj/item/clothing/gloves/white jobs_supported = list(SQUAD_MARINE, SQUAD_CORPSMAN, SQUAD_ENGINEER, SQUAD_SMARTGUNNER, SQUAD_LEADER, FIELD_COMMANDER, STAFF_OFFICER, CAPTAIN) diff --git a/code/datums/gamemodes/campaign/loadout_items/_TGMC/head.dm b/code/datums/gamemodes/campaign/loadout_items/_TGMC/head.dm index 396eab4e5a1ab..1d8e31e44012e 100644 --- a/code/datums/gamemodes/campaign/loadout_items/_TGMC/head.dm +++ b/code/datums/gamemodes/campaign/loadout_items/_TGMC/head.dm @@ -9,6 +9,7 @@ /datum/loadout_item/helmet/empty name = "no helmet" desc = "" + ui_icon = "empty" loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE jobs_supported = list( SQUAD_MARINE, @@ -45,7 +46,7 @@ loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE /datum/loadout_item/helmet/surt - name = "M10X-Surt helmet" + name = "Surt helmet" desc = "A standard combat helmet with a Surt fireproof module." req_desc = "Requires a suit with a Surt module." item_typepath = /obj/item/clothing/head/modular/m10x/surt @@ -53,7 +54,7 @@ item_whitelist = list(/obj/item/clothing/suit/modular/xenonauten/heavy/surt = ITEM_SLOT_OCLOTHING) /datum/loadout_item/helmet/tyr - name = "M10X-Tyr helmet" + name = "Tyr helmet" desc = "A standard combat helmet with a Tyr extra armor module." req_desc = "Requires a suit with a Tyr module." ui_icon = "tyr" @@ -67,13 +68,13 @@ loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE /datum/loadout_item/helmet/white_dress - name = "Dress White Cap" + name = "Dress Cap" desc = "The dress white cap for your dress uniform. Pride is your shield, because this isn't." item_typepath = /obj/item/clothing/head/white_dress jobs_supported = list(SQUAD_MARINE, SQUAD_CORPSMAN, SQUAD_ENGINEER, SQUAD_SMARTGUNNER, SQUAD_LEADER, FIELD_COMMANDER, STAFF_OFFICER, CAPTAIN) /datum/loadout_item/helmet/mimir - name = "M10X-Mimir helmet" + name = "Mimir helmet" desc = "A standard combat helmet with a Mimir environmental protection module." req_desc = "Requires a suit with a Mimir module." item_typepath = /obj/item/clothing/head/modular/m10x/mimir @@ -110,7 +111,7 @@ loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE /datum/loadout_item/helmet/captain_beret - name = "Captains Beret" + name = "Captain Beret" desc = "A beret worn by ship's captains. You thought it would have been more fancy." item_typepath = /obj/item/clothing/head/tgmcberet/tan jobs_supported = list(CAPTAIN) diff --git a/code/datums/gamemodes/campaign/loadout_items/_TGMC/mask.dm b/code/datums/gamemodes/campaign/loadout_items/_TGMC/mask.dm index 5deb4da380dee..48618d354d8c2 100644 --- a/code/datums/gamemodes/campaign/loadout_items/_TGMC/mask.dm +++ b/code/datums/gamemodes/campaign/loadout_items/_TGMC/mask.dm @@ -4,6 +4,7 @@ /datum/loadout_item/mask/empty name = "no mask" desc = "" + ui_icon = "empty" loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE jobs_supported = list( SQUAD_MARINE, @@ -25,14 +26,14 @@ ) /datum/loadout_item/mask/standard - name = "Standard gas mask" + name = "Std gas mask" desc = "A face-covering mask that can be connected to an air supply. Filters harmful gases from the air." item_typepath = /obj/item/clothing/mask/gas jobs_supported = list(SQUAD_MARINE, SQUAD_CORPSMAN, SQUAD_ENGINEER, SQUAD_SMARTGUNNER, SQUAD_LEADER, FIELD_COMMANDER, SOM_SQUAD_MARINE, SOM_SQUAD_CORPSMAN, SOM_SQUAD_ENGINEER, SOM_SQUAD_VETERAN, SOM_SQUAD_LEADER, SOM_FIELD_COMMANDER) loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE /datum/loadout_item/mask/tactical - name = "Tactical gas mask" + name = "Tac gas mask" desc = "A face-covering mask that can be connected to an air supply. Filters harmful gases from the air. This one is supposedly more tactical than the standard model." item_typepath = /obj/item/clothing/mask/gas/tactical jobs_supported = list(SQUAD_MARINE, SQUAD_CORPSMAN, SQUAD_ENGINEER, SQUAD_SMARTGUNNER, SQUAD_LEADER, FIELD_COMMANDER, SOM_SQUAD_MARINE, SOM_SQUAD_CORPSMAN, SOM_SQUAD_ENGINEER, SOM_SQUAD_VETERAN, SOM_SQUAD_LEADER, SOM_FIELD_COMMANDER) diff --git a/code/datums/gamemodes/campaign/loadout_items/_TGMC/pockets.dm b/code/datums/gamemodes/campaign/loadout_items/_TGMC/pockets.dm index c7b012c0d6357..6937dbcc02c19 100644 --- a/code/datums/gamemodes/campaign/loadout_items/_TGMC/pockets.dm +++ b/code/datums/gamemodes/campaign/loadout_items/_TGMC/pockets.dm @@ -5,6 +5,7 @@ /datum/loadout_item/r_pocket/empty name = "no right pocket" desc = "" + ui_icon = "empty" loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE jobs_supported = list( SQUAD_MARINE, @@ -44,7 +45,7 @@ jobs_supported = list(SQUAD_LEADER, FIELD_COMMANDER) /datum/loadout_item/r_pocket/marine_support_grenades - name = "Support grenades" + name = "Support nades" desc = "A pouch carrying a set of six standard support grenades." ui_icon = "grenade" item_typepath = /obj/item/storage/pouch/grenade/combat_patrol @@ -52,7 +53,7 @@ loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE /datum/loadout_item/r_pocket/marine_standard_grenades - name = "Standard grenades" + name = "Standard nades" desc = "A pouch carrying a set of six standard offensive grenades. Contains HE, lasburster and incendiary grenades." ui_icon = "grenade" item_typepath = /obj/item/storage/pouch/grenade/standard @@ -85,7 +86,7 @@ wearer.equip_to_slot_or_del(new /obj/item/stack/barbed_wire/full, SLOT_IN_R_POUCH) /datum/loadout_item/r_pocket/magazine - name = "Magazine pouch-P" + name = "Mag pouch-P" desc = "A pouch containing three ammo magazines. Will contain a primary ammo type where applicable." ui_icon = "grenade" item_typepath = /obj/item/storage/pouch/magazine/large @@ -117,6 +118,7 @@ /datum/loadout_item/l_pocket/empty name = "no left pocket" desc = "" + ui_icon = "empty" loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE jobs_supported = list( SQUAD_MARINE, @@ -158,14 +160,14 @@ loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE /datum/loadout_item/l_pocket/marine_support_grenades - name = "Support grenades" + name = "Support nades" desc = "A pouch carrying a set of six standard support grenades. Includes smoke grenades of both lethal and nonlethal varieties, as well as stun grenades." ui_icon = "grenade" item_typepath = /obj/item/storage/pouch/grenade/combat_patrol jobs_supported = list(SQUAD_MARINE, SQUAD_CORPSMAN, SQUAD_ENGINEER, SQUAD_SMARTGUNNER, SQUAD_LEADER, FIELD_COMMANDER) /datum/loadout_item/l_pocket/marine_standard_grenades - name = "Standard grenades" + name = "Standard nades" desc = "A pouch carrying a set of six standard offensive grenades. Contains HE, lasburster and incendiary grenades." ui_icon = "grenade" item_typepath = /obj/item/storage/pouch/grenade/standard @@ -198,7 +200,7 @@ wearer.equip_to_slot_or_del(new /obj/item/stack/barbed_wire/full, SLOT_IN_L_POUCH) /datum/loadout_item/l_pocket/magazine - name = "Magazine pouch-S" + name = "Mag pouch-S" desc = "A pouch containing three ammo magazines. Will contain a secondary ammo type where applicable." ui_icon = "grenade" item_typepath = /obj/item/storage/pouch/magazine/large diff --git a/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit.dm b/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit.dm index afc412d05add0..e384506ead8e7 100644 --- a/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit.dm +++ b/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit.dm @@ -11,6 +11,7 @@ /datum/loadout_item/suit_slot/empty name = "no suit" desc = "" + ui_icon = "empty" loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE jobs_supported = list( SQUAD_MARINE, @@ -33,7 +34,7 @@ /datum/loadout_item/suit_slot/light_shield - name = "Light shielded armor" + name = "L shield armor" desc = "Light armor with a Svallin shield module. Provides excellent mobility but lower protection." ui_icon = "light_armour_shield" item_typepath = /obj/item/clothing/suit/modular/xenonauten/light/shield @@ -65,7 +66,7 @@ wearer.equip_to_slot_or_del(new /obj/item/stack/barbed_wire/half_stack, SLOT_IN_SUIT) /datum/loadout_item/suit_slot/medium_shield - name = "Medium shielded armor" + name = "M shield armor" desc = "Medium armor with a Svallin shield module. Provides balanced mobility and protection." ui_icon = "medium_armour_shield" item_typepath = /obj/item/clothing/suit/modular/xenonauten/shield @@ -97,7 +98,7 @@ wearer.equip_to_slot_or_del(new /obj/item/stack/barbed_wire/half_stack, SLOT_IN_SUIT) /datum/loadout_item/suit_slot/heavy_shield - name = "Heavy shielded armor" + name = "H shield armor" desc = "Heavy armor with a Svallin shield module. Provides excellent protection but lower mobility. The shield module has been overclocked for improved performance." ui_icon = "heavy_armour_shield" item_typepath = /obj/item/clothing/suit/modular/xenonauten/heavy/shield @@ -111,14 +112,16 @@ loadout_item_flags = null /datum/loadout_item/suit_slot/heavy_surt - name = "Heavy Surt armor" + name = "H Surt armor" desc = "Heavy armor with a Surt fireproof module. Provides excellent protection and almost total fire immunity, but has poor mobility." + ui_icon = "heavy_armour" req_desc = "Requires a FL-84 flamethrower." item_typepath = /obj/item/clothing/suit/modular/xenonauten/heavy/surt jobs_supported = list(SQUAD_MARINE) + item_whitelist = list(/obj/item/weapon/gun/flamer/big_flamer/marinestandard/wide = ITEM_SLOT_SUITSTORE) /datum/loadout_item/suit_slot/heavy_tyr - name = "Heavy Tyr armor" + name = "H Tyr armor" desc = "Heavy armor with a Tyr extra armor module. Provides incredible protection at the cost of with further reduced mobility." req_desc = "Requires a ALF-51B or SMG-25." ui_icon = "tyr" @@ -135,14 +138,14 @@ item_whitelist = null /datum/loadout_item/suit_slot/medium_valk - name = "Medium Valkyrie armor" + name = "M Valkyrie armor" desc = "Medium armor with a Valkyrie automedical module. Provides respectable protection, powerful automatic medical assistance, but modest mobility." ui_icon = "medium_armour" item_typepath = /obj/item/clothing/suit/modular/xenonauten/valk jobs_supported = list(SQUAD_LEADER, FIELD_COMMANDER) /datum/loadout_item/suit_slot/heavy_valk - name = "Heavy Valkyrie armor" + name = "H Valkyrie armor" desc = "Heavy armor with a Valkyrie automedical module. Provides excellent protection, powerful automatic medical assistance, but reduced mobility." ui_icon = "heavy_armour" item_typepath = /obj/item/clothing/suit/modular/xenonauten/heavy/leader @@ -150,14 +153,14 @@ loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE /datum/loadout_item/suit_slot/white_dress - name = "White dress jacket" + name = "Dress jacket" desc = "The perfect white jacket to go with your white dress uniform. WARNING: Incompatible with almost all weapons." item_typepath = /obj/item/clothing/suit/white_dress_jacket jobs_supported = list(SQUAD_MARINE, SQUAD_CORPSMAN, SQUAD_ENGINEER, SQUAD_SMARTGUNNER, SQUAD_LEADER, FIELD_COMMANDER, STAFF_OFFICER, CAPTAIN) //corpsman /datum/loadout_item/suit_slot/medium_mimir - name = "Medium Mimir armor" + name = "M Mimir armor" desc = "Medium armor with a Mimir environmental protection module. Provides respectable armor and total immunity to chemical attacks, and improved radiological protection. Has modest mobility." ui_icon = "medium_armour" item_typepath = /obj/item/clothing/suit/modular/xenonauten/mimir @@ -170,7 +173,7 @@ //engineer /datum/loadout_item/suit_slot/medium_engineer - name = "Medium armor" + name = "M armor" desc = "Medium armor with engineering storage. Provides balanced armor and mobility." ui_icon = "medium_armour" item_typepath = /obj/item/clothing/suit/modular/xenonauten/engineer diff --git a/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage.dm b/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage.dm index bcb23984b845d..075ed95a295e2 100644 --- a/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage.dm +++ b/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage.dm @@ -4,6 +4,7 @@ /datum/loadout_item/suit_store/empty name = "no suit stored" desc = "" + ui_icon = "empty" loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE jobs_supported = list( SQUAD_MARINE, diff --git a/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/corpsman.dm b/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/corpsman.dm index db9248ebceb1d..61cbb778d5aa0 100644 --- a/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/corpsman.dm +++ b/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/corpsman.dm @@ -21,7 +21,7 @@ /datum/loadout_item/suit_store/main_gun/corpsman/laser_carbine/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return ..() wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) @@ -47,7 +47,7 @@ /datum/loadout_item/suit_store/main_gun/corpsman/laser_rifle/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return ..() wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) @@ -67,13 +67,13 @@ desc = "Equipped with a mag harness and underbarrel grenade launcher. \ The SH-15 automatic shotgun has excellent mobility and handling, and offers powerful damage per shot. Its comparatively slow rate of fire means in a straight gunfight its overall damage output is somewhat lacking.\ Uses 12-round 16 gauge magazines with slugs and flechette." - ui_icon = "ballistic" + ui_icon = "tx15" item_typepath = /obj/item/weapon/gun/rifle/standard_autoshotgun/engineer secondary_ammo_type = /obj/item/ammo_magazine/rifle/tx15_flechette /datum/loadout_item/suit_store/main_gun/corpsman/auto_shotgun/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return ..() wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) @@ -99,7 +99,7 @@ /datum/loadout_item/suit_store/main_gun/corpsman/skirmish_rifle/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return ..() wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) @@ -119,12 +119,12 @@ name = "SMG-25" desc = "Equipped with a mag harness, recoil compensator and gyroscopic stabilizer. SMG-25 submachinegun, is a large capacity smg, able to be be used effectively one or two handed. \ Like all smgs, it has excellent mobility and handling, but has poor damage application at longer ranges. Uses 10x20mm caseless ammunition." - ui_icon = "smg" + ui_icon = "m25" item_typepath = /obj/item/weapon/gun/smg/m25/magharness /datum/loadout_item/suit_store/main_gun/corpsman/standard_smg/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return ..() wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) @@ -149,25 +149,57 @@ loadout_item_flags = NONE secondary_ammo_type = /obj/item/ammo_magazine/smg/m25/ap +/datum/loadout_item/suit_store/main_gun/corpsman/carbine + name = "AR-18" + desc = "Equipped with red dot sight, extended barrel and underbarrel grenade launcher. The AR-18 is the main weapon of the TGMC, offering excellent mobility and impressive close to medium range damage output. \ + Compared to the AR-12, it suffers from a comparatively smaller magazine size, and is less effective at longer range. Uses 10x24mm caseless ammunition." + ui_icon = "t18" + item_typepath = /obj/item/weapon/gun/rifle/standard_carbine/standard + +/datum/loadout_item/suit_store/main_gun/corpsman/carbine/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + if(!isstorage(wearer.back)) + return ..() + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + if(!istype(wearer.back, /obj/item/storage/backpack/marine/corpsman/satchel)) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x24mm, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/corpsman/carbine/enhanced + name = "AR-18+" + desc = "Equipped with mag harness, extended barrel and vertical grip. The AR-18 is the main weapon of the TGMC, offering excellent mobility and impressive close to medium range damage output. \ + Compared to the AR-12, it suffers from a comparatively smaller magazine size, and is less effective at longer range. It uses a mix of standard and AP 10x24mm caseless ammunition." + loadout_item_flags = NONE + secondary_ammo_type = /obj/item/ammo_magazine/rifle/standard_carbine/ap + /datum/loadout_item/suit_store/main_gun/corpsman/assault_rifle name = "AR-12" desc = "Equipped with mag harness, extended barrel and underbarrel grenade launcher. The AR-12 is the former main weapon of the TGMC before it was superceded by the AR-18 for general issue. \ A jack of all trades weapon, effect at close and long range, with good capacity and handling, making it a reliable all-rounder. \ It does not particularly excel in any area however, and so is overshadowed by other weapons at particular tasks. It uses 10x24mm caseless ammunition." - ui_icon = "ballistic" + ui_icon = "t12" item_typepath = /obj/item/weapon/gun/rifle/standard_assaultrifle/medic /datum/loadout_item/suit_store/main_gun/corpsman/assault_rifle/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return ..() wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) if(!istype(wearer.back, /obj/item/storage/backpack/marine/corpsman/satchel)) wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) @@ -188,12 +220,12 @@ desc = "Equipped with a red dot sight and laser sight. The AR-11 is an old rifle of the TGMC, but is now a relatively uncommon sight. \ It has a very large magazine capacity, and can inflict incredible damage at long range with its HV ammo, making it particularly effective at well armored targets. \ However it suffers from relatively poor handling and mobility, and lacks any underbarrel weapon attachments, making it an effective but less flexible weapon. It uses 4.92×34mm caseless HV ammunition." - ui_icon = "ballistic" + ui_icon = "tx11" item_typepath = /obj/item/weapon/gun/rifle/tx11/standard /datum/loadout_item/suit_store/main_gun/corpsman/combat_rifle/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return ..() wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) @@ -221,7 +253,7 @@ /datum/loadout_item/suit_store/main_gun/corpsman/plasma_smg/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return ..() wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) @@ -249,7 +281,7 @@ /datum/loadout_item/suit_store/main_gun/corpsman/plasma_rifle/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return ..() wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) diff --git a/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/engineer.dm b/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/engineer.dm index 5f098c211c993..3bbd2479237ef 100644 --- a/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/engineer.dm +++ b/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/engineer.dm @@ -12,7 +12,7 @@ name = "AR-18" desc = "Equipped with mag harness, extended barrel and vertical grip. The AR-18 is the main weapon of the TGMC, offering excellent mobility and impressive close to medium range damage output. \ Compared to the AR-12, it suffers from a comparatively smaller magazine size, and is less effective at longer range. Uses 10x24mm caseless ammunition." - ui_icon = "ballistic" + ui_icon = "t18" item_typepath = /obj/item/weapon/gun/rifle/standard_carbine/engineer loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE @@ -28,7 +28,7 @@ desc = "Equipped with mag harness, extended barrel and miniflamer. The AR-12 is the former main weapon of the TGMC before it was superceded by the AR-18 for general issue. \ A jack of all trades weapon, effect at close and long range, with good capacity and handling, making it a reliable all-rounder. \ It does not particularly excel in any area however, and so is overshadowed by other weapons at particular tasks. It uses 10x24mm caseless ammunition." - ui_icon = "ballistic" + ui_icon = "t12" item_typepath = /obj/item/weapon/gun/rifle/standard_assaultrifle/engineer /datum/loadout_item/suit_store/main_gun/engineer/assault_rifle/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) @@ -52,7 +52,7 @@ desc = "Equipped with a mag harness and underbarrel grenade launcher. \ The SH-15 automatic shotgun has excellent mobility and handling, and offers powerful damage per shot. Its comparatively slow rate of fire means in a straight gunfight its overall damage output is somewhat lacking.\ Uses 12-round 16 gauge magazines with slugs and flechette." - ui_icon = "ballistic" + ui_icon = "tx15" item_typepath = /obj/item/weapon/gun/rifle/standard_autoshotgun/engineer secondary_ammo_type = /obj/item/ammo_magazine/rifle/tx15_flechette @@ -68,7 +68,7 @@ desc = "Equipped with a red dot sight and laser sight. The AR-11 is an old rifle of the TGMC, but is now a relatively uncommon sight. \ It has a very large magazine capacity, and can inflict incredible damage at long range with its HV ammo, making it particularly effective at well armored targets. \ However it suffers from relatively poor handling and mobility, and lacks any underbarrel weapon attachments, making it an effective but less flexible weapon. It uses 4.92×34mm caseless HV ammunition." - ui_icon = "ballistic" + ui_icon = "tx11" item_typepath = /obj/item/weapon/gun/rifle/tx11/standard /datum/loadout_item/suit_store/main_gun/engineer/laser_carbine @@ -82,7 +82,7 @@ name = "SMG-25" desc = "Equipped with a mag harness, recoil compensator and vertical grip. SMG-25 submachinegun, is a large capacity smg, able to be be used effectively one or two handed. \ Like all smgs, it has excellent mobility and handling, but has poor damage application at longer ranges. Uses 10x20mm caseless ammunition." - ui_icon = "smg" + ui_icon = "m25" item_typepath = /obj/item/weapon/gun/smg/m25/vgrip /datum/loadout_item/suit_store/main_gun/engineer/standard_smg/enhanced diff --git a/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/field_commander.dm b/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/field_commander.dm index dc554dba2fda9..472fe01842a03 100644 --- a/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/field_commander.dm +++ b/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/field_commander.dm @@ -2,6 +2,7 @@ name = "Officers sword" desc = "This appears to be a rather old blade that has been well taken care of, it is probably a family heirloom. \ Well made and extremely sharp, despite its probable non-combat purpose. Comes in a leather scabbard that an attached to your waist or armor." + ui_icon = "machete" item_typepath = /obj/item/storage/holster/blade/officer/full jobs_supported = list(FIELD_COMMANDER) item_blacklist = list(/obj/item/storage/holster/blade/officer/full = ITEM_SLOT_BELT) @@ -13,7 +14,7 @@ wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, SLOT_IN_ACCESSORY) - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return wearer.equip_to_slot_or_del(new /obj/item/deployable_camera, SLOT_IN_BACKPACK) @@ -34,6 +35,7 @@ name = "P-1911A1-C pistol" desc = "The P-1911A1-C is a custom modified pistol with impressive stopping power for its size. \ Light and easy to use one handed, it suffers from a small magazine size and no auto eject feature. Comes in a holster that fits on your waist or armor. Uses .45 ACP ammunition." + ui_icon = "m1911c" item_typepath = /obj/item/storage/holster/belt/pistol/m4a3/fieldcommander jobs_supported = list(FIELD_COMMANDER) item_blacklist = list(/obj/item/storage/holster/belt/pistol/m4a3/fieldcommander = ITEM_SLOT_BELT) @@ -45,7 +47,7 @@ wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, SLOT_IN_ACCESSORY) - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return wearer.equip_to_slot_or_del(new /obj/item/deployable_camera, SLOT_IN_BACKPACK) @@ -90,7 +92,7 @@ wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, SLOT_IN_ACCESSORY) - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) @@ -108,7 +110,7 @@ desc = "Equipped with a red dot sight and laser sight. The AR-11 is an old rifle of the TGMC, but is now a relatively uncommon sight. \ It has a very large magazine capacity, and can inflict incredible damage at long range with its HV ammo, making it particularly effective at well armored targets. \ However it suffers from relatively poor handling and mobility, and lacks any underbarrel weapon attachments, making it an effective but less flexible weapon. It uses 4.92×34mm caseless HV ammunition." - ui_icon = "ballistic" + ui_icon = "tx11" item_typepath = /obj/item/weapon/gun/rifle/tx11/standard /datum/loadout_item/suit_store/main_gun/field_commander/combat_rifle/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) @@ -119,7 +121,7 @@ wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, SLOT_IN_ACCESSORY) - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) @@ -148,7 +150,7 @@ wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, SLOT_IN_ACCESSORY) - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) @@ -177,7 +179,7 @@ wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, SLOT_IN_ACCESSORY) - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) @@ -195,7 +197,7 @@ desc = "Equipped with red dot sight, extended barrel and underbarrel grenade launcher. The AR-12 is the former main weapon of the TGMC before it was superceded by the AR-18 for general issue. \ A jack of all trades weapon, effect at close and long range, with good capacity and handling, making it a reliable all-rounder. \ It does not particularly excel in any area however, and so is overshadowed by other weapons at particular tasks. It uses 10x24mm caseless ammunition." - ui_icon = "ballistic" + ui_icon = "t12" item_typepath = /obj/item/weapon/gun/rifle/standard_assaultrifle/rifleman /datum/loadout_item/suit_store/main_gun/field_commander/standard_rifle/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) @@ -206,7 +208,7 @@ wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, SLOT_IN_ACCESSORY) - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return wearer.equip_to_slot_or_del(new /obj/item/deployable_camera, SLOT_IN_BACKPACK) @@ -234,7 +236,7 @@ name = "AR-18" desc = "Equipped with red dot sight, extended barrel and plasma pistol. The AR-18 is the main weapon of the TGMC, offering excellent mobility and impressive close to medium range damage output. \ Compared to the AR-12, it suffers from a comparatively smaller magazine size, and is less effective at longer range. Uses 10x24mm caseless ammunition." - ui_icon = "ballistic" + ui_icon = "t18" item_typepath = /obj/item/weapon/gun/rifle/standard_carbine/plasma_pistol /datum/loadout_item/suit_store/main_gun/field_commander/carbine/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) @@ -245,7 +247,7 @@ wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_ACCESSORY) wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, SLOT_IN_ACCESSORY) - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, SLOT_IN_BACKPACK) @@ -286,7 +288,7 @@ wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/m15, SLOT_IN_ACCESSORY) wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, SLOT_IN_ACCESSORY) - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) @@ -317,7 +319,7 @@ wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_ACCESSORY) wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, SLOT_IN_ACCESSORY) - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) diff --git a/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/marine.dm b/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/marine.dm index 61bf720fdeea9..0875eb5b715ca 100644 --- a/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/marine.dm +++ b/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/marine.dm @@ -13,13 +13,13 @@ desc = "Equipped with red dot sight, extended barrel and underbarrel grenade launcher. The AR-12 is the former main weapon of the TGMC before it was superceded by the AR-18 for general issue. \ A jack of all trades weapon, effect at close and long range, with good capacity and handling, making it a reliable all-rounder. \ It does not particularly excel in any area however, and so is overshadowed by other weapons at particular tasks. It uses 10x24mm caseless ammunition." - ui_icon = "ballistic" + ui_icon = "t12" item_typepath = /obj/item/weapon/gun/rifle/standard_assaultrifle/rifleman loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE /datum/loadout_item/suit_store/main_gun/marine/standard_rifle/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return ..() wearer.equip_to_slot_or_del(new /obj/item/weapon/shield/riot/marine/deployable, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x24mm, SLOT_IN_BACKPACK) @@ -55,7 +55,7 @@ /datum/loadout_item/suit_store/main_gun/marine/laser_rifle/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return wearer.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BACKPACK) @@ -79,12 +79,12 @@ name = "AR-18" desc = "Equipped with red dot sight, extended barrel and underbarrel grenade launcher. The AR-18 is the main weapon of the TGMC, offering excellent mobility and impressive close to medium range damage output. \ Compared to the AR-12, it suffers from a comparatively smaller magazine size, and is less effective at longer range. Uses 10x24mm caseless ammunition." - ui_icon = "ballistic" + ui_icon = "t18" item_typepath = /obj/item/weapon/gun/rifle/standard_carbine/standard /datum/loadout_item/suit_store/main_gun/marine/standard_carbine/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return ..() wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x24mm, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_BACKPACK) @@ -114,12 +114,12 @@ desc = "Equipped with a red dot sight and laser sight. The AR-11 is an old rifle of the TGMC, but is now a relatively uncommon sight. \ It has a very large magazine capacity, and can inflict incredible damage at long range with its HV ammo, making it particularly effective at well armored targets. \ However it suffers from relatively poor handling and mobility, and lacks any underbarrel weapon attachments, making it an effective but less flexible weapon. It uses 4.92×34mm caseless HV ammunition." - ui_icon = "ballistic" + ui_icon = "tx11" item_typepath = /obj/item/weapon/gun/rifle/tx11/standard /datum/loadout_item/suit_store/main_gun/marine/combat_rifle/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return ..() wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p492x34mm, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p492x34mm, SLOT_IN_BACKPACK) @@ -149,7 +149,7 @@ /datum/loadout_item/suit_store/main_gun/marine/battle_rifle/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return ..() wearer.equip_to_slot_or_del(new /obj/item/weapon/shield/riot/marine/deployable, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x265mm, SLOT_IN_BACKPACK) @@ -173,7 +173,7 @@ /datum/loadout_item/suit_store/main_gun/marine/skirmish_rifle/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return ..() wearer.equip_to_slot_or_del(new /obj/item/weapon/shield/riot/marine/deployable, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x25mm, SLOT_IN_BACKPACK) @@ -192,12 +192,12 @@ desc = "Equipped with a mag harness, bayonet and vertical grip. The ALF-51B is an unusual weapon, being a heavily modified AR-18 modified to SMG length of barrel, rechambered for a larger caliber, and belt fed. \ Combining its powerful close range damage that can slow targets, impressive mobility and huge capacity, it is a devastating close range weapon. \ However it suffers from appaling falloff making it highly ineffective at range, and its belt fed nature means it cannot be reloaded quickly, often leaving careless users exposed. Uses 10x25mm caseless ammunition." - ui_icon = "ballistic" + ui_icon = "alf51b" item_typepath = /obj/item/weapon/gun/rifle/alf_machinecarbine/assault /datum/loadout_item/suit_store/main_gun/marine/alf/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return ..() wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) @@ -223,62 +223,80 @@ name = "MG-60" desc = "Equipped with a mag harness, extended barrel and bipod. The MG-60 is a powerful machinegun, combining a tremendous capacity good stopping power and blistering rate of fire, it is extremely deadly at any range. \ It has terrible mobility and poor accuracy on the move, so is generally used as a static weapon where it can lay down blistering firepower for team mates. It uses 10x26mm caseless ammunition." - ui_icon = "ballistic" + ui_icon = "t60" item_typepath = /obj/item/weapon/gun/rifle/standard_gpmg/machinegunner /datum/loadout_item/suit_store/main_gun/marine/standard_gpmg/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return ..() wearer.equip_to_slot_or_del(new /obj/item/weapon/shield/riot/marine/deployable, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_gpmg, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/standard_heavypistol/tactical(wearer), SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_BACKPACK) if(!istype(wearer.back, /obj/item/storage/backpack/marine/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/marine/standard_gpmg/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + if(!isstorage(wearer.back)) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + return + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_ACCESSORY) /datum/loadout_item/suit_store/main_gun/marine/standard_mmg name = "MG-27" - desc = "Equipped with an unremovable miniscope and tripod. The MG-27 is large, unwieldy machinegun, with terrible mobility an effectively unmanagable handling outside of point blank range. \ - However the MG-27 is primary used a deployed weapon, where it offers devastatingly powerful, accurate and long range damage that far exceeds the lighter MG-60. \ + desc = "Equipped with an unremovable miniscope and tripod. The MG-27 is large, unwieldy machinegun, with terrible mobility and effectively unmanagable handling outside of point blank range. \ + However the MG-27 is primary used as a deployed weapon, where it offers devastatingly powerful, accurate and long range damage that far exceeds the lighter MG-60. \ Can quickly mow down any target caught out in the open, it is the final word in static weaponry. It uses 10x27mm caseless ammunition." ui_icon = "ballistic" item_typepath = /obj/item/weapon/gun/standard_mmg/machinegunner /datum/loadout_item/suit_store/main_gun/marine/standard_mmg/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return ..() - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_mmg, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_mmg, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_mmg, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang/stun, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + if(istype(wearer.belt, /obj/item/storage/holster/m25)) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + else + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x20mm, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/standard_machinepistol/compact(wearer), SLOT_IN_BACKPACK) if(!istype(wearer.back, /obj/item/storage/backpack/marine/satchel)) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/marine/standard_mmg/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25, SLOT_IN_ACCESSORY) + if(istype(wearer.belt, /obj/item/storage/holster/m25)) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/extended, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/extended, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/extended, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x20mm, SLOT_IN_ACCESSORY) + else if(isstorage(wearer.back)) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + else + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/bullet/laser, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/bullet/laser, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) /datum/loadout_item/suit_store/main_gun/marine/laser_mg name = "Laser machinegun" @@ -290,7 +308,7 @@ /datum/loadout_item/suit_store/main_gun/marine/laser_mg/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return ..() wearer.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BACKPACK) @@ -316,16 +334,48 @@ Excels at clearing out enclosed or fortified positions, but suffers from poor mobility and relatively limited range, making it of questionable use in open combat. \ Uses back or gun mounted fuel tanks." req_desc = "Requires a suit with a Surt module." - ui_icon = "ballistic" + ui_icon = "m240" item_typepath = /obj/item/weapon/gun/flamer/big_flamer/marinestandard/wide item_whitelist = list(/obj/item/clothing/suit/modular/xenonauten/heavy/surt = ITEM_SLOT_OCLOTHING) +/datum/loadout_item/suit_store/main_gun/marine/flamer/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + if(!isstorage(wearer.back)) + return ..() + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + if(istype(wearer.belt, /obj/item/storage/holster/m25)) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + else + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x20mm, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/standard_machinepistol/compact(wearer), SLOT_IN_BACKPACK) + if(!istype(wearer.back, /obj/item/storage/backpack/marine/satchel)) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/large/X, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/large/X, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/large/X, SLOT_IN_BACKPACK) + /datum/loadout_item/suit_store/main_gun/marine/flamer/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/extended, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/extended, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/extended, SLOT_IN_ACCESSORY) - wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x20mm, SLOT_IN_ACCESSORY) + if(istype(wearer.belt, /obj/item/storage/holster/m25)) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/extended, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/extended, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/extended, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x20mm, SLOT_IN_ACCESSORY) + else if(isstorage(wearer.back)) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + else + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/bullet/laser, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/bullet/laser, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) + /datum/loadout_item/suit_store/main_gun/marine/shotgun name = "SH-35" @@ -333,12 +383,12 @@ The SH-35 is the most commonly used shotgun of the TGMC. With good mobility and handling, it has unparalleled close range power when using buckshot. Able to kill or maim all but the most heavily armored targets with a single well aimmed blast. \ When using flechette rounds, it can provide surprisingly powerful long range damage with good penetration, although its low rate of fire means its sustained damage is relatively poor. \ Uses 12 gauge shells." - ui_icon = "shotgun" + ui_icon = "t35" item_typepath = /obj/item/weapon/gun/shotgun/pump/t35/standard /datum/loadout_item/suit_store/main_gun/marine/shotgun/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return ..() wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, SLOT_IN_BACKPACK) @@ -361,21 +411,42 @@ wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) -/datum/loadout_item/suit_store/main_gun/marine/laser_carbine_scout - name = "Laser carbine-S" +/datum/loadout_item/suit_store/main_gun/marine/auto_shotgun + name = "SH-15" + desc = "Equipped with a mag harness, barrel charger and underbarrel grenade launcher. \ + The SH-15 automatic shotgun has excellent mobility and handling, and offers powerful damage per shot. Its comparatively slow rate of fire means in a straight gunfight its overall damage output is somewhat lacking.\ + Uses 12-round 16 gauge magazines with slugs and flechette." + ui_icon = "tx15" + item_typepath = /obj/item/weapon/gun/rifle/standard_autoshotgun/standard + secondary_ammo_type = /obj/item/ammo_magazine/rifle/tx15_flechette + +/datum/loadout_item/suit_store/main_gun/marine/auto_shotgun/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) + . = ..() + if(!isstorage(wearer.back)) + return ..() + wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/standard_heavypistol/tactical(wearer), SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE, SLOT_IN_BACKPACK) + if(!istype(wearer.back, /obj/item/storage/backpack/marine/satchel)) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) + +/datum/loadout_item/suit_store/main_gun/marine/laser_carbine + name = "Laser carbine" desc = "Equipped with a red dot sight and underbarrel grenade launcher. The TerraGov laser carbine is the high tech equivilent to the AR-18, with extremely good mobility and handling, and powerful medium range damage. \ Variable firemodes gives it additional flexibility over its ballistic counterpart. Uses TE power cells that are shared across all TGMC laser weaponry." req_desc = "Requires a light armour suit." ui_icon = "lasergun" item_typepath = /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_carbine/scout - item_whitelist = list( - /obj/item/clothing/suit/modular/xenonauten/light/shield = ITEM_SLOT_OCLOTHING, - /obj/item/clothing/suit/modular/xenonauten/light/shield_overclocked = ITEM_SLOT_OCLOTHING, - ) -/datum/loadout_item/suit_store/main_gun/marine/laser_carbine_scout/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) +/datum/loadout_item/suit_store/main_gun/marine/laser_carbine/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return ..() wearer.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new /obj/item/cell/lasgun/lasrifle, SLOT_IN_BACKPACK) @@ -390,7 +461,7 @@ wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) -/datum/loadout_item/suit_store/main_gun/marine/laser_carbine_scout/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) +/datum/loadout_item/suit_store/main_gun/marine/laser_carbine/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) @@ -398,12 +469,12 @@ wearer.equip_to_slot_or_del(new /obj/item/binoculars, SLOT_IN_ACCESSORY) /datum/loadout_item/suit_store/main_gun/marine/scout_carbine - name = "AR-18-S" + name = "AR-18-scout" desc = "Equipped with motion detector, extended barrel and underbarrel grenade launcher. The AR-18 is the main weapon of the TGMC, offering excellent mobility and impressive close to medium range damage output. \ Compared to the AR-12, it suffers from a comparatively smaller magazine size, and is less effective at longer range. \ The motion detector on this example makes it excellent for scouting out enemy positions and tracking down hidden enemies. Uses 10x24mm caseless ammunition." req_desc = "Requires a light armour suit." - ui_icon = "ballistic" + ui_icon = "t18" item_typepath = /obj/item/weapon/gun/rifle/standard_carbine/scout item_whitelist = list( /obj/item/clothing/suit/modular/xenonauten/light/shield = ITEM_SLOT_OCLOTHING, @@ -412,7 +483,7 @@ /datum/loadout_item/suit_store/main_gun/marine/scout_carbine/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return ..() wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x24mm, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x24mm, SLOT_IN_BACKPACK) @@ -446,7 +517,7 @@ secondary_ammo_type = /obj/item/ammo_magazine/rifle/standard_carbine/ap /datum/loadout_item/suit_store/main_gun/marine/smg_and_shield - name = "SMG-25 & riot shield" + name = "SMG-25 & shield" desc = "Equipped with a mag harness, recoil compensator and gyroscopic stabilizer, and comes with a TL-172 defensive shield. SMG-25 submachinegun, is a large capacity smg, able to be be used effectively one or two handed. \ Like all smgs, it has excellent mobility and handling, but has poor damage application at longer ranges. \ The defensive shield provides incredible resilience, allowing the user to soak up tremendous amounts of damage while they or their team mates push the enemy. \ @@ -458,7 +529,7 @@ /datum/loadout_item/suit_store/main_gun/marine/smg_and_shield/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() wearer.equip_to_slot_or_del(new /obj/item/weapon/shield/riot/marine, SLOT_L_HAND) - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new /obj/item/tool/weldingtool/largetank, SLOT_IN_BACKPACK) @@ -486,12 +557,12 @@ name = "SMG-25" desc = "Equipped with a mag harness, recoil compensator and gyroscopic stabilizer. SMG-25 submachinegun, is a large capacity smg, able to be be used effectively one or two handed. \ Like all smgs, it has excellent mobility and handling, but has poor damage application at longer ranges. Uses 10x20mm caseless ammunition." - ui_icon = "smg" + ui_icon = "m25" item_typepath = /obj/item/weapon/gun/smg/m25/magharness /datum/loadout_item/suit_store/main_gun/marine/standard_smg/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return wearer.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/extended, SLOT_IN_BACKPACK) @@ -509,7 +580,7 @@ /datum/loadout_item/suit_store/main_gun/marine/standard_smg/role_post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) if(istype(wearer.belt, /obj/item/storage/belt)) return ..() - wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_ACCESSORY) + wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/extended, SLOT_IN_ACCESSORY) wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_ACCESSORY) wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_ACCESSORY) wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_ACCESSORY) @@ -539,7 +610,7 @@ /datum/loadout_item/suit_store/main_gun/marine/scout_rifle/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return ..() wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, SLOT_IN_BACKPACK) @@ -573,12 +644,12 @@ desc = "Equipped with red dot sight, suppressor and underbarrel grenade launcher. The AR-18 is the main weapon of the TGMC, offering excellent mobility and impressive close to medium range damage output. \ Compared to the AR-12, it suffers from a comparatively smaller magazine size, and is less effective at longer range. \ This suppressed variant is typically used for stealth operations, where its quiet firing and lack of tracers can give the user an edge over unsuspecting opponents. Uses 10x24mm caseless ammunition." - ui_icon = "ballistic" + ui_icon = "t18" item_typepath = /obj/item/weapon/gun/rifle/standard_carbine/suppressed /datum/loadout_item/suit_store/main_gun/marine/suppressed_carbine/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return ..() wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x24mm, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_heavypistol, SLOT_IN_BACKPACK) @@ -616,7 +687,7 @@ /datum/loadout_item/suit_store/main_gun/marine/mag_gl/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return ..() wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/standard_machinepistol, SLOT_IN_BACKPACK) @@ -656,7 +727,7 @@ /datum/loadout_item/suit_store/main_gun/marine/plasma_smg/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) @@ -689,7 +760,7 @@ /datum/loadout_item/suit_store/main_gun/marine/plasma_rifle/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) @@ -723,7 +794,7 @@ /datum/loadout_item/suit_store/main_gun/marine/plasma_cannon/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) diff --git a/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/smartgunner.dm b/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/smartgunner.dm index 04f7b151707de..44c72d3d4d543 100644 --- a/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/smartgunner.dm +++ b/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/smartgunner.dm @@ -7,7 +7,7 @@ It has good mobility for a machinegun, and is extremely effective on the move. Its innate IFF, good damage application and attached motion sensor makes it a powerful support weapon. \ Has somewhat poor falloff however, and although it has an excellent capacity, has slow reloading. It uses 10x26mm caseless ammunition. \ Requires special training and it cannot turn off IFF. It uses 10x26mm ammunition." - ui_icon = "smartgun" + ui_icon = "sg29" item_typepath = /obj/item/weapon/gun/rifle/standard_smartmachinegun/patrol loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE @@ -19,7 +19,7 @@ wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_ACCESSORY) wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_ACCESSORY) - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) @@ -77,7 +77,7 @@ wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_spottingrifle/incendiary, SLOT_IN_ACCESSORY) wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_spottingrifle/tungsten, SLOT_IN_ACCESSORY) - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_spottingrifle/incendiary, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/standard_spottingrifle/tungsten, SLOT_IN_BACKPACK) diff --git a/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/squad_leader.dm b/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/squad_leader.dm index 7b02dd0231740..f35179cace5d9 100644 --- a/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/squad_leader.dm +++ b/code/datums/gamemodes/campaign/loadout_items/_TGMC/suit_storage/squad_leader.dm @@ -6,7 +6,7 @@ desc = "Equipped with red dot sight, extended barrel and underbarrel grenade launcher. The AR-12 is the former main weapon of the TGMC before it was superceded by the AR-18 for general issue. \ A jack of all trades weapon, effect at close and long range, with good capacity and handling, making it a reliable all-rounder. \ It does not particularly excel in any area however, and so is overshadowed by other weapons at particular tasks. It uses 10x24mm caseless ammunition." - ui_icon = "ballistic" + ui_icon = "t12" item_typepath = /obj/item/weapon/gun/rifle/standard_assaultrifle/rifleman /datum/loadout_item/suit_store/main_gun/squad_leader/standard_rifle/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) @@ -17,7 +17,7 @@ wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, SLOT_IN_ACCESSORY) - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return wearer.equip_to_slot_or_del(new /obj/item/deployable_camera, SLOT_IN_BACKPACK) @@ -58,7 +58,7 @@ wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade, SLOT_IN_ACCESSORY) wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, SLOT_IN_ACCESSORY) - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return wearer.equip_to_slot_or_del(new /obj/item/deployable_camera, SLOT_IN_BACKPACK) @@ -78,7 +78,7 @@ name = "AR-18" desc = "Equipped with red dot sight, extended barrel and plasma pistol. The AR-18 is the main weapon of the TGMC, offering excellent mobility and impressive close to medium range damage output. \ Compared to the AR-12, it suffers from a comparatively smaller magazine size, and is less effective at longer range. Uses 10x24mm caseless ammunition." - ui_icon = "ballistic" + ui_icon = "t18" item_typepath = /obj/item/weapon/gun/rifle/standard_carbine/plasma_pistol /datum/loadout_item/suit_store/main_gun/squad_leader/carbine/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) @@ -89,7 +89,7 @@ wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_ACCESSORY) wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, SLOT_IN_ACCESSORY) - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/plasma_pistol, SLOT_IN_BACKPACK) @@ -117,7 +117,7 @@ desc = "Equipped with a red dot sight and laser sight. The AR-11 is an old rifle of the TGMC, but is now a relatively uncommon sight. \ It has a very large magazine capacity, and can inflict incredible damage at long range with its HV ammo, making it particularly effective at well armored targets. \ However it suffers from relatively poor handling and mobility, and lacks any underbarrel weapon attachments, making it an effective but less flexible weapon. It uses 4.92×34mm caseless HV ammunition." - ui_icon = "ballistic" + ui_icon = "tx11" item_typepath = /obj/item/weapon/gun/rifle/tx11/standard /datum/loadout_item/suit_store/main_gun/squad_leader/combat_rifle/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) @@ -128,7 +128,7 @@ wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_ACCESSORY) wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, SLOT_IN_ACCESSORY) - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return wearer.equip_to_slot_or_del(new /obj/item/deployable_camera, SLOT_IN_BACKPACK) @@ -159,7 +159,7 @@ wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/sticky, SLOT_IN_ACCESSORY) wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, SLOT_IN_ACCESSORY) - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x265mm, SLOT_IN_BACKPACK) @@ -179,7 +179,7 @@ desc = "Equipped with a motion sensor, extended barrel and plasma pistol. \ The SH-15 automatic shotgun has excellent mobility and handling, and offers powerful damage per shot. Its comparatively slow rate of fire means in a straight gunfight its overall damage output is somewhat lacking.\ Uses 12-round 16 gauge magazines with slugs and flechette." - ui_icon = "ballistic" + ui_icon = "tx15" item_typepath = /obj/item/weapon/gun/rifle/standard_autoshotgun/plasma_pistol secondary_ammo_type = /obj/item/ammo_magazine/rifle/tx15_flechette @@ -191,7 +191,7 @@ wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_ACCESSORY) wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, SLOT_IN_ACCESSORY) - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return wearer.equip_to_slot_or_del(new ammo_type, SLOT_IN_BACKPACK) @@ -213,7 +213,7 @@ The AR-55 is effectively a GL-54 with a simplified AR-18 strapped to the bottom. It has all the flexible airbursting power of the GL-54 combined with the reliable damage of an assault rifle. \ While even more bulky and cumbersome than just the GL-54 alone, and the rifle component is inferior to the AR-18 it is derived from, the AR-55 is a far more effective weapon than the sum of its parts. \ Uses 10x24mm caseless ammunition and 20mm airburst grenades." - ui_icon = "ballistic" + ui_icon = "tx55" item_typepath = /obj/item/weapon/gun/rifle/tx55/combat_patrol purchase_cost = 100 quantity = 2 @@ -226,7 +226,7 @@ wearer.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_ACCESSORY) wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, SLOT_IN_ACCESSORY) - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/packet/p10x24mm, SLOT_IN_BACKPACK) @@ -259,12 +259,12 @@ name = "SMG-25" desc = "Equipped with a mag harness, recoil compensator and plasma pistol. SMG-25 submachinegun, is a large capacity smg, intended to be used two handed to take advantage of the attached plasma pistol. \ Like all smgs, it has excellent mobility and handling, but has poor damage application at longer ranges. Uses 10x20mm caseless ammunition, and comes with multiple ammo types." - ui_icon = "smg" + ui_icon = "m25" item_typepath = /obj/item/weapon/gun/smg/m25/plasma /datum/loadout_item/suit_store/main_gun/squad_leader/standard_smg/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) . = ..() - if(!istype(wearer.back, /obj/item/storage)) //bruh + if(!isstorage(wearer.back)) //bruh wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_ACCESSORY) wearer.equip_to_slot_or_del(new secondary_ammo_type, SLOT_IN_ACCESSORY) wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/extended, SLOT_IN_ACCESSORY) @@ -317,7 +317,7 @@ wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/incendiary, SLOT_IN_ACCESSORY) wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, SLOT_IN_ACCESSORY) - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return wearer.equip_to_slot_or_del(new /obj/item/deployable_camera, SLOT_IN_BACKPACK) @@ -351,7 +351,7 @@ wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank/mini, SLOT_IN_ACCESSORY) wearer.equip_to_slot_or_del(new /obj/item/binoculars/fire_support/campaign, SLOT_IN_ACCESSORY) - if(!istype(wearer.back, /obj/item/storage)) + if(!isstorage(wearer.back)) return wearer.equip_to_slot_or_del(new /obj/item/deployable_camera, SLOT_IN_BACKPACK) diff --git a/code/datums/gamemodes/campaign/loadout_items/_TGMC/uniform.dm b/code/datums/gamemodes/campaign/loadout_items/_TGMC/uniform.dm index d54f9e798df9c..61b4991c8c929 100644 --- a/code/datums/gamemodes/campaign/loadout_items/_TGMC/uniform.dm +++ b/code/datums/gamemodes/campaign/loadout_items/_TGMC/uniform.dm @@ -4,6 +4,7 @@ /datum/loadout_item/uniform/empty name = "no uniform" desc = "" + ui_icon = "empty" loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE jobs_supported = list( SQUAD_MARINE, diff --git a/code/datums/gamemodes/campaign/missions/base_rescue.dm b/code/datums/gamemodes/campaign/missions/base_rescue.dm index 0e2cd6549ab27..a801811de73a8 100644 --- a/code/datums/gamemodes/campaign/missions/base_rescue.dm +++ b/code/datums/gamemodes/campaign/missions/base_rescue.dm @@ -10,7 +10,7 @@ map_light_levels = list(225, 150, 100, 75) objectives_total = 1 min_destruction_amount = 1 - max_game_time = 17 MINUTES + max_game_time = 15 MINUTES shutter_open_delay = list( MISSION_STARTING_FACTION = 60 SECONDS, MISSION_HOSTILE_FACTION = 0, @@ -42,6 +42,8 @@ /datum/campaign_mission/destroy_mission/base_rescue/load_mission() . = ..() RegisterSignal(SSdcs, COMSIG_GLOB_CAMPAIGN_NT_OVERRIDE_CODE, PROC_REF(override_code_received)) + RegisterSignal(SSdcs, COMSIG_GLOB_CAMPAIGN_NT_OVERRIDE_RUNNING, PROC_REF(computer_running)) + RegisterSignal(SSdcs, COMSIG_GLOB_CAMPAIGN_NT_OVERRIDE_STOP_RUNNING, PROC_REF(computer_stop_running)) /datum/campaign_mission/destroy_mission/base_rescue/set_factions() attacking_faction = hostile_faction @@ -49,7 +51,7 @@ /datum/campaign_mission/destroy_mission/base_rescue/unregister_mission_signals() . = ..() - UnregisterSignal(SSdcs, COMSIG_GLOB_CAMPAIGN_NT_OVERRIDE_CODE) + UnregisterSignal(SSdcs, list(COMSIG_GLOB_CAMPAIGN_NT_OVERRIDE_CODE, COMSIG_GLOB_CAMPAIGN_NT_OVERRIDE_RUNNING, COMSIG_GLOB_CAMPAIGN_NT_OVERRIDE_STOP_RUNNING)) /datum/campaign_mission/destroy_mission/base_rescue/play_start_intro() intro_message = list( @@ -118,6 +120,15 @@ map_text_broadcast(attacking_faction, message_to_play, "[color] override broadcast", /atom/movable/screen/text/screen_text/picture/potrait/unknown) map_text_broadcast(defending_faction, message_to_play, "[color] override broadcast", /atom/movable/screen/text/screen_text/picture/potrait/unknown) +///Code computer is actively running a segment +/datum/campaign_mission/destroy_mission/base_rescue/proc/computer_running(datum/source, obj/machinery/computer/nt_access/code_computer) + SIGNAL_HANDLER + pause_mission_timer(REF(code_computer)) + +///Code computer stops running a segment +/datum/campaign_mission/destroy_mission/base_rescue/proc/computer_stop_running(datum/source, obj/machinery/computer/nt_access/code_computer) + SIGNAL_HANDLER + resume_mission_timer(REF(code_computer)) /obj/effect/landmark/campaign_structure/weapon_x name = "weapon X spawner" diff --git a/code/datums/gamemodes/campaign/missions/mech_wars.dm b/code/datums/gamemodes/campaign/missions/mech_wars.dm index d3461db33216a..558bb7b7d6eb5 100644 --- a/code/datums/gamemodes/campaign/missions/mech_wars.dm +++ b/code/datums/gamemodes/campaign/missions/mech_wars.dm @@ -86,55 +86,6 @@ else if(dead_mech.faction == starting_faction) hostile_team_cap_points += 10 -//mech spawn points -/obj/effect/landmark/campaign/mech_spawner - name = "tgmc med mech spawner" - icon_state = "mech" - var/faction = FACTION_TERRAGOV - var/list/colors = list(ARMOR_PALETTE_SPACE_CADET, ARMOR_PALETTE_GREYISH_TURQUOISE, VISOR_PALETTE_MAGENTA) - var/obj/vehicle/sealed/mecha/combat/greyscale/mech_type = /obj/vehicle/sealed/mecha/combat/greyscale/assault/noskill - -/obj/effect/landmark/campaign/mech_spawner/Initialize(mapload) - . = ..() - GLOB.campaign_mech_spawners[faction] += list(src) - -/obj/effect/landmark/campaign/mech_spawner/Destroy() - GLOB.campaign_mech_spawners[faction] -= src - return ..() - -/obj/effect/landmark/campaign/mech_spawner/proc/spawn_mech() - var/obj/vehicle/sealed/mecha/combat/greyscale/new_mech = new mech_type(loc) - for(var/i in new_mech.limbs) - var/datum/mech_limb/limb = new_mech.limbs[i] - limb.update_colors(arglist(colors)) - new_mech.update_icon() - return new_mech - -/obj/effect/landmark/campaign/mech_spawner/heavy - name = "tgmc heavy mech spawner" - icon_state = "mech_heavy" - mech_type = /obj/vehicle/sealed/mecha/combat/greyscale/vanguard/noskill - -/obj/effect/landmark/campaign/mech_spawner/light - name = "tgmc light mech spawner" - icon_state = "mech_light" - mech_type = /obj/vehicle/sealed/mecha/combat/greyscale/recon/noskill - -/obj/effect/landmark/campaign/mech_spawner/som - name = "som med mech spawner" - faction = FACTION_SOM - colors = list(ARMOR_PALETTE_GINGER, ARMOR_PALETTE_BLACK, VISOR_PALETTE_SYNDIE_GREEN) - -/obj/effect/landmark/campaign/mech_spawner/som/heavy - name = "som heavy mech spawner" - icon_state = "mech_heavy" - mech_type = /obj/vehicle/sealed/mecha/combat/greyscale/vanguard/noskill - -/obj/effect/landmark/campaign/mech_spawner/som/light - name = "som light mech spawner" - icon_state = "mech_light" - mech_type = /obj/vehicle/sealed/mecha/combat/greyscale/recon/noskill - /datum/campaign_mission/tdm/mech_wars/som name = "Mech war" mission_icon = "mech_war" diff --git a/code/datums/gamemodes/campaign/missions/raiding_base.dm b/code/datums/gamemodes/campaign/missions/raiding_base.dm index d035a7e3c4a34..e68fba26316a4 100644 --- a/code/datums/gamemodes/campaign/missions/raiding_base.dm +++ b/code/datums/gamemodes/campaign/missions/raiding_base.dm @@ -1,97 +1,180 @@ -//placeholder /datum/campaign_mission/raiding_base - name = "Combat patrol" + name = "Raiding Base" mission_icon = "raiding_base" - map_name = "Orion Outpost" - map_file = '_maps/map_files/Campaign maps/jungle_outpost/jungle_outpost.dmm' - starting_faction_objective_description = null - hostile_faction_objective_description = null - max_game_time = 20 MINUTES + map_name = "Raiding base Zulu" + map_file = '_maps/map_files/Campaign maps/som_raid_base/som_raiding_base.dmm' + map_traits = list(ZTRAIT_AWAY = TRUE, ZTRAIT_RAIN = TRUE) + map_light_colours = list(LIGHT_COLOR_PALE_GREEN, LIGHT_COLOR_PALE_GREEN, COLOR_MISSION_RED, COLOR_MISSION_RED) + starting_faction_objective_description = "Major Victory: Set and defend an orbital beacon inside the facility until a precision orbital strike can be called in." + hostile_faction_objective_description = "Major Victory: Prevent the enemy from activating an orbital beacon inside the facility." + intro_message = list( + MISSION_STARTING_FACTION = "Infiltrate the SOM base, then plant and defend an orbital beacon until we can drop the hammer on them from orbit!", + MISSION_HOSTILE_FACTION = "Stop TGMC forces from infiltrating the base. Prevent them from activating an orbital beacon at all costs!", + ) + mission_flags = MISSION_DISALLOW_DROPPODS + max_game_time = 12 MINUTES + mission_start_delay = 90 SECONDS + shutter_open_delay = list( + MISSION_STARTING_FACTION = 90 SECONDS, + MISSION_HOSTILE_FACTION = 0, + ) victory_point_rewards = list( - MISSION_OUTCOME_MAJOR_VICTORY = list(3, 0), + MISSION_OUTCOME_MAJOR_VICTORY = list(2, 0), MISSION_OUTCOME_MINOR_VICTORY = list(1, 0), MISSION_OUTCOME_DRAW = list(0, 0), MISSION_OUTCOME_MINOR_LOSS = list(0, 1), - MISSION_OUTCOME_MAJOR_LOSS = list(0, 3), + MISSION_OUTCOME_MAJOR_LOSS = list(0, 2), ) attrition_point_rewards = list( - MISSION_OUTCOME_MAJOR_VICTORY = list(20, 5), - MISSION_OUTCOME_MINOR_VICTORY = list(15, 10), - MISSION_OUTCOME_DRAW = list(10, 10), - MISSION_OUTCOME_MINOR_LOSS = list(10, 15), - MISSION_OUTCOME_MAJOR_LOSS = list(5, 20), + MISSION_OUTCOME_MAJOR_VICTORY = list(20, 20), + MISSION_OUTCOME_MINOR_VICTORY = list(0, 0), + MISSION_OUTCOME_DRAW = list(0, 0), + MISSION_OUTCOME_MINOR_LOSS = list(0, 0), + MISSION_OUTCOME_MAJOR_LOSS = list(10, 30), ) - starting_faction_mission_brief = null - hostile_faction_mission_brief = null - starting_faction_additional_rewards = null - hostile_faction_additional_rewards = null - -/datum/campaign_mission/raiding_base/play_start_intro() - intro_message = list( - MISSION_STARTING_FACTION = "[map_name]
" + "[GAME_YEAR]-[time2text(world.realtime, "MM-DD")] [stationTimestamp("hh:mm")]
" + "Eliminate all [hostile_faction] resistance in the AO. Reinforcements are limited so preserve your forces as best you can. Good hunting!", - MISSION_HOSTILE_FACTION = "[map_name]
" + "[GAME_YEAR]-[time2text(world.realtime, "MM-DD")] [stationTimestamp("hh:mm")]
" + "Eliminate all [starting_faction] resistance in the AO. Reinforcements are limited so preserve your forces as best you can. Good hunting!", + starting_faction_mission_brief = "We have finally been able to track down a hidden SOM outpost which they have been using as a base of operations to raid our supply lines, wrecking havoc on our logistics. \ + Your unit has been tasked with ensuring the complete and utter destruction of this base and everything within it. \ + Infiltrate the facility, then deploy one of the orbital beacons you have been supplied with. \ + Defend the beacon until the TGS Horizon can secure a target lock and deploy a thermobaric bunker buster to wipe the outpost off the face of the planet." + hostile_faction_mission_brief = "Intelligence has picked up a TGMC plan to assault Raiding base Zulu. This base has been key to our sabotage and disruption efforts, significantly degrading TGMC supply lines. \ + Intel suggests that the TGMC are seeking to infiltrate the base to deploy a orbital beacon, in order to call down an orbital strike. \ + Prevent TGMC forces from entering the base, and destroy any orbital beacon they try to deploy." + starting_faction_additional_rewards = "Remove negative effects on our logistics" + hostile_faction_additional_rewards = "Allow us to continue degrading TGMC logistics" + outro_message = list( + MISSION_OUTCOME_MAJOR_VICTORY = list( + MISSION_STARTING_FACTION = "Major victory
Confirming good hit. Successful destruction of target facility. Outstanding marines!", + MISSION_HOSTILE_FACTION = "Major loss
We've lost Zulu, any survivors, fallback to exfil point Charlie, retreat!", + ), + MISSION_OUTCOME_MAJOR_LOSS = list( + MISSION_STARTING_FACTION = "Major loss
SOM interceptors are inbound, all forces fallback, this operation is a loss.", + MISSION_HOSTILE_FACTION = "Major victory
Reinforcements are almost here and enemy forces are falling back, you've done Mars proud today marines.", + ), ) + ///Records whether the OB has been called + var/ob_called = FALSE + ///Count of beacons still in play + var/beacons_remaining = 4 + +/datum/campaign_mission/raiding_base/get_status_tab_items(mob/source, list/items) . = ..() + items += "Beacons remaining: [beacons_remaining]" + +/datum/campaign_mission/raiding_base/load_pre_mission_bonuses() + spawn_mech(starting_faction, 0, 0, 3) + spawn_mech(hostile_faction, 0, 2) + new /obj/item/storage/box/crate/loot/materials_pack(get_turf(pick(GLOB.campaign_reward_spawners[hostile_faction]))) + for(var/i = 1 to beacons_remaining) + new /obj/item/explosive/plastique(get_turf(pick(GLOB.campaign_reward_spawners[hostile_faction]))) + new /obj/item/explosive/plastique(get_turf(pick(GLOB.campaign_reward_spawners[hostile_faction]))) + new /obj/item/campaign_beacon/bunker_buster(get_turf(pick(GLOB.campaign_reward_spawners[starting_faction]))) + +/datum/campaign_mission/raiding_base/start_mission() + . = ..() + RegisterSignal(SSdcs, COMSIG_GLOB_CAMPAIGN_OB_BEACON_ACTIVATION, PROC_REF(beacon_placed)) + RegisterSignal(SSdcs, COMSIG_GLOB_CAMPAIGN_OB_BEACON_TRIGGERED, PROC_REF(beacon_triggered)) /datum/campaign_mission/raiding_base/check_mission_progress() if(outcome) return TRUE if(!game_timer) - return + return FALSE - ///pulls the number of both factions, dead or alive - var/list/player_list = count_humans(count_flags = COUNT_IGNORE_ALIVE_SSD) - var/num_team_one = length(player_list[1]) - var/num_team_two = length(player_list[2]) - var/num_dead_team_one = length(player_list[3]) - var/num_dead_team_two = length(player_list[4]) - - if(num_team_two && num_team_one && !max_time_reached) - return //fighting is ongoing - - //major victor for wiping out the enemy, or draw if both sides wiped simultaneously somehow - if(!num_team_two) - if(!num_team_one) - message_admins("Mission finished: [MISSION_OUTCOME_DRAW]") //everyone died at the same time, no one wins - outcome = MISSION_OUTCOME_DRAW - return TRUE - message_admins("Mission finished: [MISSION_OUTCOME_MAJOR_VICTORY]") //starting team wiped the hostile team + if(ob_called) + message_admins("Mission finished: [MISSION_OUTCOME_MAJOR_VICTORY]") //Attackers dropped the hammer outcome = MISSION_OUTCOME_MAJOR_VICTORY return TRUE - if(!num_team_one) - message_admins("Mission finished: [MISSION_OUTCOME_MAJOR_LOSS]") //hostile team wiped the starting team - outcome = MISSION_OUTCOME_MAJOR_LOSS - return TRUE + var/attacker_lost - //minor victories for more kills or draw for equal kills - if(num_dead_team_two > num_dead_team_one) - message_admins("Mission finished: [MISSION_OUTCOME_MINOR_VICTORY]") //starting team got more kills - outcome = MISSION_OUTCOME_MINOR_VICTORY - return TRUE - if(num_dead_team_one > num_dead_team_two) - message_admins("Mission finished: [MISSION_OUTCOME_MINOR_LOSS]") //hostile team got more kills - outcome = MISSION_OUTCOME_MINOR_LOSS - return TRUE + if(!length(GLOB.campaign_objectives) || max_time_reached) + attacker_lost = TRUE + else + var/list/player_list = count_humans(count_flags = COUNT_IGNORE_ALIVE_SSD) + var/num_team_one = length(player_list[1]) + var/datum/faction_stats/attacker_stats = mode.stat_list[starting_faction] + if(!num_team_one && !attacker_stats.active_attrition_points) + attacker_lost = TRUE - message_admins("Mission finished: [MISSION_OUTCOME_DRAW]") //equal number of kills, or any other edge cases - outcome = MISSION_OUTCOME_DRAW + if(!attacker_lost) + return FALSE + message_admins("Mission finished: [MISSION_OUTCOME_MAJOR_LOSS]") //Attackers run out of beacons, time or bodies + outcome = MISSION_OUTCOME_MAJOR_LOSS return TRUE -//todo: remove these if nothing new is added -/datum/campaign_mission/raiding_base/apply_major_victory() +/datum/campaign_mission/raiding_base/unregister_mission_signals() . = ..() + UnregisterSignal(SSdcs, list(COMSIG_GLOB_CAMPAIGN_OB_BEACON_ACTIVATION, COMSIG_GLOB_CAMPAIGN_OB_BEACON_TRIGGERED)) -/datum/campaign_mission/raiding_base/apply_minor_victory() +/datum/campaign_mission/raiding_base/apply_major_victory() . = ..() + winning_faction = starting_faction + var/datum/faction_stats/winning_team = mode.stat_list[starting_faction] + winning_team.remove_asset(/datum/campaign_asset/attrition_modifier/malus_strong) + winning_team.remove_asset(/datum/campaign_asset/attrition_modifier/malus_standard) + //We don't have enough missions in the pool yet to activate this + //GLOB.campaign_mission_pool[hostile_faction] -= /datum/campaign_mission/destroy_mission/supply_raid/som + //GLOB.campaign_mission_pool[hostile_faction] -= /datum/campaign_mission/destroy_mission/supply_raid -/datum/campaign_mission/raiding_base/apply_draw() - winning_faction = pick(starting_faction, hostile_faction) - -/datum/campaign_mission/raiding_base/apply_minor_loss() - . = ..() /datum/campaign_mission/raiding_base/apply_major_loss() . = ..() + winning_faction = hostile_faction + var/datum/faction_stats/winning_team = mode.stat_list[hostile_faction] + if(hostile_faction == FACTION_TERRAGOV) + winning_team.add_asset(/datum/campaign_asset/equipment/power_armor) + else if(hostile_faction == FACTION_SOM) + winning_team.add_asset(/datum/campaign_asset/mech/light/som) + winning_team.add_asset(/datum/campaign_asset/equipment/gorgon_armor) + +///Returns a list of areas in which the beacon can be deployed +/datum/campaign_mission/raiding_base/proc/get_valid_beacon_areas() + return list( + /area/campaign/som_raiding/outpost/command, + /area/campaign/som_raiding/outpost/command/captain, + /area/campaign/som_raiding/outpost/command/telecom, + /area/campaign/som_raiding/outpost/command/cic, + /area/campaign/som_raiding/outpost/command/north, + /area/campaign/som_raiding/outpost/command/living, + /area/campaign/som_raiding/outpost/medbay, + /area/campaign/som_raiding/outpost/central_corridor, + ) + +///Reacts to an OB beacon being successfully triggered +/datum/campaign_mission/raiding_base/proc/beacon_placed(datum/source, obj/structure/campaign_objective/destruction_objective/bunker_buster/beacon) + SIGNAL_HANDLER + RegisterSignal(beacon, COMSIG_QDELETING, PROC_REF(beacon_destroyed)) + pause_mission_timer(REF(beacon)) + var/area/deployed_area = get_area(beacon) + map_text_broadcast(starting_faction, "Confirming beacon deployed in [deployed_area]. Defend it until we can secure a target lock marines!", "TGS Horizon", /atom/movable/screen/text/screen_text/picture/potrait/pod_officer, "sound/effects/alert.ogg") + map_text_broadcast(hostile_faction, "Orbital beacon detected in [deployed_area]. Destroy that beacon before they can secure a target lock!", "Overwatch", sound_effect = "sound/effects/alert.ogg") + +///Handles a beacon being destroyed. Separate from normal objective destruction for convenience as we want the specific beacon ref +/datum/campaign_mission/raiding_base/proc/beacon_destroyed(obj/structure/campaign_objective/destruction_objective/bunker_buster/beacon) + SIGNAL_HANDLER + UnregisterSignal(beacon, COMSIG_QDELETING) + resume_mission_timer(REF(beacon)) + beacons_remaining -- + if(outcome) + return + var/beacons_destroyed = initial(beacons_remaining) - beacons_remaining + map_text_broadcast(starting_faction, "We've lost [beacons_destroyed] beacon[beacons_destroyed > 1 ? "s" : null], get it together!", "Overwatch") + map_text_broadcast(hostile_faction, "[beacons_destroyed] beacon[beacons_destroyed > 1 ? "s" : null] destroyed, keep up the good work!", "Overwatch") + +///Reacts to an OB beacon being successfully triggered +/datum/campaign_mission/raiding_base/proc/beacon_triggered(datum/source, obj/structure/campaign_objective/destruction_objective/bunker_buster/beacon, activation_delay) + SIGNAL_HANDLER + pause_mission_timer() //stops the game from ending if it comes down to the wire + addtimer(CALLBACK(src, PROC_REF(beacon_effect), beacon, beacon.loc), activation_delay) + +///Handles the actual detonation effects +/datum/campaign_mission/raiding_base/proc/beacon_effect(obj/structure/campaign_objective/destruction_objective/bunker_buster/beacon, turf/location) + ob_called = TRUE + resume_mission_timer(src, TRUE) + //We handle this here instead of the beacon structure because it could be destroyed before this triggers + explosion(location, 45, flame_range = 45) + if(QDELETED(beacon)) + return + qdel(beacon) diff --git a/code/datums/gamemodes/campaign/perks.dm b/code/datums/gamemodes/campaign/perks.dm index 15e2a56c603e2..53db3189653a3 100644 --- a/code/datums/gamemodes/campaign/perks.dm +++ b/code/datums/gamemodes/campaign/perks.dm @@ -281,6 +281,7 @@ Needed both for a purchase list and effected list (if one perk impacts multiple owner_stats.replace_loadout_option(/datum/loadout_item/suit_store/main_gun/marine/standard_carbine/enhanced, /datum/loadout_item/suit_store/main_gun/marine/standard_carbine, SQUAD_MARINE) owner_stats.replace_loadout_option(/datum/loadout_item/suit_store/main_gun/marine/scout_carbine/enhanced, /datum/loadout_item/suit_store/main_gun/marine/scout_carbine, SQUAD_MARINE) owner_stats.replace_loadout_option(/datum/loadout_item/suit_store/main_gun/marine/suppressed_carbine/enhanced, /datum/loadout_item/suit_store/main_gun/marine/suppressed_carbine, SQUAD_MARINE) + owner_stats.replace_loadout_option(/datum/loadout_item/suit_store/main_gun/corpsman/carbine/enhanced, /datum/loadout_item/suit_store/main_gun/corpsman/carbine, SQUAD_CORPSMAN) owner_stats.replace_loadout_option(/datum/loadout_item/suit_store/main_gun/corpsman/assault_rifle/enhanced, /datum/loadout_item/suit_store/main_gun/corpsman/assault_rifle, SQUAD_CORPSMAN) owner_stats.replace_loadout_option(/datum/loadout_item/suit_store/main_gun/engineer/carbine/enhanced, /datum/loadout_item/suit_store/main_gun/engineer/carbine, SQUAD_ENGINEER) owner_stats.replace_loadout_option(/datum/loadout_item/suit_store/main_gun/engineer/assault_rifle/enhanced, /datum/loadout_item/suit_store/main_gun/engineer/assault_rifle, SQUAD_ENGINEER) @@ -297,6 +298,7 @@ Needed both for a purchase list and effected list (if one perk impacts multiple else if(owner_stats.faction == FACTION_SOM) owner_stats.replace_loadout_option(/datum/loadout_item/suit_store/main_gun/som_marine/standard_rifle/enhanced, /datum/loadout_item/suit_store/main_gun/som_marine/standard_rifle, SOM_SQUAD_MARINE) + owner_stats.replace_loadout_option(/datum/loadout_item/suit_store/main_gun/som_marine/suppressed_rifle/enhanced, /datum/loadout_item/suit_store/main_gun/som_marine/suppressed_rifle, SOM_SQUAD_MARINE) owner_stats.replace_loadout_option(/datum/loadout_item/suit_store/main_gun/som_medic/standard_rifle/enhanced, /datum/loadout_item/suit_store/main_gun/som_medic/standard_rifle, SOM_SQUAD_CORPSMAN) owner_stats.replace_loadout_option(/datum/loadout_item/suit_store/main_gun/som_engineer/standard_rifle/enhanced, /datum/loadout_item/suit_store/main_gun/som_engineer/standard_rifle, SOM_SQUAD_ENGINEER) diff --git a/code/datums/gamemodes/campaign/rewards/mechs.dm b/code/datums/gamemodes/campaign/rewards/mechs.dm index 06b21376ae52d..716fede63b57c 100644 --- a/code/datums/gamemodes/campaign/rewards/mechs.dm +++ b/code/datums/gamemodes/campaign/rewards/mechs.dm @@ -35,3 +35,65 @@ /datum/campaign_asset/mech/heavy/som spawner_type = /obj/effect/landmark/campaign/mech_spawner/som/heavy + +//mech spawn points +/obj/effect/landmark/campaign/mech_spawner + name = "tgmc med mech spawner" + icon_state = "mech" + ///Faction associated with this spawner + var/faction = FACTION_TERRAGOV + ///Colours to paint mechs from this spawner + var/list/colors = list(ARMOR_PALETTE_SPACE_CADET, ARMOR_PALETTE_GREYISH_TURQUOISE) + ///Colours to paint mech heads from this spawner for better visual clarity + var/list/head_colors = list(ARMOR_PALETTE_STORM, ARMOR_PALETTE_GREYISH_TURQUOISE, VISOR_PALETTE_SYNDIE_GREEN) + ///Mech type for this spawner + var/obj/vehicle/sealed/mecha/combat/greyscale/mech_type = /obj/vehicle/sealed/mecha/combat/greyscale/assault/noskill + +/obj/effect/landmark/campaign/mech_spawner/Initialize(mapload) + . = ..() + GLOB.campaign_mech_spawners[faction] += list(src) + +/obj/effect/landmark/campaign/mech_spawner/Destroy() + GLOB.campaign_mech_spawners[faction] -= src + return ..() + +///Creates and sets up the mech +/obj/effect/landmark/campaign/mech_spawner/proc/spawn_mech() + var/obj/vehicle/sealed/mecha/combat/greyscale/new_mech = new mech_type(loc) + for(var/i in new_mech.limbs) + var/datum/mech_limb/limb = new_mech.limbs[i] + limb.update_colors(arglist(istype(limb, /datum/mech_limb/head) ? head_colors : colors)) + new_mech.update_icon() + return new_mech + +/obj/effect/landmark/campaign/mech_spawner/heavy + name = "tgmc heavy mech spawner" + icon_state = "mech_heavy" + head_colors = list(ARMOR_PALETTE_RED, ARMOR_PALETTE_GREYISH_TURQUOISE, VISOR_PALETTE_SYNDIE_GREEN) + mech_type = /obj/vehicle/sealed/mecha/combat/greyscale/vanguard/noskill + +/obj/effect/landmark/campaign/mech_spawner/light + name = "tgmc light mech spawner" + icon_state = "mech_light" + head_colors = list(ARMOR_PALETTE_SPACE_CADET, ARMOR_PALETTE_GREYISH_TURQUOISE, VISOR_PALETTE_SYNDIE_GREEN) + mech_type = /obj/vehicle/sealed/mecha/combat/greyscale/recon/noskill + +/obj/effect/landmark/campaign/mech_spawner/som + name = "som med mech spawner" + faction = FACTION_SOM + colors = list(ARMOR_PALETTE_GINGER, ARMOR_PALETTE_ANGELIC) + head_colors = list(ARMOR_PALETTE_ANGELIC, ARMOR_PALETTE_GREY, VISOR_PALETTE_SYNDIE_GREEN) + +/obj/effect/landmark/campaign/mech_spawner/som/heavy + name = "som heavy mech spawner" + icon_state = "mech_heavy" + colors = list(ARMOR_PALETTE_GINGER, ARMOR_PALETTE_MAGENTA) + head_colors = list(ARMOR_PALETTE_MAGENTA, ARMOR_PALETTE_GRAPE, VISOR_PALETTE_ELITE_ORANGE) + mech_type = /obj/vehicle/sealed/mecha/combat/greyscale/vanguard/noskill + +/obj/effect/landmark/campaign/mech_spawner/som/light + name = "som light mech spawner" + icon_state = "mech_light" + colors = list(ARMOR_PALETTE_GINGER, ARMOR_PALETTE_BLACK) + head_colors = list(ARMOR_PALETTE_GINGER, ARMOR_PALETTE_BLACK, VISOR_PALETTE_SYNDIE_GREEN) + mech_type = /obj/vehicle/sealed/mecha/combat/greyscale/recon/noskill diff --git a/code/datums/jobs/job/retired.dm b/code/datums/jobs/job/retired.dm index e83f68a54cd42..be876519abc05 100644 --- a/code/datums/jobs/job/retired.dm +++ b/code/datums/jobs/job/retired.dm @@ -4,7 +4,7 @@ paygrade = "MSGT" access = ALL_ANTAGONIST_ACCESS minimal_access = ALL_ANTAGONIST_ACCESS - skills_type = /datum/skills/fo //they're old, they know their stuff + skills_type = /datum/skills/veteran //they're old, they know their stuff faction = FACTION_TERRAGOV outfit = /datum/outfit/job/retired @@ -49,7 +49,7 @@ /datum/job/retired/leader title = "TGMC retired veteran expedition leader" paygrade = "LtCol" - skills_type = /datum/skills/captain //The leader gets even more skills + skills_type = /datum/skills/veteran_captain //The leader gets even more skills outfit = /datum/outfit/job/retired/leader /datum/outfit/job/retired/leader diff --git a/code/datums/jobs/job/special_forces.dm b/code/datums/jobs/job/special_forces.dm index d07a0110268cd..11a31edec3ef9 100644 --- a/code/datums/jobs/job/special_forces.dm +++ b/code/datums/jobs/job/special_forces.dm @@ -183,8 +183,7 @@ /datum/job/special_forces/medic title = "Special Response Force Medic" outfit = /datum/outfit/job/special_forces/medic - skills_type = /datum/skills/combat_medic/crafty - + skills_type = /datum/skills/combat_medic/special_forces /datum/outfit/job/special_forces/medic name = "Special Response Force Medic" jobtype = /datum/job/special_forces/medic diff --git a/code/datums/keybinding/xeno.dm b/code/datums/keybinding/xeno.dm index e3d0cd69ff77c..1c1d3e5a7586b 100644 --- a/code/datums/keybinding/xeno.dm +++ b/code/datums/keybinding/xeno.dm @@ -110,6 +110,13 @@ keybind_signal = COMSIG_XENOABILITY_XENO_SPIT hotkey_keys = list("Q") +/datum/keybinding/xeno/long_range_sight + name = "long_range_sight" + full_name = "Long Range Sight" + description = "Toggles the zoom in." + keybind_signal = COMSIG_XENOABILITY_LONG_RANGE_SIGHT + hotkey_keys = list("E") + /datum/keybinding/xeno/xenohide name = "xenohide" full_name = "Hide" @@ -205,13 +212,6 @@ // Single caste, alphabetical order // -/datum/keybinding/xeno/long_range_sight - name = "long_range_sight" - full_name = "Boiler: Long Range Sight" - description = "Toggles the zoom in." - keybind_signal = COMSIG_XENOABILITY_LONG_RANGE_SIGHT - hotkey_keys = list("E") - /datum/keybinding/xeno/toggle_bomb name = "toggle_bomb" full_name = "Boiler: Toggle Bombard Type" @@ -251,7 +251,7 @@ full_name = "Bull: Headbutt Charge" description = "A charge that tosses the victim forward or backwards, depending on intent." keybind_signal = COMSIG_XENOABILITY_BULLHEADBUTT - hotkey_keys = list("E") + hotkey_keys = list("F") /datum/keybinding/xeno/gore_charge name = "gore_charge" diff --git a/code/datums/marine_main_ship.dm b/code/datums/marine_main_ship.dm index dff77022f389c..f39e02acddf68 100644 --- a/code/datums/marine_main_ship.dm +++ b/code/datums/marine_main_ship.dm @@ -43,10 +43,10 @@ GLOBAL_DATUM_INIT(marine_main_ship, /datum/marine_main_ship, new) light.brightness = 8 light.light_range = 8 if(istype(light, /obj/machinery/light/mainship/small)) - light.icon_state = "bulb1" - light.base_state = "bulb" + light.icon_state = "bulb_1" + light.base_state = "tube" else - light.icon_state = "tube1" + light.icon_state = "tube_1" light.update_light() else for(var/obj/effect/soundplayer/alarmplayer AS in GLOB.ship_alarms) @@ -55,7 +55,7 @@ GLOBAL_DATUM_INIT(marine_main_ship, /datum/marine_main_ship, new) else alarmplayer.deltalarm.start(alarmplayer) for(var/obj/machinery/light/mainship/light AS in GLOB.mainship_lights) - light.base_state = "tubered" + light.base_state = "tube_red" var/area/A = get_area(light) if(!A.power_light || light.status != LIGHT_OK) //do not adjust unpowered or broken bulbs continue @@ -68,10 +68,10 @@ GLOBAL_DATUM_INIT(marine_main_ship, /datum/marine_main_ship, new) rangelevel -= pick(0.5,1.0,1.5,2.0) light.light_range = rangelevel if(istype(light, /obj/machinery/light/mainship/small)) - light.icon_state = "bulbred1" - light.base_state = "bulbred" + light.icon_state = "bulb_red_1" + light.base_state = "bulb_red" else - light.icon_state = "tubered1" + light.icon_state = "tube_red_1" light.update_light() //Will not be announced if you try to set to the same level as it already is diff --git a/code/datums/round_statistics.dm b/code/datums/round_statistics.dm index 02bb1ff416c33..53a41816ee04d 100644 --- a/code/datums/round_statistics.dm +++ b/code/datums/round_statistics.dm @@ -61,6 +61,7 @@ GLOBAL_DATUM_INIT(round_statistics, /datum/round_statistics, new) var/mortar_shells_fired = 0 var/howitzer_shells_fired = 0 var/rocket_shells_fired = 0 + var/obs_fired = 0 var/queen_screech = 0 var/now_pregnant = 0 var/sentinel_drain_stings = 0 diff --git a/code/datums/skills.dm b/code/datums/skills.dm index 1505a5fa06101..cd394c63ebcf8 100644 --- a/code/datums/skills.dm +++ b/code/datums/skills.dm @@ -238,8 +238,8 @@ engineer, construction, leadership, medical, surgery, pilot, police, powerloader firearms = SKILL_FIREARMS_DEFAULT medical = SKILL_MEDICAL_EXPERT surgery = SKILL_SURGERY_EXPERT - construction = SKILL_CONSTRUCTION_MASTER - engineer = SKILL_ENGINEER_MASTER + construction = SKILL_CONSTRUCTION_EXPERT + engineer = SKILL_ENGINEER_EXPERT powerloader = SKILL_POWERLOADER_MASTER police = SKILL_POLICE_FLASH @@ -266,8 +266,8 @@ engineer, construction, leadership, medical, surgery, pilot, police, powerloader /datum/skills/civilian/survivor/atmos name = "Survivor Atmos Tech" - engineer = SKILL_ENGINEER_MASTER - construction = SKILL_CONSTRUCTION_MASTER + engineer = SKILL_ENGINEER_EXPERT + construction = SKILL_CONSTRUCTION_EXPERT /datum/skills/civilian/survivor/marshal name = "Survivor Marshal" @@ -295,6 +295,12 @@ engineer, construction, leadership, medical, surgery, pilot, police, powerloader construction = SKILL_CONSTRUCTION_METAL engineer = SKILL_ENGINEER_METAL +/datum/skills/combat_medic/special_forces + name = "Special Operations Medic" + construction = SKILL_CONSTRUCTION_METAL + engineer = SKILL_ENGINEER_METAL + smgs = SKILL_SMGS_TRAINED + /datum/skills/doctor name = "Doctor" cqc = SKILL_CQC_WEAK @@ -323,8 +329,8 @@ engineer, construction, leadership, medical, surgery, pilot, police, powerloader /datum/skills/ai name = "AI" - engineer = SKILL_ENGINEER_MASTER - construction = SKILL_CONSTRUCTION_MASTER + engineer = SKILL_ENGINEER_EXPERT + construction = SKILL_CONSTRUCTION_EXPERT firearms = SKILL_FIREARMS_UNTRAINED medical = SKILL_MEDICAL_EXPERT leadership = SKILL_LEAD_MASTER @@ -335,8 +341,8 @@ engineer, construction, leadership, medical, surgery, pilot, police, powerloader /datum/skills/synthetic name = SYNTHETIC - engineer = SKILL_ENGINEER_MASTER - construction = SKILL_CONSTRUCTION_MASTER + engineer = SKILL_ENGINEER_EXPERT + construction = SKILL_CONSTRUCTION_EXPERT firearms = SKILL_FIREARMS_UNTRAINED medical = SKILL_MEDICAL_EXPERT cqc = SKILL_CQC_MASTER @@ -349,8 +355,8 @@ engineer, construction, leadership, medical, surgery, pilot, police, powerloader /datum/skills/early_synthetic name = "Early Synthetic" - engineer = SKILL_ENGINEER_INHUMAN - construction = SKILL_CONSTRUCTION_INHUMAN + engineer = SKILL_ENGINEER_MASTER + construction = SKILL_CONSTRUCTION_MASTER firearms = SKILL_FIREARMS_UNTRAINED medical = SKILL_MEDICAL_COMPETENT cqc = SKILL_CQC_MASTER @@ -385,12 +391,40 @@ engineer, construction, leadership, medical, surgery, pilot, police, powerloader powerloader = SKILL_POWERLOADER_TRAINED cqc = SKILL_CQC_TRAINED +/datum/skills/veteran + name = "TGMC Retired Veteran" + engineer = SKILL_ENGINEER_ENGI //to fix CIC apc. + construction = SKILL_CONSTRUCTION_PLASTEEL + leadership = SKILL_LEAD_MASTER + medical = SKILL_MEDICAL_PRACTICED + surgery = SKILL_SURGERY_AMATEUR + police = SKILL_POLICE_MP + powerloader = SKILL_POWERLOADER_TRAINED + cqc = SKILL_CQC_TRAINED + firearms = SKILL_FIREARMS_TRAINED + rifles = SKILL_RIFLES_TRAINED + +/datum/skills/veteran_captain + name = "TGMC Retired Veteran Expedition Leader" + leadership = SKILL_LEAD_MASTER + police = SKILL_POLICE_MP + medical = SKILL_MEDICAL_COMPETENT + surgery = SKILL_SURGERY_AMATEUR + engineer = SKILL_ENGINEER_ENGI + construction = SKILL_CONSTRUCTION_ADVANCED + powerloader = SKILL_POWERLOADER_MASTER + firearms = SKILL_FIREARMS_TRAINED + rifles = SKILL_RIFLES_TRAINED + smartgun = SKILL_SMART_TRAINED + /datum/skills/so name = STAFF_OFFICER + engineer = SKILL_ENGINEER_ENGI construction = SKILL_CONSTRUCTION_PLASTEEL leadership = SKILL_LEAD_EXPERT medical = SKILL_MEDICAL_PRACTICED surgery = SKILL_SURGERY_AMATEUR + powerloader = SKILL_POWERLOADER_TRAINED police = SKILL_POLICE_MP /datum/skills/pilot @@ -431,7 +465,7 @@ engineer, construction, leadership, medical, surgery, pilot, police, powerloader name = CHIEF_SHIP_ENGINEER engineer = SKILL_ENGINEER_MASTER construction = SKILL_CONSTRUCTION_MASTER - leadership = SKILL_LEAD_EXPERT + leadership = SKILL_LEAD_TRAINED police = SKILL_POLICE_MP powerloader = SKILL_POWERLOADER_MASTER @@ -444,8 +478,8 @@ engineer, construction, leadership, medical, surgery, pilot, police, powerloader /datum/skills/st name = SHIP_TECH - engineer = SKILL_ENGINEER_MASTER - construction = SKILL_CONSTRUCTION_MASTER + engineer = SKILL_ENGINEER_EXPERT + construction = SKILL_CONSTRUCTION_EXPERT powerloader = SKILL_POWERLOADER_MASTER /datum/skills/pmc @@ -464,10 +498,11 @@ engineer, construction, leadership, medical, surgery, pilot, police, powerloader engineer = SKILL_ENGINEER_ENGI /datum/skills/special_forces_standard - name = "Special Force Standard" + name = "Special Response Force Standard" construction = SKILL_CONSTRUCTION_METAL engineer = SKILL_ENGINEER_METAL police = SKILL_POLICE_MP + smgs = SKILL_SMGS_TRAINED /datum/skills/sl name = SQUAD_LEADER @@ -507,6 +542,7 @@ engineer, construction, leadership, medical, surgery, pilot, police, powerloader /datum/skills/sl/pmc/special_forces name = "Special Force Leader" police = SKILL_POLICE_MP + smgs = SKILL_SMGS_TRAINED /datum/skills/sl/icc name = "ICC Leader" diff --git a/code/game/area/campaign_maps/som_raiding_base.dm b/code/game/area/campaign_maps/som_raiding_base.dm new file mode 100644 index 0000000000000..206dbb0e5c3ce --- /dev/null +++ b/code/game/area/campaign_maps/som_raiding_base.dm @@ -0,0 +1,223 @@ + +/area/campaign/som_raiding + icon_state = "lv-626" + area_flags = ALWAYS_RADIO + ambience = list('sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg') + +/area/campaign/som_raiding/ground + name = "Ground" + icon_state = "green" + always_unpowered = TRUE + ambience = list('sound/ambience/jungle_amb1.ogg') + +//Jungle +/area/campaign/som_raiding/ground/jungle + name = "Central Jungle" + icon_state = "central" + minimap_color = MINIMAP_AREA_JUNGLE + +/area/campaign/som_raiding/ground/jungle/south_west + name = "Southwestern Jungle" + icon_state = "southwest" + +/area/campaign/som_raiding/ground/jungle/south_east + name = "Southeastern Jungle" + icon_state = "southeast" + +/area/campaign/som_raiding/ground/jungle/north_west + name = "Northwestern Jungle" + icon_state = "northwest" + +/area/campaign/som_raiding/ground/jungle/north_east + name = "Northeastern Jungle" + icon_state = "northeast" + +/area/campaign/som_raiding/ground/jungle/west + name = "Western Jungle" + icon_state = "west" + +/area/campaign/som_raiding/ground/jungle/south + name = "Southern Jungle" + icon_state = "south" + +/area/campaign/som_raiding/ground/jungle/east + name = "Eastern Jungle" + icon_state = "east" + +/area/campaign/som_raiding/ground/jungle/north + name = "Northern Jungle" + icon_state = "north" + +//river +/area/campaign/som_raiding/ground/river + name = "\improper Southern River" + icon_state = "blueold" + +/area/campaign/som_raiding/ground/river/north + name = "\improper Northern River" + +/area/campaign/som_raiding/ground/river/west + name = "\improper Western River" + +/area/campaign/som_raiding/ground/river/east + name = "\improper Eastern River" + +/area/campaign/som_raiding/ground/river/lake + name = "\improper Southern Lake" + +//outpost +/area/campaign/som_raiding/cave + name = "\improper Mountain" + icon_state = "cave" + ceiling = CEILING_UNDERGROUND + outside = FALSE + minimap_color = MINIMAP_AREA_CAVES + +/area/campaign/som_raiding/cave/tunnel + name = "\improper Old tunnels" + icon_state = "explored" + +//outpost +/area/campaign/som_raiding/outpost + name = "\improper Outpost" + icon_state = "green" + ceiling = CEILING_UNDERGROUND_METAL + outside = FALSE + minimap_color = MINIMAP_AREA_COLONY + +/area/campaign/som_raiding/outpost/firing_range + name = "\improper Firing range" + +/area/campaign/som_raiding/outpost/construction + name = "\improper Construction site" + +/area/campaign/som_raiding/outpost/central_corridor + name = "\improper Central corridor" + +/area/campaign/som_raiding/outpost/maintenance + name = "\improper Southwest maintenance" + minimap_color = MINIMAP_AREA_CAVES + icon_state = "maint_security_starboard" + +/area/campaign/som_raiding/outpost/maintenance/engie + name = "\improper Engineering maintenance" + icon_state = "maint_engine" + +/area/campaign/som_raiding/outpost/maintenance/operation + name = "\improper Operations maintenance" + icon_state = "apmaint" + +/area/campaign/som_raiding/outpost/maintenance/cic + name = "\improper CIC maintenance" + icon_state = "fpmaint" + +/area/campaign/som_raiding/outpost/maintenance/req + name = "\improper Requisitions maintenance" + icon_state = "maint_cargo" + +/area/campaign/som_raiding/outpost/maintenance/med + name = "\improper medbay maintenance" + icon_state = "maint_medbay" + +/area/campaign/som_raiding/outpost/medbay + name = "\improper Medbay" + icon_state = "medbay" + minimap_color = MINIMAP_AREA_MEDBAY + +/area/campaign/som_raiding/outpost/security + name = "\improper Armoury" + icon_state = "security" + minimap_color = MINIMAP_AREA_SEC + +/area/campaign/som_raiding/outpost/security/south_post + name = "\improper South security checkpoint" + +/area/campaign/som_raiding/outpost/security/southeast_post + name = "\improper Southeast security checkpoint" + +/area/campaign/som_raiding/outpost/security/west_post + name = "\improper West security checkpoint" + +/area/campaign/som_raiding/outpost/security/north_post + name = "\improper North security checkpoint" + +/area/campaign/som_raiding/outpost/security/cargo_post + name = "\improper Caro security checkpoint" + +/area/campaign/som_raiding/outpost/command + name = "\improper Operations" + icon_state = "bridge" + minimap_color = MINIMAP_AREA_COMMAND + +/area/campaign/som_raiding/outpost/command/captain + name = "\improper Executive Office" + icon_state = "captain" + +/area/campaign/som_raiding/outpost/command/telecom + name = "\improper Telecommunications" + icon_state = "tcomms" + +/area/campaign/som_raiding/outpost/command/cic + name = "\improper Combat Information Centre" + +/area/campaign/som_raiding/outpost/command/north + name = "\improper North offices" + +/area/campaign/som_raiding/outpost/command/living + name = "\improper Officer's quarters" + +/area/campaign/som_raiding/outpost/engineering + name = "\improper Engineering" + icon_state = "engine_smes" + minimap_color = MINIMAP_AREA_ENGI + +/area/campaign/som_raiding/outpost/living + name = "\improper Barracks" + icon_state = "Sleep" + minimap_color = MINIMAP_AREA_LIVING + +/area/campaign/som_raiding/outpost/living/briefing + name = "\improper Briefing room" + icon_state = "conference" + +/area/campaign/som_raiding/outpost/living/bathroom + name = "\improper Bathrooms" + icon_state = "restrooms" + +/area/campaign/som_raiding/outpost/living/canteen + name = "\improper Canteen" + icon_state = "cafeteria" + +/area/campaign/som_raiding/outpost/living/kitchen + name = "\improper Kitchen" + icon_state = "kitchen" + +/area/campaign/som_raiding/outpost/req + name = "\improper Main cargo bay" + icon_state = "quart" + minimap_color = MINIMAP_AREA_REQ + +/area/campaign/som_raiding/outpost/req/north + name = "\improper North cargo bay" + +/area/campaign/som_raiding/outpost/req/aux + name = "\improper North auxiliary storage" + icon_state = "quart" + minimap_color = MINIMAP_AREA_REQ + +/area/campaign/som_raiding/outpost/req/secure + name = "\improper Secure storage" + icon_state = "quart" + minimap_color = MINIMAP_AREA_REQ + +/area/campaign/som_raiding/outpost/req/qm + name = "\improper Quartermaster's Office" + icon_state = "quartoffice" + +/area/campaign/som_raiding/outpost/tunnel + name = "\improper South tunnel" + icon_state = "explored" + ceiling = CEILING_UNDERGROUND + +/area/campaign/som_raiding/outpost/tunnel/west + name = "\improper West tunnel" diff --git a/code/game/area/mainship.dm b/code/game/area/mainship.dm index 5c9cc6b3af9cb..7ea34503b97b9 100644 --- a/code/game/area/mainship.dm +++ b/code/game/area/mainship.dm @@ -157,6 +157,11 @@ icon_state = "livingspace" minimap_color = MINIMAP_AREA_COMMAND +/area/mainship/living/mechpilotquarters + name = "Mech Pilot Quarters" + icon_state = "blueold" + minimap_color = MINIMAP_AREA_COMMAND + /area/mainship/hallways/exoarmor name = "Vehicle Armor Storage" icon_state = "exoarmor" diff --git a/code/game/objects/effects/countdown.dm b/code/game/objects/effects/countdown.dm index 70e66bba925fa..7faaa75f4d8c1 100644 --- a/code/game/objects/effects/countdown.dm +++ b/code/game/objects/effects/countdown.dm @@ -86,7 +86,7 @@ /obj/effect/countdown/campaign_objective/get_value() if(QDELETED(attached_to)) return - var/obj/structure/campaign_objective/capture_objective/objective = attached_to + var/obj/structure/campaign_objective/objective = attached_to return objective.get_time_left() /obj/effect/countdown/action_cooldown diff --git a/code/game/objects/effects/decals/contraband.dm b/code/game/objects/effects/decals/contraband.dm index 4343effc643fd..65f9d965f07f1 100644 --- a/code/game/objects/effects/decals/contraband.dm +++ b/code/game/objects/effects/decals/contraband.dm @@ -36,6 +36,7 @@ /obj/structure/sign/poster/Initialize(mapload) . = ..() + icon = 'icons/obj/contraband.dmi' switch(dir) if(NORTH) pixel_y = 30 diff --git a/code/game/objects/effects/spawners/random/engineering.dm b/code/game/objects/effects/spawners/random/engineering.dm index 581781d83a311..e77c3daee2d94 100644 --- a/code/game/objects/effects/spawners/random/engineering.dm +++ b/code/game/objects/effects/spawners/random/engineering.dm @@ -20,8 +20,7 @@ /obj/effect/spawner/random/engineering/technology_scanner name = "Random Scanner" - icon = 'icons/obj/items/items.dmi' - icon_state = "atmos" + icon_state = "random_scanner" loot = list( /obj/item/t_scanner = 4, /obj/item/radio = 2, diff --git a/code/game/objects/effects/temporary_visuals/miscellaneous.dm b/code/game/objects/effects/temporary_visuals/miscellaneous.dm index 95439b0e33c92..06785c65aa6d9 100644 --- a/code/game/objects/effects/temporary_visuals/miscellaneous.dm +++ b/code/game/objects/effects/temporary_visuals/miscellaneous.dm @@ -114,14 +114,21 @@ GLOBAL_LIST_EMPTY(blood_particles) opacity = FALSE anchored = FALSE animate_movement = SLIDE_STEPS + randomdir = FALSE + vis_flags = VIS_INHERIT_LAYER | VIS_INHERIT_PLANE | VIS_INHERIT_ID /obj/effect/temp_visual/xenomorph/afterimage/Initialize(mapload, atom/owner) . = ..() - appearance = owner.appearance - setDir(owner.dir) - alpha = initial(alpha) - layer = initial(layer) - mouse_opacity = MOUSE_OPACITY_TRANSPARENT + var/mutable_appearance/xeno_afterimage = new() + xeno_afterimage.appearance = owner.appearance + xeno_afterimage.render_target = null + xeno_afterimage.density = initial(density) + xeno_afterimage.alpha = initial(alpha) + xeno_afterimage.appearance_flags = RESET_COLOR|RESET_ALPHA|PASS_MOUSE + xeno_afterimage.setDir(owner.dir) + xeno_afterimage.pixel_x = owner.pixel_x + xeno_afterimage.pixel_y = owner.pixel_y + appearance = xeno_afterimage animate(src, alpha = 0, time = duration) /obj/effect/temp_visual/ob_impact diff --git a/code/game/objects/effects/temporary_visuals/temporary_visual.dm b/code/game/objects/effects/temporary_visuals/temporary_visual.dm index b0b1eb4b0cd99..ad1089e5e6f9b 100644 --- a/code/game/objects/effects/temporary_visuals/temporary_visual.dm +++ b/code/game/objects/effects/temporary_visuals/temporary_visual.dm @@ -4,9 +4,13 @@ anchored = TRUE layer = ABOVE_MOB_LAYER mouse_opacity = MOUSE_OPACITY_TRANSPARENT + ///How long before the temp_visual gets deleted var/duration = 1 SECONDS - var/randomdir = TRUE + ///Timer that our duration is stored in var/timerid + ///Gives our effect a random direction on init + var/randomdir = TRUE + /obj/effect/temp_visual/Initialize(mapload) diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm index eabeb9fb2d404..0b802f8bdf236 100644 --- a/code/game/objects/items/bodybag.dm +++ b/code/game/objects/items/bodybag.dm @@ -334,19 +334,34 @@ /obj/structure/closet/bodybag/cryobag/examine(mob/living/user) . = ..() - if(!ishuman(bodybag_occupant)) + var/mob/living/carbon/human/occupant = bodybag_occupant + if(!ishuman(occupant)) return if(!hasHUD(user,"medical")) return for(var/datum/data/record/medical_record AS in GLOB.datacore.medical) - if(medical_record.fields["name"] != bodybag_occupant.real_name) + if(medical_record.fields["name"] != occupant.real_name) continue if(!(medical_record.fields["last_scan_time"])) . += "No scan report on record" else . += "Scan from [medical_record.fields["last_scan_time"]]" break - + if(occupant.stat != DEAD) + return + var/timer = 0 // variable for DNR timer check + timer = (TIME_BEFORE_DNR-(occupant.dead_ticks))*2 //Time to DNR left in seconds + if(!occupant.mind && !occupant.get_ghost(TRUE) || occupant.dead_ticks > TIME_BEFORE_DNR || occupant.suiciding) //We couldn't find a suitable ghost or patient has passed their DNR timer or suicided, this means the person is not returning + . += span_scanner("Patient is DNR") + else if(!occupant.mind && occupant.get_ghost(TRUE)) // Ghost is available but outside of the body + . += span_scanner("Defib patient to check departed status") + . += span_scanner("Patient have [timer] seconds left before DNR") + else if(!occupant.client) //Mind is in the body but no client, most likely currently disconnected. + . += span_scanner("Patient is almost departed") + . += span_scanner("Patient have [timer] seconds left before DNR") + else + . += span_scanner("Patient have [timer] seconds left before DNR") + /obj/structure/closet/bodybag/cryobag/Topic(href, href_list) . = ..() diff --git a/code/game/objects/items/explosives/grenades/explosive_grenades.dm b/code/game/objects/items/explosives/grenades/explosive_grenades.dm new file mode 100644 index 0000000000000..4f70693ef98da --- /dev/null +++ b/code/game/objects/items/explosives/grenades/explosive_grenades.dm @@ -0,0 +1,79 @@ +/obj/item/explosive/grenade/pmc + desc = "A fragmentation grenade produced for private security firms. It explodes 3 seconds after the pin has been pulled." + icon_state = "grenade_pmc" + item_state = "grenade_pmc" + hud_state = "grenade_frag" + icon_state_mini = "grenade_red_white" + light_impact_range = 5 + +/obj/item/explosive/grenade/m15 + name = "\improper M15 fragmentation grenade" + desc = "An outdated TGMC fragmentation grenade. With decades of service in the TGMC, the old M15 Fragmentation Grenade is slowly being replaced with the slightly safer M40 HEDP. It is set to detonate in 4 seconds." + icon_state = "grenade_ex" + item_state = "grenade_ex" + hud_state = "grenade_frag" + icon_state_mini = "grenade_yellow" + light_impact_range = 5 + +/obj/item/explosive/grenade/stick + name = "\improper Webley Mk15 stick grenade" + desc = "A fragmentation grenade produced in the colonies, most commonly using old designs and schematics. It explodes 3 seconds after the pin has been pulled." + icon_state = "grenade_stick" + item_state = "grenade_stick" + hud_state = "grenade_frag" + force = 10 + w_class = WEIGHT_CLASS_SMALL + throwforce = 15 + +/obj/item/explosive/grenade/upp + name = "\improper Type 5 shrapnel grenade" + desc = "A fragmentation grenade found within the ranks of the USL. Designed to explode into shrapnel and rupture the bodies of opponents. It explodes 3 seconds after the pin has been pulled." + icon_state = "grenade_upp" + item_state = "grenade_upp" + hud_state = "greande_frag" + throw_speed = 2 + throw_range = 6 + +/obj/item/explosive/grenade/som + name = "\improper S30 HE grenade" + desc = "A reliable high explosive grenade utilised by SOM forces. Designed for hand or grenade launcher use." + icon_state = "grenade_som" + item_state = "grenade_som" + +/obj/item/explosive/grenade/sectoid + name = "alien bomb" + desc = "An odd, squishy, organ-like grenade. It will explode 3 seconds after squeezing it." + icon_state = "alien_grenade" + item_state = "alien_grenade" + hud_state = "grenade_frag" + light_impact_range = 6 + +/obj/item/explosive/grenade/ags + name = "\improper AGLS-37 HEDP grenade" + desc = "A small tiny smart grenade, it is about to blow up in your face, unless you found it inert. Otherwise a pretty normal grenade, other than it is somehow in a primeable state." + w_class = WEIGHT_CLASS_SMALL + icon = 'icons/obj/items/grenade.dmi' + icon_state = "ags_grenade" + item_state = "ags_grenade" + det_time = 2 SECONDS + light_impact_range = 2 + weak_impact_range = 4 + +/obj/item/explosive/grenade/impact + name = "\improper M40 IMDP grenade" + desc = "A high explosive contact detonation munition utilizing the standard DP canister chassis. Has a focused blast specialized for door breaching and combating emplacements and light armoured vehicles. WARNING: Handthrowing does not result in sufficient force to trigger impact detonators." + icon_state = "grenade_impact" + item_state = "grenade_impact" + hud_state = "grenade_frag" + det_time = 4 SECONDS + dangerous = TRUE + icon_state_mini = "grenade_blue_white" + light_impact_range = 3 + +/obj/item/explosive/grenade/impact/throw_impact(atom/hit_atom, speed) + . = ..() + if(!.) + return + if(launched && active && !istype(hit_atom, /turf/open)) //Only contact det if active, we actually hit something, and we're fired from a grenade launcher. + explosion(loc, light_impact_range = 1, flash_range = 2) + qdel(src) diff --git a/code/game/objects/items/explosives/grenades/flares.dm b/code/game/objects/items/explosives/grenades/flares.dm new file mode 100644 index 0000000000000..6105a0171df89 --- /dev/null +++ b/code/game/objects/items/explosives/grenades/flares.dm @@ -0,0 +1,179 @@ +#define FLARE_FIRE_STACKS 5 +/obj/item/explosive/grenade/flare + name = "\improper M40 FLDP grenade" + desc = "A TGMC standard issue flare utilizing the standard DP canister chassis. Capable of being loaded in any grenade launcher, or thrown by hand." + icon_state = "flare_grenade" + item_state = "flare_grenade" + det_time = 0 + throwforce = 1 + dangerous = FALSE + w_class = WEIGHT_CLASS_TINY + hud_state = "grenade_frag" + light_system = MOVABLE_LIGHT + light_range = 6 + light_color = LIGHT_COLOR_FLARE + var/fuel = 0 + var/lower_fuel_limit = 800 + var/upper_fuel_limit = 1000 + +/obj/item/explosive/grenade/flare/dissolvability(acid_strength) + return 2 + +/obj/item/explosive/grenade/flare/Initialize(mapload) + . = ..() + fuel = rand(lower_fuel_limit, upper_fuel_limit) // Sorry for changing this so much but I keep under-estimating how long X number of ticks last in seconds. + +/obj/item/explosive/grenade/flare/flamer_fire_act(burnlevel) + if(!fuel) //it's out of fuel, an empty shell. + return + if(!active) + turn_on() + +/obj/item/explosive/grenade/flare/prime() + return + +/obj/item/explosive/grenade/flare/Destroy() + turn_off() + return ..() + +/obj/item/explosive/grenade/flare/process() + fuel = max(fuel - 1, 0) + if(!fuel || !active) + turn_off() + +/obj/item/explosive/grenade/flare/throw_impact(atom/hit_atom, speed) + if(isopenturf(hit_atom)) + var/obj/alien/weeds/node/N = locate() in loc + if(N) + qdel(N) + turn_off() + . = ..() + if(!.) + return + if(!active) + return + + if(isliving(hit_atom)) + var/mob/living/living_target = hit_atom + living_target.fire_stacks += FLARE_FIRE_STACKS + living_target.IgniteMob() + + var/target_zone = check_zone(living_target.zone_selected) + if(!target_zone || rand(40)) + target_zone = "chest" + if(launched && CHECK_BITFIELD(resistance_flags, ON_FIRE) && !living_target.on_fire) + living_target.apply_damage(randfloat(throwforce * 0.75, throwforce * 1.25), BURN, target_zone, FIRE, updating_health = TRUE) //Do more damage if launched from a proper launcher and active + +/obj/item/explosive/grenade/flare/attack_self(mob/user) + if(!fuel) + to_chat(user, span_notice("It's out of fuel.")) + return + if(active) + return + + user.visible_message(span_notice("[user] activates the flare."), span_notice("You depress the ignition button, activating it!")) + turn_on(user) + +/obj/item/explosive/grenade/flare/activate(mob/user) + if(!active) + turn_on(user) + +/obj/item/explosive/grenade/flare/update_icon_state() + if(active && fuel > 0) + icon_state = "[initial(icon_state)]_active" + item_state = "[initial(item_state)]_active" + else if(!fuel) + icon_state = "[initial(icon_state)]_empty" + item_state = "[initial(item_state)]_empty" + else + icon_state = initial(icon_state) + item_state = initial(item_state) + + +///Shuts the flare off +/obj/item/explosive/grenade/flare/proc/turn_off() + active = FALSE + fuel = 0 + heat = 0 + force = initial(force) + damtype = initial(damtype) + update_icon() + set_light_on(FALSE) + STOP_PROCESSING(SSobj, src) + +///Activates the flare +/obj/item/explosive/grenade/flare/proc/turn_on() + active = TRUE + force = 5 + throwforce = 10 + ENABLE_BITFIELD(resistance_flags, ON_FIRE) + heat = 1500 + damtype = BURN + update_icon() + set_light_on(TRUE) + playsound(src,'sound/items/flare.ogg', 15, 1) + START_PROCESSING(SSobj, src) + +//Starts on +/obj/item/explosive/grenade/flare/on/Initialize(mapload) + . = ..() + turn_on() + +/obj/item/explosive/grenade/flare/civilian + name = "flare" + desc = "A NT standard emergency flare. There are instructions on the side, it reads 'pull cord, make light'." + icon_state = "flare" + item_state = "flare" + +/obj/item/explosive/grenade/flare/cas + name = "\improper M50 CFDP signal flare" + desc = "A TGMC signal flare utilizing the standard DP canister chassis. Capable of being loaded in any grenade launcher, or thrown by hand. When activated, provides a target for CAS pilots." + icon_state = "cas_flare_grenade" + item_state = "cas_flare_grenade" + hud_state = "grenade_frag" + lower_fuel_limit = 25 + upper_fuel_limit = 30 + light_power = 3 + light_color = LIGHT_COLOR_GREEN + var/datum/squad/user_squad + var/obj/effect/overlay/temp/laser_target/cas/target + +/obj/item/explosive/grenade/flare/cas/turn_on(mob/living/carbon/human/user) + . = ..() + if(user.assigned_squad) + user_squad = user.assigned_squad + var/turf/TU = get_turf(src) + if(!istype(TU)) + return + if(is_ground_level(TU.z)) + target = new(src, null, name, user_squad)//da lazer is stored in the grenade + +/obj/item/explosive/grenade/flare/cas/process() + . = ..() + var/turf/TU = get_turf(src) + if(is_ground_level(TU.z)) + if(!target && active) + target = new(src, null, name, user_squad) + +/obj/item/explosive/grenade/flare/cas/turn_off() + QDEL_NULL(target) + return ..() + +///Flares that the tadpole flare launcher launches +/obj/item/explosive/grenade/flare/strongerflare + icon_state = "stronger_flare_grenade" + lower_fuel_limit = 10 + upper_fuel_limit = 20 + light_system = STATIC_LIGHT//movable light has a max range + light_color = LIGHT_COLOR_CYAN + light_range = 12 + +/obj/item/explosive/grenade/flare/strongerflare/throw_impact(atom/hit_atom, speed) + . = ..() + if(!.) + return + anchored = TRUE//prevents marines from picking up and running around with a stronger flare + +/obj/item/explosive/grenade/flare/strongerflare/turn_off() + . = ..() + set_light(0) diff --git a/code/game/objects/items/explosives/grenades/grenade.dm b/code/game/objects/items/explosives/grenades/grenade.dm index f1d9a0143dba3..6a9c1c2db90e1 100644 --- a/code/game/objects/items/explosives/grenades/grenade.dm +++ b/code/game/objects/items/explosives/grenades/grenade.dm @@ -109,39 +109,3 @@ ///Adjusts det time, used for grenade launchers /obj/item/explosive/grenade/proc/launched_det_time() det_time = min(10, det_time) - -////RAD GRENADE - TOTALLY RAD MAN - -/obj/item/explosive/grenade/rad - name = "\improper V-40 rad grenade" - desc = "Rad grenades release an extremely potent but short lived burst of radiation, debilitating organic life and frying electronics in a moderate radius. After the initial detonation, the radioactive effects linger for a time. Handle with extreme care." - icon_state = "grenade_rad" //placeholder - item_state = "grenade_rad" //placeholder - icon_state_mini = "grenade_red" //placeholder - det_time = 40 //default - arm_sound = 'sound/weapons/armbomb.ogg' //placeholder - hud_state = "grenade_he" //placeholder - ///The range for the grenade's full effect - var/inner_range = 4 - ///The range range for the grenade's weak effect - var/outer_range = 7 - ///The potency of the grenade - var/rad_strength = 16 - -/obj/item/explosive/grenade/rad/prime() - var/turf/impact_turf = get_turf(src) - - playsound(impact_turf, 'sound/effects/portal_opening.ogg', 50, 1) - for(var/mob/living/victim in hearers(outer_range, src)) - var/strength - var/sound_level - if(get_dist(victim, impact_turf) <= inner_range) - strength = rad_strength - sound_level = 3 - else - strength = rad_strength * 0.6 - sound_level = 2 - - strength = victim.modify_by_armor(strength, BIO, 25) - victim.apply_radiation(strength, sound_level) - qdel(src) diff --git a/code/game/objects/items/explosives/grenades/incendiary_grenades.dm b/code/game/objects/items/explosives/grenades/incendiary_grenades.dm new file mode 100644 index 0000000000000..c5c9da1245b8e --- /dev/null +++ b/code/game/objects/items/explosives/grenades/incendiary_grenades.dm @@ -0,0 +1,53 @@ +/obj/item/explosive/grenade/incendiary + name = "\improper M40 HIDP incendiary grenade" + desc = "The M40 HIDP is a small, but deceptively strong incendiary grenade. It is set to detonate in 4 seconds." + icon_state = "grenade_fire" + item_state = "grenade_fire" + det_time = 4 SECONDS + hud_state = "grenade_fire" + icon_state_mini = "grenade_orange" + +/obj/item/explosive/grenade/incendiary/prime() + flame_radius(2, get_turf(src)) + playsound(loc, "incendiary_explosion", 35) + qdel(src) + + +/proc/flame_radius(radius = 1, turf/epicenter, burn_intensity = 25, burn_duration = 25, burn_damage = 25, fire_stacks = 15, colour = "red") //~Art updated fire. + if(!isturf(epicenter)) + CRASH("flame_radius used without a valid turf parameter") + radius = clamp(radius, 1, 50) //Sanitize inputs + + for(var/t in filled_turfs(epicenter, radius, "circle", air_pass = TRUE)) + var/turf/turf_to_flame = t + turf_to_flame.ignite(randfloat(burn_duration*0.75, burn_duration), burn_intensity, colour, burn_damage, fire_stacks) + +/obj/item/explosive/grenade/incendiary/som + name = "\improper S30-I incendiary grenade" + desc = "A reliable incendiary grenade utilised by SOM forces. Based off the S30 platform shared by most SOM grenades. Designed for hand or grenade launcher use." + icon_state = "grenade_fire_som" + item_state = "grenade_fire_som" + +/obj/item/explosive/grenade/incendiary/molotov + name = "improvised firebomb" + desc = "A potent, improvised firebomb, coupled with a pinch of gunpowder. Cheap, very effective, and deadly in confined spaces. Commonly found in the hands of rebels and terrorists. It can be difficult to predict how many seconds you have before it goes off, so be careful. Chances are, it might explode in your face." + icon_state = "molotov" + item_state = "molotov" + arm_sound = 'sound/items/welder2.ogg' + +/obj/item/explosive/grenade/incendiary/molotov/Initialize(mapload) + . = ..() + det_time = rand(1 SECONDS, 4 SECONDS)//Adds some risk to using this thing. + +/obj/item/explosive/grenade/incendiary/molotov/prime() + flame_radius(2, get_turf(src)) + playsound(loc, "molotov", 35) + qdel(src) + +/obj/item/explosive/grenade/incendiary/molotov/throw_impact(atom/hit_atom, speed, bounce = TRUE) + . = ..() + if(!.) + return + if(!hit_atom.density || prob(35)) + return + prime() diff --git a/code/game/objects/items/explosives/grenades/marines.dm b/code/game/objects/items/explosives/grenades/marines.dm deleted file mode 100644 index f6919f7a757f3..0000000000000 --- a/code/game/objects/items/explosives/grenades/marines.dm +++ /dev/null @@ -1,624 +0,0 @@ -/obj/item/explosive/grenade/training - name = "M07 training grenade" - desc = "A harmless reusable version of the M40 HEDP, used for training. Capable of being loaded in the any grenade launcher, or thrown by hand." - icon_state = "training_grenade" - item_state = "training_grenade" - hud_state = "grenade_dummy" - dangerous = FALSE - icon_state_mini = "grenade_white" - -/obj/item/explosive/grenade/training/prime() - playsound(loc, 'sound/items/detector.ogg', 80, 0, 7) - active = FALSE //so we can reuse it - overlays.Cut() - icon_state = initial(icon_state) - det_time = initial(det_time) //these can be modified when fired by UGL - throw_range = initial(throw_range) - - -/obj/item/explosive/grenade/training/flamer_fire_act(burnlevel) - return - - - -/obj/item/explosive/grenade/pmc - desc = "A fragmentation grenade produced for private security firms. It explodes 3 seconds after the pin has been pulled." - icon_state = "grenade_pmc" - item_state = "grenade_pmc" - hud_state = "grenade_frag" - icon_state_mini = "grenade_red_white" - light_impact_range = 5 - -/obj/item/explosive/grenade/m15 - name = "\improper M15 fragmentation grenade" - desc = "An outdated TGMC fragmentation grenade. With decades of service in the TGMC, the old M15 Fragmentation Grenade is slowly being replaced with the slightly safer M40 HEDP. It is set to detonate in 4 seconds." - icon_state = "grenade_ex" - item_state = "grenade_ex" - hud_state = "grenade_frag" - icon_state_mini = "grenade_yellow" - light_impact_range = 5 - -/obj/item/explosive/grenade/stick - name = "\improper Webley Mk15 stick grenade" - desc = "A fragmentation grenade produced in the colonies, most commonly using old designs and schematics. It explodes 3 seconds after the pin has been pulled." - icon_state = "grenade_stick" - item_state = "grenade_stick" - hud_state = "grenade_frag" - force = 10 - w_class = WEIGHT_CLASS_SMALL - throwforce = 15 - -/obj/item/explosive/grenade/upp - name = "\improper Type 5 shrapnel grenade" - desc = "A fragmentation grenade found within the ranks of the USL. Designed to explode into shrapnel and rupture the bodies of opponents. It explodes 3 seconds after the pin has been pulled." - icon_state = "grenade_upp" - item_state = "grenade_upp" - hud_state = "greande_frag" - throw_speed = 2 - throw_range = 6 - -/obj/item/explosive/grenade/som - name = "\improper S30 HE grenade" - desc = "A reliable high explosive grenade utilised by SOM forces. Designed for hand or grenade launcher use." - icon_state = "grenade_som" - item_state = "grenade_som" - -/obj/item/explosive/grenade/sectoid - name = "alien bomb" - desc = "An odd, squishy, organ-like grenade. It will explode 3 seconds after squeezing it." - icon_state = "alien_grenade" - item_state = "alien_grenade" - hud_state = "grenade_frag" - light_impact_range = 6 - -/obj/item/explosive/grenade/sticky - name = "\improper M40 adhesive charge grenade" - desc = "Designed for use against various fast moving drones, this grenade will adhere to its target before detonating. It's fuse is set to 5 seconds." - icon_state = "grenade_sticky" - item_state = "grenade_sticky" - det_time = 5 SECONDS - light_impact_range = 2 - weak_impact_range = 3 - ///Current atom this grenade is attached to, used to remove the overlay. - var/atom/stuck_to - ///Current image overlay applied to stuck_to, used to remove the overlay after detonation. - var/image/saved_overlay - ///if this specific grenade should be allowed to self sticky - var/self_sticky = FALSE - -/obj/item/explosive/grenade/sticky/throw_impact(atom/hit_atom, speed) - . = ..() - if(!.) - return - if(!active || stuck_to || isturf(hit_atom)) - return - stuck_to(hit_atom) - -/obj/item/explosive/grenade/sticky/afterattack(atom/target, mob/user, has_proximity, click_parameters) - . = ..() - if(target != user) - return - if(!self_sticky) - return - user.drop_held_item() - activate() - stuck_to(target) - -/obj/item/explosive/grenade/sticky/prime() - if(stuck_to) - clean_refs() - return ..() - -/obj/item/explosive/grenade/sticky/launched_det_time() - det_time -= 1 SECONDS - -///Cleans references to prevent hard deletes. -/obj/item/explosive/grenade/sticky/proc/clean_refs() - stuck_to.cut_overlay(saved_overlay) - SIGNAL_HANDLER - UnregisterSignal(stuck_to, COMSIG_QDELETING) - stuck_to = null - saved_overlay = null - -///handles sticky overlay and attaching the grenade itself to the target -/obj/item/explosive/grenade/sticky/proc/stuck_to(atom/hit_atom) - var/image/stuck_overlay = image(icon, hit_atom, initial(icon_state) + "_stuck") - stuck_overlay.pixel_x = rand(-5, 5) - stuck_overlay.pixel_y = rand(-7, 7) - hit_atom.add_overlay(stuck_overlay) - forceMove(hit_atom) - saved_overlay = stuck_overlay - stuck_to = hit_atom - RegisterSignal(stuck_to, COMSIG_QDELETING, PROC_REF(clean_refs)) - -/obj/item/explosive/grenade/sticky/trailblazer - name = "\improper M45 Trailblazer grenade" - desc = "Capsule based grenade that sticks to sufficiently hard surfaces, causing a trail of air combustable gel to form. It is set to detonate in 5 seconds." - icon_state = "grenade_sticky_fire" - item_state = "grenade_sticky_fire" - det_time = 5 SECONDS - self_sticky = TRUE - -/obj/item/explosive/grenade/sticky/trailblazer/prime() - flame_radius(0.5, get_turf(src)) - playsound(loc, "incendiary_explosion", 35) - if(stuck_to) - clean_refs() - qdel(src) - -/obj/item/explosive/grenade/sticky/trailblazer/stuck_to(atom/hit_atom) - . = ..() - RegisterSignal(stuck_to, COMSIG_MOVABLE_MOVED, PROC_REF(make_fire)) - var/turf/T = get_turf(src) - T.ignite(25, 25) - -///causes fire tiles underneath target when stuck_to -/obj/item/explosive/grenade/sticky/trailblazer/proc/make_fire(datum/source, old_loc, movement_dir, forced, old_locs) - SIGNAL_HANDLER - var/turf/T = get_turf(src) - T.ignite(25, 25) - -/obj/item/explosive/grenade/sticky/trailblazer/clean_refs() - stuck_to.cut_overlay(saved_overlay) - UnregisterSignal(stuck_to, COMSIG_MOVABLE_MOVED) - return ..() - -/obj/item/explosive/grenade/sticky/cloaker - name = "\improper M45 Cloaker grenade" - desc = "Capsule based grenade that sticks to sufficiently hard surfaces, causing a trail of air combustable gel to form. This one creates cloaking smoke! It is set to detonate in 5 seconds." - icon_state = "grenade_sticky_cloak" - item_state = "grenade_sticky_cloak" - det_time = 5 SECONDS - light_impact_range = 1 - self_sticky = TRUE - /// smoke type created when the grenade is primed - var/datum/effect_system/smoke_spread/smoketype = /datum/effect_system/smoke_spread/tactical - ///radius this smoke grenade will encompass - var/smokeradius = 1 - ///The duration of the smoke - var/smoke_duration = 8 - -/obj/item/explosive/grenade/sticky/cloaker/prime() - var/datum/effect_system/smoke_spread/smoke = new smoketype() - playsound(loc, 'sound/effects/smoke_bomb.ogg', 35) - smoke.set_up(smokeradius, loc, smoke_duration) - smoke.start() - if(stuck_to) - clean_refs() - qdel(src) - -/obj/item/explosive/grenade/sticky/cloaker/stuck_to(atom/hit_atom) - . = ..() - RegisterSignal(stuck_to, COMSIG_MOVABLE_MOVED, PROC_REF(make_smoke)) - -///causes fire tiles underneath target when stuck_to -/obj/item/explosive/grenade/sticky/cloaker/proc/make_smoke(datum/source, old_loc, movement_dir, forced, old_locs) - SIGNAL_HANDLER - var/datum/effect_system/smoke_spread/smoke = new smoketype() - smoke.set_up(smokeradius, loc, smoke_duration) - smoke.start() - -/obj/item/explosive/grenade/sticky/cloaker/clean_refs() - stuck_to.cut_overlay(saved_overlay) - UnregisterSignal(stuck_to, COMSIG_MOVABLE_MOVED) - return ..() - -/obj/item/explosive/grenade/incendiary - name = "\improper M40 HIDP incendiary grenade" - desc = "The M40 HIDP is a small, but deceptively strong incendiary grenade. It is set to detonate in 4 seconds." - icon_state = "grenade_fire" - item_state = "grenade_fire" - det_time = 4 SECONDS - hud_state = "grenade_fire" - icon_state_mini = "grenade_orange" - -/obj/item/explosive/grenade/incendiary/prime() - flame_radius(2, get_turf(src)) - playsound(loc, "incendiary_explosion", 35) - qdel(src) - - -/proc/flame_radius(radius = 1, turf/epicenter, burn_intensity = 25, burn_duration = 25, burn_damage = 25, fire_stacks = 15, colour = "red") //~Art updated fire. - if(!isturf(epicenter)) - CRASH("flame_radius used without a valid turf parameter") - radius = clamp(radius, 1, 50) //Sanitize inputs - - for(var/t in filled_turfs(epicenter, radius, "circle", air_pass = TRUE)) - var/turf/turf_to_flame = t - turf_to_flame.ignite(randfloat(burn_duration*0.75, burn_duration), burn_intensity, colour, burn_damage, fire_stacks) - -/obj/item/explosive/grenade/incendiary/som - name = "\improper S30-I incendiary grenade" - desc = "A reliable incendiary grenade utilised by SOM forces. Based off the S30 platform shared by most SOM grenades. Designed for hand or grenade launcher use." - icon_state = "grenade_fire_som" - item_state = "grenade_fire_som" - -/obj/item/explosive/grenade/incendiary/molotov - name = "improvised firebomb" - desc = "A potent, improvised firebomb, coupled with a pinch of gunpowder. Cheap, very effective, and deadly in confined spaces. Commonly found in the hands of rebels and terrorists. It can be difficult to predict how many seconds you have before it goes off, so be careful. Chances are, it might explode in your face." - icon_state = "molotov" - item_state = "molotov" - arm_sound = 'sound/items/welder2.ogg' - -/obj/item/explosive/grenade/incendiary/molotov/Initialize(mapload) - . = ..() - det_time = rand(1 SECONDS, 4 SECONDS)//Adds some risk to using this thing. - -/obj/item/explosive/grenade/incendiary/molotov/prime() - flame_radius(2, get_turf(src)) - playsound(loc, "molotov", 35) - qdel(src) - -/obj/item/explosive/grenade/incendiary/molotov/throw_impact(atom/hit_atom, speed, bounce = TRUE) - . = ..() - if(!.) - return - if(!hit_atom.density || prob(35)) - return - prime() - -/obj/item/explosive/grenade/ags - name = "\improper AGLS-37 HEDP grenade" - desc = "A small tiny smart grenade, it is about to blow up in your face, unless you found it inert. Otherwise a pretty normal grenade, other than it is somehow in a primeable state." - w_class = WEIGHT_CLASS_SMALL - icon = 'icons/obj/items/grenade.dmi' - icon_state = "ags_grenade" - item_state = "ags_grenade" - det_time = 2 SECONDS - light_impact_range = 2 - weak_impact_range = 4 - - -/obj/item/explosive/grenade/smokebomb - name = "\improper M40 HSDP smoke grenade" - desc = "The M40 HSDP is a small, but powerful smoke grenade. Based off the same platform as the M40 HEDP. It is set to detonate in 2 seconds." - icon_state = "grenade_smoke" - item_state = "grenade_smoke" - det_time = 2 SECONDS - hud_state = "grenade_smoke" - dangerous = FALSE - icon_state_mini = "grenade_blue" - /// smoke type created when the grenade is primed - var/datum/effect_system/smoke_spread/smoketype = /datum/effect_system/smoke_spread/bad - ///radius this smoke grenade will encompass - var/smokeradius = 6 - ///The duration of the smoke - var/smoke_duration = 11 - -/obj/item/explosive/grenade/smokebomb/prime() - var/datum/effect_system/smoke_spread/smoke = new smoketype() - playsound(loc, 'sound/effects/smoke_bomb.ogg', 25, TRUE) - smoke.set_up(smokeradius, loc, smoke_duration) - smoke.start() - qdel(src) - -/obj/item/explosive/grenade/smokebomb/som - name = "\improper S30-S smoke grenade" - desc = "The S30-S is a small, but powerful smoke grenade. Based off the S30 platform shared by most SOM grenades. It is set to detonate in 2 seconds." - icon_state = "grenade_smoke_som" - item_state = "grenade_smoke_som" - -///chemical grenades - -//neuro xeno nade -/obj/item/explosive/grenade/smokebomb/neuro - name = "\improper M40-N Neurotoxin smoke grenade" - desc = "A smoke grenade containing a concentrated neurotoxin developed by Nanotrasen, supposedly derived from xenomorphs. Banned in some sectors as a chemical weapon, but classed as a less lethal riot control tool by the TGMC." - icon_state = "grenade_neuro" - item_state = "grenade_neuro" - hud_state = "grenade_neuro" - det_time = 4 SECONDS - dangerous = TRUE - smoketype = /datum/effect_system/smoke_spread/xeno/neuro/medium - -/obj/item/explosive/grenade/smokebomb/acid - name = "\improper M40-A Acid smoke grenade" - desc = "A grenade set to release a cloud of extremely acidic smoke developed by Nanotrasen, supposedly derived from xenomorphs. Has a shiny acid resistant shell. Its use is considered a warcrime under several treaties, none of which Terra Gov is a signatory to." - icon_state = "grenade_acid" - item_state = "grenade_acid" - hud_state = "grenade_acid" - det_time = 4 SECONDS - dangerous = TRUE - smoketype = /datum/effect_system/smoke_spread/xeno/acid/opaque - smokeradius = 5 - -/obj/item/explosive/grenade/smokebomb/satrapine - name = "satrapine smoke grenade" - desc = "A smoke grenade containing a nerve agent that can debilitate victims with severe pain, while purging common painkillers. Employed heavily by the SOM." - icon_state = "grenade_nerve" - item_state = "grenade_nerve" - hud_state = "grenade_nerve" - det_time = 4 SECONDS - dangerous = TRUE - smoketype = /datum/effect_system/smoke_spread/satrapine - -/obj/item/explosive/grenade/smokebomb/satrapine/activate(mob/user) - . = ..() - if(!.) - return FALSE - user?.record_war_crime() - -/obj/item/explosive/grenade/smokebomb/cloak - name = "\improper M40-2 SCDP smoke grenade" - desc = "A sophisticated version of the M40 HSDP with a slighty improved smoke screen payload. It's set to detonate in 2 seconds." - icon_state = "grenade_cloak" - item_state = "grenade_cloak" - hud_state = "grenade_hide" - icon_state_mini = "grenade_green" - smoketype = /datum/effect_system/smoke_spread/tactical - smokeradius = 7 - -/obj/item/explosive/grenade/smokebomb/cloak/ags - name = "\improper AGLS-37 SCDP smoke grenade" - desc = "A small tiny smart grenade, it is about to blow up in your face, unless you found it inert. Otherwise a pretty normal grenade, other than it is somehow in a primeable state." - icon_state = "ags_cloak" - smokeradius = 4 - -/obj/item/explosive/grenade/smokebomb/drain - name = "\improper M40-T smoke grenade" - desc = "The M40-T is a small, but powerful Tanglefoot grenade, designed to remove plasma with minimal side effects. Based off the same platform as the M40 HEDP. It is set to detonate in 6 seconds." - icon_state = "grenade_pgas" - item_state = "grenade_pgas" - hud_state = "grenade_drain" - det_time = 6 SECONDS - icon_state_mini = "grenade_blue" - dangerous = TRUE - smoketype = /datum/effect_system/smoke_spread/plasmaloss - smokeradius = 7 - -/obj/item/explosive/grenade/smokebomb/antigas - name = "\improper M40-AG smoke grenade" - desc = "A gas grenade originally designed to remove any contaminants in the air for the purpose of cleaning, now repurposed to remove hostile gases." - icon_state = "grenade_agas" - item_state = "grenade_agas" - hud_state = "grenade_antigas" - det_time = 3 SECONDS - icon_state_mini = "grenade_antigas" - dangerous = TRUE - smoketype = /datum/effect_system/smoke_spread/antigas - smokeradius = 7 - -/obj/item/explosive/grenade/smokebomb/drain/agls - name = "\improper AGLS-T smoke grenade" - desc = "A small tiny smart grenade, it is about to blow up in your face, unless you found it inert. Otherwise a pretty normal grenade, other than it is somehow in a primeable state." - icon_state = "ags_pgas" - det_time = 3 SECONDS - smokeradius = 4 - -/obj/item/explosive/grenade/phosphorus - name = "\improper M40 HPDP grenade" - desc = "The M40 HPDP is a small, but powerful phosphorus grenade. It is set to detonate in 2 seconds." - icon_state = "grenade_phos" - item_state = "grenade_phos" - det_time = 2 SECONDS - hud_state = "grenade_hide" - var/datum/effect_system/smoke_spread/phosphorus/smoke - icon_state_mini = "grenade_cyan" - -/obj/item/explosive/grenade/phosphorus/Initialize(mapload) - . = ..() - smoke = new(src) - -/obj/item/explosive/grenade/phosphorus/Destroy() - QDEL_NULL(smoke) - return ..() - -/obj/item/explosive/grenade/phosphorus/prime() - playsound(loc, 'sound/effects/smoke.ogg', 25, 1, 4) - smoke.set_up(6, loc, 7) - smoke.start() - flame_radius(4, get_turf(src)) - flame_radius(1, get_turf(src), burn_intensity = 75, burn_duration = 45, burn_damage = 15, fire_stacks = 75) //The closer to the middle you are the more it hurts - qdel(src) - -/obj/item/explosive/grenade/phosphorus/activate(mob/user) - . = ..() - if(!.) - return FALSE - user?.record_war_crime() - -/obj/item/explosive/grenade/phosphorus/upp - name = "\improper Type 8 WP grenade" - desc = "A deadly gas grenade found within the ranks of the USL. Designed to spill white phosphorus on the target. It explodes 2 seconds after the pin has been pulled." - icon_state = "grenade_upp_wp" - item_state = "grenade_upp_wp" - arm_sound = 'sound/weapons/armbombpin_1.ogg' - -/obj/item/explosive/grenade/impact - name = "\improper M40 IMDP grenade" - desc = "A high explosive contact detonation munition utilizing the standard DP canister chassis. Has a focused blast specialized for door breaching and combating emplacements and light armoured vehicles. WARNING: Handthrowing does not result in sufficient force to trigger impact detonators." - icon_state = "grenade_impact" - item_state = "grenade_impact" - hud_state = "grenade_frag" - det_time = 4 SECONDS - dangerous = TRUE - icon_state_mini = "grenade_blue_white" - light_impact_range = 3 - -/obj/item/explosive/grenade/impact/throw_impact(atom/hit_atom, speed) - . = ..() - if(!.) - return - if(launched && active && !istype(hit_atom, /turf/open)) //Only contact det if active, we actually hit something, and we're fired from a grenade launcher. - explosion(loc, light_impact_range = 1, flash_range = 2) - qdel(src) - -#define FLARE_FIRE_STACKS 5 -/obj/item/explosive/grenade/flare - name = "\improper M40 FLDP grenade" - desc = "A TGMC standard issue flare utilizing the standard DP canister chassis. Capable of being loaded in any grenade launcher, or thrown by hand." - icon_state = "flare_grenade" - item_state = "flare_grenade" - det_time = 0 - throwforce = 1 - dangerous = FALSE - w_class = WEIGHT_CLASS_TINY - hud_state = "grenade_frag" - light_system = MOVABLE_LIGHT - light_range = 6 - light_color = LIGHT_COLOR_FLARE - var/fuel = 0 - var/lower_fuel_limit = 800 - var/upper_fuel_limit = 1000 - -/obj/item/explosive/grenade/flare/dissolvability(acid_strength) - return 2 - -/obj/item/explosive/grenade/flare/Initialize(mapload) - . = ..() - fuel = rand(lower_fuel_limit, upper_fuel_limit) // Sorry for changing this so much but I keep under-estimating how long X number of ticks last in seconds. - -/obj/item/explosive/grenade/flare/flamer_fire_act(burnlevel) - if(!fuel) //it's out of fuel, an empty shell. - return - if(!active) - turn_on() - -/obj/item/explosive/grenade/flare/prime() - return - -/obj/item/explosive/grenade/flare/Destroy() - turn_off() - return ..() - -/obj/item/explosive/grenade/flare/process() - fuel = max(fuel - 1, 0) - if(!fuel || !active) - turn_off() - -/obj/item/explosive/grenade/flare/throw_impact(atom/hit_atom, speed) - if(isopenturf(hit_atom)) - var/obj/alien/weeds/node/N = locate() in loc - if(N) - qdel(N) - turn_off() - . = ..() - if(!.) - return - if(!active) - return - - if(isliving(hit_atom)) - var/mob/living/living_target = hit_atom - living_target.fire_stacks += FLARE_FIRE_STACKS - living_target.IgniteMob() - - var/target_zone = check_zone(living_target.zone_selected) - if(!target_zone || rand(40)) - target_zone = "chest" - if(launched && CHECK_BITFIELD(resistance_flags, ON_FIRE) && !living_target.on_fire) - living_target.apply_damage(randfloat(throwforce * 0.75, throwforce * 1.25), BURN, target_zone, FIRE, updating_health = TRUE) //Do more damage if launched from a proper launcher and active - -/obj/item/explosive/grenade/flare/attack_self(mob/user) - if(!fuel) - to_chat(user, span_notice("It's out of fuel.")) - return - if(active) - return - - user.visible_message(span_notice("[user] activates the flare."), span_notice("You depress the ignition button, activating it!")) - turn_on(user) - -/obj/item/explosive/grenade/flare/activate(mob/user) - if(!active) - turn_on(user) - -/obj/item/explosive/grenade/flare/update_icon_state() - if(active && fuel > 0) - icon_state = "[initial(icon_state)]_active" - item_state = "[initial(item_state)]_active" - else if(!fuel) - icon_state = "[initial(icon_state)]_empty" - item_state = "[initial(item_state)]_empty" - else - icon_state = initial(icon_state) - item_state = initial(item_state) - - -///Shuts the flare off -/obj/item/explosive/grenade/flare/proc/turn_off() - active = FALSE - fuel = 0 - heat = 0 - force = initial(force) - damtype = initial(damtype) - update_icon() - set_light_on(FALSE) - STOP_PROCESSING(SSobj, src) - -///Activates the flare -/obj/item/explosive/grenade/flare/proc/turn_on() - active = TRUE - force = 5 - throwforce = 10 - ENABLE_BITFIELD(resistance_flags, ON_FIRE) - heat = 1500 - damtype = BURN - update_icon() - set_light_on(TRUE) - playsound(src,'sound/items/flare.ogg', 15, 1) - START_PROCESSING(SSobj, src) - -//Starts on -/obj/item/explosive/grenade/flare/on/Initialize(mapload) - . = ..() - turn_on() - -/obj/item/explosive/grenade/flare/civilian - name = "flare" - desc = "A NT standard emergency flare. There are instructions on the side, it reads 'pull cord, make light'." - icon_state = "flare" - item_state = "flare" - -/obj/item/explosive/grenade/flare/cas - name = "\improper M50 CFDP signal flare" - desc = "A TGMC signal flare utilizing the standard DP canister chassis. Capable of being loaded in any grenade launcher, or thrown by hand. When activated, provides a target for CAS pilots." - icon_state = "cas_flare_grenade" - item_state = "cas_flare_grenade" - hud_state = "grenade_frag" - lower_fuel_limit = 25 - upper_fuel_limit = 30 - light_power = 3 - light_color = LIGHT_COLOR_GREEN - var/datum/squad/user_squad - var/obj/effect/overlay/temp/laser_target/cas/target - -/obj/item/explosive/grenade/flare/cas/turn_on(mob/living/carbon/human/user) - . = ..() - if(user.assigned_squad) - user_squad = user.assigned_squad - var/turf/TU = get_turf(src) - if(!istype(TU)) - return - if(is_ground_level(TU.z)) - target = new(src, null, name, user_squad)//da lazer is stored in the grenade - -/obj/item/explosive/grenade/flare/cas/process() - . = ..() - var/turf/TU = get_turf(src) - if(is_ground_level(TU.z)) - if(!target && active) - target = new(src, null, name, user_squad) - -/obj/item/explosive/grenade/flare/cas/turn_off() - QDEL_NULL(target) - return ..() - -///Flares that the tadpole flare launcher launches -/obj/item/explosive/grenade/flare/strongerflare - icon_state = "stronger_flare_grenade" - lower_fuel_limit = 10 - upper_fuel_limit = 20 - light_system = STATIC_LIGHT//movable light has a max range - light_color = LIGHT_COLOR_CYAN - light_range = 12 - -/obj/item/explosive/grenade/flare/strongerflare/throw_impact(atom/hit_atom, speed) - . = ..() - if(!.) - return - anchored = TRUE//prevents marines from picking up and running around with a stronger flare - -/obj/item/explosive/grenade/flare/strongerflare/turn_off() - . = ..() - set_light(0) diff --git a/code/game/objects/items/explosives/grenades/phosphorus_grenades.dm b/code/game/objects/items/explosives/grenades/phosphorus_grenades.dm new file mode 100644 index 0000000000000..4be272dbfb668 --- /dev/null +++ b/code/game/objects/items/explosives/grenades/phosphorus_grenades.dm @@ -0,0 +1,38 @@ +/obj/item/explosive/grenade/phosphorus + name = "\improper M40 HPDP grenade" + desc = "The M40 HPDP is a small, but powerful phosphorus grenade. It is set to detonate in 2 seconds." + icon_state = "grenade_phos" + item_state = "grenade_phos" + det_time = 2 SECONDS + hud_state = "grenade_hide" + var/datum/effect_system/smoke_spread/phosphorus/smoke + icon_state_mini = "grenade_cyan" + +/obj/item/explosive/grenade/phosphorus/Initialize(mapload) + . = ..() + smoke = new(src) + +/obj/item/explosive/grenade/phosphorus/Destroy() + QDEL_NULL(smoke) + return ..() + +/obj/item/explosive/grenade/phosphorus/prime() + playsound(loc, 'sound/effects/smoke.ogg', 25, 1, 4) + smoke.set_up(6, loc, 7) + smoke.start() + flame_radius(4, get_turf(src)) + flame_radius(1, get_turf(src), burn_intensity = 75, burn_duration = 45, burn_damage = 15, fire_stacks = 75) //The closer to the middle you are the more it hurts + qdel(src) + +/obj/item/explosive/grenade/phosphorus/activate(mob/user) + . = ..() + if(!.) + return FALSE + user?.record_war_crime() + +/obj/item/explosive/grenade/phosphorus/upp + name = "\improper Type 8 WP grenade" + desc = "A deadly gas grenade found within the ranks of the USL. Designed to spill white phosphorus on the target. It explodes 2 seconds after the pin has been pulled." + icon_state = "grenade_upp_wp" + item_state = "grenade_upp_wp" + arm_sound = 'sound/weapons/armbombpin_1.ogg' diff --git a/code/game/objects/items/explosives/grenades/rad_grenade.dm b/code/game/objects/items/explosives/grenades/rad_grenade.dm new file mode 100644 index 0000000000000..77b2d71698fec --- /dev/null +++ b/code/game/objects/items/explosives/grenades/rad_grenade.dm @@ -0,0 +1,31 @@ +/obj/item/explosive/grenade/rad + name = "\improper V-40 rad grenade" + desc = "Rad grenades release an extremely potent but short lived burst of radiation, debilitating organic life and frying electronics in a moderate radius. After the initial detonation, the radioactive effects linger for a time. Handle with extreme care." + icon_state = "grenade_rad" + item_state = "grenade_rad" + icon_state_mini = "grenade_red" + hud_state = "grenade_he" + ///The range for the grenade's full effect + var/inner_range = 4 + ///The range range for the grenade's weak effect + var/outer_range = 7 + ///The potency of the grenade + var/rad_strength = 16 + +/obj/item/explosive/grenade/rad/prime() + var/turf/impact_turf = get_turf(src) + + playsound(impact_turf, 'sound/effects/portal_opening.ogg', 50, 1) + for(var/mob/living/victim in hearers(outer_range, src)) + var/strength + var/sound_level + if(get_dist(victim, impact_turf) <= inner_range) + strength = rad_strength + sound_level = 3 + else + strength = rad_strength * 0.6 + sound_level = 2 + + strength = victim.modify_by_armor(strength, BIO, 25) + victim.apply_radiation(strength, sound_level) + qdel(src) diff --git a/code/game/objects/items/explosives/grenades/smoke_grenades.dm b/code/game/objects/items/explosives/grenades/smoke_grenades.dm new file mode 100644 index 0000000000000..2b3d2a8a2a9df --- /dev/null +++ b/code/game/objects/items/explosives/grenades/smoke_grenades.dm @@ -0,0 +1,115 @@ +/obj/item/explosive/grenade/smokebomb + name = "\improper M40 HSDP smoke grenade" + desc = "The M40 HSDP is a small, but powerful smoke grenade. Based off the same platform as the M40 HEDP. It is set to detonate in 2 seconds." + icon_state = "grenade_smoke" + item_state = "grenade_smoke" + det_time = 2 SECONDS + hud_state = "grenade_smoke" + dangerous = FALSE + icon_state_mini = "grenade_blue" + /// smoke type created when the grenade is primed + var/datum/effect_system/smoke_spread/smoketype = /datum/effect_system/smoke_spread/bad + ///radius this smoke grenade will encompass + var/smokeradius = 6 + ///The duration of the smoke in 2 second ticks + var/smoke_duration = 9 + +/obj/item/explosive/grenade/smokebomb/prime() + var/datum/effect_system/smoke_spread/smoke = new smoketype() + playsound(loc, 'sound/effects/smoke_bomb.ogg', 25, TRUE) + smoke.set_up(smokeradius, loc, smoke_duration) + smoke.start() + qdel(src) + +/obj/item/explosive/grenade/smokebomb/som + name = "\improper S30-S smoke grenade" + desc = "The S30-S is a small, but powerful smoke grenade. Based off the S30 platform shared by most SOM grenades. It is set to detonate in 2 seconds." + icon_state = "grenade_smoke_som" + item_state = "grenade_smoke_som" + +/obj/item/explosive/grenade/smokebomb/neuro + name = "\improper M40-N Neurotoxin smoke grenade" + desc = "A smoke grenade containing a concentrated neurotoxin developed by Nanotrasen, supposedly derived from xenomorphs. Banned in some sectors as a chemical weapon, but classed as a less lethal riot control tool by the TGMC." + icon_state = "grenade_neuro" + item_state = "grenade_neuro" + hud_state = "grenade_neuro" + det_time = 4 SECONDS + dangerous = TRUE + smoketype = /datum/effect_system/smoke_spread/xeno/neuro/medium + +/obj/item/explosive/grenade/smokebomb/acid + name = "\improper M40-A Acid smoke grenade" + desc = "A grenade set to release a cloud of extremely acidic smoke developed by Nanotrasen, supposedly derived from xenomorphs. Has a shiny acid resistant shell. Its use is considered a warcrime under several treaties, none of which Terra Gov is a signatory to." + icon_state = "grenade_acid" + item_state = "grenade_acid" + hud_state = "grenade_acid" + det_time = 4 SECONDS + dangerous = TRUE + smoketype = /datum/effect_system/smoke_spread/xeno/acid/opaque + smokeradius = 5 + +/obj/item/explosive/grenade/smokebomb/satrapine + name = "satrapine smoke grenade" + desc = "A smoke grenade containing a nerve agent that can debilitate victims with severe pain, while purging common painkillers. Employed heavily by the SOM." + icon_state = "grenade_nerve" + item_state = "grenade_nerve" + hud_state = "grenade_nerve" + det_time = 4 SECONDS + dangerous = TRUE + smoketype = /datum/effect_system/smoke_spread/satrapine + +/obj/item/explosive/grenade/smokebomb/satrapine/activate(mob/user) + . = ..() + if(!.) + return FALSE + user?.record_war_crime() + +/obj/item/explosive/grenade/smokebomb/cloak + name = "\improper M40-2 SCDP smoke grenade" + desc = "A sophisticated version of the M40 HSDP with a slighty improved smoke screen payload. It's set to detonate in 2 seconds." + icon_state = "grenade_cloak" + item_state = "grenade_cloak" + hud_state = "grenade_hide" + icon_state_mini = "grenade_green" + smoketype = /datum/effect_system/smoke_spread/tactical + smoke_duration = 11 + smokeradius = 7 + +/obj/item/explosive/grenade/smokebomb/cloak/ags + name = "\improper AGLS-37 SCDP smoke grenade" + desc = "A small tiny smart grenade, it is about to blow up in your face, unless you found it inert. Otherwise a pretty normal grenade, other than it is somehow in a primeable state." + icon_state = "ags_cloak" + smokeradius = 4 + +/obj/item/explosive/grenade/smokebomb/drain + name = "\improper M40-T smoke grenade" + desc = "The M40-T is a small, but powerful Tanglefoot grenade, designed to remove plasma with minimal side effects. Based off the same platform as the M40 HEDP. It is set to detonate in 6 seconds." + icon_state = "grenade_pgas" + item_state = "grenade_pgas" + hud_state = "grenade_drain" + det_time = 6 SECONDS + icon_state_mini = "grenade_blue" + dangerous = TRUE + smoketype = /datum/effect_system/smoke_spread/plasmaloss + smoke_duration = 11 + smokeradius = 7 + +/obj/item/explosive/grenade/smokebomb/antigas + name = "\improper M40-AG smoke grenade" + desc = "A gas grenade originally designed to remove any contaminants in the air for the purpose of cleaning, now repurposed to remove hostile gases." + icon_state = "grenade_agas" + item_state = "grenade_agas" + hud_state = "grenade_antigas" + det_time = 3 SECONDS + icon_state_mini = "grenade_antigas" + dangerous = TRUE + smoketype = /datum/effect_system/smoke_spread/antigas + smoke_duration = 11 + smokeradius = 7 + +/obj/item/explosive/grenade/smokebomb/drain/agls + name = "\improper AGLS-T smoke grenade" + desc = "A small tiny smart grenade, it is about to blow up in your face, unless you found it inert. Otherwise a pretty normal grenade, other than it is somehow in a primeable state." + icon_state = "ags_pgas" + det_time = 3 SECONDS + smokeradius = 4 diff --git a/code/game/objects/items/explosives/grenades/sticky_grenades.dm b/code/game/objects/items/explosives/grenades/sticky_grenades.dm new file mode 100644 index 0000000000000..f12659a70cb9e --- /dev/null +++ b/code/game/objects/items/explosives/grenades/sticky_grenades.dm @@ -0,0 +1,131 @@ +/obj/item/explosive/grenade/sticky + name = "\improper M40 adhesive charge grenade" + desc = "Designed for use against various fast moving drones, this grenade will adhere to its target before detonating. It's fuse is set to 5 seconds." + icon_state = "grenade_sticky" + item_state = "grenade_sticky" + det_time = 5 SECONDS + light_impact_range = 2 + weak_impact_range = 3 + ///Current atom this grenade is attached to, used to remove the overlay. + var/atom/stuck_to + ///Current image overlay applied to stuck_to, used to remove the overlay after detonation. + var/image/saved_overlay + ///if this specific grenade should be allowed to self sticky + var/self_sticky = FALSE + +/obj/item/explosive/grenade/sticky/throw_impact(atom/hit_atom, speed) + . = ..() + if(!.) + return + if(!active || stuck_to || isturf(hit_atom)) + return + stuck_to(hit_atom) + +/obj/item/explosive/grenade/sticky/afterattack(atom/target, mob/user, has_proximity, click_parameters) + . = ..() + if(target != user) + return + if(!self_sticky) + return + user.drop_held_item() + activate() + stuck_to(target) + +/obj/item/explosive/grenade/sticky/prime() + if(stuck_to) + clean_refs() + return ..() + +/obj/item/explosive/grenade/sticky/launched_det_time() + det_time -= 1 SECONDS + +///Cleans references to prevent hard deletes. +/obj/item/explosive/grenade/sticky/proc/clean_refs() + stuck_to.cut_overlay(saved_overlay) + SIGNAL_HANDLER + UnregisterSignal(stuck_to, COMSIG_QDELETING) + stuck_to = null + saved_overlay = null + +///handles sticky overlay and attaching the grenade itself to the target +/obj/item/explosive/grenade/sticky/proc/stuck_to(atom/hit_atom) + var/image/stuck_overlay = image(icon, hit_atom, initial(icon_state) + "_stuck") + stuck_overlay.pixel_x = rand(-5, 5) + stuck_overlay.pixel_y = rand(-7, 7) + hit_atom.add_overlay(stuck_overlay) + forceMove(hit_atom) + saved_overlay = stuck_overlay + stuck_to = hit_atom + RegisterSignal(stuck_to, COMSIG_QDELETING, PROC_REF(clean_refs)) + +/obj/item/explosive/grenade/sticky/trailblazer + name = "\improper M45 Trailblazer grenade" + desc = "Capsule based grenade that sticks to sufficiently hard surfaces, causing a trail of air combustable gel to form. It is set to detonate in 5 seconds." + icon_state = "grenade_sticky_fire" + item_state = "grenade_sticky_fire" + det_time = 5 SECONDS + self_sticky = TRUE + +/obj/item/explosive/grenade/sticky/trailblazer/prime() + flame_radius(0.5, get_turf(src)) + playsound(loc, "incendiary_explosion", 35) + if(stuck_to) + clean_refs() + qdel(src) + +/obj/item/explosive/grenade/sticky/trailblazer/stuck_to(atom/hit_atom) + . = ..() + RegisterSignal(stuck_to, COMSIG_MOVABLE_MOVED, PROC_REF(make_fire)) + var/turf/T = get_turf(src) + T.ignite(25, 25) + +///causes fire tiles underneath target when stuck_to +/obj/item/explosive/grenade/sticky/trailblazer/proc/make_fire(datum/source, old_loc, movement_dir, forced, old_locs) + SIGNAL_HANDLER + var/turf/T = get_turf(src) + T.ignite(25, 25) + +/obj/item/explosive/grenade/sticky/trailblazer/clean_refs() + stuck_to.cut_overlay(saved_overlay) + UnregisterSignal(stuck_to, COMSIG_MOVABLE_MOVED) + return ..() + +/obj/item/explosive/grenade/sticky/cloaker + name = "\improper M45 Cloaker grenade" + desc = "Capsule based grenade that sticks to sufficiently hard surfaces, causing a trail of air combustable gel to form. This one creates cloaking smoke! It is set to detonate in 5 seconds." + icon_state = "grenade_sticky_cloak" + item_state = "grenade_sticky_cloak" + det_time = 5 SECONDS + light_impact_range = 1 + self_sticky = TRUE + /// smoke type created when the grenade is primed + var/datum/effect_system/smoke_spread/smoketype = /datum/effect_system/smoke_spread/tactical + ///radius this smoke grenade will encompass + var/smokeradius = 1 + ///The duration of the smoke + var/smoke_duration = 8 + +/obj/item/explosive/grenade/sticky/cloaker/prime() + var/datum/effect_system/smoke_spread/smoke = new smoketype() + playsound(loc, 'sound/effects/smoke_bomb.ogg', 35) + smoke.set_up(smokeradius, loc, smoke_duration) + smoke.start() + if(stuck_to) + clean_refs() + qdel(src) + +/obj/item/explosive/grenade/sticky/cloaker/stuck_to(atom/hit_atom) + . = ..() + RegisterSignal(stuck_to, COMSIG_MOVABLE_MOVED, PROC_REF(make_smoke)) + +///causes fire tiles underneath target when stuck_to +/obj/item/explosive/grenade/sticky/cloaker/proc/make_smoke(datum/source, old_loc, movement_dir, forced, old_locs) + SIGNAL_HANDLER + var/datum/effect_system/smoke_spread/smoke = new smoketype() + smoke.set_up(smokeradius, loc, smoke_duration) + smoke.start() + +/obj/item/explosive/grenade/sticky/cloaker/clean_refs() + stuck_to.cut_overlay(saved_overlay) + UnregisterSignal(stuck_to, COMSIG_MOVABLE_MOVED) + return ..() diff --git a/code/game/objects/items/explosives/grenades/training_grenade.dm b/code/game/objects/items/explosives/grenades/training_grenade.dm new file mode 100644 index 0000000000000..0a92cee9b4755 --- /dev/null +++ b/code/game/objects/items/explosives/grenades/training_grenade.dm @@ -0,0 +1,19 @@ +/obj/item/explosive/grenade/training + name = "M07 training grenade" + desc = "A harmless reusable version of the M40 HEDP, used for training. Capable of being loaded in the any grenade launcher, or thrown by hand." + icon_state = "training_grenade" + item_state = "training_grenade" + hud_state = "grenade_dummy" + dangerous = FALSE + icon_state_mini = "grenade_white" + +/obj/item/explosive/grenade/training/prime() + playsound(loc, 'sound/items/detector.ogg', 80, 0, 7) + active = FALSE //so we can reuse it + overlays.Cut() + icon_state = initial(icon_state) + det_time = initial(det_time) //these can be modified when fired by UGL + throw_range = initial(throw_range) + +/obj/item/explosive/grenade/training/flamer_fire_act(burnlevel) + return diff --git a/code/game/objects/items/stacks/sandbags.dm b/code/game/objects/items/stacks/sandbags.dm index 01d95ff53e84f..cada5cca97479 100644 --- a/code/game/objects/items/stacks/sandbags.dm +++ b/code/game/objects/items/stacks/sandbags.dm @@ -88,5 +88,5 @@ /obj/item/stack/sandbags/attack_self(mob/living/user) . = ..() - var/building_time = LERP(2 SECONDS, 1 SECONDS, user.skills.getPercent(SKILL_CONSTRUCTION, SKILL_ENGINEER_MASTER)) + var/building_time = LERP(2 SECONDS, 1 SECONDS, user.skills.getPercent(SKILL_CONSTRUCTION, SKILL_ENGINEER_EXPERT)) create_object(user, new/datum/stack_recipe("sandbag barricade", /obj/structure/barricade/sandbags, 5, time = building_time, max_per_turf = STACK_RECIPE_ONE_DIRECTIONAL_PER_TILE, on_floor = TRUE), 1) diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 68bf6f0d28e63..422272ad44b0c 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -31,21 +31,21 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \ new/datum/stack_recipe("reinforced table parts", /obj/item/frame/table/reinforced, 2), \ new/datum/stack_recipe("rack parts", /obj/item/frame/rack, 1), \ new/datum/stack_recipe_list("airlock assemblies", list( \ - new/datum/stack_recipe("standard airlock assembly", /obj/structure/door_assembly, 4, time = 5 SECONDS, max_per_turf = STACK_RECIPE_ONE_PER_TILE, on_floor = TRUE, skill_req = SKILL_CONSTRUCTION_MASTER), \ - new/datum/stack_recipe("command airlock assembly", /obj/structure/door_assembly/door_assembly_com, 4, time = 5 SECONDS, max_per_turf = STACK_RECIPE_ONE_PER_TILE, on_floor = TRUE, skill_req = SKILL_CONSTRUCTION_MASTER), \ - new/datum/stack_recipe("security airlock assembly", /obj/structure/door_assembly/door_assembly_sec, 4, time = 5 SECONDS, max_per_turf = STACK_RECIPE_ONE_PER_TILE, on_floor = TRUE, skill_req = SKILL_CONSTRUCTION_MASTER), \ - new/datum/stack_recipe("engineering airlock assembly", /obj/structure/door_assembly/door_assembly_eng, 4, time = 5 SECONDS, max_per_turf = STACK_RECIPE_ONE_PER_TILE, on_floor = TRUE, skill_req = SKILL_CONSTRUCTION_MASTER), \ - new/datum/stack_recipe("mining airlock assembly", /obj/structure/door_assembly/door_assembly_min, 4, time = 5 SECONDS, max_per_turf = STACK_RECIPE_ONE_PER_TILE, on_floor = TRUE, skill_req = SKILL_CONSTRUCTION_MASTER), \ - new/datum/stack_recipe("atmospherics airlock assembly", /obj/structure/door_assembly/door_assembly_atmo, 4, time = 5 SECONDS, max_per_turf = STACK_RECIPE_ONE_PER_TILE, on_floor = TRUE, skill_req = SKILL_CONSTRUCTION_MASTER), \ - new/datum/stack_recipe("research airlock assembly", /obj/structure/door_assembly/door_assembly_research, 4, time = 5 SECONDS, max_per_turf = STACK_RECIPE_ONE_PER_TILE, on_floor = TRUE, skill_req = SKILL_CONSTRUCTION_MASTER), \ - new/datum/stack_recipe("medical airlock assembly", /obj/structure/door_assembly/door_assembly_med, 4, time = 5 SECONDS, max_per_turf = STACK_RECIPE_ONE_PER_TILE, on_floor = TRUE, skill_req = SKILL_CONSTRUCTION_MASTER), \ - new/datum/stack_recipe("maintenance airlock assembly", /obj/structure/door_assembly/door_assembly_mai, 4, time = 5 SECONDS, max_per_turf = STACK_RECIPE_ONE_PER_TILE, on_floor = TRUE, skill_req = SKILL_CONSTRUCTION_MASTER), \ - new/datum/stack_recipe("external airlock assembly", /obj/structure/door_assembly/door_assembly_ext, 4, time = 5 SECONDS, max_per_turf = STACK_RECIPE_ONE_PER_TILE, on_floor = TRUE, skill_req = SKILL_CONSTRUCTION_MASTER), \ - new/datum/stack_recipe("freezer airlock assembly", /obj/structure/door_assembly/door_assembly_fre, 4, time = 5 SECONDS, max_per_turf = STACK_RECIPE_ONE_PER_TILE, on_floor = TRUE, skill_req = SKILL_CONSTRUCTION_MASTER), \ - new/datum/stack_recipe("airtight hatch assembly", /obj/structure/door_assembly/door_assembly_hatch, 4, time = 5 SECONDS, max_per_turf = STACK_RECIPE_ONE_PER_TILE, on_floor = TRUE, skill_req = SKILL_CONSTRUCTION_MASTER), \ - new/datum/stack_recipe("maintenance hatch assembly", /obj/structure/door_assembly/door_assembly_mhatch, 4, time = 5 SECONDS, max_per_turf = STACK_RECIPE_ONE_PER_TILE, on_floor = TRUE, skill_req = SKILL_CONSTRUCTION_MASTER), \ - new/datum/stack_recipe("high security airlock assembly", /obj/structure/door_assembly/door_assembly_highsecurity, 4, time = 5 SECONDS, max_per_turf = STACK_RECIPE_ONE_PER_TILE, on_floor = TRUE, skill_req = SKILL_CONSTRUCTION_MASTER), \ - new/datum/stack_recipe("multi-tile airlock assembly", /obj/structure/door_assembly/multi_tile, 4, time = 5 SECONDS, max_per_turf = STACK_RECIPE_ONE_PER_TILE, on_floor = TRUE, skill_req = SKILL_CONSTRUCTION_MASTER), \ + new/datum/stack_recipe("standard airlock assembly", /obj/structure/door_assembly, 4, time = 5 SECONDS, max_per_turf = STACK_RECIPE_ONE_PER_TILE, on_floor = TRUE, skill_req = SKILL_CONSTRUCTION_EXPERT), \ + new/datum/stack_recipe("command airlock assembly", /obj/structure/door_assembly/door_assembly_com, 4, time = 5 SECONDS, max_per_turf = STACK_RECIPE_ONE_PER_TILE, on_floor = TRUE, skill_req = SKILL_CONSTRUCTION_EXPERT), \ + new/datum/stack_recipe("security airlock assembly", /obj/structure/door_assembly/door_assembly_sec, 4, time = 5 SECONDS, max_per_turf = STACK_RECIPE_ONE_PER_TILE, on_floor = TRUE, skill_req = SKILL_CONSTRUCTION_EXPERT), \ + new/datum/stack_recipe("engineering airlock assembly", /obj/structure/door_assembly/door_assembly_eng, 4, time = 5 SECONDS, max_per_turf = STACK_RECIPE_ONE_PER_TILE, on_floor = TRUE, skill_req = SKILL_CONSTRUCTION_EXPERT), \ + new/datum/stack_recipe("mining airlock assembly", /obj/structure/door_assembly/door_assembly_min, 4, time = 5 SECONDS, max_per_turf = STACK_RECIPE_ONE_PER_TILE, on_floor = TRUE, skill_req = SKILL_CONSTRUCTION_EXPERT), \ + new/datum/stack_recipe("atmospherics airlock assembly", /obj/structure/door_assembly/door_assembly_atmo, 4, time = 5 SECONDS, max_per_turf = STACK_RECIPE_ONE_PER_TILE, on_floor = TRUE, skill_req = SKILL_CONSTRUCTION_EXPERT), \ + new/datum/stack_recipe("research airlock assembly", /obj/structure/door_assembly/door_assembly_research, 4, time = 5 SECONDS, max_per_turf = STACK_RECIPE_ONE_PER_TILE, on_floor = TRUE, skill_req = SKILL_CONSTRUCTION_EXPERT), \ + new/datum/stack_recipe("medical airlock assembly", /obj/structure/door_assembly/door_assembly_med, 4, time = 5 SECONDS, max_per_turf = STACK_RECIPE_ONE_PER_TILE, on_floor = TRUE, skill_req = SKILL_CONSTRUCTION_EXPERT), \ + new/datum/stack_recipe("maintenance airlock assembly", /obj/structure/door_assembly/door_assembly_mai, 4, time = 5 SECONDS, max_per_turf = STACK_RECIPE_ONE_PER_TILE, on_floor = TRUE, skill_req = SKILL_CONSTRUCTION_EXPERT), \ + new/datum/stack_recipe("external airlock assembly", /obj/structure/door_assembly/door_assembly_ext, 4, time = 5 SECONDS, max_per_turf = STACK_RECIPE_ONE_PER_TILE, on_floor = TRUE, skill_req = SKILL_CONSTRUCTION_EXPERT), \ + new/datum/stack_recipe("freezer airlock assembly", /obj/structure/door_assembly/door_assembly_fre, 4, time = 5 SECONDS, max_per_turf = STACK_RECIPE_ONE_PER_TILE, on_floor = TRUE, skill_req = SKILL_CONSTRUCTION_EXPERT), \ + new/datum/stack_recipe("airtight hatch assembly", /obj/structure/door_assembly/door_assembly_hatch, 4, time = 5 SECONDS, max_per_turf = STACK_RECIPE_ONE_PER_TILE, on_floor = TRUE, skill_req = SKILL_CONSTRUCTION_EXPERT), \ + new/datum/stack_recipe("maintenance hatch assembly", /obj/structure/door_assembly/door_assembly_mhatch, 4, time = 5 SECONDS, max_per_turf = STACK_RECIPE_ONE_PER_TILE, on_floor = TRUE, skill_req = SKILL_CONSTRUCTION_EXPERT), \ + new/datum/stack_recipe("high security airlock assembly", /obj/structure/door_assembly/door_assembly_highsecurity, 4, time = 5 SECONDS, max_per_turf = STACK_RECIPE_ONE_PER_TILE, on_floor = TRUE, skill_req = SKILL_CONSTRUCTION_EXPERT), \ + new/datum/stack_recipe("multi-tile airlock assembly", /obj/structure/door_assembly/multi_tile, 4, time = 5 SECONDS, max_per_turf = STACK_RECIPE_ONE_PER_TILE, on_floor = TRUE, skill_req = SKILL_CONSTRUCTION_EXPERT), \ ), 4), \ null, \ )) diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm index e96ea854b4c2b..5ad3952b67823 100644 --- a/code/game/objects/items/storage/boxes.dm +++ b/code/game/objects/items/storage/boxes.dm @@ -1146,9 +1146,9 @@ /obj/item/storage/box/visual/grenade/phosphorus name = "\improper M40 HPDP grenade box" desc = "A secure box holding 15 M40 HPDP white phosphorous grenades. War crimes for the entire platoon!" - storage_slots = 15 + storage_slots = 25 max_storage_space = 30 - spawn_number = 15 + spawn_number = 25 spawn_type = /obj/item/explosive/grenade/phosphorus closed_overlay = "grenade_box_overlay_phosphorus" @@ -1190,9 +1190,9 @@ /obj/item/storage/box/visual/grenade/razorburn name = "razorburn grenade box" desc = "A secure box holding 15 razor burn grenades. Used for quick flank coverage." - storage_slots = 15 + storage_slots = 25 max_storage_space = 30 - spawn_number = 15 + spawn_number = 25 spawn_type = /obj/item/explosive/grenade/chem_grenade/razorburn_small closed_overlay = "grenade_box_overlay_razorburn" diff --git a/code/game/objects/items/whistle.dm b/code/game/objects/items/whistle.dm index 5ef35fc26d641..5345fba6e7d4a 100644 --- a/code/game/objects/items/whistle.dm +++ b/code/game/objects/items/whistle.dm @@ -8,8 +8,8 @@ equip_slot_flags = ITEM_SLOT_MASK var/volume = 60 - var/spamcheck = FALSE - + /// The range in tiles which whistle makes people warcry + var/warcryrange = 5 /obj/item/whistle/attack_self(mob/user) . = ..() @@ -34,14 +34,22 @@ /obj/item/whistle/proc/whistle_playsound(mob/user as mob) - if (spamcheck) + if(TIMER_COOLDOWN_CHECK(user, COOLDOWN_WHISTLE_BLOW)) + user.balloon_alert(user, "Catch your breath!") return user.visible_message(span_warning("[user] blows into [src]!")) playsound(get_turf(src), 'sound/items/whistle.ogg', volume, 1) - spamcheck = TRUE - addtimer(VARSET_CALLBACK(src, spamcheck, FALSE), 3 SECONDS) + if(TIMER_COOLDOWN_CHECK(user, COOLDOWN_WHISTLE_WARCRY)) + to_chat(user, span_notice("You have to wait a while to rally your troops...")) + else + TIMER_COOLDOWN_START(user, COOLDOWN_WHISTLE_WARCRY, 1 MINUTES) + for(var/mob/living/carbon/human/human in get_hearers_in_view(warcryrange, user.loc)) + human.emote("warcry", intentional = TRUE) + CHECK_TICK + + TIMER_COOLDOWN_START(user, COOLDOWN_WHISTLE_BLOW, 3 SECONDS) /obj/item/hailer diff --git a/code/game/objects/machinery/computer/computer.dm b/code/game/objects/machinery/computer/computer.dm index e9afef27dc3ea..286c5a5279843 100644 --- a/code/game/objects/machinery/computer/computer.dm +++ b/code/game/objects/machinery/computer/computer.dm @@ -141,10 +141,10 @@ if(!welder.tool_use_check(user, 2)) return FALSE - if(user.skills.getRating(SKILL_ENGINEER) < SKILL_ENGINEER_MASTER) + if(user.skills.getRating(SKILL_ENGINEER) < SKILL_ENGINEER_EXPERT) user.visible_message(span_notice("[user] fumbles around figuring out how to deconstruct [src]."), span_notice("You fumble around figuring out how to deconstruct [src].")) - var/fumbling_time = 5 SECONDS * (SKILL_ENGINEER_MASTER - user.skills.getRating(SKILL_ENGINEER)) + var/fumbling_time = 5 SECONDS * (SKILL_ENGINEER_EXPERT - user.skills.getRating(SKILL_ENGINEER)) if(!do_after(user, fumbling_time, NONE, src, BUSY_ICON_UNSKILLED)) return @@ -172,10 +172,10 @@ return if(isscrewdriver(I) && circuit) - if(user.skills.getRating(SKILL_ENGINEER) < SKILL_ENGINEER_MASTER) + if(user.skills.getRating(SKILL_ENGINEER) < SKILL_ENGINEER_EXPERT) user.visible_message(span_notice("[user] fumbles around figuring out how to deconstruct [src]."), span_notice("You fumble around figuring out how to deconstruct [src].")) - var/fumbling_time = 50 * ( SKILL_ENGINEER_MASTER - user.skills.getRating(SKILL_ENGINEER) ) + var/fumbling_time = 50 * ( SKILL_ENGINEER_EXPERT - user.skills.getRating(SKILL_ENGINEER) ) if(!do_after(user, fumbling_time, NONE, src, BUSY_ICON_UNSKILLED)) return diff --git a/code/game/objects/machinery/computer/nt_access.dm b/code/game/objects/machinery/computer/nt_access.dm index 29011e3c6ba68..028e05a0f174f 100644 --- a/code/game/objects/machinery/computer/nt_access.dm +++ b/code/game/objects/machinery/computer/nt_access.dm @@ -134,6 +134,7 @@ visible_message(span_notice("[src] beeps as it finishes sending the security override command.")) SEND_GLOBAL_SIGNAL(COMSIG_GLOB_CAMPAIGN_NT_OVERRIDE_CODE, code_color) busy = FALSE + set_disabled() //stops spamming the signal return busy = TRUE @@ -144,7 +145,7 @@ return busy = FALSE - + SEND_GLOBAL_SIGNAL(COMSIG_GLOB_CAMPAIGN_NT_OVERRIDE_RUNNING, src) current_timer = addtimer(CALLBACK(src, PROC_REF(complete_segment)), segment_time, TIMER_STOPPABLE) update_minimap_icon() running = TRUE @@ -154,6 +155,7 @@ ///Completes a stage of program progress /obj/machinery/computer/nt_access/proc/complete_segment() + SEND_GLOBAL_SIGNAL(COMSIG_GLOB_CAMPAIGN_NT_OVERRIDE_STOP_RUNNING, src) playsound(src, 'sound/machines/ping.ogg', 25, 1) deltimer(current_timer) current_timer = null diff --git a/code/game/objects/machinery/doors/multi_tile.dm b/code/game/objects/machinery/doors/multi_tile.dm index c53d57728187e..9972fa1607245 100644 --- a/code/game/objects/machinery/doors/multi_tile.dm +++ b/code/game/objects/machinery/doors/multi_tile.dm @@ -133,12 +133,11 @@ /obj/machinery/door/airlock/multi_tile/mainship/blackgeneric name = "\improper Airlock" icon = 'icons/obj/doors/mainship/2x1almayerdoor.dmi' - opacity = FALSE - glass = FALSE /obj/machinery/door/airlock/multi_tile/mainship/blackgeneric/glass name = "\improper Glass Airlock" icon = 'icons/obj/doors/mainship/2x1almayerdoor_glass.dmi' + opacity = FALSE glass = TRUE //PREP DOORS @@ -314,8 +313,6 @@ /obj/machinery/door/airlock/multi_tile/mainship/engineering name = "\improper Engineering Airlock" icon = 'icons/obj/doors/mainship/2x1engidoor.dmi' - opacity = FALSE - glass = FALSE req_one_access = list(ACCESS_MARINE_LOGISTICS, ACCESS_MARINE_ENGINEERING) /obj/machinery/door/airlock/multi_tile/mainship/engineering/glass diff --git a/code/game/objects/machinery/mortar.dm b/code/game/objects/machinery/mortar.dm index 9c857f5a12175..a27ecbb35a9fe 100644 --- a/code/game/objects/machinery/mortar.dm +++ b/code/game/objects/machinery/mortar.dm @@ -598,7 +598,7 @@ user.balloon_alert(user, "The barrel is steaming hot. Wait till it cools off") return - if(!istype(I, /obj/item/storage/box/mlrs_rockets) && !istype(I, /obj/item/storage/box/mlrs_rockets_gas)) + if(!istype(I, /obj/item/storage/box/mlrs_rockets)) return ..() var/obj/item/storage/box/rocket_box = I @@ -749,7 +749,7 @@ name = "\improper 60mm 'S-2' cloak rocket" desc = "A 60mm rocket loaded with cloak smoke that hides any friendlies inside of it with advanced chemical technology." icon_state = "mlrs_rocket_cloak" - ammo_type = /datum/ammo/mortar/rocket/smoke/mlrs + ammo_type = /datum/ammo/mortar/rocket/smoke/mlrs/cloak /obj/item/mortal_shell/rocket/mlrs/incendiary name = "\improper 60mm incendiary rocket" @@ -892,8 +892,7 @@ desc = "A large case containing rockets in a compressed setting for the TA-40L MLRS. Drag this sprite into you to open it up!\nNOTE: You cannot put items back inside this case." storage_slots = 16 -/obj/item/storage/box/mlrs_rockets/Initialize(mapload) - . = ..() +/obj/item/storage/box/mlrs_rockets/PopulateContents() new /obj/item/mortal_shell/rocket/mlrs(src) new /obj/item/mortal_shell/rocket/mlrs(src) new /obj/item/mortal_shell/rocket/mlrs(src) @@ -911,13 +910,10 @@ new /obj/item/mortal_shell/rocket/mlrs(src) new /obj/item/mortal_shell/rocket/mlrs(src) -/obj/item/storage/box/mlrs_rockets_gas +/obj/item/storage/box/mlrs_rockets/gas name = "\improper TA-40L X-50 rocket crate" - desc = "A large case containing rockets in a compressed setting for the TA-40L MLRS. Drag this sprite into you to open it up!\nNOTE: You cannot put items back inside this case." - storage_slots = 16 -/obj/item/storage/box/mlrs_rockets_gas/Initialize(mapload) - . = ..() +/obj/item/storage/box/mlrs_rockets/gas/PopulateContents() new /obj/item/mortal_shell/rocket/mlrs/gas(src) new /obj/item/mortal_shell/rocket/mlrs/gas(src) new /obj/item/mortal_shell/rocket/mlrs/gas(src) @@ -935,13 +931,31 @@ new /obj/item/mortal_shell/rocket/mlrs/gas(src) new /obj/item/mortal_shell/rocket/mlrs/gas(src) -/obj/item/storage/box/mlrs_rocket_incendiary +/obj/item/storage/box/mlrs_rockets/cloak + name = "\improper TA-40L 'S-2' rocket crate" + +/obj/item/storage/box/mlrs_rockets/cloak/PopulateContents() + new /obj/item/mortal_shell/rocket/mlrs/cloak(src) + new /obj/item/mortal_shell/rocket/mlrs/cloak(src) + new /obj/item/mortal_shell/rocket/mlrs/cloak(src) + new /obj/item/mortal_shell/rocket/mlrs/cloak(src) + new /obj/item/mortal_shell/rocket/mlrs/cloak(src) + new /obj/item/mortal_shell/rocket/mlrs/cloak(src) + new /obj/item/mortal_shell/rocket/mlrs/cloak(src) + new /obj/item/mortal_shell/rocket/mlrs/cloak(src) + new /obj/item/mortal_shell/rocket/mlrs/cloak(src) + new /obj/item/mortal_shell/rocket/mlrs/cloak(src) + new /obj/item/mortal_shell/rocket/mlrs/cloak(src) + new /obj/item/mortal_shell/rocket/mlrs/cloak(src) + new /obj/item/mortal_shell/rocket/mlrs/cloak(src) + new /obj/item/mortal_shell/rocket/mlrs/cloak(src) + new /obj/item/mortal_shell/rocket/mlrs/cloak(src) + new /obj/item/mortal_shell/rocket/mlrs/cloak(src) + +/obj/item/storage/box/mlrs_rockets/incendiary name = "\improper TA-40L incendiary rocket crate" - desc = "A large case containing rockets in a compressed setting for the TA-40L MLRS. Drag this sprite into you to open it up!\nNOTE: You cannot put items back inside this case." - storage_slots = 16 -/obj/item/storage/box/mlrs_rocket_incendiary/Initialize(mapload) - . = ..() +/obj/item/storage/box/mlrs_rockets/incendiary/PopulateContents() new /obj/item/mortal_shell/rocket/mlrs/incendiary(src) new /obj/item/mortal_shell/rocket/mlrs/incendiary(src) new /obj/item/mortal_shell/rocket/mlrs/incendiary(src) @@ -959,29 +973,7 @@ new /obj/item/mortal_shell/rocket/mlrs/incendiary(src) new /obj/item/mortal_shell/rocket/mlrs/incendiary(src) -/obj/item/storage/box/mlrs_rocket_gas_cloak - name = "\improper TA-40L 'S-2' rocket crate" - desc = "A large case containing rockets in a compressed setting for the TA-40L MLRS. Drag this sprite into you to open it up!\nNOTE: You cannot put items back inside this case." - storage_slots = 16 - -/obj/item/storage/box/mlrs_rocket_gas_cloak/Initialize(mapload) - . = ..() - new /obj/item/mortal_shell/rocket/mlrs/cloak(src) - new /obj/item/mortal_shell/rocket/mlrs/cloak(src) - new /obj/item/mortal_shell/rocket/mlrs/cloak(src) - new /obj/item/mortal_shell/rocket/mlrs/cloak(src) - new /obj/item/mortal_shell/rocket/mlrs/cloak(src) - new /obj/item/mortal_shell/rocket/mlrs/cloak(src) - new /obj/item/mortal_shell/rocket/mlrs/cloak(src) - new /obj/item/mortal_shell/rocket/mlrs/cloak(src) - new /obj/item/mortal_shell/rocket/mlrs/cloak(src) - new /obj/item/mortal_shell/rocket/mlrs/cloak(src) - new /obj/item/mortal_shell/rocket/mlrs/cloak(src) - new /obj/item/mortal_shell/rocket/mlrs/cloak(src) - new /obj/item/mortal_shell/rocket/mlrs/cloak(src) - new /obj/item/mortal_shell/rocket/mlrs/cloak(src) - new /obj/item/mortal_shell/rocket/mlrs/cloak(src) - new /obj/item/mortal_shell/rocket/mlrs/cloak(src) #undef TALLY_MORTAR #undef TALLY_HOWITZER +#undef TALLY_ROCKET_ARTY diff --git a/code/game/objects/machinery/robotic_cradle.dm b/code/game/objects/machinery/robotic_cradle.dm index 20c6a3f00c8b7..4567a7d5b87c3 100644 --- a/code/game/objects/machinery/robotic_cradle.dm +++ b/code/game/objects/machinery/robotic_cradle.dm @@ -1,13 +1,9 @@ #define CRADLE_NOTICE_SUCCESS 1 #define CRADLE_NOTICE_DEATH 2 -#define CRADLE_NOTICE_NO_RECORD 3 -#define CRADLE_NOTICE_NO_POWER 4 -#define CRADLE_NOTICE_XENO_FUCKERY 5 -#define CRADLE_NOTICE_IDIOT_EJECT 6 -#define CRADLE_NOTICE_FORCE_EJECT 7 +#define CRADLE_NOTICE_NO_POWER 3 +#define CRADLE_NOTICE_XENO_FUCKERY 4 +#define CRADLE_NOTICE_EARLY_EJECT 5 //Cradle -//This code is so shit, I don't even want to fix it. If someone wants to, please fix var/repairing never being used and try to make sense of the procs -//Like auto_start() gets called 20 seconds after the machine says it's starting, which seems to be turning on the machine, but immediately calls repair_op() which pops out the occupant ??????? /obj/machinery/robotic_cradle name = "robotic cradle" @@ -28,13 +24,18 @@ var/mob/living/carbon/human/occupant ///This var is in reference to the radio the cradle uses to speak to the crew var/obj/item/radio/headset/mainship/doc/radio + ///This var is so we can call deltimer() it if we need to abort the operation early + var/operation_timer /obj/machinery/robotic_cradle/Initialize(mapload) . = ..() radio = new(src) /obj/machinery/robotic_cradle/Destroy() - do_eject(forceeject = TRUE) + if(occupant) + visible_message("\The [src] malfunctions as it is destroyed mid-repair, ejecting [occupant] with unfinished repair wounds and showering them in debris.") + occupant.take_limb_damage(rand(30,50),rand(30,50)) + remove_occupant() if(radio) QDEL_NULL(radio) return ..() @@ -50,8 +51,7 @@ if(is_operational() || !occupant) return visible_message("[src] engages the safety override, ejecting the occupant.") - repairing = FALSE - go_out(CRADLE_NOTICE_NO_POWER) + perform_eject(CRADLE_NOTICE_NO_POWER) /obj/machinery/robotic_cradle/process() if(!occupant) @@ -59,45 +59,22 @@ if(occupant.stat == DEAD) say("Patient has expired.") - repairing = FALSE - go_out(CRADLE_NOTICE_DEATH) + perform_eject(CRADLE_NOTICE_DEATH) return if(!repairing) return -///This proc handles the actual repair once the timer is up, ejection of the healed robot and radio message of ejection. -/obj/machinery/robotic_cradle/proc/repair_op() - if(QDELETED(occupant) || occupant.stat == DEAD) - if(!ishuman(occupant)) - stack_trace("Non-human occupant made its way into the autodoc: [occupant] | [occupant?.type].") - visible_message("[src] buzzes.") - go_out(CRADLE_NOTICE_DEATH) //kick them out too. - return - - occupant.revive() - visible_message("\The [src] clicks and opens up having finished the requested operations.") - repairing = FALSE - go_out(CRADLE_NOTICE_SUCCESS) - /obj/machinery/robotic_cradle/attack_alien(mob/living/carbon/xenomorph/xeno_attacker, damage_amount = xeno_attacker.xeno_caste.melee_damage, damage_type = BRUTE, armor_type = MELEE, effects = TRUE, armor_penetration = xeno_attacker.xeno_caste.melee_ap, isrightclick = FALSE) if(!occupant) to_chat(xeno_attacker, span_xenowarning("There is nothing of interest in there.")) return if(xeno_attacker.status_flags & INCORPOREAL || xeno_attacker.do_actions) return - visible_message(span_warning("[xeno_attacker] begins to pry the [src]'s cover!"), 3) - playsound(src,'sound/effects/metal_creaking.ogg', 25, 1) - if(!do_after(xeno_attacker, 2 SECONDS)) - return - playsound(loc, 'sound/effects/metal_creaking.ogg', 25, 1) - go_out() + start_emergency_eject(xeno_attacker) -//This proc acts as a heads up to the doctors/engineers about the patient exiting the cradle for whatever reason. Does not warn if the patient itself exits the cradle. it also wipes the memory of who the patient was and readies the cradle for a new patient. -/obj/machinery/robotic_cradle/proc/go_out(notice_code = FALSE) - if(!occupant) - return - occupant.forceMove(drop_location()) +///This proc acts as a heads up to the doctors/engineers about the patient exiting the cradle for whatever reason. Takes CRADLE_NOTICE defines as arguments +/obj/machinery/robotic_cradle/proc/notify_about_eject(notice_code = FALSE) var/reason = "Reason for discharge: Procedural completion." switch(notice_code) if(CRADLE_NOTICE_SUCCESS) @@ -105,86 +82,128 @@ if(CRADLE_NOTICE_DEATH) playsound(src, 'sound/machines/warning-buzzer.ogg', 50, FALSE) reason = "Reason for discharge: Patient has expired." - if(CRADLE_NOTICE_NO_RECORD) - playsound(src, 'sound/machines/warning-buzzer.ogg', 50, FALSE) - reason = "Reason for discharge: Medical records not detected. Alerting security advised." if(CRADLE_NOTICE_NO_POWER) playsound(src, 'sound/machines/warning-buzzer.ogg', 50, FALSE) reason = "Reason for discharge: Power failure." if(CRADLE_NOTICE_XENO_FUCKERY) playsound(src, 'sound/machines/warning-buzzer.ogg', 50, FALSE) reason = "Reason for discharge: Unauthorized manual release. Alerting security advised." - if(CRADLE_NOTICE_IDIOT_EJECT) - playsound(src, 'sound/machines/warning-buzzer.ogg', 50, FALSE) - reason = "Reason for discharge: Unauthorized manual release during repair. Alerting security advised." - if(CRADLE_NOTICE_FORCE_EJECT) - playsound(src, 'sound/machines/warning-buzzer.ogg', 50, FALSE) - reason = "Reason for discharge: Destruction of linked CRADLE Engineering System. Alerting security advised." + if(CRADLE_NOTICE_EARLY_EJECT) + playsound(src,'sound/machines/buzz-two.ogg',50,FALSE) + reason = "Reason for discharge: Operation manually terminated by end user." + if(!radio)//The radio shouldn't ever be deleted, but this is a sanity check just in case + return radio.talk_into(src, "Patient: [occupant] has been released from [src] at: [get_area(src)]. [reason]", RADIO_CHANNEL_MEDICAL) + +///Forces the occupant out of the cradle, leaves it empty for someone else to enter. +/obj/machinery/robotic_cradle/proc/remove_occupant() + if(!occupant) + return + occupant.forceMove(drop_location()) occupant = null update_icon() stop_processing() -//This proc is what a robot calls when they try to enter a cradle on their own. -/obj/machinery/robotic_cradle/proc/move_inside_wrapper(mob/living/dropped, mob/dragger) - if(dragger.incapacitated() || !ishuman(dragger) || !isrobot(dropped)) - return - +///Finishes ejecting the patient after the cradle is done. Takes CRADLE_NOTICE defines as arguments, used in notify_about_eject() +/obj/machinery/robotic_cradle/proc/perform_eject(notice_code = FALSE) + repairing = FALSE + if(operation_timer) + deltimer(operation_timer) + notify_about_eject(notice_code) + remove_occupant() + +///Handles any mob placing themselves or someone else into the cradle. target_mob is the mob being placed in, operating_mob is the person placing the mob in. Returns true if the mob got placed inside, false otherwise +/obj/machinery/robotic_cradle/proc/place_mob_inside(mob/living/target_mob, mob/operating_mob) + if(operating_mob.incapacitated()||!ishuman(operating_mob)||!ishuman(target_mob)) + return FALSE if(occupant) - to_chat(dragger, span_notice("[src] is already occupied!")) - return - + to_chat(operating_mob, span_notice("[src] is already occupied!")) + return FALSE + var/mob/living/carbon/human/patient = target_mob + if(!(patient.species.species_flags & ROBOTIC_LIMBS)) + visible_message(span_warning("[src] buzzes. Subject is biological, cannot repair")) + playsound(src, 'sound/machines/buzz-two.ogg', 50, FALSE) + return FALSE + if(patient.abiotic()) + visible_message(span_warning("[src] buzzes. Subject cannot wear abiotic items.")) + playsound(src, 'sound/machines/buzz-two.ogg', 50, FALSE) + return FALSE if(machine_stat & (NOPOWER|BROKEN)) - to_chat(dragger, span_notice("[src] is non-functional!")) + to_chat(operating_mob, span_notice("[src] is non-functional!")) + return FALSE + + if(operating_mob == patient) + patient.visible_message(span_notice("[patient] starts climbing into \the [src]."), + span_notice("You start climbing into \the [src].")) + else + operating_mob.visible_message(span_notice("[operating_mob] starts placing [patient] \the [src]."), + span_notice("You start placing [patient] into \the [src].")) + + if(!do_after(patient, 1 SECONDS, IGNORE_HELD_ITEM, src, BUSY_ICON_GENERIC)) + return FALSE + if(occupant) //In case someone tried climbing in earlier than us, while the cradle was empty + to_chat(operating_mob, span_notice("[src] is already occupied!")) + return FALSE + patient.stop_pulling() + patient.forceMove(src) + occupant = patient + return TRUE +///Starts the repair operation of the cradle +/obj/machinery/robotic_cradle/proc/start_repair_operation() + if(!occupant) return - if(dragger.skills.getRating(SKILL_ENGINEER) < SKILL_ENGINEER_ENGI) - dropped.visible_message(span_notice("[dropped] fumbles around figuring out how to get into \the [src]."), - span_notice("You fumble around figuring out how to get into \the [src].")) - var/fumbling_time = max(0 , SKILL_TASK_TOUGH - ( SKILL_TASK_EASY * dragger.skills.getRating(SKILL_ENGINEER) ))// 8 secs non-trained, 5 amateur - if(!do_after(dropped, fumbling_time, NONE, src, BUSY_ICON_UNSKILLED)) - return - - dropped.visible_message(span_notice("[dropped] starts climbing into \the [src]."), - span_notice("You start climbing into \the [src].")) - if(!do_after(dropped, 1 SECONDS, IGNORE_HELD_ITEM, src, BUSY_ICON_GENERIC)) + if(powered()) + use_power(active_power_usage) + playsound(loc, 'sound/machines/ping.ogg', 25, 1) + else + perform_eject(CRADLE_NOTICE_NO_POWER) return - if(occupant) - to_chat(dragger, span_notice("[src] is already occupied!")) - return - dropped.stop_pulling() - dropped.forceMove(src) - occupant = dropped - var/implants = list(/obj/item/implant/neurostim) - var/mob/living/carbon/human/H = occupant - var/doc_dat - med_scan(H, doc_dat, implants, TRUE) + start_processing() update_icon() - - say("Automatic mode engaged, initialising procedure.") - addtimer(CALLBACK(src, PROC_REF(auto_start)), 20 SECONDS) - -///Callback to start auto mode on someone entering -/obj/machinery/robotic_cradle/proc/auto_start() - if(repairing) + repairing = TRUE + say("Automatic mode engaged, initialising repair procedure.") + operation_timer = addtimer(CALLBACK(src, PROC_REF(handle_repair_operation)), 20 SECONDS,TIMER_STOPPABLE) + +///Callback to start repair on someone entering the cradle +/obj/machinery/robotic_cradle/proc/handle_repair_operation() + if(!occupant) //sanity check, in case we get teleported outside the cradle midrepair without calling perform_eject() + if(operation_timer) + deltimer(operation_timer) + repairing = FALSE + visible_message(span_warning("[src] buzzes. Occupant missing, procedures canceled.")) + playsound(src, 'sound/machines/buzz-two.ogg', 50, FALSE) return + say("Repair procedure complete.") + perform_repair() + +///This proc handles the actual repair once the timer is up and ejects the healed robot. +/obj/machinery/robotic_cradle/proc/perform_repair() if(!occupant) - say("Occupant missing, procedures canceled.") return - say("Beginning repair procedure.") - repair_op() + if(QDELETED(occupant) || occupant.stat == DEAD) + if(!ishuman(occupant)) + stack_trace("Non-human occupant made its way into the autodoc: [occupant] | [occupant?.type].") + visible_message(span_warning("[src] buzzes.")) + perform_eject(CRADLE_NOTICE_DEATH) + return + occupant.revive() + visible_message("\The [src] clicks and opens up having finished the requested operations.") + perform_eject(CRADLE_NOTICE_SUCCESS) /obj/machinery/robotic_cradle/MouseDrop_T(mob/dropping, mob/user) . = ..() - move_inside_wrapper(dropping, user) + if(place_mob_inside(dropping, user)) + start_repair_operation() /obj/machinery/robotic_cradle/verb/move_inside() set name = "Enter Cradle" set category = "Object" set src in oview(1) - move_inside_wrapper(usr, usr) + if(place_mob_inside(usr, usr)) + start_repair_operation() /obj/machinery/robotic_cradle/attackby(obj/item/I, mob/user, params) . = ..() @@ -196,20 +215,18 @@ J.attack(occupant, user) return -/obj/machinery/robotic_cradle/grab_interact(obj/item/grab/grab, mob/user, base_damage = BASE_OBJ_SLAM_DAMAGE, is_sharp = FALSE) +/obj/machinery/robotic_cradle/attack_hand(mob/living/user) . = ..() - if(.) - return - if(!ishuman(user)) + if(user.do_actions) //stops them from spamming if they're attempting to eject someone or otherwise busy return - if(machine_stat & (NOPOWER|BROKEN)) - to_chat(user, span_notice("\ [src] is non-functional!")) + if(!occupant) return + start_emergency_eject(user) - if(occupant) - to_chat(user, span_notice("\ [src] is already occupied!")) +/obj/machinery/robotic_cradle/grab_interact(obj/item/grab/grab, mob/user, base_damage = BASE_OBJ_SLAM_DAMAGE, is_sharp = FALSE) + . = ..() + if(.) return - var/mob/grabbed_mob if(ismob(grab.grabbed_thing)) @@ -224,46 +241,8 @@ cryobag.open() user.start_pulling(grabbed_mob) - if(!ishuman(grabbed_mob)) - to_chat(user, span_notice("\ [src] is compatible with humanoid anatomies only!")) - return - - if(ishumanbasic(grabbed_mob)) - to_chat(user, span_warning("Subject is biological, cannot repair.")) - return - - if(grabbed_mob.abiotic()) - to_chat(user, span_warning("Subject cannot have abiotic items on.")) - return - - if(user.skills.getRating(SKILL_ENGINEER) < SKILL_ENGINEER_ENGI) - user.visible_message(span_notice("[user] fumbles around figuring out how to put [grabbed_mob] into [src]."), - span_notice("You fumble around figuring out how to put [grabbed_mob] into [src].")) - var/fumbling_time = max(0 , SKILL_TASK_TOUGH - ( SKILL_TASK_EASY * user.skills.getRating(SKILL_ENGINEER) ))// 8 secs non-trained, 5 amateur - if(!do_after(user, fumbling_time, NONE, grabbed_mob, BUSY_ICON_UNSKILLED) || QDELETED(src)) - return - - visible_message("[user] starts putting [grabbed_mob] into [src].", 3) - - if(!do_after(user, 10, IGNORE_HELD_ITEM, grabbed_mob, BUSY_ICON_GENERIC) || QDELETED(src)) - return - - if(occupant) - to_chat(user, span_notice("[src] is already occupied!")) - return - - if(!grabbed_mob || !grab) - return - - grabbed_mob.forceMove(src) - occupant = grabbed_mob - update_icon() - var/implants = list(/obj/item/implant/neurostim) - var/mob/living/carbon/human/H = occupant - med_scan(H, null, implants, TRUE) - start_processing() - say("Automatic mode engaged, initialising procedure.") - addtimer(CALLBACK(src, PROC_REF(auto_start)), 20 SECONDS) + if(place_mob_inside(grabbed_mob,user)) + start_repair_operation() return TRUE @@ -273,53 +252,34 @@ set src in oview(1) if(usr.incapacitated()) return - do_eject() + start_emergency_eject(usr) -///This proc ejects whomever is inside the cradle, by force if needed depending if the cradle is destroyed or not. -/obj/machinery/robotic_cradle/proc/do_eject(forceeject) +///This proc ejects whomever is inside the cradle while it is presumably operating. mob_ejecting is the mob triggering the eject +/obj/machinery/robotic_cradle/proc/start_emergency_eject(mob/mob_ejecting) if(!occupant) return - if(forceeject) - if(!repairing) - visible_message("\The [src] is destroyed, ejecting [occupant] and showering them in debris.") - occupant.take_limb_damage(rand(10,20),rand(10,20)) - else - visible_message("\The [src] malfunctions as it is destroyed mid-repair, ejecting [occupant] with unfinished repair wounds and showering them in debris.") - occupant.take_limb_damage(rand(30,50),rand(30,50)) - go_out(CRADLE_NOTICE_FORCE_EJECT) + if(!repairing)//this shouldn't be possible unless you get var edited inside without triggering start_repair_operation(), in that case just get them out + remove_occupant() return - if(isxeno(usr) && !repairing) // let xenos eject people hiding inside; a xeno ejecting someone during repair does so like someone untrained - go_out(CRADLE_NOTICE_XENO_FUCKERY) + if(!mob_ejecting) + perform_eject(CRADLE_NOTICE_EARLY_EJECT) return - if(!ishuman(usr)) - return - if(usr == occupant) - if(repairing) - to_chat(usr, span_warning("There's no way you're getting out while this thing is operating on you!")) - return - else - visible_message("[usr] engages the internal release mechanism, and climbs out of \the [src].") - if(usr.skills.getRating(SKILL_ENGINEER) < SKILL_ENGINEER_ENGI) - usr.visible_message(span_notice("[usr] fumbles around figuring out how to use [src]."), - span_notice("You fumble around figuring out how to use [src].")) - var/fumbling_time = max(0 , SKILL_TASK_TOUGH - ( SKILL_TASK_EASY * usr.skills.getRating(SKILL_ENGINEER) ))// 8 secs non-trained, 5 amateur - if(!do_after(usr, fumbling_time, NONE, src, BUSY_ICON_UNSKILLED) || !occupant) + if(isxeno(mob_ejecting)) + mob_ejecting.visible_message(span_notice("[mob_ejecting] pries the cover of [src]"), + span_notice("You begin to pry at the cover of [src].")) + playsound(mob_ejecting,'sound/effects/metal_creaking.ogg', 25, 1) + if(!do_after(mob_ejecting, 2 SECONDS, NONE, src, BUSY_ICON_DANGER) || !occupant) return - if(repairing) - repairing = FALSE - if(usr.skills.getRating(SKILL_ENGINEER) < SKILL_ENGINEER_ENGI) //Untrained people will fail to terminate the repair properly. - visible_message("\The [src] malfunctions as [usr] aborts the rapair in progress.") - occupant.take_limb_damage(rand(30,50),rand(30,50)) - log_game("[key_name(usr)] ejected [key_name(occupant)] from the cradle during repair causing damage.") - message_admins("[ADMIN_TPMONTY(usr)] ejected [ADMIN_TPMONTY(occupant)] from the cradle during repair causing damage.") - go_out(CRADLE_NOTICE_IDIOT_EJECT) - return - go_out() + perform_eject(CRADLE_NOTICE_XENO_FUCKERY) + return + if(!ishuman(mob_ejecting)) + return + if(mob_ejecting == occupant) + to_chat(usr, span_warning("There's no way you're getting out while this thing is operating on you!")) + return + perform_eject(CRADLE_NOTICE_EARLY_EJECT) #undef CRADLE_NOTICE_SUCCESS #undef CRADLE_NOTICE_DEATH -#undef CRADLE_NOTICE_NO_RECORD #undef CRADLE_NOTICE_NO_POWER -#undef CRADLE_NOTICE_XENO_FUCKERY -#undef CRADLE_NOTICE_IDIOT_EJECT -#undef CRADLE_NOTICE_FORCE_EJECT +#undef CRADLE_NOTICE_EARLY_EJECT diff --git a/code/game/objects/machinery/squad_supply/supply_console.dm b/code/game/objects/machinery/squad_supply/supply_console.dm index fc675c38b2262..285b54ab0bc9e 100644 --- a/code/game/objects/machinery/squad_supply/supply_console.dm +++ b/code/game/objects/machinery/squad_supply/supply_console.dm @@ -25,6 +25,7 @@ /obj/machinery/computer/supplydrop_console/Initialize(mapload) . = ..() + RegisterSignal(SSdcs, COMSIG_GLOB_SUPPLY_BEACON_CREATED, PROC_REF(ping_beacon)) return INITIALIZE_HINT_LATELOAD /obj/machinery/computer/supplydrop_console/LateInitialize() @@ -34,6 +35,11 @@ supply_pad = _supply_pad return +/// Used to notify of a new beacon target +/obj/machinery/computer/supplydrop_console/proc/ping_beacon() + SIGNAL_HANDLER + playsound(src,'sound/machines/terminal_prompt_confirm.ogg', 50, TRUE) + /obj/machinery/computer/supplydrop_console/Destroy() supply_beacon = null supply_pad = null diff --git a/code/game/objects/machinery/vending/marine_vending.dm b/code/game/objects/machinery/vending/marine_vending.dm index 361593cac1458..74d99b0155ca3 100644 --- a/code/game/objects/machinery/vending/marine_vending.dm +++ b/code/game/objects/machinery/vending/marine_vending.dm @@ -23,6 +23,7 @@ ), "Energy Weapons" = list( /obj/item/cell/lasgun/lasrifle = -1, + /obj/item/cell/lasgun/volkite/powerpack/marine = -1, /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_rifle = -1, /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_sniper = -1, /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_carbine = -1, @@ -242,6 +243,7 @@ ), "Energy Weapons" = list( /obj/item/cell/lasgun/lasrifle = -1, + /obj/item/cell/lasgun/volkite/powerpack/marine = -1, /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_rifle = -1, /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_sniper = -1, /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_carbine = -1, @@ -441,6 +443,7 @@ ), "Energy Weapons" = list( /obj/item/cell/lasgun/lasrifle = -1, + /obj/item/cell/lasgun/volkite/powerpack/marine = -1, /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_rifle = -1, /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_sniper = -1, /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_carbine = -1, @@ -562,23 +565,11 @@ "Heavy Weapons" = list( /obj/structure/closet/crate/mortar_ammo/mortar_kit = -1, /obj/structure/closet/crate/mortar_ammo/howitzer_kit = -1, - /obj/structure/largecrate/supply/weapons/standard_atgun = -1, - /obj/item/ammo_magazine/standard_atgun = -1, - /obj/item/ammo_magazine/standard_atgun/apcr = -1, - /obj/item/ammo_magazine/standard_atgun/he = -1, - /obj/item/ammo_magazine/standard_atgun/beehive = -1, - /obj/item/ammo_magazine/standard_atgun/incend = -1, /obj/item/storage/box/crate/sentry = -1, /obj/item/storage/box/hsg_102 = -1, /obj/item/weapon/gun/heavymachinegun = -1, /obj/item/ammo_magazine/heavymachinegun = -1, - /obj/item/storage/holster/backholster/rpg/full = -1, - /obj/item/ammo_magazine/rocket/recoilless = -1, - /obj/item/ammo_magazine/rocket/recoilless/light = -1, - /obj/item/ammo_magazine/rocket/recoilless/heat = -1, - /obj/item/ammo_magazine/rocket/recoilless/cloak = -1, - /obj/item/ammo_magazine/rocket/recoilless/smoke = -1, - /obj/item/ammo_magazine/rocket/recoilless/plasmaloss = -1, + /obj/item/ammo_magazine/heavymachinegun/small = -1, ), "Attachments" = list( /obj/item/attachable/bayonet = -1, @@ -1423,6 +1414,13 @@ /obj/item/ammo_magazine/railgun/hvap = -1, /obj/item/ammo_magazine/packet/scout_rifle = -1, /obj/item/weapon/gun/energy/lasgun/lasrifle/xray = -1, + /obj/item/weapon/gun/launcher/rocket/recoillessrifle = -1, + /obj/item/ammo_magazine/rocket/recoilless = -1, + /obj/item/ammo_magazine/rocket/recoilless/light = -1, + /obj/item/ammo_magazine/rocket/recoilless/heat = -1, + /obj/item/ammo_magazine/rocket/recoilless/cloak = -1, + /obj/item/ammo_magazine/rocket/recoilless/smoke = -1, + /obj/item/ammo_magazine/rocket/recoilless/plasmaloss = -1, /obj/item/weapon/gun/launcher/rocket/m57a4/t57 = -1, /obj/item/ammo_magazine/rocket/m57a4 = -1, /obj/item/weapon/gun/launcher/rocket/sadar/valhalla = -1, @@ -1486,6 +1484,12 @@ /obj/item/ammo_magazine/sniper/flak = -1, ), "Mounted" = list( + /obj/item/weapon/gun/standard_atgun = -1, + /obj/item/ammo_magazine/standard_atgun = -1, + /obj/item/ammo_magazine/standard_atgun/apcr = -1, + /obj/item/ammo_magazine/standard_atgun/he = -1, + /obj/item/ammo_magazine/standard_atgun/beehive = -1, + /obj/item/ammo_magazine/standard_atgun/incend = -1, /obj/structure/largecrate/supply/weapons/standard_flakgun = -1, /obj/item/ammo_magazine/auto_cannon = -1, /obj/item/ammo_magazine/auto_cannon/flak = -1, @@ -1504,6 +1508,9 @@ ), "Equipment" = list( /obj/item/clothing/glasses/hud/xenohud = -1, + /obj/item/clothing/glasses/night_vision = -1, + /obj/item/armor_module/module/night_vision = -1, + /obj/item/cell/night_vision_battery = -1, /obj/item/clothing/mask/gas/swat = -1, /obj/item/clothing/head/helmet/riot = -1, /obj/item/clothing/suit/storage/marine/specialist/valhalla = -1, diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index 13877da839def..aa96df4e841c5 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -322,6 +322,9 @@ if(!do_after(user, (fumble_time ? fumble_time : repair_time) * (skill_required - user.skills.getRating(SKILL_ENGINEER)), NONE, src, BUSY_ICON_BUILD)) return TRUE + if(user.skills.getRating(SKILL_ENGINEER) > skill_required) + repair_amount *= (1+(0.1*(user.skills.getRating(SKILL_ENGINEER) - (skill_required + 1)))) + repair_time *= welder.toolspeed balloon_alert_to_viewers("starting repair...") handle_weldingtool_overlay() diff --git a/code/game/objects/structures/campaign_structures/campaign_structure.dm b/code/game/objects/structures/campaign_structures/campaign_structure.dm index f0b5597afde8d..7c3c2d9aae227 100644 --- a/code/game/objects/structures/campaign_structures/campaign_structure.dm +++ b/code/game/objects/structures/campaign_structures/campaign_structure.dm @@ -27,9 +27,11 @@ anchored = TRUE allow_pass_flags = PASSABLE destroy_sound = 'sound/effects/meteorimpact.ogg' - icon = 'icons/obj/structures/campaign_structures.dmi' + ///overhead timer + var/obj/effect/countdown/campaign_objective/countdown + /obj/structure/campaign_objective/Initialize(mapload) . = ..() GLOB.campaign_objectives += src @@ -56,3 +58,7 @@ /obj/structure/campaign_objective/proc/update_control_minimap_icon() SSminimaps.remove_marker(src) SSminimaps.add_marker(src, MINIMAP_FLAG_ALL, image('icons/UI_icons/map_blips.dmi', null, "campaign_objective", HIGH_FLOAT_LAYER)) + +///Remaining time for overhead countdown if applicable +/obj/structure/campaign_objective/proc/get_time_left() + return diff --git a/code/game/objects/structures/campaign_structures/capture_objectives.dm b/code/game/objects/structures/campaign_structures/capture_objectives.dm index 439b4e2ec112c..cc6681602c561 100644 --- a/code/game/objects/structures/campaign_structures/capture_objectives.dm +++ b/code/game/objects/structures/campaign_structures/capture_objectives.dm @@ -15,8 +15,6 @@ var/capturing_faction ///Timer holder for the current capture/decapture timer var/capture_timer - ///overhead timer - var/obj/effect/countdown/campaign_objective/countdown /obj/structure/campaign_objective/capture_objective/Initialize(mapload) . = ..() @@ -128,8 +126,7 @@ personal_statistics.mission_objective_captured ++ update_icon() -///Returns time left on the nuke in seconds -/obj/structure/campaign_objective/capture_objective/proc/get_time_left() +/obj/structure/campaign_objective/capture_objective/get_time_left() return capture_timer ? round(timeleft(capture_timer) MILLISECONDS) : null //sensor tower diff --git a/code/game/objects/structures/campaign_structures/deploy_blockers.dm b/code/game/objects/structures/campaign_structures/deploy_blockers.dm index b62896412bb08..3558749cfc1e8 100644 --- a/code/game/objects/structures/campaign_structures/deploy_blockers.dm +++ b/code/game/objects/structures/campaign_structures/deploy_blockers.dm @@ -59,7 +59,11 @@ name = "TELEBLOCKER" icon = 'icons/obj/structures/campaign_structures.dmi' icon_state = "drop_block" - mission_types = list(/datum/campaign_mission/destroy_mission/supply_raid, /datum/campaign_mission/destroy_mission/fire_support_raid) + mission_types = list( + /datum/campaign_mission/destroy_mission/supply_raid, + /datum/campaign_mission/destroy_mission/fire_support_raid, + /datum/campaign_mission/raiding_base, + ) spawn_object = /obj/structure/campaign_deployblocker/drop_blocker /obj/structure/campaign_deployblocker/drop_blocker diff --git a/code/game/objects/structures/campaign_structures/orbital_beacons.dm b/code/game/objects/structures/campaign_structures/orbital_beacons.dm new file mode 100644 index 0000000000000..4a2808959010f --- /dev/null +++ b/code/game/objects/structures/campaign_structures/orbital_beacons.dm @@ -0,0 +1,118 @@ +/obj/item/campaign_beacon + name = "default campaign beacon" + desc = "what smelly admin spawned this?" + icon = 'icons/Marine/marine-navigation.dmi' + icon_state = "motion4" + w_class = WEIGHT_CLASS_SMALL + item_flags = IS_DEPLOYABLE + ///Type path for what this deploys into + var/deployable_type + ///Time to deploy + var/deploy_time = 2 SECONDS + ///Time to undeploy + var/undeploy_time = 2 SECONDS + +/obj/item/campaign_beacon/Initialize(mapload) + . = ..() + AddComponent(/datum/component/deployable_item, deployable_type, deploy_time, undeploy_time, CALLBACK(src, PROC_REF(can_deploy))) + +///Any Additional checks for deploying validity +/obj/item/campaign_beacon/proc/can_deploy(mob/user, turf/location) + return TRUE + +/obj/item/campaign_beacon/bunker_buster + name = "orbital beacon" + desc = "A bulky device that is used to provide precision guidance to powerful orbital weapon systems." + icon = 'icons/Marine/marine-navigation.dmi' + icon_state = "motion4" + deployable_type = /obj/structure/campaign_objective/destruction_objective/bunker_buster + deploy_time = 2 SECONDS + undeploy_time = 2 SECONDS + ///Can only be deployed in map areas listed here + var/list/valid_deploy_areas + +/obj/item/campaign_beacon/bunker_buster/Initialize(mapload) + . = ..() + GLOB.campaign_objectives += src + var/datum/campaign_mission/raiding_base/current_mission = get_current_mission() + if(!istype(current_mission)) + return + valid_deploy_areas = current_mission.get_valid_beacon_areas() + +/obj/item/campaign_beacon/bunker_buster/Destroy() + GLOB.campaign_objectives -= src + return ..() + +/obj/item/campaign_beacon/bunker_buster/examine(mob/user) + . = ..() + if(!length(valid_deploy_areas)) + return + var/location_info + location_info += "Can be deployed in the following areas: \n" + for(var/area/valid_area AS in valid_deploy_areas) + location_info += "[valid_area::name]\n" + . += location_info + +///Checks if we can deploy the beacon here +/obj/item/campaign_beacon/bunker_buster/can_deploy(mob/user, turf/location) + var/area/beacon_area = get_area(location) + if(beacon_area.type in valid_deploy_areas) + return TRUE + if(user) + user.balloon_alert(user, "Cannot deploy here") + return FALSE + +///Delay between beacon timer finishing and the actual explosion +#define CAMPAIGN_OB_BEACON_IMPACT_DELAY 10 SECONDS + +/obj/structure/campaign_objective/destruction_objective/bunker_buster + name = "deployed orbital beacon" + desc = "An ominous red beacon, used to provide precision guidance to powerful orbital weapon systems." + icon = 'icons/Marine/marine-navigation.dmi' + icon_state = "motion1" + faction = FACTION_TERRAGOV + density = FALSE + ///How long the beacon takes to trigger its effect + var/beacon_duration = 3 MINUTES + ///Holds the actual timer for the beacon + var/beacon_timer + +/obj/structure/campaign_objective/destruction_objective/bunker_buster/Initialize(mapload) + . = ..() + RegisterSignal(SSdcs, COMSIG_GLOB_CAMPAIGN_OB_BEACON_TRIGGERED, PROC_REF(cancel_beacon)) + SEND_SIGNAL(SSdcs, COMSIG_GLOB_CAMPAIGN_OB_BEACON_ACTIVATION, src) + + beacon_timer = addtimer(CALLBACK(src, PROC_REF(beacon_effect)), beacon_duration, TIMER_STOPPABLE) + countdown = new(src) + countdown.pixel_x = 7 + countdown.pixel_y = 24 + countdown.start() + +/obj/structure/campaign_objective/destruction_objective/bunker_buster/Destroy() + QDEL_NULL(countdown) + if(beacon_timer) + deltimer(beacon_timer) + beacon_timer = null + return ..() + +/obj/structure/campaign_objective/destruction_objective/bunker_buster/get_time_left() + return beacon_timer ? round(timeleft(beacon_timer) MILLISECONDS) : null + +///Clears the beacon if another beacon successfully activates +/obj/structure/campaign_objective/destruction_objective/bunker_buster/proc/cancel_beacon(datum/source) + SIGNAL_HANDLER + qdel(src) + +///Effects triggered when the timer runs out +/obj/structure/campaign_objective/destruction_objective/bunker_buster/proc/beacon_effect() + UnregisterSignal(SSdcs, COMSIG_GLOB_CAMPAIGN_OB_BEACON_TRIGGERED) + SEND_SIGNAL(SSdcs, COMSIG_GLOB_CAMPAIGN_OB_BEACON_TRIGGERED, src, CAMPAIGN_OB_BEACON_IMPACT_DELAY) + for(var/mob/mob AS in GLOB.player_list) + if(mob.z != z) + continue + var/play_sound = 'sound/effects/OB_warning_announce_novoiceover.ogg' + if(isobserver(mob) || mob.faction == faction) + play_sound = 'sound/effects/OB_warning_announce.ogg' + mob.playsound_local(loc, play_sound, 125, falloff = 10, distance_multiplier = 0.2) + +#undef CAMPAIGN_OB_BEACON_IMPACT_DELAY diff --git a/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm index 76161931efd78..47bc062619a6d 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm @@ -148,3 +148,27 @@ new /obj/item/clothing/suit/armor/riot(src) new /obj/item/clothing/suit/armor/riot(src) new /obj/item/storage/box/flashbangs(src) + +/obj/structure/closet/secure_closet/guncabinet/emergency_combat_gear + name = "\improper emergency combat gear" + desc = "Kept in cases of extreme emergency. Tends to feature surplus, second rate gear. Not for regular TGMC squad marines." + req_access = null + +/obj/structure/closet/secure_closet/guncabinet/emergency_combat_gear/PopulateContents() + new /obj/item/clothing/head/helmet/marine + new /obj/item/clothing/head/helmet/marine + new /obj/item/clothing/shoes/marine/brown + new /obj/item/clothing/shoes/marine/brown + new /obj/item/clothing/under/marine/camo + new /obj/item/clothing/under/marine/camo + new /obj/item/storage/backpack/marine/satchel/green + new /obj/item/storage/backpack/marine/satchel/green + new /obj/item/storage/belt/marine/standard_skirmishrifle + new /obj/item/storage/belt/marine/standard_skirmishrifle + new /obj/item/weapon/gun/rifle/standard_skirmishrifle/standard + new /obj/item/weapon/gun/rifle/standard_skirmishrifle/standard + new /obj/item/storage/box/visual/magazine/compact/standard_skirmishrifle + new /obj/item/clothing/suit/modular/xenonauten + new /obj/item/clothing/suit/modular/xenonauten + + diff --git a/code/game/objects/structures/droppod.dm b/code/game/objects/structures/droppod.dm index 1c428a8e38612..4847469d2ffad 100644 --- a/code/game/objects/structures/droppod.dm +++ b/code/game/objects/structures/droppod.dm @@ -480,7 +480,7 @@ GLOBAL_LIST_INIT(blocked_droppod_tiles, typecacheof(list(/turf/open/space/transi /obj/structure/droppod/nonmob/mech_pod name = "\improper TGMC Zeus mech drop pod" - desc = "A menacing metal hunk of steel that is used by the TGMC for quick tactical redeployment. This is a larger model designed specifically to carry mechs." + desc = "A menacing metal hunk of steel that is used by the TGMC for quick tactical redeployment. This is a larger model designed specifically to carry mechs. Shift click to enter when inside a mech." icon = 'icons/obj/structures/big_droppod.dmi' icon_state = "mechpod" light_range = 2 diff --git a/code/game/objects/structures/orbital_cannon.dm b/code/game/objects/structures/orbital_cannon.dm index e0e695deca60d..700f11968df1b 100644 --- a/code/game/objects/structures/orbital_cannon.dm +++ b/code/game/objects/structures/orbital_cannon.dm @@ -214,7 +214,8 @@ fuel_warning = "Warhead fuel level: incorrect.
Warhead may be inaccurate." var/turf/target = locate(T.x + inaccurate_fuel * pick(-1,1),T.y + inaccurate_fuel * pick(-1,1),T.z) - + GLOB.round_statistics.obs_fired++ + SSblackbox.record_feedback("tally", "round_statistics", 1, "obs_fired") priority_announce( message = "Get out of danger close!

Warhead type: [tray.warhead.warhead_kind].
[fuel_warning]
Estimated location of impact: [get_area(T)].", title = "Orbital bombardment launch command detected!", diff --git a/code/game/objects/structures/patrol_points.dm b/code/game/objects/structures/patrol_points.dm index dc4b87bef28cc..07dc1a7df3d33 100644 --- a/code/game/objects/structures/patrol_points.dm +++ b/code/game/objects/structures/patrol_points.dm @@ -4,7 +4,7 @@ /obj/structure/patrol_point name = "Patrol start point" - desc = "A one way ticket to the combat zone." + desc = "A one way ticket to the combat zone. Shift click to deploy when inside a mech." icon = 'icons/effects/effects.dmi' icon_state = "patrolpoint" anchored = TRUE diff --git a/code/game/turfs/closed.dm b/code/game/turfs/closed.dm index 7861f55e15bdd..0b380f666043b 100644 --- a/code/game/turfs/closed.dm +++ b/code/game/turfs/closed.dm @@ -111,10 +111,6 @@ icon_state = "darkfrostwall-0" walltype = "darkfrostwall" base_icon_state = "darkfrostwall" - resistance_flags = PLASMACUTTER_IMMUNE|UNACIDABLE - -/turf/closed/mineral/smooth/darkfrostwall/cuttable - resistance_flags = UNACIDABLE /turf/closed/mineral/smooth/darkfrostwall/indestructible name = "tough rock" @@ -166,6 +162,16 @@ resistance_flags = RESIST_ALL icon_state = "wall-invincible" +//basalt mineral wall +/turf/closed/mineral/smooth/basalt + icon = 'icons/turf/walls/basaltwall.dmi' + icon_state = "basaltwall-0" + base_icon_state = "basaltwall" + +/turf/closed/mineral/smooth/basalt/indestructible + resistance_flags = RESIST_ALL + icon_state = "wall-invincible" + //Ground map dense jungle /turf/closed/gm icon = 'icons/turf/walls/jungle.dmi' diff --git a/code/game/turfs/floor_ground.dm b/code/game/turfs/floor_ground.dm index 72d592521911a..c9deeab594a35 100644 --- a/code/game/turfs/floor_ground.dm +++ b/code/game/turfs/floor_ground.dm @@ -187,6 +187,7 @@ /turf/open/floor/plating/ground/mars/random/cave name = "cave" icon_state = "mars_cave" + smoothing_groups = list(SMOOTH_GROUP_SAND) /turf/open/floor/plating/ground/mars/random/cave/darker color = "#948a7c" @@ -346,6 +347,20 @@ name = "asphalt" icon_state = "cement_threeside" +/turf/open/floor/plating/ground/desertdam/asphalt/autosmooth + name = "concrete" + icon = 'icons/turf/floors/asphalt-regular.dmi' + icon_state = "asphalt-icon" + smoothing_flags = SMOOTH_BITMASK + smoothing_groups = list(SMOOTH_GROUP_ASPHALT) + canSmoothWith = list( + SMOOTH_GROUP_ASPHALT, + ) + base_icon_state = "asphalt-regular" + +/turf/open/floor/plating/ground/desertdam/asphalt/autosmooth/alt + icon = 'icons/turf/floors/asphalt-sunbleached.dmi' + base_icon_state = "aasphalt-sunbleached" //CAVE /turf/open/floor/plating/ground/desertdam/cave @@ -412,3 +427,20 @@ mediumxenofootstep = FOOTSTEP_CONCRETE barefootstep = FOOTSTEP_CONCRETE shoefootstep = FOOTSTEP_CONCRETE + +///These are entirely for decoration purposes, do not make them functional, it will cause salt. +/turf/open/floor/chasm + name = "chasm" + desc = "Watch your step." + icon = 'icons/turf/floors/chasms.dmi' + icon_state = "chasms-0" + base_icon_state = "chasms" + smoothing_flags = SMOOTH_BITMASK + smoothing_groups = list(SMOOTH_GROUP_TURF_CHASM) + canSmoothWith = list(SMOOTH_GROUP_TURF_CHASM) + density = TRUE //keep people from stepping on it + +/turf/open/floor/chasm/junglechasm + icon = 'icons/turf/floors/junglechasm.dmi' + icon_state = "junglechasm-0" + base_icon_state = "junglechasm" diff --git a/code/game/turfs/floor_types.dm b/code/game/turfs/floor_types.dm index 936a936aea188..6561f58d72292 100644 --- a/code/game/turfs/floor_types.dm +++ b/code/game/turfs/floor_types.dm @@ -20,9 +20,18 @@ /turf/open/floor/mainship/plate/outline icon_state = "test_floor5" +/turf/open/floor/mainship/hexagon + icon_state = "hexagon" + /turf/open/floor/mainship/cargo icon_state = "cargo" +/turf/open/floor/mainship/yellow_cargo + icon_state = "yellow_cargo" + +/turf/open/floor/mainship/yellow_cargo/arrow + icon_state = "yellow_cargo_arrow" + /turf/open/floor/mainship/cargo/arrow icon_state = "cargo_arrow" @@ -906,6 +915,46 @@ /turf/open/floor/carpet/side icon_state = "carpetside" +/turf/open/floor/carpet/blue + icon = 'icons/turf/floors/carpet_blue.dmi' + base_icon_state = "carpet_blue" + icon_state = "carpet_blue-0" + +/turf/open/floor/carpet/black + icon = 'icons/turf/floors/carpet_black.dmi' + base_icon_state = "carpet_black" + icon_state = "carpet_black-0" + +/turf/open/floor/carpet/green + icon = 'icons/turf/floors/carpet_green.dmi' + base_icon_state = "carpet_green" + icon_state = "carpet_green-0" + +/turf/open/floor/carpet/orange + icon = 'icons/turf/floors/carpet_orange.dmi' + base_icon_state = "carpet_orange" + icon_state = "carpet_orange-0" + +/turf/open/floor/carpet/purple + icon = 'icons/turf/floors/carpet_purple.dmi' + base_icon_state = "carpet_purple" + icon_state = "carpet_purple-0" + +/turf/open/floor/carpet/red + icon = 'icons/turf/floors/carpet_red.dmi' + base_icon_state = "carpet_red" + icon_state = "carpet_red-0" + +/turf/open/floor/carpet/cyan + icon = 'icons/turf/floors/carpet_cyan.dmi' + base_icon_state = "carpet_cyan" + icon_state = "carpet_cyan-0" + +/turf/open/floor/carpet/royalblack + icon = 'icons/turf/floors/carpet_royalblack.dmi' + base_icon_state = "carpet_royalblack" + icon_state = "carpet_royalblack-0" + // Start Prison tiles /turf/open/floor/prison diff --git a/code/game/turfs/iron_floor.dm b/code/game/turfs/iron_floor.dm index 82aa6c55c2b4b..ad3a0c9dccb7b 100644 --- a/code/game/turfs/iron_floor.dm +++ b/code/game/turfs/iron_floor.dm @@ -233,8 +233,12 @@ /turf/open/floor/glass name = "glass floor" desc = "Don't jump on it, or do, I'm not your mom." - icon = 'icons/turf/floors.dmi' + icon = 'icons/turf/floors/glass.dmi' icon_state = "glass-0" + base_icon_state = "glass" + smoothing_flags = SMOOTH_BITMASK + smoothing_groups = list(SMOOTH_GROUP_FLOOR_TRANSPARENT_GLASS) + canSmoothWith = list(SMOOTH_GROUP_FLOOR_TRANSPARENT_GLASS) /turf/open/floor/glass/reinforced name = "reinforced glass floor" @@ -242,7 +246,17 @@ icon = 'icons/turf/floors/reinf_glass.dmi' icon_state = "reinf_glass-0" base_icon_state = "reinf_glass" - smoothing_flags = SMOOTH_BITMASK - smoothing_groups = list(SMOOTH_GROUP_FLOOR_TRANSPARENT_GLASS) - canSmoothWith = list(SMOOTH_GROUP_FLOOR_TRANSPARENT_GLASS) +/turf/open/floor/glass/plasma + name = "plasma glass floor" + desc = "Studies by the Nanotrasen Materials Safety Division have not yet determined if this is safe to jump on, do so at your own risk." + icon = 'icons/turf/floors/plasma_glass.dmi' + icon_state = "plasma_glass-0" + base_icon_state = "plasma_glass" + +/turf/open/floor/glass/reinforced/plasma + name = "reinforced plasma glass floor" + desc = "Do jump on it, jump on it while in a mecha, it can take it." + icon = 'icons/turf/floors/reinf_plasma_glass.dmi' + icon_state = "reinf_plasma_glass-0" + base_icon_state = "reinf_plasma_glass" diff --git a/code/modules/admin/admin_ranks.dm b/code/modules/admin/admin_ranks.dm index be8f8fb6b3253..9a5e144de5ab5 100644 --- a/code/modules/admin/admin_ranks.dm +++ b/code/modules/admin/admin_ranks.dm @@ -82,6 +82,8 @@ flag = R_DBRANKS if("LOG") flag = R_LOG + if("POLLS") + flag = R_POLLS if("EVERYTHING") flag = R_EVERYTHING if("@") diff --git a/code/modules/admin/holder.dm b/code/modules/admin/holder.dm index d792d75d806c4..ff31ac4539e6c 100644 --- a/code/modules/admin/holder.dm +++ b/code/modules/admin/holder.dm @@ -464,7 +464,6 @@ GLOBAL_PROTECT(admin_verbs_server) /world/proc/AVpermissions() return list( /client/proc/edit_admin_permissions, - /client/proc/poll_panel, ) GLOBAL_LIST_INIT(admin_verbs_permissions, world.AVpermissions()) GLOBAL_PROTECT(admin_verbs_permissions) @@ -507,6 +506,13 @@ GLOBAL_PROTECT(admin_verbs_spawn) GLOBAL_LIST_INIT(admin_verbs_log, world.AVlog()) GLOBAL_PROTECT(admin_verbs_log) +/world/proc/AVpolls() + return list( + /client/proc/poll_panel, + ) +GLOBAL_LIST_INIT(admin_verbs_polls, world.AVpolls()) +GLOBAL_PROTECT(admin_verbs_polls) + /client/proc/add_admin_verbs() if(holder) var/rights = holder.rank.rights @@ -541,6 +547,8 @@ GLOBAL_PROTECT(admin_verbs_log) add_verb(src, GLOB.admin_verbs_spawn) if(rights & R_LOG) add_verb(src, GLOB.admin_verbs_log) + if(rights & R_POLLS) + add_verb(src, GLOB.admin_verbs_polls) /client/proc/remove_admin_verbs() diff --git a/code/modules/admin/panels/poll_panel.dm b/code/modules/admin/panels/poll_panel.dm index 065c72e2b6b0b..b6b8f104b895c 100644 --- a/code/modules/admin/panels/poll_panel.dm +++ b/code/modules/admin/panels/poll_panel.dm @@ -1,7 +1,7 @@ /client/proc/poll_panel() set name = "Server Poll Management" set category = "Admin" - if(!check_rights(R_DBRANKS)) + if(!check_rights(R_POLLS)) return holder.poll_list_panel() SSblackbox.record_feedback("tally", "admin_verb", 1, "Server Poll Management") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index fa1feb7a8c836..1be91de3c537a 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -2117,7 +2117,7 @@ Status: [status ? status : "Unknown"] | Damage: [health ? health : "None"] else if(href_list["clearpollvotes"]) var/datum/poll_question/poll = locate(href_list["clearpollvotes"]) in GLOB.polls - poll.cleaR_DBRANKS_votes() + poll.cleaR_POLLS_votes() poll_management_panel(poll) else if(href_list["addpolloption"]) diff --git a/code/modules/admin/verbs/poll_managment.dm b/code/modules/admin/verbs/poll_managment.dm index ceebb7f7e338c..9c930b2508e7c 100644 --- a/code/modules/admin/verbs/poll_managment.dm +++ b/code/modules/admin/verbs/poll_managment.dm @@ -242,7 +242,7 @@ * */ /datum/admins/proc/poll_parse_href(list/href_list, datum/poll_question/poll) - if(!check_rights(R_DBRANKS)) + if(!check_rights(R_POLLS)) return if(!SSdbcore.Connect()) to_chat(usr, span_danger("Failed to establish database connection.")) @@ -351,7 +351,7 @@ * */ /datum/poll_question/proc/delete_poll() - if(!check_rights(R_DBRANKS)) + if(!check_rights(R_POLLS)) return if(!SSdbcore.Connect()) to_chat(usr, span_danger("Failed to establish database connection.")) @@ -376,11 +376,11 @@ * Uses INSERT ON DUPLICATE KEY UPDATE to handle both inserting and updating at once. * The start and end datetimes and poll id for new polls is then retrieved for the poll datum. * Arguments: - * * clear_votes - When true will call cleaR_DBRANKS_votes() to delete all votes matching this poll id. + * * clear_votes - When true will call cleaR_POLLS_votes() to delete all votes matching this poll id. * */ /datum/poll_question/proc/save_poll_data(clear_votes) - if(!check_rights(R_DBRANKS)) + if(!check_rights(R_POLLS)) return if(!SSdbcore.Connect()) to_chat(usr, span_danger("Failed to establish database connection.")) @@ -427,7 +427,7 @@ future_poll = text2num(query_get_poll_id_start_endtime.item[3]) qdel(query_get_poll_id_start_endtime) if(clear_votes) - cleaR_DBRANKS_votes() + cleaR_POLLS_votes() edit_ready = TRUE var/msg = "has [new_poll ? "created a new" : "edited a"][admin_only ? " admin only" : ""] server poll. Question: [question]" if(admin_only) @@ -456,8 +456,8 @@ * Deletes all votes or text replies for this poll, depending on its type. * */ -/datum/poll_question/proc/cleaR_DBRANKS_votes() - if(!check_rights(R_DBRANKS)) +/datum/poll_question/proc/cleaR_POLLS_votes() + if(!check_rights(R_POLLS)) return if(!SSdbcore.Connect()) to_chat(usr, span_danger("Failed to establish database connection.")) @@ -465,14 +465,14 @@ var/table = "poll_vote" if(poll_type == POLLTYPE_TEXT) table = "poll_textreply" - var/datum/db_query/query_cleaR_DBRANKS_votes = SSdbcore.NewQuery( + var/datum/db_query/query_cleaR_POLLS_votes = SSdbcore.NewQuery( "UPDATE [format_table_name(table)] SET deleted = 1 WHERE pollid = :poll_id", list("poll_id" = poll_id) ) - if(!query_cleaR_DBRANKS_votes.warn_execute()) - qdel(query_cleaR_DBRANKS_votes) + if(!query_cleaR_POLLS_votes.warn_execute()) + qdel(query_cleaR_POLLS_votes) return - qdel(query_cleaR_DBRANKS_votes) + qdel(query_cleaR_POLLS_votes) poll_votes = 0 to_chat(usr, span_danger("Poll [poll_type == POLLTYPE_TEXT ? "responses" : "votes"] cleared.")) @@ -540,7 +540,7 @@ * */ /datum/admins/proc/poll_option_parse_href(list/href_list, datum/poll_question/poll, datum/poll_option/option) - if(!check_rights(R_DBRANKS)) + if(!check_rights(R_POLLS)) return if(!SSdbcore.Connect()) to_chat(usr, span_danger("Failed to establish database connection.")) @@ -638,7 +638,7 @@ * */ /datum/poll_option/proc/save_option() - if(!check_rights(R_DBRANKS)) + if(!check_rights(R_POLLS)) return if(!SSdbcore.Connect()) to_chat(usr, span_danger("Failed to establish database connection.")) @@ -672,7 +672,7 @@ * */ /datum/poll_option/proc/delete_option() - if(!check_rights(R_DBRANKS)) + if(!check_rights(R_POLLS)) return . = parent_poll if(option_id) diff --git a/code/modules/ai/ai_behaviors/ai_behavior.dm b/code/modules/ai/ai_behaviors/ai_behavior.dm index f348ba2985997..b69eea04b6127 100644 --- a/code/modules/ai/ai_behaviors/ai_behavior.dm +++ b/code/modules/ai/ai_behaviors/ai_behavior.dm @@ -35,13 +35,15 @@ Registers signals, handles the pathfinding element addition/removal alongside ma ///When this timer is up, we force a change of node to ensure that the ai will never stay stuck trying to go to a specific node var/anti_stuck_timer ///Minimum health percentage before the ai tries to run away - var/minimum_health = 0 + var/minimum_health = 0.4 ///If the mob attached to the ai is offered on xeno creation var/is_offered_on_creation = FALSE ///Are we waiting for advanced pathfinding var/registered_for_node_pathfinding = FALSE ///Are we already registered for normal pathfinding var/registered_for_move = FALSE + ///Should we lose the escorted atom if we change action + var/weak_escort = FALSE /datum/ai_behavior/New(loc, mob/parent_to_assign, atom/escorted_atom) ..() @@ -255,16 +257,18 @@ Registers signals, handles the pathfinding element addition/removal alongside ma goal_nodes = null RegisterSignal(goal_node, COMSIG_QDELETING, PROC_REF(clean_goal_node)) -///Set the escorted atom -/datum/ai_behavior/proc/set_escorted_atom(datum/source, atom/atom_to_escort) +///Set the escorted atom. +/datum/ai_behavior/proc/set_escorted_atom(datum/source, atom/atom_to_escort, new_escort_is_weak) SIGNAL_HANDLER clean_escorted_atom() escorted_atom = atom_to_escort - UnregisterSignal(SSdcs, COMSIG_GLOB_AI_MINION_RALLY) + weak_escort = new_escort_is_weak + if(!weak_escort) + UnregisterSignal(SSdcs, COMSIG_GLOB_AI_MINION_RALLY) + base_action = ESCORTING_ATOM RegisterSignal(escorted_atom, COMSIG_ESCORTED_ATOM_CHANGING, PROC_REF(set_escorted_atom)) RegisterSignal(escorted_atom, COMSIG_QDELETING, PROC_REF(clean_escorted_atom)) RegisterSignal(escorted_atom, COMSIG_ESCORTING_ATOM_BEHAVIOUR_CHANGED, PROC_REF(set_agressivity)) - base_action = ESCORTING_ATOM change_action(ESCORTING_ATOM, escorted_atom) ///Change atom to walk to if the order comes from a corresponding commander diff --git a/code/modules/ai/ai_behaviors/xeno/puppet.dm b/code/modules/ai/ai_behaviors/xeno/puppet.dm index e19db649e12b7..504988bd75042 100644 --- a/code/modules/ai/ai_behaviors/xeno/puppet.dm +++ b/code/modules/ai/ai_behaviors/xeno/puppet.dm @@ -24,6 +24,10 @@ RegisterSignal(master, COMSIG_PUPPET_CHANGE_ALL_ORDER, PROC_REF(change_order)) RegisterSignal(mob_parent, COMSIG_OBSTRUCTED_MOVE, PROC_REF(deal_with_obstacle)) RegisterSignal(mob_parent, COMSIG_PUPPET_CHANGE_ORDER, PROC_REF(change_order)) + RegisterSignal(escorted_atom, COMSIG_XENOMORPH_REST, PROC_REF(start_resting)) + RegisterSignal(escorted_atom, COMSIG_XENOMORPH_UNREST, PROC_REF(stop_resting)) + RegisterSignal(escorted_atom, COMSIG_ELEMENT_JUMP_STARTED, PROC_REF(do_jump)) + RegisterSignal(escorted_atom, COMSIG_LIVING_DO_RESIST, PROC_REF(parent_resist)) return ..() ///cleans up signals and unregisters obstructed move signal @@ -181,3 +185,27 @@ return if(feed.ai_should_use(target)) feed.use_ability(target) + +/// rest when puppeter does +/datum/ai_behavior/puppet/proc/start_resting(mob/source) + SIGNAL_HANDLER + var/mob/living/living = mob_parent + living?.set_resting(TRUE) + +/// stop resting when puppeter does +/datum/ai_behavior/puppet/proc/stop_resting(mob/source) + SIGNAL_HANDLER + var/mob/living/living = mob_parent + living?.set_resting(FALSE) + +/// resist when puppeter does +/datum/ai_behavior/puppet/proc/do_jump() + SIGNAL_HANDLER + var/datum/component/jump/puppet_jump = mob_parent.GetComponent(/datum/component/jump) + puppet_jump?.do_jump(mob_parent) + +/// resist when puppeter does +/datum/ai_behavior/puppet/proc/parent_resist() + SIGNAL_HANDLER + var/mob/living/carbon/xenomorph/puppet/puppet_parent = mob_parent + puppet_parent?.do_resist() diff --git a/code/modules/ai/ai_behaviors/xeno/xeno.dm b/code/modules/ai/ai_behaviors/xeno/xeno.dm index 7e67342c418b3..45cb2aa3ea1fa 100644 --- a/code/modules/ai/ai_behaviors/xeno/xeno.dm +++ b/code/modules/ai/ai_behaviors/xeno/xeno.dm @@ -44,31 +44,37 @@ action.action_activate() return ..() +#define ESCORTING_MAX_DISTANCE 10 + /datum/ai_behavior/xeno/look_for_new_state() var/mob/living/living_parent = mob_parent switch(current_action) if(ESCORTING_ATOM) - if(get_dist(escorted_atom, mob_parent) > 10) - cleanup_current_action() - base_action = MOVING_TO_NODE - late_initialize() + if(get_dist(escorted_atom, mob_parent) > ESCORTING_MAX_DISTANCE) + look_for_next_node() return - var/atom/next_target = get_nearest_target(escorted_atom, target_distance, ALL, mob_parent.faction, mob_parent.get_xeno_hivenumber()) + var/atom/next_target = get_nearest_target(escorted_atom, target_distance, TARGET_HOSTILE, mob_parent.faction, mob_parent.get_xeno_hivenumber()) if(!next_target) return change_action(MOVING_TO_ATOM, next_target) if(MOVING_TO_NODE, FOLLOWING_PATH) - var/atom/next_target = get_nearest_target(mob_parent, target_distance, ALL, mob_parent.faction, mob_parent.get_xeno_hivenumber()) + var/atom/next_target = get_nearest_target(mob_parent, target_distance, TARGET_HOSTILE, mob_parent.faction, mob_parent.get_xeno_hivenumber()) if(!next_target) if(can_heal && living_parent.health <= minimum_health * 2 * living_parent.maxHealth) try_to_heal() //If we have some damage, look for some healing + return + if(!goal_node) // We are randomly moving + var/atom/xeno_to_follow = get_nearest_target(mob_parent, ESCORTING_MAX_DISTANCE, TARGET_FRIENDLY_XENO, mob_parent.faction, mob_parent.get_xeno_hivenumber()) + if(xeno_to_follow) + set_escorted_atom(null, xeno_to_follow, TRUE) + return return change_action(MOVING_TO_ATOM, next_target) if(MOVING_TO_ATOM) - if(escorted_atom && get_dist(escorted_atom, mob_parent) > target_distance) + if(!weak_escort && escorted_atom && get_dist(escorted_atom, mob_parent) > target_distance) change_action(ESCORTING_ATOM, escorted_atom) return - var/atom/next_target = get_nearest_target(mob_parent, target_distance, ALL, mob_parent.faction, mob_parent.get_xeno_hivenumber()) + var/atom/next_target = get_nearest_target(mob_parent, target_distance, TARGET_HOSTILE, mob_parent.faction, mob_parent.get_xeno_hivenumber()) if(!next_target)//We didn't find a target cleanup_current_action() late_initialize() @@ -77,7 +83,7 @@ return change_action(null, next_target)//We found a better target, change course! if(MOVING_TO_SAFETY) - var/atom/next_target = get_nearest_target(escorted_atom, target_distance, ALL, mob_parent.faction, mob_parent.get_xeno_hivenumber()) + var/atom/next_target = get_nearest_target(escorted_atom, target_distance, TARGET_HOSTILE, mob_parent.faction, mob_parent.get_xeno_hivenumber()) if(!next_target)//We are safe, try to find some weeds target_distance = initial(target_distance) cleanup_current_action() @@ -88,7 +94,7 @@ return change_action(null, next_target, INFINITY) if(IDLE) - var/atom/next_target = get_nearest_target(escorted_atom, target_distance, ALL, mob_parent.faction, mob_parent.get_xeno_hivenumber()) + var/atom/next_target = get_nearest_target(escorted_atom, target_distance, TARGET_HOSTILE, mob_parent.faction, mob_parent.get_xeno_hivenumber()) if(!next_target) return change_action(MOVING_TO_ATOM, next_target) @@ -227,7 +233,7 @@ var/mob/living/living_mob = mob_parent if(!can_heal || living_mob.health - damage > minimum_health * living_mob.maxHealth) return - var/atom/next_target = get_nearest_target(mob_parent, target_distance, ALL, mob_parent.faction, mob_parent.get_xeno_hivenumber()) + var/atom/next_target = get_nearest_target(mob_parent, target_distance, TARGET_HOSTILE, mob_parent.faction, mob_parent.get_xeno_hivenumber()) if(!next_target) return target_distance = 15 @@ -243,3 +249,6 @@ /datum/ai_behavior/xeno/ranged distance_to_maintain = 5 minimum_health = 0.3 + +/datum/ai_behavior/xeno/suicidal + minimum_health = 0 diff --git a/code/modules/ai/ai_behaviors/xeno/xeno_illusion.dm b/code/modules/ai/ai_behaviors/xeno/xeno_illusion.dm index 535540062aa78..ed9f76377eff3 100644 --- a/code/modules/ai/ai_behaviors/xeno/xeno_illusion.dm +++ b/code/modules/ai/ai_behaviors/xeno/xeno_illusion.dm @@ -50,6 +50,7 @@ appearance = original_mob.appearance desc = original_mob.desc name = original_mob.name + render_target = null RegisterSignals(original_mob, list(COMSIG_QDELETING, COMSIG_MOB_DEATH), PROC_REF(destroy_illusion)) QDEL_IN(src, life_time) diff --git a/code/modules/ai/presets/xeno_presets.dm b/code/modules/ai/presets/xeno_presets.dm index 0659a731b2f6b..f251905f0fbac 100644 --- a/code/modules/ai/presets/xeno_presets.dm +++ b/code/modules/ai/presets/xeno_presets.dm @@ -2,7 +2,7 @@ /mob/living/carbon/xenomorph/beetle/ai/Initialize(mapload) . = ..() - AddComponent(/datum/component/ai_controller, /datum/ai_behavior/xeno) + AddComponent(/datum/component/ai_controller, /datum/ai_behavior/xeno/suicidal) /mob/living/carbon/xenomorph/crusher/ai @@ -50,7 +50,7 @@ /mob/living/carbon/xenomorph/mantis/ai/Initialize(mapload) . = ..() - AddComponent(/datum/component/ai_controller, /datum/ai_behavior/xeno) + AddComponent(/datum/component/ai_controller, /datum/ai_behavior/xeno/suicidal) /mob/living/carbon/xenomorph/ravager/ai diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 3fd0cd8f72e3c..27631ca64b2b9 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -74,7 +74,7 @@ item_state = "bulletproof" blood_overlay_type = "armor" armor_protection_flags = CHEST - soft_armor = list(MELEE = 30, BULLET = 55, LASER = 0, ENERGY = 0, BOMB = 30, BIO = 0, FIRE = 0, ACID = 15) + soft_armor = list(MELEE = 30, BULLET = 75, LASER = 15, ENERGY = 15, BOMB = 30, BIO = 0, FIRE = 0, ACID = 15) hard_armor = list(MELEE = 0, BULLET = 20, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, FIRE = 0, ACID = 5) siemens_coefficient = 0.7 permeability_coefficient = 0.9 diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm index 378c53e9ae7b0..4497024be51ed 100644 --- a/code/modules/clothing/suits/labcoat.dm +++ b/code/modules/clothing/suits/labcoat.dm @@ -63,33 +63,37 @@ name = "chief medical officer's labcoat" desc = "Bluer than the standard model." icon_state = "labcoat_cmo" - /obj/item/clothing/suit/storage/labcoat/mad name = "The Mad's labcoat" desc = "It makes you look capable of konking someone on the noggin and shooting them into space." icon_state = "labgreen" -/obj/item/clothing/suit/storage/labcoat/genetics - name = "Geneticist labcoat" - desc = "A suit that protects against minor chemical spills. Has a blue stripe on the shoulder." - icon_state = "labcoat_gen" +/obj/item/clothing/suit/storage/labcoat/paramedic + name = "paramedic's labcoat" + desc = "A suit that holds small medical items for responding and tending to emergencies." + icon_state = "labcoat_paramedic" /obj/item/clothing/suit/storage/labcoat/chemist - name = "Chemist labcoat" + name = "chemist labcoat" desc = "A suit that protects against minor chemical spills. Has an orange stripe on the shoulder." icon_state = "labcoat_chem" /obj/item/clothing/suit/storage/labcoat/virologist - name = "Virologist labcoat" + name = "virologist labcoat" desc = "A suit that protects against minor chemical spills. Offers slightly more protection against biohazards than the standard model. Has a green stripe on the shoulder." icon_state = "labcoat_viro" +/obj/item/clothing/suit/storage/labcoat/genetics + name = "geneticist labcoat" + desc = "A suit that protects against minor chemical spills. Has a blue stripe on the shoulder." + icon_state = "labcoat_gen" + /obj/item/clothing/suit/storage/labcoat/science - name = "Scientist labcoat" + name = "scientist labcoat" desc = "A suit that protects against minor chemical spills. Has a purple stripe on the shoulder." icon_state = "labcoat_sci" /obj/item/clothing/suit/storage/labcoat/researcher - name = "Researcher's labcoat" + name = "researcher's labcoat" desc = "A high quality labcoat, seemingly worn by scholars and researchers alike. It has a distinct rough feel to it, and goads you towards adventure." icon_state = "labcoat_researcher" diff --git a/code/modules/factory/parts.dm b/code/modules/factory/parts.dm index eb954cba76e7e..563204340230d 100644 --- a/code/modules/factory/parts.dm +++ b/code/modules/factory/parts.dm @@ -464,48 +464,6 @@ GLOBAL_LIST_INIT(minigun_powerpack, list( . = ..() recipe = GLOB.minigun_powerpack -GLOBAL_LIST_INIT(howitzer_shell, list( - list(STEP_NEXT_MACHINE = FACTORY_MACHINE_CUTTER, STEP_ICON_STATE = "uncutplate"), - list(STEP_NEXT_MACHINE = FACTORY_MACHINE_DRILLER, STEP_ICON_STATE = "cutplate"), - list(STEP_NEXT_MACHINE = FACTORY_MACHINE_COMPRESSOR, STEP_ICON_STATE = "barrelplate"), - list(STEP_NEXT_MACHINE = FACTORY_MACHINE_GALVANIZER, STEP_ICON_STATE = "rockettube"), - )) -/obj/item/factory_part/howitzer_shell_he - name = "howitzer shell" - desc = "An unfinished high explosive howitzer shell." - result = /obj/item/mortal_shell/howitzer/he - -/obj/item/factory_part/howitzer_shell_he/Initialize(mapload) - . = ..() - recipe = GLOB.howitzer_shell - -/obj/item/factory_part/howitzer_shell_incen - name = "howitzer shell" - desc = "An unfinished incendiary howitzer shell." - result = /obj/item/mortal_shell/howitzer/incendiary - -/obj/item/factory_part/howitzer_shell_incen/Initialize(mapload) - . = ..() - recipe = GLOB.howitzer_shell - -/obj/item/factory_part/howitzer_shell_wp - name = "howitzer shell" - desc = "An unfinished white phosphorus Howitzer shell." - result = /obj/item/mortal_shell/howitzer/white_phos - -/obj/item/factory_part/howitzer_shell_wp/Initialize(mapload) - . = ..() - recipe = GLOB.howitzer_shell - -/obj/item/factory_part/howitzer_shell_tfoot - name = "howitzer shell" - desc = "An unfinished high explosive howitzer shell." - result = /obj/item/mortal_shell/howitzer/plasmaloss - -/obj/item/factory_part/howitzer_shell_tfoot/Initialize(mapload) - . = ..() - recipe = GLOB.howitzer_shell - GLOBAL_LIST_INIT(swat_mask, list( list(STEP_NEXT_MACHINE = FACTORY_MACHINE_COMPRESSOR, STEP_ICON_STATE = "cutplate"), list(STEP_NEXT_MACHINE = FACTORY_MACHINE_GALVANIZER, STEP_ICON_STATE = "steelingot"), @@ -521,38 +479,6 @@ GLOBAL_LIST_INIT(swat_mask, list( . = ..() recipe = GLOB.swat_mask -GLOBAL_LIST_INIT(meds, list( - list(STEP_NEXT_MACHINE = FACTORY_MACHINE_FLATTER, STEP_ICON_STATE = "uncutplate"), - list(STEP_NEXT_MACHINE = FACTORY_MACHINE_COMPRESSOR, STEP_ICON_STATE = "req_bag3"), - list(STEP_NEXT_MACHINE = FACTORY_MACHINE_DRILLER, STEP_ICON_STATE = "req_bag1"), - list(STEP_NEXT_MACHINE = FACTORY_MACHINE_GALVANIZER, STEP_ICON_STATE = "req_bag2"), - )) - -/obj/item/factory_part/med_advpack - name = "advanced first-aid kit" - desc = "An unfinished advanced first-aid ." - result = list( - /obj/item/stack/medical/heal_pack/advanced/bruise_pack, - /obj/item/stack/medical/heal_pack/advanced/bruise_pack, - /obj/item/stack/medical/heal_pack/advanced/bruise_pack, - /obj/item/stack/medical/heal_pack/advanced/bruise_pack, - /obj/item/stack/medical/heal_pack/advanced/bruise_pack, - /obj/item/stack/medical/heal_pack/advanced/burn_pack, - /obj/item/stack/medical/heal_pack/advanced/burn_pack, - /obj/item/stack/medical/heal_pack/advanced/burn_pack, - /obj/item/stack/medical/heal_pack/advanced/burn_pack, - /obj/item/stack/medical/heal_pack/advanced/burn_pack, - /obj/item/stack/medical/splint, - /obj/item/stack/medical/splint, - /obj/item/stack/medical/splint, - /obj/item/stack/medical/splint, - /obj/item/stack/medical/splint, - ) - -/obj/item/factory_part/med_advpack/Initialize(mapload) - . = ..() - recipe = GLOB.meds - GLOBAL_LIST_INIT(module, list( list(STEP_NEXT_MACHINE = FACTORY_MACHINE_CUTTER, STEP_ICON_STATE = "cutplate"), list(STEP_NEXT_MACHINE = FACTORY_MACHINE_FLATTER, STEP_ICON_STATE = "roundplate"), @@ -613,6 +539,8 @@ GLOBAL_LIST_INIT(module, list( . = ..() recipe = GLOB.module +// Mortar + GLOBAL_LIST_INIT(mortar_shell, list( list(STEP_NEXT_MACHINE = FACTORY_MACHINE_CUTTER, STEP_ICON_STATE = "uncutplate"), list(STEP_NEXT_MACHINE = FACTORY_MACHINE_HEATER, STEP_ICON_STATE = "cutplate"), @@ -666,7 +594,55 @@ GLOBAL_LIST_INIT(mortar_shell, list( . = ..() recipe = GLOB.mortar_shell +// +// Howitzer +// + +GLOBAL_LIST_INIT(howitzer_shell, list( + list(STEP_NEXT_MACHINE = FACTORY_MACHINE_CUTTER, STEP_ICON_STATE = "uncutplate"), + list(STEP_NEXT_MACHINE = FACTORY_MACHINE_DRILLER, STEP_ICON_STATE = "cutplate"), + list(STEP_NEXT_MACHINE = FACTORY_MACHINE_COMPRESSOR, STEP_ICON_STATE = "barrelplate"), + list(STEP_NEXT_MACHINE = FACTORY_MACHINE_GALVANIZER, STEP_ICON_STATE = "rockettube"), + )) +/obj/item/factory_part/howitzer_shell_he + name = "howitzer shell" + desc = "An unfinished high explosive howitzer shell." + result = /obj/item/mortal_shell/howitzer/he + +/obj/item/factory_part/howitzer_shell_he/Initialize(mapload) + . = ..() + recipe = GLOB.howitzer_shell + +/obj/item/factory_part/howitzer_shell_incen + name = "howitzer shell" + desc = "An unfinished incendiary howitzer shell." + result = /obj/item/mortal_shell/howitzer/incendiary + +/obj/item/factory_part/howitzer_shell_incen/Initialize(mapload) + . = ..() + recipe = GLOB.howitzer_shell + +/obj/item/factory_part/howitzer_shell_wp + name = "howitzer shell" + desc = "An unfinished white phosphorus Howitzer shell." + result = /obj/item/mortal_shell/howitzer/white_phos + +/obj/item/factory_part/howitzer_shell_wp/Initialize(mapload) + . = ..() + recipe = GLOB.howitzer_shell + +/obj/item/factory_part/howitzer_shell_tfoot + name = "howitzer shell" + desc = "An unfinished high explosive howitzer shell." + result = /obj/item/mortal_shell/howitzer/plasmaloss + +/obj/item/factory_part/howitzer_shell_tfoot/Initialize(mapload) + . = ..() + recipe = GLOB.howitzer_shell +// +// MLRS +// GLOBAL_LIST_INIT(mlrs_rocket, list( list(STEP_NEXT_MACHINE = FACTORY_MACHINE_CUTTER, STEP_ICON_STATE = "uncutplate"), @@ -685,6 +661,23 @@ GLOBAL_LIST_INIT(mlrs_rocket, list( . = ..() recipe = GLOB.mlrs_rocket +/obj/item/factory_part/mlrs_rocket/gas + name = "\improper MLRS mustard gas rocket" + desc = "An unfinished mustard gas rocket." + result = /obj/item/storage/box/mlrs_rockets/gas + +/obj/item/factory_part/mlrs_rocket/cloak + name = "\improper MLRS cloak rocket" + desc = "An unfinished cloak gas rocket." + result = /obj/item/storage/box/mlrs_rockets/cloak + +/obj/item/factory_part/mlrs_rocket/incendiary + name = "\improper MLRS Incendiary rocket" + desc = "An unfinished incendiary rocket." + result = /obj/item/storage/box/mlrs_rockets/incendiary + +// Thermobaric + GLOBAL_LIST_INIT(thermobaric_wp_recipe, list( list(STEP_NEXT_MACHINE = FACTORY_MACHINE_CUTTER, STEP_ICON_STATE = "uncutplate"), list(STEP_NEXT_MACHINE = FACTORY_MACHINE_HEATER, STEP_ICON_STATE = "cutplate"), diff --git a/code/modules/factory/unboxer.dm b/code/modules/factory/unboxer.dm index 03940fa631686..1228d6e986c43 100644 --- a/code/modules/factory/unboxer.dm +++ b/code/modules/factory/unboxer.dm @@ -110,67 +110,67 @@ name = "box of rounded metal plates" desc = "A box with round metal plates inside. Used to refill Unboxers." refill_type = /obj/item/factory_part/bignade - refill_amount = 40 + refill_amount = 50 /obj/item/factory_refill/incennade_refill name = "box of incendiary grenade plates" desc = "A box with round metal plates inside that could be used to construct Incendiary genades. Used to refill Unboxers." refill_type = /obj/item/factory_part/incennade - refill_amount = 40 + refill_amount = 50 /obj/item/factory_refill/stickynade_refill name = "box of adhesive genade plates" desc = "A box with round metal plates inside that could be used to construct Adhesive grenades. Used to refill Unboxers." refill_type = /obj/item/factory_part/stickynade - refill_amount = 40 + refill_amount = 50 /obj/item/factory_refill/phosnade_refill name = "box of rounded metal plates" desc = "A box with round metal plates inside. Used to refill Unboxers." refill_type = /obj/item/factory_part/phosnade - refill_amount = 40 + refill_amount = 50 /obj/item/factory_refill/cloaknade_refill name = "box of cloaking grenade plates" desc = "A box with round metal plates inside that could be used to construct Cloaking grenades. Used to refill Unboxers." refill_type = /obj/item/factory_part/cloaknade - refill_amount = 40 + refill_amount = 50 /obj/item/factory_refill/tfootnade_refill name = "box of tangle grenade plates" desc = "A box with round metal plates inside that could be used to construct Tanglefoot grenades. Used to refill Unboxers." refill_type = /obj/item/factory_part/tfootnade - refill_amount = 40 + refill_amount = 50 /obj/item/factory_refill/trailblazer_refill name = "box of trailblazer grenade plates" desc = "A box with round metal plates inside that could be used to construct Trailblazer genades. Used to refill Unboxers." refill_type = /obj/item/factory_part/trailblazer - refill_amount = 40 + refill_amount = 50 /obj/item/factory_refill/lasenade_refill name = "box of laser grenade plates and cells." desc = "A box with plates and cells inside that could be used to construct Laser grenades. Used to refill Unboxers." refill_type = /obj/item/factory_part/lasenade - refill_amount = 40 + refill_amount = 50 /obj/item/factory_refill/hefanade_refill name = "box of hefa nade plates and shells." desc = "A box with plates and shells inside that could be used to construct HEFA grenades. Used to refill Unboxers." refill_type = /obj/item/factory_part/hefanade - refill_amount = 40 + refill_amount = 50 /obj/item/factory_refill/antigas_refill name = "box of Anti-Gas plates." desc = "A box with plates inside that could be used to construct M40-AG grenades. Used to refill Unboxers." refill_type = /obj/item/factory_part/antigas - refill_amount = 40 + refill_amount = 50 /obj/item/factory_refill/razornade_refill name = "box of rounded metal plates" desc = "A box with round metal plates inside. Used to refill Unboxers." refill_type = /obj/item/factory_part/razornade - refill_amount = 40 + refill_amount = 50 /obj/item/factory_refill/pizza_refill name = "box of rounded metal plates" @@ -372,12 +372,6 @@ refill_type = /obj/item/factory_part/swat_mask refill_amount = 20 -/obj/item/factory_refill/med_advpack_refill - name = "box of rounded metal plates" - desc = "A box of round metal plates inside. Used to refill Unboxers." - refill_type = /obj/item/factory_part/med_advpack - refill_amount = 10 - /obj/item/factory_refill/module_valk_refill name = "box of rounded metal plates" desc = "A box of round metal plates inside. Used to refill Unboxers." @@ -440,9 +434,27 @@ /obj/item/factory_refill/mlrs_rocket_refill name = "box of rounded metal plates" - desc = "A box with round metal plates inside. Used to refill Unboxers." + desc = "A box with round metal plates inside. Used to refill Unboxers. These will become High Explosive rockets for an MLRS, once finished." refill_type = /obj/item/factory_part/mlrs_rocket refill_amount = 6 + +/obj/item/factory_refill/mlrs_rocket_refill_gas + name = "box of rounded metal plates" + desc = "A box with round metal plates inside. Used to refill Unboxers. These will become deadly Gas rockets for an MLRS, once finished." + refill_type = /obj/item/factory_part/mlrs_rocket/gas + refill_amount = 6 + +/obj/item/factory_refill/mlrs_rocket_refill_cloak + name = "box of rounded metal plates" + desc = "A box with round metal plates inside. Used to refill Unboxers. These will become Cloaking Smoke rockets for an MLRS, once finished." + refill_type = /obj/item/factory_part/mlrs_rocket/cloak + refill_amount = 6 + +/obj/item/factory_refill/mlrs_rocket_refill_incendiary + name = "box of rounded metal plates" + desc = "A box with round metal plates inside. Used to refill Unboxers. These will become Incendiary rockets for an MLRS, once finished." + refill_type = /obj/item/factory_part/mlrs_rocket/incendiary + refill_amount = 6 /obj/item/factory_refill/agls_he_refill name = "box of rounded metal plates" diff --git a/code/modules/mob/living/carbon/xenomorph/castes/boiler/castedatum_boiler.dm b/code/modules/mob/living/carbon/xenomorph/castes/boiler/castedatum_boiler.dm index 524391a84d371..01a912d91d50b 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/boiler/castedatum_boiler.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/boiler/castedatum_boiler.dm @@ -51,7 +51,7 @@ // *** Boiler Abilities *** // max_ammo = 7 bomb_strength = 1.3 //Multiplier to the effectiveness of the boiler glob. - bomb_delay = 27 SECONDS + bomb_delay = 32 SECONDS acid_spray_duration = 10 SECONDS acid_spray_damage = 16 diff --git a/code/modules/mob/living/carbon/xenomorph/castes/bull/bull.dm b/code/modules/mob/living/carbon/xenomorph/castes/bull/bull.dm index 5c10abb4df92b..145d6b4698e7b 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/bull/bull.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/bull/bull.dm @@ -10,6 +10,7 @@ plasma_stored = 200 tier = XENO_TIER_TWO upgrade = XENO_UPGRADE_NORMAL + mob_size = MOB_SIZE_BIG pixel_x = -16 pixel_y = -3 diff --git a/code/modules/mob/living/carbon/xenomorph/castes/bull/castedatum_bull.dm b/code/modules/mob/living/carbon/xenomorph/castes/bull/castedatum_bull.dm index 9029ce6603bde..e1e8d8d8b4c49 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/bull/castedatum_bull.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/bull/castedatum_bull.dm @@ -48,6 +48,7 @@ /datum/action/ability/activable/xeno/bull_charge, /datum/action/ability/activable/xeno/bull_charge/headbutt, /datum/action/ability/activable/xeno/bull_charge/gore, + /datum/action/ability/xeno_action/toggle_long_range, ) /datum/xeno_caste/bull/normal diff --git a/code/modules/mob/living/carbon/xenomorph/castes/hunter/abilities_hunter.dm b/code/modules/mob/living/carbon/xenomorph/castes/hunter/abilities_hunter.dm index d4fba00505dc3..e0893aba38dc4 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/hunter/abilities_hunter.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/hunter/abilities_hunter.dm @@ -211,8 +211,6 @@ keybinding_signals = list( KEYBINDING_NORMAL = COMSIG_XENOABILITY_TOGGLE_DISGUISE, ) - ///the regular appearance of the hunter - var/old_appearance /datum/action/ability/xeno_action/stealth/disguise/action_activate() if(stealth) @@ -229,26 +227,22 @@ if(ishuman(mark.marked_target)) to_chat(owner, "You cannot turn into a human!") return - old_appearance = xenoowner.appearance - ADD_TRAIT(xenoowner, TRAIT_MOB_ICON_UPDATE_BLOCKED, STEALTH_TRAIT) + var/image/disguised_icon = image(icon = mark.marked_target.icon, icon_state = mark.marked_target.icon_state, loc = owner) + disguised_icon.override = TRUE + xenoowner.add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/everyone, "hunter_disguise", disguised_icon) + ADD_TRAIT(xenoowner, TRAIT_XENOMORPH_INVISIBLE_BLOOD, STEALTH_TRAIT) xenoowner.update_wounds() return ..() /datum/action/ability/xeno_action/stealth/disguise/cancel_stealth() . = ..() - owner.appearance = old_appearance - REMOVE_TRAIT(owner, TRAIT_MOB_ICON_UPDATE_BLOCKED, STEALTH_TRAIT) var/mob/living/carbon/xenomorph/xenoowner = owner + REMOVE_TRAIT(xenoowner, TRAIT_XENOMORPH_INVISIBLE_BLOOD, STEALTH_TRAIT) + xenoowner.remove_alt_appearance("hunter_disguise") xenoowner.update_wounds() /datum/action/ability/xeno_action/stealth/disguise/handle_stealth() var/mob/living/carbon/xenomorph/xenoowner = owner - var/datum/action/ability/activable/xeno/hunter_mark/mark = xenoowner.actions_by_path[/datum/action/ability/activable/xeno/hunter_mark] - var/old_layer = xenoowner.layer - xenoowner.appearance = mark.marked_target.appearance - //Retaining old rendering layer to prevent rendering under objects. - xenoowner.layer = old_layer - xenoowner.underlays.Cut() if(owner.last_move_intent >= world.time - HUNTER_STEALTH_STEALTH_DELAY) xenoowner.use_plasma(owner.m_intent == MOVE_INTENT_WALK ? HUNTER_STEALTH_WALK_PLASMADRAIN : HUNTER_STEALTH_RUN_PLASMADRAIN) //If we have 0 plasma after expending stealth's upkeep plasma, end stealth. @@ -256,7 +250,6 @@ to_chat(xenoowner, span_xenodanger("We lack sufficient plasma to remain disguised.")) cancel_stealth() - // *************************************** // *********** Hunter's Pounce // *************************************** diff --git a/code/modules/mob/living/carbon/xenomorph/castes/runner/abilities_runner.dm b/code/modules/mob/living/carbon/xenomorph/castes/runner/abilities_runner.dm index 36ce572b163e3..0885e4a8dfdbb 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/runner/abilities_runner.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/runner/abilities_runner.dm @@ -149,6 +149,16 @@ SSblackbox.record_feedback("tally", "round_statistics", 1, "runner_evasions") TIMER_COOLDOWN_START(src, COOLDOWN_EVASION_ACTIVATION, 1 SECONDS) +/datum/action/ability/xeno_action/evasion/ai_should_start_consider() + return TRUE + +/datum/action/ability/xeno_action/evasion/ai_should_use(atom/target) + if(iscarbon(target)) + return FALSE + var/mob/living/carbon/xenomorph/xeno_owner = owner + var/hp_left_percent = xeno_owner.health / xeno_owner.maxHealth // minimum_health or retreating ai datum instead maybe? + return (hp_left_percent < 0.5) + /datum/action/ability/xeno_action/evasion/process() var/mob/living/carbon/xenomorph/runner/runner_owner = owner runner_owner.hud_set_evasion(evasion_duration) diff --git a/code/modules/mob/living/carbon/xenomorph/update_icons.dm b/code/modules/mob/living/carbon/xenomorph/update_icons.dm index a201d98e41a11..dd0bfa7284916 100644 --- a/code/modules/mob/living/carbon/xenomorph/update_icons.dm +++ b/code/modules/mob/living/carbon/xenomorph/update_icons.dm @@ -20,8 +20,7 @@ update_icons() /mob/living/carbon/xenomorph/update_icons(state_change = TRUE) - if(HAS_TRAIT(src, TRAIT_MOB_ICON_UPDATE_BLOCKED)) - return + SEND_SIGNAL(src, COMSIG_XENOMORPH_UPDATE_ICONS, state_change) if(state_change) if(stat == DEAD) icon_state = "[xeno_caste.caste_name][(xeno_flags & XENO_ROUNY) ? " rouny" : ""] Dead" @@ -99,7 +98,7 @@ wound_overlay.layer = layer + 0.3 wound_overlay.icon = src.icon wound_overlay.vis_flags |= VIS_HIDE - if(HAS_TRAIT(src, TRAIT_MOB_ICON_UPDATE_BLOCKED)) + if(HAS_TRAIT(src, TRAIT_XENOMORPH_INVISIBLE_BLOOD)) wound_overlay.icon_state = "none" return if(health > health_threshold_crit) diff --git a/code/modules/mob/living/carbon/xenomorph/xenomorph.dm b/code/modules/mob/living/carbon/xenomorph/xenomorph.dm index ebd32ab44df4b..aefd0cd5644f3 100644 --- a/code/modules/mob/living/carbon/xenomorph/xenomorph.dm +++ b/code/modules/mob/living/carbon/xenomorph/xenomorph.dm @@ -76,6 +76,7 @@ AddElement(/datum/element/footstep, footstep_type, mob_size >= MOB_SIZE_BIG ? 0.8 : 0.5) set_jump_component() + AddComponent(/datum/component/seethrough_mob) /mob/living/carbon/xenomorph/register_init_signals() . = ..() diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index b1426dc8495fd..b163c7357e345 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -138,19 +138,6 @@ GLOB.ai_list -= src QDEL_NULL(builtInCamera) QDEL_NULL(track) - UnregisterSignal(src, COMSIG_ORDER_SELECTED) - UnregisterSignal(src, COMSIG_MOB_CLICK_ALT) - - UnregisterSignal(SSdcs, COMSIG_GLOB_OB_LASER_CREATED) - UnregisterSignal(SSdcs, COMSIG_GLOB_CAS_LASER_CREATED) - UnregisterSignal(SSdcs, COMSIG_GLOB_RAILGUN_LASER_CREATED) - UnregisterSignal(SSdcs, COMSIG_GLOB_SHUTTLE_TAKEOFF) - UnregisterSignal(SSdcs, COMSIG_GLOB_DROPSHIP_CONTROLS_CORRUPTED) - UnregisterSignal(SSdcs, COMSIG_GLOB_MINI_DROPSHIP_DESTROYED) - UnregisterSignal(SSdcs, COMSIG_GLOB_DISK_GENERATED) - UnregisterSignal(SSdcs, COMSIG_GLOB_NUKE_START) - UnregisterSignal(SSdcs, COMSIG_GLOB_CLONE_PRODUCED) - UnregisterSignal(SSdcs, COMSIG_GLOB_HOLOPAD_AI_CALLED) QDEL_NULL(mini) return ..() diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 7d83f73c3c745..81a46aac522bd 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -11,7 +11,6 @@ ghostize() clear_fullscreens() if(mind) - stack_trace("Found a reference to an undeleted mind in mob/Destroy(). Mind name: [mind.name]. Mind mob: [mind.current]") mind = null if(hud_used) QDEL_NULL(hud_used) diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index f99ff3d2e4e45..9d779a51483b8 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -167,7 +167,7 @@ DIRECT_OUTPUT(usr, browse(null, "window=xenosunbalanced")) if(href_list["showpoll"]) - handle_playeR_DBRANKSing() + handle_playeR_POLLSing() return if(href_list["viewpoll"]) diff --git a/code/modules/mob/new_player/poll.dm b/code/modules/mob/new_player/poll.dm index 393fc60caca73..8e8ef5464f8b0 100644 --- a/code/modules/mob/new_player/poll.dm +++ b/code/modules/mob/new_player/poll.dm @@ -2,7 +2,7 @@ * Shows a list of currently running polls a player can vote/has voted on * */ -/mob/new_player/proc/handle_playeR_DBRANKSing() +/mob/new_player/proc/handle_playeR_POLLSing() var/list/output = list("
Player polls
") var/rs = REF(src) for(var/p in GLOB.polls) diff --git a/code/modules/power/fusion_engine.dm b/code/modules/power/fusion_engine.dm index e2d08e23c42a6..4c5b38ec7d97f 100644 --- a/code/modules/power/fusion_engine.dm +++ b/code/modules/power/fusion_engine.dm @@ -301,7 +301,7 @@ . += span_info("The power gauge reads: [power_gen_percent]%") if(fusion_cell) . += span_info("You can see a fuel cell in the receptacle.") - if(user.skills.getRating(SKILL_ENGINEER) >= SKILL_ENGINEER_MASTER) + if(user.skills.getRating(SKILL_ENGINEER) >= SKILL_ENGINEER_EXPERT) switch(fusion_cell.fuel_amount) if(0 to 10) . += span_danger("The fuel cell is critically low.") diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index 0011fcbd390a9..877888749786e 100755 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -128,7 +128,7 @@ icon = 'icons/obj/lighting.dmi' var/base_state = "tube" // base description and icon_state base_icon_state = "tube" - icon_state = "tube1" + icon_state = "tube_1" desc = "A lighting fixture." anchored = TRUE layer = FLY_LAYER @@ -176,7 +176,7 @@ GLOB.mainship_lights -= src /obj/machinery/light/mainship/small - icon_state = "bulb1" + icon_state = "bulb_1" base_state = "bulb" fitting = "bulb" brightness = 4 @@ -185,8 +185,8 @@ base_icon_state = "bulb" /obj/machinery/light/red - base_state = "tubered" - icon_state = "tubered1" + base_state = "tube_red" + icon_state = "tube_red" light_color = LIGHT_COLOR_FLARE brightness = 3 bulb_power = 0.5 @@ -195,7 +195,7 @@ // the smaller bulb light fixture /obj/machinery/light/small - icon_state = "bulb1" + icon_state = "bulb_1" base_state = "bulb" fitting = "bulb" brightness = 4 @@ -274,7 +274,7 @@ . = ..() switch(status) // set icon_states if(LIGHT_OK) - icon_state = "[base_state][light_on]" + icon_state = "[base_state]_[light_on]" if(LIGHT_EMPTY) icon_state = "[base_state]-empty" if(LIGHT_BURNED) @@ -670,13 +670,6 @@ light_tile.update_icon() to_chat(user, span_notice("You replace the light bulb.")) -/obj/item/light_bulb/bulb/fire - name = "fire bulb" - desc = "A replacement fire bulb." - icon_state = "fbulb" - base_state = "fbulb" - item_state = "egg4" - brightness = 5 // update the icon state and description of the light diff --git a/code/modules/projectiles/ammo_datums.dm b/code/modules/projectiles/ammo_datums.dm index 64ae975305693..fe3d4b5305bec 100644 --- a/code/modules/projectiles/ammo_datums.dm +++ b/code/modules/projectiles/ammo_datums.dm @@ -303,6 +303,8 @@ GLOBAL_LIST_INIT(no_sticky_resin, typecacheof(list(/obj/item/clothing/mask/faceh ///bounces the projectile by creating a new projectile and calculating an angle of reflection /datum/ammo/proc/reflect(turf/T, obj/projectile/proj, scatter_variance) + if(!bonus_projectiles_type) //while fire_bonus_projectiles does not require this var, it can cause infinite recursion in some cases, leading to death tiles + return var/new_range = proj.proj_max_range - proj.distance_travelled if(new_range <= 0) return @@ -1446,6 +1448,65 @@ GLOBAL_LIST_INIT(no_sticky_resin, typecacheof(list(/obj/item/clothing/mask/faceh ammo_behavior_flags = AMMO_BALLISTIC +/datum/ammo/bullet/turret/sniper + name = "antimaterial bullet" + bullet_color = COLOR_SOFT_RED + accurate_range = 21 + damage = 80 + penetration = 50 + sundering = 5 + +/datum/ammo/bullet/turret/buckshot + name = "turret buckshot shell" + icon_state = "buckshot" + hud_state = "shotgun_buckshot" + bonus_projectiles_type = /datum/ammo/bullet/turret/spread + bonus_projectiles_amount = 6 + bonus_projectiles_scatter = 5 + max_range = 10 + damage = 20 + penetration = 40 + damage_falloff = 1 + +/datum/ammo/bullet/turret/buckshot/on_hit_mob(mob/M,obj/projectile/P) + staggerstun(M, P, knockback = 1, max_range = 4) + +/datum/ammo/bullet/turret/spread + name = "additional buckshot" + max_range = 10 + damage = 20 + penetration = 40 + damage_falloff = 1 + +/datum/ammo/flamer + name = "flame turret glob" + icon_state = "pulse0" + hud_state = "flame" + hud_state_empty = "flame_empty" + damage_type = BURN + ammo_behavior_flags = AMMO_INCENDIARY|AMMO_FLAME + armor_type = FIRE + damage = 30 + max_range = 7 + bullet_color = LIGHT_COLOR_FIRE + +/datum/ammo/flamer/drop_nade(turf/T) + flame_radius(2, T) + playsound(T, 'sound/weapons/guns/fire/flamethrower2.ogg', 50, 1, 4) + + +/datum/ammo/flamer/on_hit_mob(mob/M, obj/projectile/P) + drop_nade(get_turf(M)) + +/datum/ammo/flamer/on_hit_obj(obj/O, obj/projectile/P) + drop_nade(O.density ? P.loc : O.loc) + +/datum/ammo/flamer/on_hit_turf(turf/T, obj/projectile/P) + drop_nade(T.density ? P.loc : T) + +/datum/ammo/flamer/do_at_max_range(turf/T, obj/projectile/P) + drop_nade(T.density ? P.loc : T) + /datum/ammo/bullet/machinegun //Adding this for the MG Nests (~Art) name = "machinegun bullet" icon_state = "bullet" // Keeping it bog standard with the turret but allows it to be changed. @@ -2767,7 +2828,7 @@ GLOBAL_LIST_INIT(no_sticky_resin, typecacheof(list(/obj/item/clothing/mask/faceh smoke.set_up(5, T, 6) smoke.start() -/datum/ammo/mortar/rocket/smoke/mlrs +/datum/ammo/mortar/rocket/smoke/mlrs/cloak smoketype = /datum/effect_system/smoke_spread/tactical /* @@ -3384,12 +3445,6 @@ GLOBAL_LIST_INIT(no_sticky_resin, typecacheof(list(/obj/item/clothing/mask/faceh flame_radius(2, T, burn_duration = 9, colour = "blue") playsound(T, 'sound/weapons/guns/fire/flamethrower2.ogg', 35, 1, 4) -/datum/ammo/energy/plasma/cannon_standard - damage = 20 - penetration = 15 - sundering = 0.75 - damage_falloff = 0.75 - #define PLASMA_CANNON_INNER_STAGGERSTUN_RANGE 3 #define PLASMA_CANNON_STAGGERSTUN_RANGE 9 #define PLASMA_CANNON_STAGGER_DURATION 3 SECONDS @@ -3470,7 +3525,7 @@ GLOBAL_LIST_INIT(no_sticky_resin, typecacheof(list(/obj/item/clothing/mask/faceh /datum/ammo/energy/xeno/psy_blast name = "psychic blast" - ammo_behavior_flags = AMMO_XENO|AMMO_TARGET_TURF|AMMO_SNIPER|AMMO_ENERGY|AMMO_HITSCAN + ammo_behavior_flags = AMMO_XENO|AMMO_TARGET_TURF|AMMO_SNIPER|AMMO_ENERGY|AMMO_HITSCAN|AMMO_SKIPS_ALIENS damage = 35 penetration = 10 sundering = 1 @@ -3493,7 +3548,6 @@ GLOBAL_LIST_INIT(no_sticky_resin, typecacheof(list(/obj/item/clothing/mask/faceh var/mob/living/carbon/xenomorph/xeno_firer = P.firer aoe_damage = xeno_firer.xeno_caste.blast_strength - var/list/throw_atoms = list() var/list/turf/target_turfs = generate_true_cone(T, aoe_range, -1, 359, 0, air_pass = TRUE) for(var/turf/target_turf AS in target_turfs) for(var/atom/movable/target AS in target_turf) @@ -3508,16 +3562,11 @@ GLOBAL_LIST_INIT(no_sticky_resin, typecacheof(list(/obj/item/clothing/mask/faceh var/obj/obj_victim = target if(!(obj_victim.resistance_flags & XENO_DAMAGEABLE)) continue + if(isbarricade(target)) + continue obj_victim.take_damage(aoe_damage, BURN, ENERGY, TRUE, armour_penetration = penetration) if(target.anchored) continue - throw_atoms += target - - for(var/atom/movable/target AS in throw_atoms) - var/throw_dir = get_dir(T, target) - if(T == get_turf(target)) - throw_dir = get_dir(P.starting_turf, T) - target.safe_throw_at(get_ranged_target_turf(T, throw_dir, 5), 3, 1, spin = TRUE) new /obj/effect/temp_visual/shockwave(T, aoe_range + 2) @@ -4176,7 +4225,7 @@ GLOBAL_LIST_INIT(no_sticky_resin, typecacheof(list(/obj/item/clothing/mask/faceh ///As opposed to normal globs, this will pass by the target tile if they hit nothing. ammo_behavior_flags = AMMO_XENO|AMMO_SKIPS_ALIENS|AMMO_LEAVE_TURF danger_message = span_danger("A pressurized glob of acid lands with a nasty splat and explodes into noxious fumes!") - max_range = 40 + max_range = 25 damage = 75 penetration = 70 reagent_transfer_amount = 55 @@ -4196,7 +4245,7 @@ GLOBAL_LIST_INIT(no_sticky_resin, typecacheof(list(/obj/item/clothing/mask/faceh ///As opposed to normal globs, this will pass by the target tile if they hit nothing. ammo_behavior_flags = AMMO_XENO|AMMO_SKIPS_ALIENS|AMMO_LEAVE_TURF danger_message = span_danger("A pressurized glob of acid lands with a concerning hissing sound and explodes into corrosive bile!") - max_range = 40 + max_range = 25 damage = 75 penetration = 70 passed_turf_smoke_type = /datum/effect_system/smoke_spread/xeno/acid/light @@ -4205,7 +4254,6 @@ GLOBAL_LIST_INIT(no_sticky_resin, typecacheof(list(/obj/item/clothing/mask/faceh hit_drowsyness = 2 fixed_spread_range = 2 accuracy = 100 - accurate_range = 30 shell_speed = 1.5 /datum/ammo/xeno/hugger diff --git a/code/modules/projectiles/guns/flamer.dm b/code/modules/projectiles/guns/flamer.dm index 0a8ea8491cf1d..78dbe81dc5317 100644 --- a/code/modules/projectiles/guns/flamer.dm +++ b/code/modules/projectiles/guns/flamer.dm @@ -315,6 +315,7 @@ default_ammo_type = /obj/item/ammo_magazine/flamer_tank/large/som allowed_ammo_types = list( /obj/item/ammo_magazine/flamer_tank/large/som, + /obj/item/ammo_magazine/flamer_tank/large/X/som, /obj/item/ammo_magazine/flamer_tank/backtank, /obj/item/ammo_magazine/flamer_tank/backtank/X, ) diff --git a/code/modules/projectiles/guns/mounted.dm b/code/modules/projectiles/guns/mounted.dm index 029e30178ad1e..9b04d79484b7c 100644 --- a/code/modules/projectiles/guns/mounted.dm +++ b/code/modules/projectiles/guns/mounted.dm @@ -212,7 +212,7 @@ w_class = WEIGHT_CLASS_HUGE equip_slot_flags = ITEM_SLOT_BACK icon = 'icons/Marine/marine-hmg.dmi' - icon_state = "heavylaser" + icon_state = "heavylaser_deployed" fire_sound = 'sound/weapons/guns/fire/tank_flamethrower.ogg' reload_sound = 'sound/weapons/guns/interact/minigun_cocked.ogg' diff --git a/code/modules/projectiles/guns/plasma.dm b/code/modules/projectiles/guns/plasma.dm index d28ae8ef2b108..6bbbfe5b43656 100644 --- a/code/modules/projectiles/guns/plasma.dm +++ b/code/modules/projectiles/guns/plasma.dm @@ -135,11 +135,12 @@ unload_sound = 'sound/weapons/guns/interact/plasma_unload_2.ogg' reload_sound = 'sound/weapons/guns/interact/plasma_reload_1.ogg' force = 35 - ammo_datum_type = /datum/ammo/energy/plasma/cannon_standard + ammo_datum_type = /datum/ammo/energy/plasma/cannon_heavy gun_firemode = GUN_FIREMODE_AUTOMATIC - fire_delay = 2.5 SECONDS + fire_delay = 2 SECONDS heat_per_fire = 50 rounds_per_shot = 180 + windup_delay = 0.5 SECONDS mode_list = list( "Standard" = /datum/lasrifle/base/plasma_cannon/cannon_standard, "Shatter" = /datum/lasrifle/base/plasma_cannon/shatter_blast, diff --git a/code/modules/projectiles/guns/rifles.dm b/code/modules/projectiles/guns/rifles.dm index cfd6156418c94..e3728502e2c65 100644 --- a/code/modules/projectiles/guns/rifles.dm +++ b/code/modules/projectiles/guns/rifles.dm @@ -2128,6 +2128,14 @@ /obj/item/attachable/reddot, ) +/obj/item/weapon/gun/rifle/som/suppressed + starting_attachment_types = list( + /obj/item/weapon/gun/shotgun/micro_grenade, + /obj/item/attachable/verticalgrip, + /obj/item/attachable/suppressor, + /obj/item/attachable/magnetic_harness, + ) + /obj/item/weapon/gun/rifle/som/veteran default_ammo_type = /obj/item/ammo_magazine/rifle/som/ap starting_attachment_types = list( diff --git a/code/modules/projectiles/guns/sentries.dm b/code/modules/projectiles/guns/sentries.dm index 21416188479a4..e98da3b19c802 100644 --- a/code/modules/projectiles/guns/sentries.dm +++ b/code/modules/projectiles/guns/sentries.dm @@ -299,4 +299,147 @@ ammo_datum_type = /datum/ammo/bullet/turret sentry_iff_signal = TGMC_LOYALIST_IFF +// Sniper Sentry + +/obj/item/weapon/gun/sentry/sniper_sentry + name = "\improper SRT-574 sentry gun" + desc = "A deployable, fully automatic turret with AI targeting capabilities. Armed with a heavy caliber AM-5 antimaterial rifle and a 75-round drum magazine." + icon_state = "snipersentry" + + turret_range = 12 + deploy_time = 10 SECONDS + max_shells = 75 + fire_delay = 2 SECONDS + burst_amount = 1 + + scatter = 0 + + ammo_datum_type = /datum/ammo/bullet/turret/sniper + default_ammo_type = /obj/item/ammo_magazine/sentry/sniper + allowed_ammo_types = list(/obj/item/ammo_magazine/sentry/sniper) + + gun_firemode_list = list(GUN_FIREMODE_AUTOMATIC) + + attachable_allowed = list(/obj/item/attachable/scope/unremovable) + starting_attachment_types = list( + /obj/item/attachable/scope/unremovable, + ) + +/obj/item/storage/box/crate/sentry_sniper + name = "\improper SST-574 sentry crate" + desc = "A large case containing all you need to set up an automated sentry." + icon_state = "sentry_case" + w_class = WEIGHT_CLASS_HUGE + max_w_class = WEIGHT_CLASS_HUGE + storage_slots = 6 + max_storage_space = 16 + can_hold = list( + /obj/item/weapon/gun/sentry/sniper_sentry, + /obj/item/ammo_magazine/sentry/sniper, + ) + bypass_w_limit = list( + /obj/item/weapon/gun/sentry/sniper_sentry, + /obj/item/ammo_magazine/sentry/sniper, + ) + +/obj/item/storage/box/crate/sentry_sniper/Initialize(mapload) + . = ..() + new /obj/item/weapon/gun/sentry/sniper_sentry(src) + new /obj/item/ammo_magazine/sentry/sniper(src) + +// Shotgun Sentry + +/obj/item/weapon/gun/sentry/shotgun_sentry + name = "\improper SHT-573 sentry gun" + desc = "A deployable, fully automatic turret with AI targeting capabilities. Armed with a heavy caliber SM-10 shotgun and a 100-round drum magazine." + icon_state = "shotgunsentry" + + turret_range = 8 + deploy_time = 5 SECONDS + max_shells = 75 + fire_delay = 1 SECONDS + burst_amount = 1 + + scatter = 5 + + ammo_datum_type = /datum/ammo/bullet/turret/buckshot + default_ammo_type = /obj/item/ammo_magazine/sentry/shotgun + allowed_ammo_types = list(/obj/item/ammo_magazine/sentry/shotgun) + + gun_firemode_list = list(GUN_FIREMODE_AUTOMATIC) + + attachable_allowed = list(/obj/item/attachable/scope/unremovable/hsg_102) + starting_attachment_types = list( + /obj/item/attachable/scope/unremovable/hsg_102, + ) + +/obj/item/storage/box/crate/sentry_shotgun + name = "\improper SHT-573 sentry crate" + desc = "A large case containing all you need to set up an automated sentry." + icon_state = "sentry_case" + w_class = WEIGHT_CLASS_HUGE + max_w_class = WEIGHT_CLASS_HUGE + storage_slots = 6 + max_storage_space = 16 + can_hold = list( + /obj/item/weapon/gun/sentry/shotgun_sentry, + /obj/item/ammo_magazine/sentry/shotgun, + ) + bypass_w_limit = list( + /obj/item/weapon/gun/sentry/shotgun_sentry, + /obj/item/ammo_magazine/sentry/shotgun, + ) + +/obj/item/storage/box/crate/sentry_shotgun/Initialize(mapload) + . = ..() + new /obj/item/weapon/gun/sentry/shotgun_sentry(src) + new /obj/item/ammo_magazine/sentry/shotgun(src) + +// Flamethrower Sentry + +/obj/item/weapon/gun/sentry/flamer_sentry + name = "\improper SFT-573 sentry gun" + desc = "A deployable, fully automatic turret with AI targeting capabilities. Armed with a heavy flamethrower and a 200-round drum magazine." + icon_state = "flamersentry" + + turret_range = 8 + deploy_time = 5 SECONDS + max_shells = 200 + fire_delay = 2 SECONDS + burst_amount = 1 + + scatter = 5 + + ammo_datum_type = /datum/ammo/flamer + default_ammo_type = /obj/item/ammo_magazine/sentry/flamer + allowed_ammo_types = list(/obj/item/ammo_magazine/sentry/flamer) + + gun_firemode_list = list(GUN_FIREMODE_AUTOMATIC) + + attachable_allowed = list(/obj/item/attachable/scope/unremovable/hsg_102) + starting_attachment_types = list( + /obj/item/attachable/scope/unremovable/hsg_102, + ) + +/obj/item/storage/box/crate/sentry_flamer + name = "\improper SHT-573 sentry crate" + desc = "A large case containing all you need to set up an automated sentry." + icon_state = "sentry_case" + w_class = WEIGHT_CLASS_HUGE + max_w_class = WEIGHT_CLASS_HUGE + storage_slots = 6 + max_storage_space = 16 + can_hold = list( + /obj/item/weapon/gun/sentry/flamer_sentry, + /obj/item/ammo_magazine/sentry/flamer, + ) + bypass_w_limit = list( + /obj/item/weapon/gun/sentry/flamer_sentry, + /obj/item/ammo_magazine/sentry/flamer, + ) + +/obj/item/storage/box/crate/sentry_flamer/Initialize(mapload) + . = ..() + new /obj/item/weapon/gun/sentry/flamer_sentry(src) + new /obj/item/ammo_magazine/sentry/flamer(src) diff --git a/code/modules/projectiles/magazines/flamer.dm b/code/modules/projectiles/magazines/flamer.dm index 71604a847a814..1aeb777acad41 100644 --- a/code/modules/projectiles/magazines/flamer.dm +++ b/code/modules/projectiles/magazines/flamer.dm @@ -80,6 +80,10 @@ icon_state_mini = "tank_blue" dispenser_type = /obj/structure/reagent_dispensers/fueltank/xfuel +/obj/item/ammo_magazine/flamer_tank/large/X/som + desc = "A large fuel tank of ultra thick napthal Fuel type X, a sticky combustable liquid chemical, for use in the V-62 flamethrower." + icon_state = "flametank_som_x" + /obj/item/ammo_magazine/flamer_tank/large/X/deathsquad name = "Gargantuan flamethrower X-tank" desc = "Using Bluespace technology, Nanotrasen has managed to fit in way more x-fuel than you would ever hope to need in a single lifetime into this specialized tank." diff --git a/code/modules/projectiles/magazines/sentries.dm b/code/modules/projectiles/magazines/sentries.dm index 85ad14a5de121..d21183d818e34 100644 --- a/code/modules/projectiles/magazines/sentries.dm +++ b/code/modules/projectiles/magazines/sentries.dm @@ -29,3 +29,33 @@ /obj/item/ammo_magazine/sentry/fob_sentry max_rounds = INFINITY + +// Sniper Sentry + +/obj/item/ammo_magazine/sentry/sniper + name = "\improper AM-5 box magazine (10x28mm Caseless)" + desc = "A drum of 50 10x28mm caseless rounds for the SST-574 sentry gun. Just feed it into the sentry gun's ammo port when its ammo is depleted." + icon_state = "snipersentry" + max_rounds = 75 + default_ammo = /datum/ammo/bullet/turret/sniper + +// Shotgun Sentry + +/obj/item/ammo_magazine/sentry/shotgun + name = "\improper SM-10 box magazine (12G Caseless)" + desc = "A drum of 200 specialized telescopic 12G rounds for the SST-573 sentry gun. Just feed it into the sentry gun's ammo port when its ammo is depleted." + caliber = CALIBER_12G + icon_state = "shotgunsentry" + max_rounds = 100 + default_ammo = /datum/ammo/bullet/turret/buckshot + +// Flamer Sentry + +/obj/item/ammo_magazine/sentry/flamer + name = "\improper SM-10 box magazine (12G Caseless)" + desc = "A drum of 200 specialized telescopic 12G rounds for the SST-573 sentry gun. Just feed it into the sentry gun's ammo port when its ammo is depleted." + caliber = CALIBER_12G + icon_state = "flamersentry" + max_rounds = 100 + default_ammo = /datum/ammo/flamer + diff --git a/code/modules/radial/radial_body_select.dm b/code/modules/radial/radial_body_select.dm index ef5310c41c91a..835f3f88363f1 100644 --- a/code/modules/radial/radial_body_select.dm +++ b/code/modules/radial/radial_body_select.dm @@ -25,18 +25,18 @@ //the list of the above var/list/radial_options_show = list("head" = radial_options[BODY_ZONE_HEAD], "chest" = radial_options[BODY_ZONE_CHEST], - "groin" = radial_options[BODY_ZONE_PRECISE_GROIN], - "Larm" = radial_options[BODY_ZONE_L_ARM], - "Lhand" = radial_options[BODY_ZONE_PRECISE_L_HAND], "Rarm" = radial_options[BODY_ZONE_R_ARM], "Rhand" = radial_options[BODY_ZONE_PRECISE_R_HAND], - "Lleg" = radial_options[BODY_ZONE_L_LEG], - "Lfoot" = radial_options[BODY_ZONE_PRECISE_L_FOOT], "Rleg" = radial_options[BODY_ZONE_R_LEG], - "Rfoot" = radial_options[BODY_ZONE_PRECISE_R_FOOT]) + "Rfoot" = radial_options[BODY_ZONE_PRECISE_R_FOOT], + "Lfoot" = radial_options[BODY_ZONE_PRECISE_L_FOOT], + "Lleg" = radial_options[BODY_ZONE_L_LEG], + "Lhand" = radial_options[BODY_ZONE_PRECISE_L_HAND], + "Larm" = radial_options[BODY_ZONE_L_ARM], + "groin" = radial_options[BODY_ZONE_PRECISE_GROIN]) var/datum/limb/affecting = null - var/choice = show_radial_menu(doctor, H, radial_options_show, null, 48, null, TRUE) + var/choice = show_radial_menu(doctor, H, radial_options_show, null, 48, null, TRUE, null, 30) switch(choice) if("head") affecting = H.get_limb(BODY_ZONE_HEAD) diff --git a/code/modules/reagents/reagents.dm b/code/modules/reagents/reagents.dm index bdfc9d7e5f21b..1b9c22354464e 100644 --- a/code/modules/reagents/reagents.dm +++ b/code/modules/reagents/reagents.dm @@ -48,7 +48,7 @@ GLOBAL_LIST_INIT(name2reagent, build_name2reagent()) /// increases as addiction gets worse var/addiction_stage = 0 /// does this show up on health analyzers - var/scannable = FALSE + var/scannable = TRUE /// if false stops metab in liverless mobs var/self_consuming = FALSE /// List of reagents removed by this chemical diff --git a/code/modules/reagents/reagents/medical.dm b/code/modules/reagents/reagents/medical.dm index 15d15b6caf4f2..e49e75f7d2211 100644 --- a/code/modules/reagents/reagents/medical.dm +++ b/code/modules/reagents/reagents/medical.dm @@ -13,7 +13,6 @@ color = COLOR_REAGENT_INAPROVALINE overdose_threshold = REAGENTS_OVERDOSE*2 overdose_crit_threshold = REAGENTS_OVERDOSE_CRITICAL*2 - scannable = TRUE trait_flags = TACHYCARDIC /datum/reagent/medicine/inaprovaline/on_mob_add(mob/living/L, metabolism) @@ -54,7 +53,6 @@ description = "Ryetalyn is a long-duration shield against toxic chemicals." reagent_state = SOLID color = COLOR_REAGENT_RYETALYN - scannable = TRUE custom_metabolism = REAGENTS_METABOLISM * 0.125 purge_list = list(/datum/reagent/toxin, /datum/reagent/zombium) purge_rate = 5 @@ -87,7 +85,6 @@ name = "Paracetamol" description = "Most probably know this as Tylenol, but this chemical is a mild, simple painkiller, good for enduring heavy labor." color = COLOR_REAGENT_PARACETAMOL - scannable = TRUE custom_metabolism = REAGENTS_METABOLISM * 0.125 purge_list = list(/datum/reagent/medicine/kelotane, /datum/reagent/medicine/bicaridine) purge_rate = 1 @@ -113,7 +110,6 @@ name = "Tramadol" description = "A simple, yet effective painkiller." color = COLOR_REAGENT_TRAMADOL - scannable = TRUE custom_metabolism = REAGENTS_METABOLISM * 0.5 overdose_threshold = REAGENTS_OVERDOSE overdose_crit_threshold = REAGENTS_OVERDOSE_CRITICAL @@ -139,7 +135,6 @@ custom_metabolism = REAGENTS_METABOLISM * 1.25 overdose_threshold = REAGENTS_OVERDOSE * 0.5 overdose_crit_threshold = REAGENTS_OVERDOSE_CRITICAL * 0.5 - scannable = TRUE /datum/reagent/medicine/oxycodone/on_mob_add(mob/living/L, metabolism) if(TIMER_COOLDOWN_CHECK(L, name)) @@ -181,7 +176,6 @@ custom_metabolism = REAGENTS_METABOLISM * 2 overdose_threshold = REAGENTS_OVERDOSE*0.6 //You aren't using this out of combat. And only the B18 makes it. overdose_crit_threshold = REAGENTS_OVERDOSE_CRITICAL*0.5 - scannable = TRUE /datum/reagent/medicine/hydrocodone/on_mob_life(mob/living/L, metabolism) L.reagent_pain_modifier += PAIN_REDUCTION_VERY_HEAVY @@ -200,7 +194,6 @@ name = "Leporazine" description = "Leporazine can be use to stabilize an individuals body temperature." color = COLOR_REAGENT_LEPORAZINE - scannable = TRUE overdose_threshold = REAGENTS_OVERDOSE overdose_crit_threshold = REAGENTS_OVERDOSE_CRITICAL @@ -223,7 +216,6 @@ name = "Kelotane" description = "Kelotane is a drug used to treat burns." color = COLOR_REAGENT_KELOTANE - scannable = TRUE purge_list = list(/datum/reagent/medicine/ryetalyn) purge_rate = 1 overdose_threshold = REAGENTS_OVERDOSE @@ -253,7 +245,6 @@ color = COLOR_REAGENT_DERMALINE overdose_threshold = REAGENTS_OVERDOSE*0.5 overdose_crit_threshold = REAGENTS_OVERDOSE_CRITICAL*0.5 - scannable = TRUE purge_list = list(/datum/reagent/medicine/oxycodone) purge_rate = 0.2 @@ -283,7 +274,6 @@ overdose_threshold = REAGENTS_OVERDOSE overdose_crit_threshold = REAGENTS_OVERDOSE_CRITICAL taste_description = "salty water" - scannable = TRUE /datum/reagent/medicine/saline_glucose/on_mob_life(mob/living/L, metabolism) if(L.blood_volume < BLOOD_VOLUME_NORMAL) @@ -302,7 +292,6 @@ color = COLOR_REAGENT_DEXALIN overdose_threshold = REAGENTS_OVERDOSE overdose_crit_threshold = REAGENTS_OVERDOSE_CRITICAL - scannable = TRUE /datum/reagent/medicine/dexalin/on_mob_life(mob/living/L,metabolism) L.adjustOxyLoss(-3*effect_str) @@ -321,7 +310,6 @@ color = COLOR_REAGENT_DEXALINPLUS overdose_threshold = REAGENTS_OVERDOSE/2 overdose_crit_threshold = REAGENTS_OVERDOSE_CRITICAL/2 - scannable = TRUE /datum/reagent/medicine/dexalinplus/on_mob_life(mob/living/L,metabolism) L.adjustOxyLoss(-L.getOxyLoss()) @@ -338,7 +326,6 @@ name = "Tricordrazine" description = "Tricordrazine is a highly potent stimulant, originally derived from cordrazine. Can be used to treat a wide range of injuries." color = COLOR_REAGENT_TRICORDRAZINE - scannable = TRUE purge_list = list(/datum/reagent/medicine/ryetalyn) purge_rate = 1 overdose_threshold = REAGENTS_OVERDOSE @@ -367,7 +354,6 @@ name = "Dylovene" description = "Dylovene is a broad-spectrum antitoxin." color = COLOR_REAGENT_DYLOVENE - scannable = TRUE purge_list = list(/datum/reagent/toxin, /datum/reagent/medicine/research/stimulon, /datum/reagent/consumable/drink/atomiccoffee, /datum/reagent/medicine/paracetamol, /datum/reagent/medicine/larvaway) purge_rate = 1 overdose_threshold = REAGENTS_OVERDOSE @@ -442,7 +428,6 @@ color = COLOR_REAGENT_SYNAPTIZINE overdose_threshold = REAGENTS_OVERDOSE/5 overdose_crit_threshold = REAGENTS_OVERDOSE_CRITICAL/5 - scannable = TRUE custom_metabolism = REAGENTS_METABOLISM * 0.5 purge_list = list(/datum/reagent/toxin/mindbreaker) purge_rate = 5 @@ -535,7 +520,6 @@ custom_metabolism = REAGENTS_METABOLISM overdose_threshold = REAGENTS_OVERDOSE overdose_crit_threshold = REAGENTS_OVERDOSE_CRITICAL - scannable = TRUE /datum/reagent/medicine/hyronalin/on_mob_life(mob/living/L) L.adjustToxLoss(-effect_str) @@ -554,7 +538,6 @@ custom_metabolism = REAGENTS_METABOLISM overdose_threshold = REAGENTS_OVERDOSE/2 overdose_crit_threshold = REAGENTS_OVERDOSE_CRITICAL/2 - scannable = TRUE /datum/reagent/medicine/arithrazine/on_mob_life(mob/living/L) L.adjustToxLoss(-0.5*effect_str) @@ -575,7 +558,6 @@ custom_metabolism = REAGENTS_METABOLISM * 5 overdose_threshold = REAGENTS_OVERDOSE/2 //so it makes the OD threshold effectively 15 so two pills is too much but one is fine overdose_crit_threshold = REAGENTS_OVERDOSE_CRITICAL/2.5 //and this makes the Critical OD 20 - scannable = TRUE /datum/reagent/medicine/russian_red/on_mob_add(mob/living/L, metabolism) var/mob/living/carbon/human/H = L @@ -611,7 +593,6 @@ custom_metabolism = REAGENTS_METABOLISM * 0.25 overdose_threshold = REAGENTS_OVERDOSE overdose_crit_threshold = REAGENTS_OVERDOSE_CRITICAL - scannable = TRUE /datum/reagent/medicine/alkysine/on_mob_life(mob/living/L, metabolism) L.reagent_shock_modifier += PAIN_REDUCTION_VERY_LIGHT @@ -631,7 +612,6 @@ color = COLOR_REAGENT_IMIDAZOLINE overdose_threshold = REAGENTS_OVERDOSE overdose_crit_threshold = REAGENTS_OVERDOSE_CRITICAL - scannable = TRUE taste_description = "dull toxin" /datum/reagent/medicine/imidazoline/on_mob_life(mob/living/L, metabolism) @@ -657,7 +637,6 @@ overdose_threshold = REAGENTS_OVERDOSE/30 overdose_crit_threshold = REAGENTS_OVERDOSE_CRITICAL/25 custom_metabolism = REAGENTS_METABOLISM * 0.5 - scannable = TRUE /datum/reagent/medicine/peridaxon_plus/on_mob_life(mob/living/L, metabolism) L.reagents.add_reagent(/datum/reagent/toxin/scannable,5) @@ -686,7 +665,6 @@ purge_rate = 1 overdose_threshold = REAGENTS_OVERDOSE overdose_crit_threshold = REAGENTS_OVERDOSE_CRITICAL - scannable = TRUE /datum/reagent/medicine/bicaridine/on_mob_life(mob/living/L, metabolism) L.heal_overall_damage(effect_str, 0) @@ -710,7 +688,6 @@ color = COLOR_REAGENT_MERALYNE overdose_threshold = REAGENTS_OVERDOSE*0.5 overdose_crit_threshold = REAGENTS_OVERDOSE_CRITICAL*0.5 - scannable = TRUE purge_list = list(/datum/reagent/medicine/oxycodone) purge_rate = 0.2 @@ -736,7 +713,6 @@ color = COLOR_REAGENT_QUICKCLOT overdose_threshold = REAGENTS_OVERDOSE/2 //Was 4, now 6 //Now 15 overdose_crit_threshold = REAGENTS_OVERDOSE_CRITICAL/2 - scannable = TRUE //scannable now. HUZZAH. custom_metabolism = REAGENTS_METABOLISM * 0.25 /datum/reagent/medicine/quickclot/on_mob_life(mob/living/L, metabolism) @@ -763,7 +739,6 @@ color = COLOR_REAGENT_QUICKCLOTPLUS overdose_threshold = REAGENTS_OVERDOSE/5 //6u overdose_crit_threshold = REAGENTS_OVERDOSE_CRITICAL/5 //12u - scannable = TRUE custom_metabolism = REAGENTS_METABOLISM * 2.5 ///The IB wound this dose of QCP will cure, if it lasts long enough var/datum/wound/internal_bleeding/target_IB @@ -837,7 +812,6 @@ color = COLOR_REAGENT_NANOBLOOD overdose_threshold = REAGENTS_OVERDOSE/5 //6u overdose_crit_threshold = REAGENTS_OVERDOSE_CRITICAL/5 //10u - scannable = TRUE /datum/reagent/medicine/nanoblood/on_mob_life(mob/living/L, metabolism) L.adjust_blood_volume(2.4) @@ -961,7 +935,6 @@ description = "A chemical mixture with almost magical healing powers. Its main limitation is that the targets body temperature must be under 170K for it to metabolise correctly." reagent_state = LIQUID color = COLOR_REAGENT_CRYOXADONE - scannable = TRUE taste_description = "sludge" trait_flags = BRADYCARDICS @@ -977,7 +950,6 @@ name = "Clonexadone" description = "A liquid compound similar to that used in the cloning process. Can be used to 'finish' the cloning process when used in conjunction with a cryo tube." color = COLOR_REAGENT_CLONEXADONE - scannable = TRUE taste_description = "muscle" trait_flags = BRADYCARDICS @@ -997,7 +969,6 @@ color = COLOR_REAGENT_REZADONE overdose_threshold = REAGENTS_OVERDOSE overdose_crit_threshold = REAGENTS_OVERDOSE_CRITICAL - scannable = TRUE taste_description = "fish" /datum/reagent/medicine/rezadone/on_mob_life(mob/living/L, metabolism) @@ -1032,7 +1003,6 @@ custom_metabolism = REAGENTS_METABOLISM * 0.05 overdose_threshold = REAGENTS_OVERDOSE overdose_crit_threshold = REAGENTS_OVERDOSE_CRITICAL - scannable = TRUE /datum/reagent/medicine/spaceacillin/overdose_process(mob/living/L, metabolism) L.apply_damage(effect_str, TOX) @@ -1046,7 +1016,6 @@ color = COLOR_REAGENT_POLYHEXANIDE custom_metabolism = REAGENTS_METABOLISM * 2 overdose_crit_threshold = REAGENTS_OVERDOSE_CRITICAL - scannable = TRUE /datum/reagent/medicine/polyhexanide/on_mob_life(mob/living/L, metabolism) switch(current_cycle) @@ -1070,7 +1039,6 @@ custom_metabolism = REAGENTS_METABOLISM * 0.5 overdose_threshold = REAGENTS_OVERDOSE * 0.5 overdose_crit_threshold = REAGENTS_OVERDOSE_CRITICAL * 0.5 - scannable = TRUE /datum/reagent/medicine/larvaway/on_mob_life(mob/living/L, metabolism) switch(current_cycle) @@ -1126,7 +1094,6 @@ custom_metabolism = REAGENTS_METABOLISM * 5 purge_list = list(/datum/reagent/medicine, /datum/reagent/toxin, /datum/reagent/zombium) purge_rate = 5 - scannable = TRUE taste_description = "punishment" taste_multi = 8 @@ -1177,7 +1144,6 @@ description = "Accelerates natural bone repair in a low temperature environment. Causes severe pain." color = COLOR_REAGENT_BIHEXAJULINE taste_description = "skim milk" - scannable = TRUE overdose_threshold = REAGENTS_OVERDOSE /datum/reagent/medicine/bihexajuline/on_mob_life(mob/living/L, metabolism) @@ -1218,7 +1184,6 @@ description = "This is a latent poison, designed to quickly and painlessly kill you in the event that you become unable to fight. Never washes out on it's own, must be purged." color = COLOR_REAGENT_QUIETUS custom_metabolism = 0 - scannable = TRUE taste_description = "Victory" /datum/reagent/medicine/research/quietus/on_mob_add(mob/living/L, metabolism) @@ -1250,7 +1215,6 @@ name = "Somolent" description = "This is a highly potent regenerative drug, designed to heal critically injured personnel. Only functions on unconscious or sleeping people." color = COLOR_REAGENT_SOMOLENT - scannable = TRUE overdose_threshold = REAGENTS_OVERDOSE taste_description = "naptime" @@ -1280,7 +1244,6 @@ description = "These are a batch of construction nanites altered for in-vivo replication. They can heal wounds using the iron present in the bloodstream. Medical care is recommended during injection." color = COLOR_REAGENT_MEDICALNANITES custom_metabolism = 0 - scannable = TRUE taste_description = "metal, followed by mild burning" overdose_threshold = REAGENTS_OVERDOSE * 1.2 //slight buffer to keep you safe purge_list = list( @@ -1348,7 +1311,6 @@ description = "A chemical designed to boost running by driving your body beyond it's normal limits. Can have unpredictable side effects, caution recommended." color = COLOR_REAGENT_STIMULON custom_metabolism = 0 - scannable = TRUE /datum/reagent/medicine/research/stimulon/on_mob_add(mob/living/L, metabolism) to_chat(L, span_userdanger("You feel jittery and fast! Time to MOVE!")) diff --git a/code/modules/reagents/reagents/other.dm b/code/modules/reagents/reagents/other.dm index 6af24146b3a18..2b2c9dca6d366 100644 --- a/code/modules/reagents/reagents/other.dm +++ b/code/modules/reagents/reagents/other.dm @@ -30,7 +30,6 @@ purge_list = list(/datum/reagent/toxin, /datum/reagent/medicine, /datum/reagent/consumable) purge_rate = 1 taste_description = "water" - scannable = TRUE /datum/reagent/water/reaction_turf(turf/T, volume) if(volume >= 3) @@ -346,7 +345,6 @@ overdose_threshold = REAGENTS_OVERDOSE overdose_crit_threshold = REAGENTS_OVERDOSE_CRITICAL taste_description = "iron" - scannable = TRUE /datum/reagent/iron/overdose_process(mob/living/L, metabolism) L.apply_damages(1, 0, 1) @@ -655,4 +653,3 @@ custom_metabolism = REAGENTS_METABOLISM * 0.1 overdose_threshold = REAGENTS_OVERDOSE overdose_crit_threshold = REAGENTS_OVERDOSE_CRITICAL - scannable = TRUE diff --git a/code/modules/reagents/reagents/toxin.dm b/code/modules/reagents/reagents/toxin.dm index 6704c0297bf8b..2204e51d63f44 100644 --- a/code/modules/reagents/reagents/toxin.dm +++ b/code/modules/reagents/reagents/toxin.dm @@ -19,7 +19,6 @@ ///For medicines that generate toxin reagent when metabolized /datum/reagent/toxin/scannable - scannable = TRUE /datum/reagent/toxin/hptoxin name = "Toxin" @@ -218,7 +217,6 @@ toxpwr = 0 overdose_threshold = REAGENTS_OVERDOSE overdose_crit_threshold = REAGENTS_OVERDOSE_CRITICAL - scannable = TRUE taste_description = "cough syrup" trait_flags = BRADYCARDICS @@ -449,7 +447,6 @@ color = COLOR_TOXIN_XENO_NEUROTOXIN custom_metabolism = REAGENTS_METABOLISM * 2 overdose_threshold = 10000 //Overdosing for neuro is what happens when you run out of stamina to avoid its oxy and toxin damage - scannable = TRUE toxpwr = 0 /datum/reagent/toxin/xeno_neurotoxin/on_mob_life(mob/living/L, metabolism) @@ -496,7 +493,6 @@ color = COLOR_TOXIN_XENO_HEMODILE custom_metabolism = 0.4 overdose_threshold = 10000 - scannable = TRUE toxpwr = 0 /datum/reagent/toxin/xeno_hemodile/on_mob_life(mob/living/L, metabolism) @@ -533,7 +529,6 @@ color = COLOR_TOXIN_XENO_TRANSVITOX custom_metabolism = 0.4 overdose_threshold = 10000 - scannable = TRUE toxpwr = 0 /datum/reagent/toxin/xeno_transvitox/on_mob_add(mob/living/L, metabolism, affecting) @@ -589,7 +584,6 @@ color = COLOR_TOXIN_XENO_SANGUINAL custom_metabolism = 0.4 overdose_threshold = 10000 - scannable = TRUE toxpwr = 0 /datum/reagent/toxin/xeno_sanguinal/on_mob_life(mob/living/L, metabolism) @@ -623,7 +617,6 @@ color = COLOR_TOXIN_XENO_OZELOMELYN custom_metabolism = 1.5 // metabolizes decently quickly. A sting does 15 at the same rate as neurotoxin. overdose_threshold = 10000 - scannable = TRUE toxpwr = 0 // This is going to do slightly snowflake tox damage. purge_list = list(/datum/reagent/medicine) purge_rate = 5 @@ -644,7 +637,6 @@ reagent_state = LIQUID color = COLOR_TOXIN_ZOMBIUM custom_metabolism = REAGENTS_METABOLISM * 0.25 - scannable = TRUE overdose_threshold = 20 overdose_crit_threshold = 50 @@ -684,7 +676,6 @@ color = COLOR_TOXIN_SATRAPINE overdose_threshold = 10000 custom_metabolism = REAGENTS_METABOLISM - scannable = TRUE toxpwr = 0 purge_list = list( /datum/reagent/medicine/tramadol, diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm index dd666023f90d1..268d6f217c206 100644 --- a/code/modules/recycling/conveyor2.dm +++ b/code/modules/recycling/conveyor2.dm @@ -135,6 +135,7 @@ GLOBAL_LIST_EMPTY(conveyors_by_id) ///Attempts to move a batch of AMs /obj/machinery/conveyor/proc/convey(list/affecting) + conveyor_flags &= ~CONVEYOR_IS_CONVEYING if(!is_operational()) return if(!operating) @@ -156,8 +157,6 @@ GLOBAL_LIST_EMPTY(conveyors_by_id) continue step(movable_thing, movedir) - conveyor_flags &= ~CONVEYOR_IS_CONVEYING - ///Sets the correct movement directions based on dir /obj/machinery/conveyor/proc/update_move_direction() var/forwards diff --git a/code/modules/reqs/supplypacks.dm b/code/modules/reqs/supplypacks.dm index c7e518f0ee4bb..6d21d2b088941 100644 --- a/code/modules/reqs/supplypacks.dm +++ b/code/modules/reqs/supplypacks.dm @@ -189,6 +189,26 @@ WEAPONS contains = list(/obj/item/ammo_magazine/minisentry) cost = 100 +/datum/supply_packs/weapons/sentry_shotgun + name = "SHT-573 Shotgun Sentry" + contains = list(/obj/item/storage/box/crate/sentry_shotgun) + cost = 400 + +/datum/supply_packs/weapons/sentry_shotgun_ammo + name = "SHT-573 shotgun sentry ammunition" + contains = list(/obj/item/ammo_magazine/sentry/shotgun) + cost = 100 + +/datum/supply_packs/weapons/sentry_sniper + name = "SST-574 Sniper Sentry" + contains = list(/obj/item/storage/box/crate/sentry_sniper) + cost = 600 + +/datum/supply_packs/weapons/sentry_sniper_ammo + name = "SST-571 sniper sentry ammunition" + contains = list(/obj/item/ammo_magazine/sentry/sniper) + cost = 100 + /datum/supply_packs/weapons/buildasentry name = "Build-A-Sentry Attachment System" contains = list( @@ -360,12 +380,12 @@ WEAPONS /datum/supply_packs/weapons/plasma_smg name = "PL-51 Plasma SMG" contains = list(/obj/item/weapon/gun/energy/lasgun/lasrifle/plasma/smg) - cost = 250 + cost = 400 /datum/supply_packs/weapons/plasma_rifle name = "PL-38 Plasma Rifle" contains = list(/obj/item/weapon/gun/energy/lasgun/lasrifle/plasma/rifle) - cost = 300 + cost = 350 /datum/supply_packs/weapons/plasma_cannon name = "PL-96 Plasma Cannon" @@ -815,6 +835,21 @@ WEAPONS contains = list(/obj/item/ammo_magazine/pistol/standard_pistol/smart_pistol) cost = 10 +/datum/supply_packs/weapons/ltb_shells + name = "LTB tank shell" + contains = list(/obj/item/ammo_magazine/tank/ltb_cannon) + cost = 10 + +/datum/supply_packs/weapons/ltaap_rounds + name = "LTAAP tank magazine" + contains = list(/obj/item/ammo_magazine/tank/ltaap_chaingun) + cost = 10 + +/datum/supply_packs/weapons/cupola_rounds + name = "Cupola tank magazine" + contains = list(/obj/item/ammo_magazine/tank/secondary_cupola) + cost = 10 + /******************************************************************************* EXPLOSIVES *******************************************************************************/ @@ -835,7 +870,7 @@ EXPLOSIVES /datum/supply_packs/explosives/explosives_razor name = "Razorburn grenade box crate" - notes = "Contains 15 razor burns" + notes = "Contains 25 razor burns" contains = list(/obj/item/storage/box/visual/grenade/razorburn) cost = 500 @@ -843,25 +878,25 @@ EXPLOSIVES name = "M40 adhesive charge grenade box crate" notes = "Contains 25 grenades" contains = list(/obj/item/storage/box/visual/grenade/sticky) - cost = 310 + cost = 300 /datum/supply_packs/explosives/explosives_smokebomb name = "M40 HSDP smokebomb grenade box crate" notes = "Contains 25 grenades" contains = list(/obj/item/storage/box/visual/grenade/smokebomb) - cost = 310 + cost = 300 /datum/supply_packs/explosives/explosives_hedp name = "M40 HEDP high explosive grenade box crate" notes = "Contains 25 grenades" contains = list(/obj/item/storage/box/visual/grenade/frag) - cost = 310 + cost = 300 /datum/supply_packs/explosives/explosives_cloaker name = "M45 Cloaker grenade box crate" notes = "Contains 25 grenades" contains = list(/obj/item/storage/box/visual/grenade/cloaker) - cost = 310 + cost = 300 /datum/supply_packs/explosives/explosives_antigas name = "M40-AG Anti-Gas grenade box crate" @@ -873,13 +908,13 @@ EXPLOSIVES name = "M40-2 SCDP grenade box crate" notes = "Contains 25 grenades" contains = list(/obj/item/storage/box/visual/grenade/cloak) - cost = 310 + cost = 300 /datum/supply_packs/explosives/explosives_lasburster name = "M80 lasburster grenade box crate" notes = "Contains 25 grenades" contains = list(/obj/item/storage/box/visual/grenade/lasburster) - cost = 310 + cost = 300 /datum/supply_packs/explosives/explosives_hidp name = "M40 HIDP incendiary explosive grenade box crate" @@ -889,7 +924,7 @@ EXPLOSIVES /datum/supply_packs/explosives/explosives_m15 name = "M15 fragmentation grenade box crate" - notes = "Contains 15 grenades" + notes = "Contains 25 grenades" contains = list(/obj/item/storage/box/visual/grenade/M15) cost = 350 @@ -897,19 +932,19 @@ EXPLOSIVES name = "M45 Trailblazer grenade box crate" notes = "Contains 25 grenades" contains = list(/obj/item/storage/box/visual/grenade/trailblazer) - cost = 350 + cost = 500 /datum/supply_packs/explosives/explosives_hsdp name = "M40 HSDP white phosphorous grenade box crate" notes = "Contains 15 grenades" contains = list(/obj/item/storage/box/visual/grenade/phosphorus) - cost = 700 + cost = 1000 /datum/supply_packs/explosives/explosives_hefa name = "M25 HEFA grenade box crate" notes = "Contains 25 grenades" contains = list(/obj/item/storage/box/visual/grenade/hefa) - cost = 550 + cost = 500 /datum/supply_packs/explosives/plastique name = "C4 plastic explosive" @@ -969,21 +1004,21 @@ EXPLOSIVES contains = list(/obj/item/storage/box/mlrs_rockets) cost = 60 -/datum/supply_packs/explosives/mlrs_rockets_incendiary - name = "TA-40L MLRS Incendiary Rocket Pack (x16)" - contains = list(/obj/item/storage/box/mlrs_rocket_incendiary) - cost = 60 - /datum/supply_packs/explosives/mlrs_rockets_gas name = "TA-40L X-50 MLRS Rocket Pack (x16)" - contains = list(/obj/item/storage/box/mlrs_rockets_gas) + contains = list(/obj/item/storage/box/mlrs_rockets/gas) cost = 60 /datum/supply_packs/explosives/mlrs_rockets_cloak name = "TA-40L S-2 MLRS Cloak Rocket Pack (x16)" - contains = list(/obj/item/storage/box/mlrs_rocket_gas_cloak) + contains = list(/obj/item/storage/box/mlrs_rockets/cloak) cost = 50 +/datum/supply_packs/explosives/mlrs_rockets_incendiary + name = "TA-40L MLRS Incendiary Rocket Pack (x16)" + contains = list(/obj/item/storage/box/mlrs_rockets/incendiary) + cost = 60 + /datum/supply_packs/explosives/howitzer name = "MG-100Y howitzer" contains = list(/obj/item/mortar_kit/howitzer) @@ -2098,12 +2133,12 @@ FACTORY /datum/supply_packs/factory/bignaderefill name = "Rounded M15 plates refill" contains = list(/obj/item/factory_refill/bignade_refill) - cost = 700 + cost = 550 /datum/supply_packs/factory/incennaderefill name = "Incendiary grenade refill" contains = list(/obj/item/factory_refill/incennade_refill) - cost = 500 + cost = 550 /datum/supply_packs/factory/stickynaderefill name = "Adhesive grenade refill" @@ -2113,12 +2148,17 @@ FACTORY /datum/supply_packs/factory/phosphosrefill name = "Phosphorus-resistant plates refill" contains = list(/obj/item/factory_refill/phosnade_refill) - cost = 1400 + cost = 1050 + +/datum/supply_packs/factory/cloaknade_refill + name = "Cloak grenade refill" + contains = list(/obj/item/factory_refill/cloaknade_refill) + cost = 450 /datum/supply_packs/factory/trailblazerrefill name = "Trailblazer grenade refill" contains = list(/obj/item/factory_refill/trailblazer_refill) - cost = 500 + cost = 750 /datum/supply_packs/factory/lasenaderefill name = "Laserburster grenade refill" @@ -2128,17 +2168,17 @@ FACTORY /datum/supply_packs/factory/hefanaderefill name = "HEFA fragmentation grenade refill" contains = list(/obj/item/factory_refill/hefanade_refill) - cost = 700 + cost = 750 /datum/supply_packs/factory/antigasrefill name = "Anti-Gas grenade refill" contains = list(/obj/item/factory_refill/antigas_refill) - cost = 800 + cost = 900 /datum/supply_packs/factory/razornade_refill name = "Razornade assembly refill" contains = list(/obj/item/factory_refill/razornade_refill) - cost = 1000 + cost = 750 /datum/supply_packs/factory/sadar_refill_he name = "SADAR HE missile assembly refill" @@ -2295,11 +2335,6 @@ FACTORY contains = list(/obj/item/factory_refill/swat_mask_refill) cost = 500 -/datum/supply_packs/factory/med_advpack - name = "Advanced medical pack assembly refill" - contains = list(/obj/item/factory_refill/med_advpack_refill) - cost = 500 - /datum/supply_packs/factory/module_valk_refill name = "Valkyrie Automedical Armor System assembly refill" contains = list(/obj/item/factory_refill/module_valk_refill) @@ -2370,6 +2405,21 @@ FACTORY contains = list(/obj/item/factory_refill/mlrs_rocket_refill) cost = 240 +/datum/supply_packs/factory/mlrs_rocket_refill_cloak + name = "MLRS 'S-2' Cloak rocket assembly refill" + contains = list(/obj/item/factory_refill/mlrs_rocket_refill_cloak) + cost = 240 + +/datum/supply_packs/factory/mlrs_rocket_refill_gas + name = "MLRS 'X-50' gas rocket assembly refill" + contains = list(/obj/item/factory_refill/mlrs_rocket_refill_gas) + cost = 240 + +/datum/supply_packs/factory/mlrs_rocket_refill_incendiary + name = "MLRS Incendiary rocket assembly refill" + contains = list(/obj/item/factory_refill/mlrs_rocket_refill_incendiary) + cost = 240 + /datum/supply_packs/factory/agls_he_refill name = "AGLS HE magazine assembly refill" contains = list(/obj/item/factory_refill/agls_he_refill) diff --git a/code/modules/shuttle/escape_pod.dm b/code/modules/shuttle/escape_pod.dm index 4f4117b37fbdb..b7a10aca5643e 100644 --- a/code/modules/shuttle/escape_pod.dm +++ b/code/modules/shuttle/escape_pod.dm @@ -101,6 +101,7 @@ name = "escape pod controller" icon = 'icons/obj/airlock_machines.dmi' icon_state = "airlock_control_standby" + screen_overlay = null power_channel = ENVIRON density = FALSE diff --git a/code/modules/shuttle/marine_dropship.dm b/code/modules/shuttle/marine_dropship.dm index b0df1805096ba..15e4305c3b8f9 100644 --- a/code/modules/shuttle/marine_dropship.dm +++ b/code/modules/shuttle/marine_dropship.dm @@ -506,11 +506,11 @@ #endif var/obj/docking_port/mobile/marine_dropship/shuttle = SSshuttle.getShuttle(shuttleId) if(shuttle.hijack_state != HIJACK_STATE_CALLED_DOWN && shuttle.hijack_state != HIJACK_STATE_CRASHING) //Process of corrupting the controls - to_chat(xeno_attacker, span_xenowarning("We corrupt the bird's controls, unlocking the doors[(shuttle.mode != SHUTTLE_IGNITING) ? "and preventing it from flying." : ", but we are unable to prevent it from flying as it is already taking off!"]")) + to_chat(xeno_attacker, span_xenowarning("We corrupt the bird's controls, unlocking the doors and preventing it from flying.")) SEND_GLOBAL_SIGNAL(COMSIG_GLOB_DROPSHIP_CONTROLS_CORRUPTED, src) - if(shuttle.mode != SHUTTLE_IGNITING) - shuttle.set_hijack_state(HIJACK_STATE_CALLED_DOWN) - shuttle.do_start_hijack_timer() + shuttle.set_idle() + shuttle.set_hijack_state(HIJACK_STATE_CALLED_DOWN) + shuttle.do_start_hijack_timer() interact(xeno_attacker) //Open the UI /obj/machinery/computer/shuttle/marine_dropship/ui_state(mob/user) diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm index 9093c29a703f3..6d378d1c7f302 100644 --- a/code/modules/shuttle/shuttle.dm +++ b/code/modules/shuttle/shuttle.dm @@ -315,7 +315,7 @@ /obj/docking_port/stationary/proc/on_crash() return -//returns first-found touching shuttleport +///returns first-found touching shuttleport /obj/docking_port/stationary/get_docked() . = locate(/obj/docking_port/mobile) in loc @@ -355,14 +355,20 @@ var/list/shuttle_areas - var/timer //used as a timer (if you want time left to complete move, use timeLeft proc) + ///used as a timer (if you want time left to complete move, use timeLeft proc) + var/timer var/last_timer_length - var/mode = SHUTTLE_IDLE //current shuttle mode - var/callTime = 100 //time spent in transit (deciseconds). Should not be lower then 10 seconds without editing the animation of the hyperspace ripples. - var/ignitionTime = 55 // time spent "starting the engines". Also rate limits how often we try to reserve transit space if its ever full of transiting shuttles. - var/rechargeTime = 0 //time spent after arrival before being able to launch again - var/prearrivalTime = 0 //delay after call time finishes for sound effects, explosions, etc. + ///current shuttle mode + var/mode = SHUTTLE_IDLE + ///time spent in transit (deciseconds). Should not be lower then 10 seconds without editing the animation of the hyperspace ripples. + var/callTime = 100 + /// time spent "starting the engines". Also rate limits how often we try to reserve transit space if its ever full of transiting shuttles. + var/ignitionTime = 55 + ///time spent after arrival before being able to launch again + var/rechargeTime = 0 + ///delay after call time finishes for sound effects, explosions, etc. + var/prearrivalTime = 0 var/landing_sound = 'sound/effects/engine_landing.ogg' var/ignition_sound = 'sound/effects/engine_startup.ogg' diff --git a/code/modules/vehicles/armored/__armored.dm b/code/modules/vehicles/armored/__armored.dm index 37dd51543c87f..86dc61cc8f355 100644 --- a/code/modules/vehicles/armored/__armored.dm +++ b/code/modules/vehicles/armored/__armored.dm @@ -1,4 +1,3 @@ - /obj/vehicle/sealed/armored name = "\improper MT - Shortstreet MK4" desc = "An adorable chunk of metal with an alarming amount of firepower designed to crush, immolate, destroy and maim anything that Nanotrasen wants it to. This model contains advanced Bluespace technology which allows a TARDIS-like amount of room on the inside." @@ -70,8 +69,14 @@ var/zoom_mode = FALSE /// damage done by rams var/ram_damage = 20 + /** + * List for storing all item typepaths that we may "easy load" into the tank by attacking its entrance + * This will be turned into a typeCache on initialize + */ + var/list/easy_load_list /obj/vehicle/sealed/armored/Initialize(mapload) + easy_load_list = typecacheof(easy_load_list) if(interior) interior = new interior(src, CALLBACK(src, PROC_REF(interior_exit))) . = ..() @@ -142,6 +147,12 @@ if(max_occupants > 1) initialize_passenger_action_type(/datum/action/vehicle/sealed/armored/swap_seat) +///returns a list of possible locations that this vehicle may be entered from +/obj/vehicle/sealed/armored/proc/enter_locations(mob/M) + // from any adjacent position + if(Adjacent(M, src)) + return list(get_turf(M)) + /obj/vehicle/sealed/armored/obj_destruction(damage_amount, damage_type, damage_flag) . = ..() playsound(get_turf(src), 'sound/weapons/guns/fire/tank_cannon1.ogg', 100, TRUE) @@ -185,6 +196,18 @@ if(!isxeno(user)) . += "It is currently at [PERCENT(obj_integrity / max_integrity)]% integrity." +/obj/vehicle/sealed/armored/get_mechanics_info() + . = ..() + var/list/named_paths = list() + named_paths += " You can easily load the following items by attacking the vehicle at its entrance or click dragging them " + for(var/obj/path AS in easy_load_list) + named_paths.Add(initial(path:name)) + var/list/entries = SScodex.retrieve_entries_for_string(name) + var/datum/codex_entry/general_entry = LAZYACCESS(entries, 1) + if(general_entry?.mechanics_text) + named_paths += general_entry.mechanics_text + return jointext(named_paths, "
") + /obj/vehicle/sealed/armored/vehicle_move(mob/living/user, direction) . = ..() if(!.) @@ -244,6 +267,23 @@ return mob_exit(leaver, TRUE) +/// call to try easy_loading an item into the tank. Checks for all being in the list , interior existing and the user bieng at the enter loc +/obj/vehicle/sealed/armored/proc/try_easy_load(atom/movable/item, mob/living/user) + if(!is_type_in_typecache(item.type, easy_load_list)) + return + if(!interior) + user.balloon_alert(user, "no interior") + return + if(!interior.door) + user.balloon_alert(user, "no door") + return + if(!(user.loc in enter_locations(user))) + user.balloon_alert(user, "not at entrance") + return + user.temporarilyRemoveItemFromInventory(item) + item.forceMove(interior.door.get_enter_location()) + user.balloon_alert(user, "item thrown inside") + /obj/vehicle/sealed/armored/mob_try_enter(mob/M) if(isobserver(M)) interior?.mob_enter(M) @@ -252,6 +292,9 @@ return FALSE if(M.skills.getRating(SKILL_LARGE_VEHICLE) < required_entry_skill) return FALSE + if(!(M.loc in enter_locations(M))) + balloon_alert(M, "not at entrance") + return FALSE return ..() /obj/vehicle/sealed/armored/enter_checks(mob/M) @@ -384,6 +427,8 @@ mod.on_equip(src, user) return if(interior) // if interior handle by gun breech + // check for easy loading instead + try_easy_load(I, user) return if(istype(I, /obj/item/ammo_magazine)) if(!primary_weapon) @@ -406,6 +451,19 @@ primary_weapon.ammo_magazine += I balloon_alert(user, "magazines [length(primary_weapon.ammo_magazine)]/[primary_weapon.maximum_magazines]") +/obj/vehicle/sealed/armored/MouseDrop_T(atom/movable/dropping, mob/M) + // Bypass to parent to handle mobs entering the vehicle. + if(dropping == M) + return ..() + if(!isliving(M)) + return + try_easy_load(dropping, M) + +/obj/vehicle/sealed/armored/grab_interact(obj/item/grab/grab, mob/user, base_damage, is_sharp) + if(!is_type_in_typecache(grab.grabbed_thing.type, easy_load_list)) + return ..() + try_easy_load(grab.grabbed_thing, user) + /obj/vehicle/sealed/armored/attackby_alternate(obj/item/I, mob/user, params) . = ..() if(user.skills.getRating(SKILL_LARGE_VEHICLE) < required_entry_skill) diff --git a/code/modules/vehicles/armored/_multitile.dm b/code/modules/vehicles/armored/_multitile.dm index 15130efacd889..94aa52943f67f 100644 --- a/code/modules/vehicles/armored/_multitile.dm +++ b/code/modules/vehicles/armored/_multitile.dm @@ -20,20 +20,16 @@ max_occupants = 4 move_delay = 0.9 SECONDS ram_damage = 100 + easy_load_list = list( + /obj/item/ammo_magazine/tank, + ) -///returns a list of possible locations that this vehicle may be entered from -/obj/vehicle/sealed/armored/multitile/proc/enter_locations(mob/M) +/obj/vehicle/sealed/armored/multitile/enter_locations(mob/M) return list(get_step_away(get_step(src, REVERSE_DIR(dir)), src, 2)) /obj/vehicle/sealed/armored/multitile/exit_location(mob/M) return pick(enter_locations(M)) -/obj/vehicle/sealed/armored/multitile/mob_try_enter(mob/M) - if(!isobserver(M) && !(M.loc in enter_locations(M))) - balloon_alert(M, "Not at entrance") - return FALSE - return ..() - /obj/vehicle/sealed/armored/multitile/enter_checks(mob/M) . = ..() if(!.) diff --git a/code/modules/vehicles/mecha/combat/greyscale/greyscale_constructor.dm b/code/modules/vehicles/mecha/combat/greyscale/greyscale_constructor.dm index 032633edb19ee..f1d1f76b3608f 100644 --- a/code/modules/vehicles/mecha/combat/greyscale/greyscale_constructor.dm +++ b/code/modules/vehicles/mecha/combat/greyscale/greyscale_constructor.dm @@ -89,6 +89,7 @@ GLOBAL_LIST_INIT(greyscale_weapons_data, generate_greyscale_weapons_data()) screen_overlay = "mech_computer" dir = EAST // determines where the mech will pop out, NOT where the computer faces interaction_flags = INTERACT_OBJ_UI + req_access = list(ACCESS_MARINE_MECH) ///current selected name for the mech var/selected_name = "TGMC Combat Mech" diff --git a/docs/faction-design.md b/docs/faction-design.md index 86ce36441a9d9..3237ede2d671e 100644 --- a/docs/faction-design.md +++ b/docs/faction-design.md @@ -9,19 +9,19 @@ The future design section should be mainly updated by maintainers as a central l The main USP of TGMC is: “asymmetrical team deathmatch PvP gameplay with a high degree of QoL”. -## Current Design +# Current Design -### Visual +## Visual - Xenomorphs - arachnid/dinosaur mix. - TG Marines - highly flamboyant armour design and accessorising similar to Destiny, or dressed in modern military attire if preferred. Ballistic, incendiary and explosive weaponry with a modern design, as well as futuristic laser weaponry. - Sons of Mars - orange mirrored helmets, dark orange accent colour on black armoured suits. High-tech volkite weaponry. -### Gameplay +## Gameplay The two main factions Xenomorphs and TG Marines have assymetrical combat. This means whilst there may be a few distinct exceptions in their gameplay, they each have unique strengths, weaknesses and other differences. -#### Xenomorphs +### Xenomorphs Xenos have 4 tiers of playable castes. Tier 1-3 have decreasing amounts of availability to players as they move up the tiers. The tiers more or less increase the combat prowess of the player with increasing tiers. They also serve to funnel some players into the weaker roles that they typically wouldn't play by having a player cap based off of total players on the team. Tier 4 allows only one playable per caste and typically comes with minimum player requirements. @@ -31,50 +31,58 @@ The 4 main tiers are supplemented by a minion tier that consists of AI xenomorph Xenos can persistently identify themselves through a simple phrase or word, e.g. `Mature Runner (Cucumber)`, as well as through selection of a female TTS voice. -**Strengths** -- More suited to hit-and-run attacks, due to their better information gathering (X-ray and darkvision) and high movement speed (especially on weeds). -- Combat castes are well-suited to go deep behind enemy lines to pick off stragglers or destroy structures. -- Excels in caves as this prevents Orbital Strikes, Close Air Support, the Tadpole and marine radio communication. -- Many castes are decent in melee range thanks to bump attacks and faster movement speed for dodging (especially on weeds). And a few castes are very good at melee combat. - - Marines on the other hand *do* have a lot of tools which are very strong in melee (e.g. Vali, powerfist, rocket sledge, point-blank shotgun blasts, etc) but their slower movement holds them back some. -- A large number of reliable combat engagement tools (e.g. Queen's Screech, King's Scattering Roar, Defiler's Emit Neurogas, Boiler's Bombard, etc) for initiating team fights. - - Marines on the other hand have some (e.g. tgas nade, tgas minirocket, tgas RR shell) but they require more accuracy or have lower AOE, though they do have greater AOE damage. -- Respawn timer is much shorter than a marines. - - Marines on the other hand *can* recover their dead bodies to revive those, heavily reducing their time spent dead. But if their body isn't recovered it's a much longer respawn timer. -- Minimal long-term resource limitations to continue successful heavy combat (just recovery pheromones and resting weeds needed mainly). - - Marines on the other hand are dependent on ammo and equipment supplies. They have to coordinate with others to resupply after sustained combat, unless they take a small combat performance hit to always bring an ammo box with them. - -#### TG Marines +### TG Marines Marines have a variety of different roles, broadly categorised as infantry, engineers, medical staff, command and pilots. The vast majority of infantry are Marines, who are aided by Squad Leaders who are able to use useful AOE buffs. -**Strengths** -- Better suited to defend areas thanks to barricades, razorfoam, automated turrets, machine gun emplacements, mortars and railguns. Their defensive structures especially are far superior to xeno equivalents. -- Excels in corridors as it means less directions they can be attacked from, and a better chance of getting shots on-target. -- Very strong in ranged combat as they have guns. -- If their dead bodies can be recovered, they can be revived. -- Tadpoles and Drop Pods give marines a lot of powerful mobility. It can be used to sneakily reach strategic objectives, or to transport/evacuate/reinforce areas as needed. -- Short-term resource management (i.e. ammo inside weaponry) for most marines isn't a concern as they only need 5-10 seconds to reload generally after every few minute or two in combat. - - Xenos on the other hand have to constantly manage their resources carefully to be effective (e.g. plasma for most, spiderlings for Widows, rage for Ravagers, blood for Gorgers, etc). This often leads to needing a 2:1 ratio or higher of downtime compared to combat. -- Healing is generally quick, can be interrupted to rejoin combat quickly and can be done solo for most injuries. - - Xenos on the other hand have to rest for long periods to heal usually and it takes a few seconds to unrest which means they can be attacked by marines before being able to get up. It's also dependent on weeds being available (especially rest weeds) created by Drone tree castes and healing is slow without recovery pheromones. -- Well-suited to siege areas thanks to Orbital Strikes, Close Air Support, plasma cutters, explosives and incendiary weaponry. Can clear large areas in one shot, or quickly delete any single tile in less than a second. - - Xenos on the other hand have difficulty sieging unless there are large areas infront for Boiler's Bombard and Crusher's Charge. -- Less dependent on unique roles staying alive. Only a few medics, engineers and a pilot are needed, the rest being marines can work just fine. - - Xenos on the other hand are dependent on a variety of castes staying alive. Drone tree for construction, Sentinel tree for ranged/sieging capabilities, Runner and Defender trees for close quarters combat, plus Rulers for pheromones and evolution. -- Less dependent on individual player skill. As there are much more marines than xenos, unless they sabotage the group then skilled players can average out the less skilled ones. - - Xenos on the other hand depend on skilled players as there are much less of them, and it's especially needed for the Ruler roles. -- Greater benefit for getting kills. Xeno corpses when recovered can be converted into req points for top-tier equipment, killing particular castes can totally disrupt xenos' ability to function well as a team (see "dependence on unique roles staying alive") and it neuters the xeno's snowball mechanic (maturity and evolution are reset). - - Xenos on the other hand gain psy points for purchasing beneficial structures and Primordial evolution, however xenos have to accumulate a lot more corpses for this. -- Easier to respec if needed. Marines can pick up a new weapon, get equipment sent down or briefly head shipside to swap to a whole new set of equipment. - - Xenos on the other hand to devolve one or more tiers then wait to evolve one or more tiers, which takes a lot of time. -- On Nuclear War: Marines losing control of their most important map area (FOB) is not too impactful as they also have a Tadpole for moving troops and can call an ERT for example. - - Xenos on the other hand must defend their resin silo using their relatively weaker defensive structures, and losing it can make it very difficult to comeback from. It's so impactful that it's often the primary win condition, rather than collecting all nuke disks and using the nuclear bomb. - -#### Similarities +## Faction Comparison + +### Damage Types + +| Aspect | Marines | Xenos | +| --- | --- | --- | +| Melee Damage | **Medium** (powerfist, vali, rocket sledge point-blank guns) | **Very Strong** (decent melee damage minimum for all castes, high amounts for specialists) | +| Short-Range Damage (on-screen) | **Very Strong** (most guns) | **Medium** (acid spit, Behemoth rocks, Warlock) | +| Long-Range Damage (off-screen) | **Very Strong** (snipers, TAT, mortar, CAS, OB) | **Weak** (just Boiler) +| Area of Effect Damage | **Very Strong** (CAS, OB, mortar, tank) | **Medium** (mainly T3s: Warlock, Defiler, Boiler, Praetorian, Behemoth, King) + +### Combat Tactics + +| Aspect | Marines | Xenos | +| --- | --- | --- | +| Flanking | **Weak** (slow movespeed) | **Very Strong** (x-ray and dark vision, high mobility) | +| Point Defence | **Very Strong** (cades, turrets, machine guns, SG, aim mode ungaballs, tank, mech) | **Medium** (quickly building walls, acid spray, crowd control abilities) +| Sieging | **Very Strong** (grenades, mortars, CAS, OB, flamethrowers, plasmacutters, machineguns) | **Medium** (acid spit, Boiler, Warlock, Crusher) +| Area Denial | **Very Strong** (grenades, turrets, tank, CAS, OB) | **Medium** (turrets, acid spray, gas, Warlock, Behemoth) +| Combat Initiation | **Medium** (grenades, rockets, tangle OB, squad leader orders) | **Very Strong** (multiple quick abilities that can be used for crowd control or cover to begin combat on favourable terms e.g. Queen's Screech, Defiler's Neurogas, etc) +| Backlining | **Weak** (low Mobility means difficult to retreat or get reinforcements) | **Very Strong** (several castes can reliabily win 1v1s, destroy structures, retreat if necessary, etc) +| Terrain Advantage | **Open Air** | **Caves** (this prevents Orbital Strikes, Close Air Support, Drop-pods, Tadpole and radio communication) | +| Chokepoints | **Very Strong** (can focus heavy suppressive fire in one direction) | **Weak** (Warlock can reflect projectiles, but otherwise not much) | +| Open Areas | **Very Strong** (allows for many marines to do suppressive machine gun or sniper fire) | **Weak** (usually takes too damage whilst trying to engage, better off Flanking then slowly encroaching with weeds and walls) | +| Mazes (Twisting Paths) | **Weak** (blocks sightlines for most weaponry) | **Very Strong** (allows xenos to utilise their high mobility to gapclose and initiate combat, and quickly retreat out of combat) + +### Misc + +| Aspect | Marines | Xenos | +| --- | --- | --- | +| Mobility | **Weak** (slow movespeed, but there is Tadpole, Drop-pods and Move Orders which help) | **Very Strong** (fast movespeed especially on weeds, King Summon) | +| Healing | **Medium** (can be done solo, but isn't infinite) | **Very Strong** (fast, plus weeds and pheros are usually prevalent) | +| Revival | **Possible** | **Impossible** | +| Respawning | **Slow** | **Fast** | +| Short-Term Resource Management | **Low** (quick reloads, on ammo, meds) | **High** (plasma pools are small and recharge slowly, requiring frequent periods of rest. Also healing needed more often due to ranged combat disparity) | +| Long-Term Resource Management | **High** (dependent on ammo, meds and materials resupplies) | **Medium** (Strategic and Tactical psypoints, weeds, pheromones) | +| Adaptability | **Very Strong** (can use any gun, and not having a skill merely slows you down) | **Strong** (caste swap possible but has a timer, you also lose your current evolution progress) | +| Population | **High** (no cap on marine population) | **Low** (cap on xeno population, and it's a fraction of marine pop) | +| Skill Floor | **Low** (beginner loadouts, most marine guns work similarly) | **Medium** (T1s each have a few abilities to learn, knowing when to retreat and heal, several pieces of marine equipment to be know of) +| Skill Ceiling | **Very High** (accuracy, knowing the meta gear, when to change tactics, etc ) | **Very High** (accuracy, lots of ability combos, when to change tactics, etc) | +| Teamwork Dependence | **Medium** (a few medics, engineers and a pilot are needed only) | **High** (at least half the team are required to be competent due to lower pop, and also requires certain roles filled: Queen, builders, frontliners and gas are basically essential) +| Kill Benefits | **Very High** (corpses become req points which can purchase game-changing equipment, also because of xeno's teamwork dependence you can easily disrupt their effectiveness by killing essential castes) | **Medium** (psypoints gained from marine corpses, but the purchases aren't as game-changing and stuff like Primordials can take a long while to come into effect) +| Game Mode: Nuclear War | **Advantaged** (marines losing control of their most important map area the FOB is not too impactful as the Alamo can be kept shipside to prevent a xeno Minor Victory) | **Disadvantaged** (xenos are massively impacted by loss of their resin silo to the point that marines can win games by ignoring nuke disks and just killing the silo. Their Point Defence is also weak which makes defending the silo and disk rooms difficult) + +### Similarities - Both have mechanics intended to reduce their individual effectiveness if they take heavy damage during sustained combat (sunder for xenos, fractures for marines). -- Both have snowball mechanics (they get stronger over the course of the round if they're winning). Evolution, maturity and structures for xenos, req points for marines. +- Both have snowball mechanics (they get stronger over the course of the round if they're winning). Psy points for xenos, req points for marines. Both also have structures. - Neither have catch-up mechanics (getting stronger if losing). ### Round flow diff --git a/html/changelogs/AutoChangeLog-pr-15528.yml b/html/changelogs/AutoChangeLog-pr-15528.yml new file mode 100644 index 0000000000000..00a72074895f9 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-15528.yml @@ -0,0 +1,4 @@ +author: "lbnesquik" +delete-after: True +changes: + - rscadd: "Added extra clone bays to TGS Theseus" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-15548.yml b/html/changelogs/AutoChangeLog-pr-15548.yml new file mode 100644 index 0000000000000..a83a88c04a883 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-15548.yml @@ -0,0 +1,4 @@ +author: "blackdav123" +delete-after: True +changes: + - balance: "Gelida caves can now be plasmacut one tile deep." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-15566.yml b/html/changelogs/AutoChangeLog-pr-15566.yml new file mode 100644 index 0000000000000..89c5bbbff93fd --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-15566.yml @@ -0,0 +1,4 @@ +author: "TiviPlus" +delete-after: True +changes: + - rscadd: "AI can use evasion" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-15567.yml b/html/changelogs/AutoChangeLog-pr-15567.yml new file mode 100644 index 0000000000000..b420786e484da --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-15567.yml @@ -0,0 +1,4 @@ +author: "TiviPlus" +delete-after: True +changes: + - rscadd: "Nymphs and non-minion AI will no longer be suicidal" \ No newline at end of file diff --git a/html/changelogs/archive/2024-03.yml b/html/changelogs/archive/2024-03.yml index bc814e30d27bf..12b512c0d8ad5 100644 --- a/html/changelogs/archive/2024-03.yml +++ b/html/changelogs/archive/2024-03.yml @@ -428,5 +428,92 @@ 2024-03-29: Barnet2: - qol: The toxin reagent from QC+, Peri+ and Nanoblood now shows on medical scanners. + Lumipharon: + - code_imp: Some performance improvements to campaign loadout UI + Pariah919: + - rscadd: Added new Sniper and Shotgun sentry to the marine arsenal, as well as + new sentry sprites. blackdav123: - bugfix: Fills in space tile on Theseus +2024-03-30: + Aporhtonoma: + - rscadd: Puppets have now the ability to rest and unrest when puppeter does + - rscadd: puppets have now the ability to sleep and resist when puppeter does + - rscadd: Puppets have now the ability to jump when puppeter does + Barnet2: + - rscdel: Removes the ability to vote for the current map during groundmap vote + - admin: R_POLLS rank used for Server Poll Management + Lumipharon: + - qol: 'Campaign: Improved loadout UI and new icons' + Xander3359: + - bugfix: fix the HSG_102 that spawn on maps having the wrong item path + blackdav123: + - bugfix: Fixed a few misplaced area tiles on Gelida caves + lbnesquik: + - code_imp: Removes some redundant code + - rscdel: Removed factory medpacks +2024-03-31: + Barnet2: + - balance: Boiler glob CD increased by 5 + - balance: Boiler lance has a range of 25, the same distance as it's horizontal + zoom range. + - rscadd: Whistle makes every human in range do the *warcry emote + - balance: Bull now has Boiler's zoom ability + - balance: Bull is now has a mob size of big + - qol: Sulaco generators and SMES are now preset + - balance: Warlock psy blast AOE no longer damages barricades and their subtypes + - balance: Warlock psy blast no longer has knockback + - balance: Warlock psy blast now has IFF, going through teammates + Lumipharon: + - balance: Made SMG and rifle more expensive + - bugfix: Fixed plasma cannon starting with an incorrect ammo type set + - bugfix: 'Campaign: Fixed a missing whitelist requirement for Surt' + Naaanii: + - rscdel: Removed RR launcher, AT gun and it's ammo from regular Valhalla vendors. + - rscadd: Added the RR launcher, AT gun and it's ammo to the Valhalla req vendors. + - rscadd: Added the small HMG magazines to the regular Valhalla vendors. + Notamaniac: + - refactor: Robotic Cradle was refactored + - qol: You can now eject people just by clicking + - balance: There are no more skill requirements to putting yourself or someone into + the cradle + - bugfix: Synths can now place themselves into the cradle + - bugfix: Moths can no longer use the cradle by getting grabbed and put in (or other + creatures like sectoids) + - bugfix: Robot and synth medical records don't get updated anymore when using the + cradle. + - bugfix: You can no longer start a repair, get ejected, then hop back in and get + repaired from the earlier unfinished operation. + PestoVerde322: + - qol: The TE powerpack is now available in the default, Crash and Valhalla Automated + weapon rack + RipGrayson: + - bugfix: Fixed a few incorrect icons in our walls. + - bugfix: You can no longer perma trap people inside hull walls on some BR modulars + as wraith. + - bugfix: Corrected an incorrect icon for mounted lasers on Oscar Outpost. + - bugfix: Removed an incorrect merge conflict marker on Jungle Outpost. + - bugfix: Fixed the tank being unable to leave the dropship on Delta. + - bugfix: Fixed a situation on Sulaco where transport officers could be stuck in + mech crew headquarters. + - bugfix: Adjusted some IDs on the tank vehicle bay so that they were no longer + bugged. + - imageadd: Ported some carpets from TG for mapper use. + - imageadd: Ported some glass floors from TG for mapper use. + - imageadd: Ported the chasm sprites from TG. + - imageadd: Created a new set of walls for basalt terrain. + - imageadd: Created two new autosmoothing variations for asphalt. + - imageadd: Added error signs to many icon files, for easier debugging. + - imagedel: Deleted some unused carpet icons that have been obsolete since the new + smoothing system. + Xander3359: + - bugfix: Touching the alamo console as a xeno stops takeoff + lbnesquik: + - rscadd: Add OB shots to round end statistics + novaepee: + - rscadd: Pillar of Spring's Vehicle Bay + - rscadd: Change POS's TO and PO's bunk + - rscadd: expand PoS' req + - rscadd: Move PoS' OB to be closer to CIC. Also add brig. + - rscadd: move PoS' droppod to where mech is and vice versa + - rscadd: move PoS' tadpole to where briefing is and vice versa diff --git a/html/changelogs/archive/2024-04.yml b/html/changelogs/archive/2024-04.yml new file mode 100644 index 0000000000000..8292d8990fd1b --- /dev/null +++ b/html/changelogs/archive/2024-04.yml @@ -0,0 +1,108 @@ +2024-04-01: + Lumipharon: + - rscadd: 'Campaign: Added a new mission - Raiding Base for TGMC' + Notamaniac: + - bugfix: R76 icon no longer shows up as an error icon in holster + Xander3359: + - qol: Gives xenos "Toggle Seethrough" ability, making their sprite translucent, + allowing you to click through yourself +2024-04-02: + RipGrayson: + - bugfix: Fixed posters displaying error signs instead of their valid icon. +2024-04-03: + AusarAtkin: + - balance: Welder repair amount scale off Engi skill. + Barnet2: + - balance: Warding pheros have near half effectiveness, from 2.5 armor per aura + level to 1.5 + Lumipharon: + - rscadd: 'Campaign: Added a few new loadout options and tweaked a few existing + ones' + - bugfix: 'Campaign: Fixed a few incorrect gun sprites in the loadout menu' + - qol: 'Campaign: Updated mech colours to distinguish the different weight classes + better' + - bugfix: 'Campaign: fixed a few minor issues on Raiding Base' + - qol: 'Campaign: Mech pods and deploy point descriptions explain how mechs can + use them' + MLGTASTICa: + - balance: Veteran ERT now starts with their firearms and rifles skills at trained + instead of the default(+1) + - balance: Special Ops ERT now starts with their smg skill set to trained instead + of the default(+1) + Naaanii: + - rscadd: Actually adds the cloak nade refill to req. + - balance: rebalances grenade pricing and reqtorio yield. + TiviPlus: + - bugfix: ACs can no longer use mech console + blackdav123: + - bugfix: Tanks will now be able to leave the Alamo on Slumbridge + - code_imp: Standardized dark frost walls with other wall types. + coldironwarrior: + - balance: CSE now has 5 in engineering and construction skills + - balance: SOs have higher engineering and powerloader skill now (shouldn't fumble + with OB) + - balance: ' CSEs now have leadership level 2, down from leadership 3' + lbnesquik: + - balance: Increase bulletproof vests armor bullet resistance. Slight energy/laser + increase. + novaepee: + - bugfix: PoS req and tc +2024-04-04: + AusarAtkin: + - qol: Examining stasis bag while wearing med hud now show defib status (DNR, Almost + departed) and DNR timer + Lumipharon: + - bugfix: fixed conveyors breaking in certain scenarios + - code_imp: Fixed a minor runtime and removed an unneeded stack trace + - balance: 'Campaign: Deploying an OB beacon in the Raiding Base mission pauses + the game timer' + - balance: 'Campaign: Running a code computer on NT Base Rescue pauses the game + timer' + TiviPlus: + - balance: Doubled AI xeno spawnrate + - bugfix: Fixed tank ammo rack LTA-AP Overlay + Xander3359: + - qol: All chems (except neuraline) are scannable by a health scanner + coldironwarrior: + - rscadd: adds the paramedic labcoat + homexp13: + - balance: Silo larva gene now decreases more depending on the marine to xenos ratio. + lbnesquik: + - qol: Activating supply beacons notify the shipside console with a noise + - rscadd: Add alternate ammo MLRS ammo to the req factory + - bugfix: Fix the MLRS gas and cloaking gas sharing the same path and likely bugging + out + - code_imp: Renames the MLRS ammo to a more consistent schema + - bugfix: Fix the MLRS having free ammo thanks to init mapload :( +2024-04-05: + PestoVerde322: + - bugfix: The lightbulbs on red alert or low power now no longer turn into a massive + error + - bugfix: The welding glasses have been aligned instead of nudging off weirdly when + toggled + - bugfix: The door control button will stay in place if you don't have access + - bugfix: The error on the escape pod controller is gone + - imagedel: Cleared some unused icons in lighting.dmi + - rscdel: Removed the unused firelight + TiviPlus: + - bugfix: Probably fixed AI roaming and that one startup runtime + exdal: + - bugfix: Fixes full_name typo in Orbit UI +2024-04-06: + BraveMole: + - rscadd: Idled minions will now follow xenos players to the front + Lumipharon: + - bugfix: fixed infinite projectile reflection + - qol: 'Campaign: Loadout options with a cost are now coloured to indicate this' + - balance: Reduced the duration of smoke nades used in HvH + MLGTASTICa: + - code_imp: Moved entrance code from the armored/sealed/multitile type to armored/sealed. + Refactors the NT mini tank code to work with this. + - balance: You can now throw shells to the interior of the MT Ares by attacking + the tank with them at an entrance. + - qol: Radial menus for applying medicine will now fit all LIMBS on a ring instead + of having 2 pages. + Victor239: + - code_imp: Updated faction comparison docs. + yyzsong: + - rscadd: Adds night vision goggles to valhalla diff --git a/icons/Marine/marine-hmg.dmi b/icons/Marine/marine-hmg.dmi index 48c4465e41252..7920acd0305bf 100644 Binary files a/icons/Marine/marine-hmg.dmi and b/icons/Marine/marine-hmg.dmi differ diff --git a/icons/Marine/sentry.dmi b/icons/Marine/sentry.dmi index 3d7eb7cf0935b..260bf342e740e 100644 Binary files a/icons/Marine/sentry.dmi and b/icons/Marine/sentry.dmi differ diff --git a/icons/UI_Icons/campaign/loadout_item_icons.dmi b/icons/UI_Icons/campaign/loadout_item_icons.dmi index 357d9c23d98cb..ba9bba0cc8c7f 100644 Binary files a/icons/UI_Icons/campaign/loadout_item_icons.dmi and b/icons/UI_Icons/campaign/loadout_item_icons.dmi differ diff --git a/icons/obj/airlock_machines.dmi b/icons/obj/airlock_machines.dmi index 52e482dfcf9de..9eb4201e06ca2 100644 Binary files a/icons/obj/airlock_machines.dmi and b/icons/obj/airlock_machines.dmi differ diff --git a/icons/obj/alien_autopsy.dmi b/icons/obj/alien_autopsy.dmi index b8c9a73831d59..59564dab411c0 100644 Binary files a/icons/obj/alien_autopsy.dmi and b/icons/obj/alien_autopsy.dmi differ diff --git a/icons/obj/armored/3x3/tank_interior.dmi b/icons/obj/armored/3x3/tank_interior.dmi index f1a97c4bcdfb1..3e3fceb36156d 100644 Binary files a/icons/obj/armored/3x3/tank_interior.dmi and b/icons/obj/armored/3x3/tank_interior.dmi differ diff --git a/icons/obj/bodybag.dmi b/icons/obj/bodybag.dmi index 325d7afaa9c21..dd3f040882f97 100644 Binary files a/icons/obj/bodybag.dmi and b/icons/obj/bodybag.dmi differ diff --git a/icons/obj/clothing/belts.dmi b/icons/obj/clothing/belts.dmi index fc31dbd290c65..c46d88d372c53 100644 Binary files a/icons/obj/clothing/belts.dmi and b/icons/obj/clothing/belts.dmi differ diff --git a/icons/obj/clothing/glasses.dmi b/icons/obj/clothing/glasses.dmi index 478a7f4b7f597..9e63b9fa38b92 100644 Binary files a/icons/obj/clothing/glasses.dmi and b/icons/obj/clothing/glasses.dmi differ diff --git a/icons/obj/contraband.dmi b/icons/obj/contraband.dmi index cfa1b8301ae57..03c9902fa26be 100644 Binary files a/icons/obj/contraband.dmi and b/icons/obj/contraband.dmi differ diff --git a/icons/obj/cryobag.dmi b/icons/obj/cryobag.dmi index f44680b19c9b1..8154f75e53924 100644 Binary files a/icons/obj/cryobag.dmi and b/icons/obj/cryobag.dmi differ diff --git a/icons/obj/decals.dmi b/icons/obj/decals.dmi index fa65d40f30172..38ea1433dd190 100644 Binary files a/icons/obj/decals.dmi and b/icons/obj/decals.dmi differ diff --git a/icons/obj/decals_arrow.dmi b/icons/obj/decals_arrow.dmi index a09fcc9396851..ebd16f9d42cc4 100644 Binary files a/icons/obj/decals_arrow.dmi and b/icons/obj/decals_arrow.dmi differ diff --git a/icons/obj/det.dmi b/icons/obj/det.dmi index fb6635eeaedb0..04015e4c52004 100644 Binary files a/icons/obj/det.dmi and b/icons/obj/det.dmi differ diff --git a/icons/obj/inflatable.dmi b/icons/obj/inflatable.dmi index 2abd2c0150e34..3db2072f2ff28 100644 Binary files a/icons/obj/inflatable.dmi and b/icons/obj/inflatable.dmi differ diff --git a/icons/obj/items/ammo.dmi b/icons/obj/items/ammo.dmi index f92f602db1ac4..548309e64c663 100644 Binary files a/icons/obj/items/ammo.dmi and b/icons/obj/items/ammo.dmi differ diff --git a/icons/obj/items/grenade.dmi b/icons/obj/items/grenade.dmi index af815f9f2c302..7219a82679dd5 100644 Binary files a/icons/obj/items/grenade.dmi and b/icons/obj/items/grenade.dmi differ diff --git a/icons/obj/items/items.dmi b/icons/obj/items/items.dmi index 9a099dc86a1b2..e96dbe5bcfef1 100644 Binary files a/icons/obj/items/items.dmi and b/icons/obj/items/items.dmi differ diff --git a/icons/obj/items/tools.dmi b/icons/obj/items/tools.dmi index 5d7231f21d2c6..1f50759a3dcb4 100644 Binary files a/icons/obj/items/tools.dmi and b/icons/obj/items/tools.dmi differ diff --git a/icons/obj/items/vali.dmi b/icons/obj/items/vali.dmi index a7c3091989c7e..d46908ea44ce4 100644 Binary files a/icons/obj/items/vali.dmi and b/icons/obj/items/vali.dmi differ diff --git a/icons/obj/items/weapons.dmi b/icons/obj/items/weapons.dmi index f0e2433d278dc..c56703392f86a 100644 Binary files a/icons/obj/items/weapons.dmi and b/icons/obj/items/weapons.dmi differ diff --git a/icons/obj/items/weapons64.dmi b/icons/obj/items/weapons64.dmi index 6279d15ffb4cb..7953d7c4e88b0 100644 Binary files a/icons/obj/items/weapons64.dmi and b/icons/obj/items/weapons64.dmi differ diff --git a/icons/obj/iv_drip.dmi b/icons/obj/iv_drip.dmi index e007c7d13ef95..6530974383fc1 100644 Binary files a/icons/obj/iv_drip.dmi and b/icons/obj/iv_drip.dmi differ diff --git a/icons/obj/kitchen.dmi b/icons/obj/kitchen.dmi index 7d49711da7532..60dae0d5fecbd 100644 Binary files a/icons/obj/kitchen.dmi and b/icons/obj/kitchen.dmi differ diff --git a/icons/obj/lighting.dmi b/icons/obj/lighting.dmi old mode 100755 new mode 100644 index 21f835d0b6d14..e7e23f0f8b2e5 Binary files a/icons/obj/lighting.dmi and b/icons/obj/lighting.dmi differ diff --git a/icons/obj/machines/vending.dmi b/icons/obj/machines/vending.dmi index 37a34e3b879b0..01a5f1e0552e6 100644 Binary files a/icons/obj/machines/vending.dmi and b/icons/obj/machines/vending.dmi differ diff --git a/icons/obj/musician.dmi b/icons/obj/musician.dmi index 4a8fa9291ebe8..b563e5e60340d 100644 Binary files a/icons/obj/musician.dmi and b/icons/obj/musician.dmi differ diff --git a/icons/obj/objects.dmi b/icons/obj/objects.dmi index 5ce55c7502d0b..f0702ab2ec9a3 100644 Binary files a/icons/obj/objects.dmi and b/icons/obj/objects.dmi differ diff --git a/icons/obj/pipes.dmi b/icons/obj/pipes.dmi index ed5558e47e35c..da036c553b6f7 100644 Binary files a/icons/obj/pipes.dmi and b/icons/obj/pipes.dmi differ diff --git a/icons/obj/safety_signs.dmi b/icons/obj/safety_signs.dmi index 74f362e6c9c8c..0d2ed38ed2b44 100644 Binary files a/icons/obj/safety_signs.dmi and b/icons/obj/safety_signs.dmi differ diff --git a/icons/obj/safety_signs_arrow.dmi b/icons/obj/safety_signs_arrow.dmi index 29550ee8e0180..0e21f8b608112 100644 Binary files a/icons/obj/safety_signs_arrow.dmi and b/icons/obj/safety_signs_arrow.dmi differ diff --git a/icons/obj/smooth_objects/chigusa_window.dmi b/icons/obj/smooth_objects/chigusa_window.dmi index 7e8f7a20bf826..7e1e6f4f17911 100644 Binary files a/icons/obj/smooth_objects/chigusa_window.dmi and b/icons/obj/smooth_objects/chigusa_window.dmi differ diff --git a/icons/obj/smooth_objects/prison_rwindow.dmi b/icons/obj/smooth_objects/prison_rwindow.dmi index 3d4954207132c..d800945bc5b42 100644 Binary files a/icons/obj/smooth_objects/prison_rwindow.dmi and b/icons/obj/smooth_objects/prison_rwindow.dmi differ diff --git a/icons/obj/stack_objects.dmi b/icons/obj/stack_objects.dmi index 72873f3142fa9..f6eb551e74734 100644 Binary files a/icons/obj/stack_objects.dmi and b/icons/obj/stack_objects.dmi differ diff --git a/icons/obj/stationobjs.dmi b/icons/obj/stationobjs.dmi index 722e4d3573905..bd83705975b2b 100644 Binary files a/icons/obj/stationobjs.dmi and b/icons/obj/stationobjs.dmi differ diff --git a/icons/obj/structures/stairs.dmi b/icons/obj/structures/stairs.dmi index c8aec613b8b5c..60cf87c10401b 100644 Binary files a/icons/obj/structures/stairs.dmi and b/icons/obj/structures/stairs.dmi differ diff --git a/icons/obj/wallframes.dmi b/icons/obj/wallframes.dmi index 63f70d53423c1..d9fa1bbb38915 100644 Binary files a/icons/obj/wallframes.dmi and b/icons/obj/wallframes.dmi differ diff --git a/icons/obj/watercloset.dmi b/icons/obj/watercloset.dmi index 17e5f89fae261..d94c8f9cef518 100644 Binary files a/icons/obj/watercloset.dmi and b/icons/obj/watercloset.dmi differ diff --git a/icons/turf/areas.dmi b/icons/turf/areas.dmi index 8622a7299e844..eed2d031abe44 100644 Binary files a/icons/turf/areas.dmi and b/icons/turf/areas.dmi differ diff --git a/icons/turf/floors.dmi b/icons/turf/floors.dmi index e73ada5692526..ff96565e7b513 100644 Binary files a/icons/turf/floors.dmi and b/icons/turf/floors.dmi differ diff --git a/icons/turf/floors/asphalt-regular.dmi b/icons/turf/floors/asphalt-regular.dmi new file mode 100644 index 0000000000000..947335b5b0dce Binary files /dev/null and b/icons/turf/floors/asphalt-regular.dmi differ diff --git a/icons/turf/floors/asphalt-sunbleached.dmi b/icons/turf/floors/asphalt-sunbleached.dmi new file mode 100644 index 0000000000000..842f213d156a0 Binary files /dev/null and b/icons/turf/floors/asphalt-sunbleached.dmi differ diff --git a/icons/turf/floors/basalt-dirt.dmi b/icons/turf/floors/basalt-dirt.dmi index 50f1ab66530b1..abd56eb455897 100644 Binary files a/icons/turf/floors/basalt-dirt.dmi and b/icons/turf/floors/basalt-dirt.dmi differ diff --git a/icons/turf/floors/carpet.dmi b/icons/turf/floors/carpet.dmi index 5e98790d2b9c0..c4e108ddbc63d 100644 Binary files a/icons/turf/floors/carpet.dmi and b/icons/turf/floors/carpet.dmi differ diff --git a/icons/turf/floors/carpet_black.dmi b/icons/turf/floors/carpet_black.dmi new file mode 100644 index 0000000000000..7df942035adc4 Binary files /dev/null and b/icons/turf/floors/carpet_black.dmi differ diff --git a/icons/turf/floors/carpet_blue.dmi b/icons/turf/floors/carpet_blue.dmi new file mode 100644 index 0000000000000..6eea31902c8d2 Binary files /dev/null and b/icons/turf/floors/carpet_blue.dmi differ diff --git a/icons/turf/floors/carpet_cyan.dmi b/icons/turf/floors/carpet_cyan.dmi new file mode 100644 index 0000000000000..fa38993c5ceeb Binary files /dev/null and b/icons/turf/floors/carpet_cyan.dmi differ diff --git a/icons/turf/floors/carpet_green.dmi b/icons/turf/floors/carpet_green.dmi new file mode 100644 index 0000000000000..49daef00acd02 Binary files /dev/null and b/icons/turf/floors/carpet_green.dmi differ diff --git a/icons/turf/floors/carpet_orange.dmi b/icons/turf/floors/carpet_orange.dmi new file mode 100644 index 0000000000000..0ee9b56e8b09c Binary files /dev/null and b/icons/turf/floors/carpet_orange.dmi differ diff --git a/icons/turf/floors/carpet_purple.dmi b/icons/turf/floors/carpet_purple.dmi new file mode 100644 index 0000000000000..a00c1621d3881 Binary files /dev/null and b/icons/turf/floors/carpet_purple.dmi differ diff --git a/icons/turf/floors/carpet_red.dmi b/icons/turf/floors/carpet_red.dmi new file mode 100644 index 0000000000000..dbd5f889e76d5 Binary files /dev/null and b/icons/turf/floors/carpet_red.dmi differ diff --git a/icons/turf/floors/carpet_royalblack.dmi b/icons/turf/floors/carpet_royalblack.dmi new file mode 100644 index 0000000000000..296b7b683fd0b Binary files /dev/null and b/icons/turf/floors/carpet_royalblack.dmi differ diff --git a/icons/turf/floors/cave-basalt.dmi b/icons/turf/floors/cave-basalt.dmi index dee1804dffbbd..5c9f34cd0d734 100644 Binary files a/icons/turf/floors/cave-basalt.dmi and b/icons/turf/floors/cave-basalt.dmi differ diff --git a/icons/turf/floors/chasms.dmi b/icons/turf/floors/chasms.dmi new file mode 100644 index 0000000000000..d37fa7d50c647 Binary files /dev/null and b/icons/turf/floors/chasms.dmi differ diff --git a/icons/turf/floors/glass.dmi b/icons/turf/floors/glass.dmi new file mode 100644 index 0000000000000..ae840919f6e5d Binary files /dev/null and b/icons/turf/floors/glass.dmi differ diff --git a/icons/turf/floors/jungle-border.dmi b/icons/turf/floors/jungle-border.dmi index 860a09d9c3b91..6acb365689502 100644 Binary files a/icons/turf/floors/jungle-border.dmi and b/icons/turf/floors/jungle-border.dmi differ diff --git a/icons/turf/floors/jungle-dirt-border.dmi b/icons/turf/floors/jungle-dirt-border.dmi index 4589eefec1700..96fb32717fd7d 100644 Binary files a/icons/turf/floors/jungle-dirt-border.dmi and b/icons/turf/floors/jungle-dirt-border.dmi differ diff --git a/icons/turf/floors/junglechasm.dmi b/icons/turf/floors/junglechasm.dmi new file mode 100644 index 0000000000000..c50775c91b1c2 Binary files /dev/null and b/icons/turf/floors/junglechasm.dmi differ diff --git a/icons/turf/floors/lava.dmi b/icons/turf/floors/lava.dmi index f0e2322d41a28..e86882c623038 100644 Binary files a/icons/turf/floors/lava.dmi and b/icons/turf/floors/lava.dmi differ diff --git a/icons/turf/floors/plasma_glass.dmi b/icons/turf/floors/plasma_glass.dmi new file mode 100644 index 0000000000000..a0e2dd20b796c Binary files /dev/null and b/icons/turf/floors/plasma_glass.dmi differ diff --git a/icons/turf/floors/red-dirt.dmi b/icons/turf/floors/red-dirt.dmi index 58d127a917462..4c18a06f28188 100644 Binary files a/icons/turf/floors/red-dirt.dmi and b/icons/turf/floors/red-dirt.dmi differ diff --git a/icons/turf/floors/reinf_glass.dmi b/icons/turf/floors/reinf_glass.dmi index 97614f510f745..a51849e547390 100644 Binary files a/icons/turf/floors/reinf_glass.dmi and b/icons/turf/floors/reinf_glass.dmi differ diff --git a/icons/turf/floors/reinf_plasma_glass.dmi b/icons/turf/floors/reinf_plasma_glass.dmi new file mode 100644 index 0000000000000..31c1c339c37d3 Binary files /dev/null and b/icons/turf/floors/reinf_plasma_glass.dmi differ diff --git a/icons/turf/floors/river.dmi b/icons/turf/floors/river.dmi index 8c44a4e0e5a40..fa071b078ed71 100644 Binary files a/icons/turf/floors/river.dmi and b/icons/turf/floors/river.dmi differ diff --git a/icons/turf/mainship.dmi b/icons/turf/mainship.dmi index 837a20f9208e4..cb07b43109f49 100644 Binary files a/icons/turf/mainship.dmi and b/icons/turf/mainship.dmi differ diff --git a/icons/turf/prison.dmi b/icons/turf/prison.dmi index 1ab26777506f0..6237b7d5096a8 100644 Binary files a/icons/turf/prison.dmi and b/icons/turf/prison.dmi differ diff --git a/icons/turf/walls.dmi b/icons/turf/walls.dmi index a51d49c0fffb4..62a87e2c1d0df 100644 Binary files a/icons/turf/walls.dmi and b/icons/turf/walls.dmi differ diff --git a/icons/turf/walls/basaltwall.dmi b/icons/turf/walls/basaltwall.dmi new file mode 100644 index 0000000000000..67d59d9d6ca5a Binary files /dev/null and b/icons/turf/walls/basaltwall.dmi differ diff --git a/rust_g.dll b/rust_g.dll index 30f63e72f4b1d..2e95a6be9b35e 100644 Binary files a/rust_g.dll and b/rust_g.dll differ diff --git a/tgmc.dme b/tgmc.dme index 5f6daff9c6af6..8e45a543ea3e7 100644 --- a/tgmc.dme +++ b/tgmc.dme @@ -139,9 +139,11 @@ #include "code\__DEFINES\dcs\helpers.dm" #include "code\__DEFINES\dcs\signals.dm" #include "code\__DEFINES\dcs\signals\signals_datum.dm" +#include "code\__DEFINES\dcs\signals\signals_hud.dm" #include "code\__DEFINES\dcs\signals\signals_mind.dm" #include "code\__DEFINES\dcs\signals\signals_subsystem.dm" #include "code\__HELPERS\_lists.dm" +#include "code\__HELPERS\_planes.dm" #include "code\__HELPERS\_string_lists.dm" #include "code\__HELPERS\admin.dm" #include "code\__HELPERS\ai.dm" @@ -248,7 +250,8 @@ #include "code\_onclick\hud\picture_in_picture.dm" #include "code\_onclick\hud\radial.dm" #include "code\_onclick\hud\radial_persistent.dm" -#include "code\_onclick\hud\rendering\plane_master.dm" +#include "code\_onclick\hud\rendering\_plane_master.dm" +#include "code\_onclick\hud\rendering\plane_master_group.dm" #include "code\_onclick\hud\rendering\render_plate.dm" #include "code\_onclick\hud\screen_objects\menu_text_objects.dm" #include "code\_onclick\hud\screen_objects\screen_objects.dm" @@ -422,6 +425,7 @@ #include "code\datums\components\reequip.dm" #include "code\datums\components\remote_control.dm" #include "code\datums\components\rotation.dm" +#include "code\datums\components\seethrough_mob.dm" #include "code\datums\components\shield.dm" #include "code\datums\components\sizzle.dm" #include "code\datums\components\slippery.dm" @@ -681,6 +685,7 @@ #include "code\game\area\areas\shuttles.dm" #include "code\game\area\campaign_maps\jungle_outpost.dm" #include "code\game\area\campaign_maps\som_base.dm" +#include "code\game\area\campaign_maps\som_raiding_base.dm" #include "code\game\atoms\_atom.dm" #include "code\game\atoms\atom_appearance.dm" #include "code\game\atoms\atom_movable.dm" @@ -833,10 +838,17 @@ #include "code\game\objects\items\explosives\grenades\bullet_grenade.dm" #include "code\game\objects\items\explosives\grenades\chem_grenade.dm" #include "code\game\objects\items\explosives\grenades\emgrenade.dm" +#include "code\game\objects\items\explosives\grenades\explosive_grenades.dm" +#include "code\game\objects\items\explosives\grenades\flares.dm" #include "code\game\objects\items\explosives\grenades\flashbang.dm" #include "code\game\objects\items\explosives\grenades\grenade.dm" -#include "code\game\objects\items\explosives\grenades\marines.dm" +#include "code\game\objects\items\explosives\grenades\incendiary_grenades.dm" +#include "code\game\objects\items\explosives\grenades\phosphorus_grenades.dm" +#include "code\game\objects\items\explosives\grenades\rad_grenade.dm" +#include "code\game\objects\items\explosives\grenades\smoke_grenades.dm" #include "code\game\objects\items\explosives\grenades\spawnergrenade.dm" +#include "code\game\objects\items\explosives\grenades\sticky_grenades.dm" +#include "code\game\objects\items\explosives\grenades\training_grenade.dm" #include "code\game\objects\items\frames\alarms.dm" #include "code\game\objects\items\frames\frame.dm" #include "code\game\objects\items\frames\light_fixtures.dm" @@ -1158,6 +1170,7 @@ #include "code\game\objects\structures\campaign_structures\deploy_blockers.dm" #include "code\game\objects\structures\campaign_structures\destroy_objectives.dm" #include "code\game\objects\structures\campaign_structures\misc_structures.dm" +#include "code\game\objects\structures\campaign_structures\orbital_beacons.dm" #include "code\game\objects\structures\crates_lockers\closets.dm" #include "code\game\objects\structures\crates_lockers\crates.dm" #include "code\game\objects\structures\crates_lockers\largecrate.dm" diff --git a/tgui/packages/tgui/interfaces/CampaignMenu/CampaignAssets.tsx b/tgui/packages/tgui/interfaces/CampaignMenu/CampaignAssets.tsx index a6b93ad1c76ba..5cb96c1a7c9fa 100644 --- a/tgui/packages/tgui/interfaces/CampaignMenu/CampaignAssets.tsx +++ b/tgui/packages/tgui/interfaces/CampaignMenu/CampaignAssets.tsx @@ -42,7 +42,7 @@ export const CampaignAssets = (props) => { onClick={() => setSelectedReward(reward)} color={ selectedReward.name === reward.name - ? 'orange' + ? 'green' : reward.currently_active ? 'yellow' : reward.is_debuff @@ -60,9 +60,9 @@ export const CampaignAssets = (props) => { className={classes([ 'campaign_assets18x18', selectedReward.name === reward.name - ? reward.icon + '_red' + ? reward.icon + '_green' : reward.currently_active - ? reward.icon + '_orange' + ? reward.icon + '_yellow' : reward.is_debuff ? reward.icon + '_red' : reward.uses_remaining > 0 diff --git a/tgui/packages/tgui/interfaces/CampaignMenu/CampaignMissions.tsx b/tgui/packages/tgui/interfaces/CampaignMenu/CampaignMissions.tsx index e79df8101f280..f51ec46cb4eaa 100644 --- a/tgui/packages/tgui/interfaces/CampaignMenu/CampaignMissions.tsx +++ b/tgui/packages/tgui/interfaces/CampaignMenu/CampaignMissions.tsx @@ -34,7 +34,7 @@ export const CampaignMissions = (props) => { onClick={() => setSelectedMission(mission)} color={ selectedMission.name === mission.name - ? 'orange' + ? 'green' : mission.mission_critical ? 'red' : 'blue' @@ -47,7 +47,7 @@ export const CampaignMissions = (props) => { className={classes([ 'campaign_missions24x24', selectedMission.name === mission.name - ? mission.mission_icon + '_yellow' + ? mission.mission_icon + '_green' : mission.mission_critical ? mission.mission_icon + '_red' : mission.mission_icon + '_blue', diff --git a/tgui/packages/tgui/interfaces/CampaignMenu/CampaignPurchase.tsx b/tgui/packages/tgui/interfaces/CampaignMenu/CampaignPurchase.tsx index b6709c32bb0a7..5c056060a20e7 100644 --- a/tgui/packages/tgui/interfaces/CampaignMenu/CampaignPurchase.tsx +++ b/tgui/packages/tgui/interfaces/CampaignMenu/CampaignPurchase.tsx @@ -40,7 +40,7 @@ export const CampaignPurchase = (props) => { onClick={() => setSelectedReward(reward)} color={ selectedReward.name === reward.name - ? 'orange' + ? 'green' : reward.uses_remaining > 0 ? 'blue' : reward.uses_remaining < 0 @@ -54,7 +54,7 @@ export const CampaignPurchase = (props) => { className={classes([ 'campaign_assets18x18', selectedReward.name === reward.name - ? reward.icon + '_red' + ? reward.icon + '_green' : reward.icon + '_blue', ])} /> diff --git a/tgui/packages/tgui/interfaces/CampaignMenu/index.tsx b/tgui/packages/tgui/interfaces/CampaignMenu/index.tsx index a6b1c2b9650d4..59fa9ecb3dea6 100644 --- a/tgui/packages/tgui/interfaces/CampaignMenu/index.tsx +++ b/tgui/packages/tgui/interfaces/CampaignMenu/index.tsx @@ -91,8 +91,8 @@ export const CampaignMenu = (props) => { {selectedAsset ? ( diff --git a/tgui/packages/tgui/interfaces/IndividualStats/IndividualLoadouts.tsx b/tgui/packages/tgui/interfaces/IndividualStats/IndividualLoadouts.tsx index e9e3706b7d4b7..a9cfbeaf4c1ef 100644 --- a/tgui/packages/tgui/interfaces/IndividualStats/IndividualLoadouts.tsx +++ b/tgui/packages/tgui/interfaces/IndividualStats/IndividualLoadouts.tsx @@ -1,14 +1,7 @@ import { classes } from 'common/react'; import { useBackend, useLocalState } from '../../backend'; -import { - Box, - Button, - Flex, - LabeledList, - Section, - Stack, -} from '../../components'; +import { Box, Button, LabeledList, Section, Stack } from '../../components'; import { IndividualData, LoadoutItemData, OutfitCostData } from './index'; export const IndividualLoadouts = (props) => { @@ -83,43 +76,48 @@ export const IndividualLoadouts = (props) => { mr="3px" ml="3px" onClick={() => { + act('play_ding'); setselectedLoadoutItem(equippeditem); setselectedPossibleItem(equippeditem.item_type); }} color={ selectedLoadoutItem.item_type.name === equippeditem.item_type.name - ? 'orange' + ? 'green' : equippeditem.item_type.quantity === 0 ? 'grey' - : equippeditem.item_type.valid_choice === 0 + : !equippeditem.item_type.valid_choice ? 'red' - : 'blue' + : equippeditem.item_type.purchase_cost > 0 + ? 'orange' + : 'blue' } > - + {!!equippeditem.item_type.icon && ( - 0 + ? equippeditem.item_type.icon + '_orange' + : equippeditem.item_type.icon + '_blue', ])} /> )} - + {equippeditem.slot_text + ':'} - - {equippeditem.item_type.name} - + + {equippeditem.item_type.name} + ))} @@ -128,69 +126,75 @@ export const IndividualLoadouts = (props) => { -
+
Equipment options - - {available_loadouts_data - .filter((potentialitem) => potentialitem.job === selectedJob) - .filter( - (potentialitem) => - potentialitem.slot === selectedLoadoutItem.item_type.slot, - ) - .map((potentialitem) => ( - - - - ))} - +
+ + {available_loadouts_data + .filter((potentialitem) => potentialitem.job === selectedJob) + .filter( + (potentialitem) => + potentialitem.slot === selectedLoadoutItem.item_type.slot, + ) + .map((potentialitem) => ( + + + + ))} + +
@@ -210,28 +214,28 @@ export const IndividualLoadouts = (props) => { title={ selectedPossibleItem ? ( - - + - + {selectedPossibleItem.name} - + {!selectedPossibleItem.unlocked && ( - + - + )} - + ) : ( 'No item selected' diff --git a/tgui/packages/tgui/interfaces/IndividualStats/IndividualPerks.tsx b/tgui/packages/tgui/interfaces/IndividualStats/IndividualPerks.tsx index 0c60b124da8b6..80db2262f9c7a 100644 --- a/tgui/packages/tgui/interfaces/IndividualStats/IndividualPerks.tsx +++ b/tgui/packages/tgui/interfaces/IndividualStats/IndividualPerks.tsx @@ -47,10 +47,13 @@ export const IndividualPerks = (props) => {