diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_cultaltar.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_cultaltar.dmm index d77a0f7ec0..02f3446902 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_cultaltar.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_cultaltar.dmm @@ -120,9 +120,6 @@ /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/ruin/unpowered) "t" = ( -/turf/open/floor/plasteel/cult{ - initial_gas_mix = "o2=14;n2=23;TEMP=300" - }, /obj/effect/baseturf_helper/lava_land/surface, /turf/closed/wall/mineral/cult, /area/ruin/unpowered) @@ -169,7 +166,7 @@ s d c c -n +g c c d @@ -234,7 +231,7 @@ b b c c -h +g i b b @@ -252,14 +249,14 @@ b g b b -j +d b o b -j +d b b -r +g b c "} @@ -285,10 +282,10 @@ a c c c -h +g b m -j +d q b b @@ -339,7 +336,7 @@ s d c c -p +g c c d diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm index 8d52fc9180..587e234886 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm @@ -1,4 +1,4 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( /turf/closed/mineral/volcanic/lava_land_surface, /area/lavaland/surface/outdoors) @@ -145,9 +145,6 @@ /turf/open/floor/pod/dark, /area/ruin/powered) "E" = ( -/turf/open/floor/plating{ - initial_gas_mix = "o2=14;n2=23;TEMP=300" - }, /obj/structure/shuttle/engine/propulsion/burst{ dir = 8 }, diff --git a/_maps/RandomRuins/SpaceRuins/asteroid4.dmm b/_maps/RandomRuins/SpaceRuins/asteroid4.dmm index c6234672bf..da6047ce22 100644 --- a/_maps/RandomRuins/SpaceRuins/asteroid4.dmm +++ b/_maps/RandomRuins/SpaceRuins/asteroid4.dmm @@ -30,7 +30,6 @@ /turf/closed/wall/mineral/titanium, /area/ruin/unpowered) "k" = ( -/turf/open/floor/plating, /obj/item/stack/sheet/mineral/bananium{ amount = 15 }, diff --git a/_maps/RandomRuins/SpaceRuins/caravanambush.dmm b/_maps/RandomRuins/SpaceRuins/caravanambush.dmm index 6811cc6be2..2f3a1eb42c 100644 --- a/_maps/RandomRuins/SpaceRuins/caravanambush.dmm +++ b/_maps/RandomRuins/SpaceRuins/caravanambush.dmm @@ -355,7 +355,6 @@ /turf/closed/wall/mineral/titanium, /area/ruin/unpowered) "bm" = ( -/turf/open/floor/plating, /obj/machinery/door/poddoor{ id = "caravantrade1"; name = "cargo blastdoor" @@ -399,17 +398,6 @@ /obj/structure/lattice, /turf/template_noop, /area/template_noop) -"bt" = ( -/turf/open/floor/plating/airless{ - icon_plating = "platingdmg3"; - icon_state = "platingdmg3" - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating/airless{ - icon_plating = "platingdmg2"; - icon_state = "platingdmg2" - }, -/area/ruin/unpowered) "bu" = ( /obj/item/stack/sheet/metal, /obj/effect/decal/cleanable/dirt, @@ -493,7 +481,6 @@ /turf/open/floor/mineral/titanium/blue/airless, /area/ruin/unpowered) "bJ" = ( -/turf/open/floor/plating, /obj/effect/spawner/structure/window/shuttle, /turf/open/floor/plating/airless{ icon_plating = "platingdmg2"; @@ -649,7 +636,6 @@ /turf/template_noop, /area/template_noop) "ch" = ( -/turf/template_noop, /obj/item/stack/rods, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/airless{ @@ -754,7 +740,6 @@ }, /area/ruin/unpowered) "cx" = ( -/turf/template_noop, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/airless{ icon_plating = "platingdmg2"; @@ -1159,12 +1144,6 @@ }, /turf/open/floor/plasteel, /area/ruin/powered) -"dB" = ( -/obj/machinery/computer{ - dir = 8 - }, -/turf/open/floor/mineral/plastitanium, -/area/ruin/powered) "dC" = ( /obj/machinery/computer{ dir = 8 @@ -1862,7 +1841,7 @@ aa aa ab ce -dB +dC ce ab aa @@ -3497,7 +3476,7 @@ aa aa aa bl -bt +ci bB bB bU diff --git a/_maps/RandomRuins/SpaceRuins/crashedship.dmm b/_maps/RandomRuins/SpaceRuins/crashedship.dmm index 2f4586c11b..177f1c3cbc 100644 --- a/_maps/RandomRuins/SpaceRuins/crashedship.dmm +++ b/_maps/RandomRuins/SpaceRuins/crashedship.dmm @@ -10,18 +10,9 @@ "ac" = ( /turf/closed/wall/mineral/titanium, /area/awaymission/BMPship/Aft) -"ad" = ( -/turf/closed/wall/mineral/titanium/interior, -/area/awaymission/BMPship/Aft) "ae" = ( /turf/closed/wall/mineral/titanium/overspace, /area/awaymission/BMPship/Aft) -"af" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/end{ - dir = 1 - }, -/turf/open/floor/engine, -/area/awaymission/BMPship/Aft) "ag" = ( /obj/machinery/porta_turret{ dir = 8; @@ -181,22 +172,9 @@ }, /turf/open/floor/plating, /area/awaymission/BMPship/Aft) -"aH" = ( -/turf/closed/wall/mineral/titanium/interior, -/area/awaymission/BMPship/Fore) "aI" = ( /turf/closed/wall/mineral/titanium/overspace, /area/awaymission/BMPship/Fore) -"aJ" = ( -/turf/open/floor/plating/airless{ - icon_state = "platingdmg2" - }, -/area/awaymission/BMPship/Midship) -"aK" = ( -/turf/open/floor/plating/airless{ - icon_state = "platingdmg3" - }, -/area/awaymission/BMPship/Midship) "aL" = ( /obj/structure/cable{ icon_state = "1-2" @@ -224,12 +202,6 @@ }, /turf/open/floor/plating, /area/awaymission/BMPship/Aft) -"aQ" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/end{ - dir = 1 - }, -/turf/open/floor/plating/airless, -/area/awaymission/BMPship/Fore) "aR" = ( /obj/structure/table/wood, /obj/item/stack/spacecash/c500, @@ -274,16 +246,6 @@ /obj/structure/sign/vacuum, /turf/closed/wall/mineral/titanium, /area/awaymission/BMPship/Fore) -"aZ" = ( -/turf/open/floor/plating/airless{ - icon_state = "platingdmg1" - }, -/area/awaymission/BMPship/Midship) -"ba" = ( -/turf/open/floor/plating/airless{ - icon_state = "panelscorched" - }, -/area/awaymission/BMPship/Midship) "bb" = ( /obj/effect/decal/cleanable/blood/gibs/old, /obj/effect/gibspawner/human, @@ -296,12 +258,6 @@ /obj/item/clothing/glasses/regular/hipster, /turf/open/floor/plating/airless, /area/awaymission/BMPship/Midship) -"bd" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plating/airless, -/area/awaymission/BMPship/Midship) "be" = ( /obj/machinery/door/unpowered/shuttle, /obj/structure/cable{ @@ -370,12 +326,6 @@ /obj/machinery/door/airlock/external, /turf/open/floor/plating, /area/awaymission/BMPship/Fore) -"br" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plating, -/area/awaymission/BMPship/Aft) "bs" = ( /obj/structure/closet/crate, /obj/item/stack/spacecash/c1000, @@ -455,12 +405,6 @@ /obj/item/hand_labeler, /turf/open/floor/plating, /area/awaymission/BMPship/Aft) -"bF" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plating, -/area/awaymission/BMPship/Aft) "bG" = ( /obj/structure/cable{ icon_state = "4-8" @@ -474,10 +418,6 @@ }, /turf/open/floor/plating, /area/awaymission/BMPship/Aft) -"bI" = ( -/obj/machinery/door/unpowered/shuttle, -/turf/open/floor/carpet, -/area/awaymission/BMPship/Fore) "bJ" = ( /obj/machinery/door/airlock/silver, /turf/open/floor/carpet, @@ -697,12 +637,6 @@ }, /turf/open/floor/plating, /area/awaymission/BMPship/Aft) -"co" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/carpet, -/area/awaymission/BMPship/Fore) "cp" = ( /obj/item/reagent_containers/food/snacks/hugemushroomslice, /turf/open/floor/plasteel/bar, @@ -758,18 +692,9 @@ "cC" = ( /turf/open/floor/plasteel/hydrofloor, /area/awaymission/BMPship/Aft) -"cD" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel, -/area/awaymission/BMPship/Aft) "cE" = ( /turf/open/floor/plasteel, /area/awaymission/BMPship/Aft) -"cF" = ( -/turf/closed/wall/mineral/titanium/overspace, -/area/template_noop) "cG" = ( /turf/closed/wall/mineral/titanium/interior, /area/awaymission/BMPship/Fore) @@ -922,12 +847,6 @@ }, /turf/open/floor/plasteel/bar, /area/awaymission/BMPship/Midship) -"dh" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel/bar, -/area/awaymission/BMPship/Midship) "di" = ( /obj/structure/cable{ icon_state = "2-8" @@ -1079,15 +998,6 @@ }, /turf/open/floor/plasteel, /area/awaymission/BMPship/Aft) -"dF" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/awaymission/BMPship/Aft) "dG" = ( /obj/effect/spawner/structure/window/hollow/reinforced/end{ dir = 1 @@ -1509,12 +1419,6 @@ }, /turf/open/floor/plasteel/bar, /area/awaymission/BMPship/Midship) -"eN" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel/showroomfloor, -/area/awaymission/BMPship/Aft) "eO" = ( /obj/structure/cable{ icon_state = "1-2" @@ -2041,12 +1945,6 @@ }, /turf/open/floor/plasteel, /area/awaymission/BMPship/Aft) -"gB" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel, -/area/awaymission/BMPship/Aft) "gC" = ( /obj/structure/cable{ icon_state = "1-4" @@ -2250,12 +2148,6 @@ dir = 2 }, /area/awaymission/BMPship/Aft) -"hm" = ( -/turf/open/floor/plasteel/cafeteria{ - dir = 2 - }, -/turf/closed/wall/mineral/titanium/interior, -/area/awaymission/BMPship/Aft) "hn" = ( /obj/item/clothing/gloves/color/fyellow, /turf/open/floor/plating/asteroid/airless, @@ -2305,24 +2197,6 @@ }, /turf/open/floor/carpet, /area/awaymission/BMPship/Fore) -"hy" = ( -/turf/closed/wall/mineral/titanium/nodiagonal, -/area/awaymission/BMPship/Fore) -"hz" = ( -/turf/closed/wall/mineral/titanium/nodiagonal, -/area/awaymission/BMPship/Fore) -"hA" = ( -/turf/closed/wall/mineral/titanium/nodiagonal, -/area/awaymission/BMPship/Fore) -"hB" = ( -/turf/closed/wall/mineral/titanium/nodiagonal, -/area/awaymission/BMPship/Fore) -"hC" = ( -/turf/closed/wall/mineral/titanium/nodiagonal, -/area/awaymission/BMPship/Fore) -"hD" = ( -/turf/closed/wall/mineral/titanium/nodiagonal, -/area/awaymission/BMPship/Fore) "hE" = ( /turf/closed/wall/mineral/titanium/nodiagonal, /area/awaymission/BMPship/Fore) @@ -2702,7 +2576,7 @@ aa aa aa aI -hD +hE bV hx ee @@ -2752,7 +2626,7 @@ aa aa aa aI -hC +hE bV bV dH @@ -2802,7 +2676,7 @@ aa aa aa aI -hB +hE bV bV bV @@ -2847,12 +2721,12 @@ aa aa aa aa -aH -aQ +cG +gk bl bt -hy -hA +hE +hE bV bV cY @@ -2862,15 +2736,15 @@ eg bV bV bV -bI +fc fv fJ -aH +cG hE -aQ +gk gF gR -aH +cG fS fS gb @@ -2898,7 +2772,7 @@ aa aa aa aa -aH +cG aR bm bu @@ -2911,17 +2785,17 @@ du bV bV ev -co -co +db +db fd fw fu fT -aH +cG gl gG gl -aH +cG gb gb gb @@ -2949,11 +2823,11 @@ aa aa aa aa -aH +cG aS bn bm -bI +fc bV bV bV @@ -2968,11 +2842,11 @@ aT fx fK fU -aH +cG gm gG gG -aH +cG gb gb gb @@ -3000,13 +2874,13 @@ aa aa aa aa -aH +cG aT aT aT -hz +hE bW -co +db cH bV bV @@ -3019,11 +2893,11 @@ aT fy fL fv -aH -aH +cG +cG gH -aH -aH +cG +cG gb gb gb @@ -3051,7 +2925,7 @@ aa aa aa aa -aH +cG aU bo bp @@ -3059,10 +2933,10 @@ bJ bV bV cI -co +db dv dI -co +db ex bV eU @@ -3074,7 +2948,7 @@ gd gn gI fv -aH +cG gb gb gb @@ -3102,7 +2976,7 @@ aa aa aa aa -aH +cG aV bp bv @@ -3125,7 +2999,7 @@ aT go fI fv -aH +cG gb gb gb @@ -3153,7 +3027,7 @@ aa aa aa aa -aH +cG aW bp bv @@ -3163,7 +3037,7 @@ ce ce ce dw -dh +dy ce ce ce @@ -3204,7 +3078,7 @@ aa aa aa aa -aH +cG aV bp bw @@ -3255,7 +3129,7 @@ aa aa aa aa -aH +cG aW bp bv @@ -3264,7 +3138,7 @@ bZ bZ bZ dc -dh +dy dB dB dB @@ -3306,7 +3180,7 @@ aa aa aa aa -aH +cG aV bp bv @@ -3315,7 +3189,7 @@ ca cq cq dd -dh +dy dB eh eh @@ -3357,7 +3231,7 @@ aa aa aa aa -aH +cG aX bp bx @@ -3366,7 +3240,7 @@ cb cq cJ dd -dh +dy dB eh ey @@ -3417,7 +3291,7 @@ cc cq cq de -dh +dy dB eh ej @@ -3468,7 +3342,7 @@ ca cr cq dd -dh +dy dB ei ei @@ -3519,7 +3393,7 @@ cd cd cd df -dh +dy dL ej ej @@ -3624,7 +3498,7 @@ ce ce ce ek -dh +dy ce ce fg @@ -3717,7 +3591,7 @@ am aa am aq -aZ +gt aq cf cs @@ -3726,7 +3600,7 @@ ce ce ce ce -dh +dy ce ce ce @@ -3766,9 +3640,9 @@ am aa aa am -aZ +gt at -ba +ha aq cg cs @@ -3816,15 +3690,15 @@ aa aa am am -aJ -aK -ba +gL +hg +ha at aq ch cs cN -dh +dy ce dO ce @@ -3833,7 +3707,7 @@ ce ce dO ce -dh +dy ce fm at @@ -3867,15 +3741,15 @@ aa aa ap aq -aK +hg at -aK +hg by aq ci ct cO -dh +dy dA dP el @@ -3884,7 +3758,7 @@ ce dA fi fB -dh +dy ce fm gt @@ -3919,14 +3793,14 @@ aa aq as at -ba +ha at bz aq ce ce ce -dh +dy dB dQ dB @@ -3935,7 +3809,7 @@ eL dB fj dB -dh +dy ce fm gs @@ -3971,13 +3845,13 @@ aq at at bb -ba +ha at bK ce ce ce -dh +dy dB dP dB @@ -3986,7 +3860,7 @@ ce dB fk dB -dh +dy fV fm gu @@ -4028,7 +3902,7 @@ bK ce ce ce -dh +dy dB dP dB @@ -4037,7 +3911,7 @@ ce dB fk dB -dh +dy ce fm at @@ -4079,7 +3953,7 @@ bK ce ce ce -dh +dy dB dP dB @@ -4088,7 +3962,7 @@ ce dB fk dB -dh +dy ce fm gs @@ -4130,7 +4004,7 @@ aq cj cu ce -dh +dy dB dP dB @@ -4139,7 +4013,7 @@ ce dB fk dB -dh +dy ce fm gt @@ -4181,7 +4055,7 @@ aq ck cu ce -dh +dy dB dR dB @@ -4190,7 +4064,7 @@ ce dB dR dB -dh +dy ce fm gv @@ -4232,7 +4106,7 @@ aq cl ce cP -dh +dy dB dS dB @@ -4241,7 +4115,7 @@ ce dB dS dB -dh +dy fV fm gw @@ -4276,7 +4150,7 @@ aa aq az at -bd +gV at bA aq @@ -4327,7 +4201,7 @@ aa aq aA at -bd +gV at bB aq @@ -4339,7 +4213,7 @@ ce dU em ce -dh +dy eW fl ce @@ -4348,7 +4222,7 @@ ce fm gy at -bd +gV at hi fm @@ -4390,7 +4264,7 @@ aq aq en ce -dh +dy eX fm fm @@ -4423,7 +4297,7 @@ aa aa aa ac -af +ho aj an ac @@ -4441,7 +4315,7 @@ cw cw eo cw -eN +fD eo cw cw @@ -4450,11 +4324,11 @@ ac cE gz gg -gB +gX cE hj -ad -af +ht +ho aj hu dk @@ -4473,7 +4347,7 @@ aa aa aa aa -ad +ht ag ah ag @@ -4481,7 +4355,7 @@ ac aC al bg -br +fR bD bM ac @@ -4501,10 +4375,10 @@ ac cE cE cE -gB +gX cE hk -ad +ht ag ah ag @@ -4524,7 +4398,7 @@ aa aa aa aa -ad +ht ah ah ao @@ -4546,16 +4420,16 @@ eD eD eq fn -eN +fD cw fY cE al cE -gB +gX hb cE -ad +ht hp ah ah @@ -4575,7 +4449,7 @@ aa aa aa aa -ad +ht ac ak ac @@ -4584,7 +4458,7 @@ aE aN bh al -bF +dm bO ac cx @@ -4597,16 +4471,16 @@ al er eY fo -eN +fD cw ac cE cE gN -gB +gX hc al -ad +ht ac ak ac @@ -4626,7 +4500,7 @@ aa aa aa aa -ad +ht ai al al @@ -4635,7 +4509,7 @@ aF al al al -bF +dm bM ac cy @@ -4648,16 +4522,16 @@ eE al al fo -eN +fD cw ac gf cE cE -gB +gX cE cE -ad +ht hq al ai @@ -4678,7 +4552,7 @@ aa aa aa ae -ad +ht al al ar @@ -4702,7 +4576,7 @@ fp fE dj fZ -cD +dE gA gO gY @@ -4711,7 +4585,7 @@ cE fY al hs -ad +ht ae aa aa @@ -4730,14 +4604,14 @@ aa aa aa ae -ad +ht al ac aG al bi al -bF +dm bP ac cA @@ -4754,14 +4628,14 @@ cw fP ac gg -gB +gX cE cE cE cE -ad +ht hr -ad +ht ae aa aa @@ -4782,13 +4656,13 @@ aa aa aa ae -ad -ad +ht +ht aG al bj al -bF +dm bQ ac cB @@ -4805,12 +4679,12 @@ fF fQ ac gh -gB +gX gN cE gN cE -ad +ht ac ae aa @@ -4834,34 +4708,34 @@ aa aa aa ae -ad +ht aG al bk al -bF +dm bR -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad +ht +ht +ht +ht +ht +ht +ht +ht +ht +ht +ht +ht +ht +ht gi -gB +gX cE cE cE cE -ad +ht ae aa aa @@ -4885,12 +4759,12 @@ aa aa aa aa -ad +ht aG al al al -bF +dm bS ac cC @@ -4907,12 +4781,12 @@ cV cV ac gf -gB +gX cE -ad +ht hd -ad -ad +ht +ht aa aa aa @@ -4936,7 +4810,7 @@ aa aa aa aa -ad +ht aG aO al @@ -4944,26 +4818,26 @@ al bg bT cn -cD -cD +dE +dE dl -cD +dE dZ dZ -cD -cD +dE +dE fa dZ -cD -br +dE +fR ga -cD +dE gC cE -ad +ht he hl -ad +ht aa aa aa @@ -4988,16 +4862,16 @@ aa aa aa ae -ad +ht aP aP bs bH bU -ad +ht cE cC -bF +dm al al al @@ -5011,9 +4885,9 @@ ac gj gD gP -ad +ht hf -hm +ht ae aa aa @@ -5040,30 +4914,30 @@ aa aa aa ae -ad -ad -ad -ad -ad -ad -ad +ht +ht +ht +ht +ht +ht +ht cC dn -br +fR ea -br -br +fR +fR eQ al fq cC -ad -ad -ad -ad -ad -ad -ad +ht +ht +ht +ht +ht +ht +ht ae aa aa @@ -5108,7 +4982,7 @@ eb al al fG -ad +ht ae aa aa @@ -5151,15 +5025,15 @@ aa ac cX dp -dF +eu ec -dF -dF +eu +eu eR cX fr fH -ad +ht aa aa aa @@ -5200,17 +5074,17 @@ aa aa aa ac -ad -ad +ht +ht ak -ad -ad +ht +ht ac -ad +ht fb -ad -ad -ad +ht +ht +ht aa aa aa @@ -5251,16 +5125,16 @@ aa aa aa ae -ad +ht dq ah ah -ad -ad +ht +ht eS ah fs -ad +ht ae aa aa @@ -5302,16 +5176,16 @@ aa aa aa aa -ad +ht dr dr dr -ad -ad +ht +ht dr dr dr -ad +ht aa aa aa diff --git a/_maps/RandomRuins/SpaceRuins/derelict6.dmm b/_maps/RandomRuins/SpaceRuins/derelict6.dmm index 6b714814af..c1ba9f561c 100644 --- a/_maps/RandomRuins/SpaceRuins/derelict6.dmm +++ b/_maps/RandomRuins/SpaceRuins/derelict6.dmm @@ -11,16 +11,8 @@ icon_plating = "platingdmg3"; icon_state = "platingdmg3" }, -/turf/open/floor/plating/airless{ - icon_plating = "platingdmg2"; - icon_state = "platingdmg2" - }, /area/ruin/unpowered) "ad" = ( -/turf/open/floor/plating/airless{ - icon_plating = "platingdmg3"; - icon_state = "platingdmg3" - }, /obj/structure/girder, /turf/open/floor/plating/airless{ icon_plating = "platingdmg2"; @@ -33,10 +25,6 @@ /turf/template_noop, /area/template_noop) "af" = ( -/turf/open/floor/plating/airless{ - icon_plating = "platingdmg3"; - icon_state = "platingdmg3" - }, /obj/item/stack/sheet/metal, /turf/open/floor/plating/airless{ icon_plating = "platingdmg2"; @@ -63,10 +51,6 @@ /turf/template_noop, /area/template_noop) "ak" = ( -/turf/open/floor/plating/airless{ - icon_plating = "platingdmg3"; - icon_state = "platingdmg3" - }, /obj/item/stack/rods, /turf/open/floor/plating/airless{ icon_plating = "platingdmg2"; @@ -116,7 +100,6 @@ /turf/open/floor/plating/airless, /area/ruin/unpowered) "as" = ( -/turf/open/floor/plating/airless, /obj/item/stack/sheet/metal, /turf/open/floor/plating/airless{ icon_plating = "platingdmg2"; @@ -147,7 +130,6 @@ /turf/open/floor/plasteel/airless, /area/ruin/unpowered) "ay" = ( -/turf/open/floor/plating/airless, /obj/item/stack/tile/plasteel, /turf/open/floor/plating/airless{ icon_plating = "platingdmg2"; @@ -328,9 +310,6 @@ /turf/open/floor/plasteel/airless/bar, /area/ruin/unpowered) "be" = ( -/turf/open/floor/plasteel/bar{ - initial_gas_mix = "TEMP=2.7" - }, /turf/open/floor/plating/airless{ icon_plating = "platingdmg2"; icon_state = "platingdmg2" diff --git a/_maps/RandomRuins/SpaceRuins/vaporwave.dmm b/_maps/RandomRuins/SpaceRuins/vaporwave.dmm index 3a4010784a..896a34e5db 100644 --- a/_maps/RandomRuins/SpaceRuins/vaporwave.dmm +++ b/_maps/RandomRuins/SpaceRuins/vaporwave.dmm @@ -162,7 +162,6 @@ /turf/open/floor/plating/asteroid/airless, /area/ruin/unpowered/no_grav) "I" = ( -/turf/open/space, /obj/effect/turf_decal/sand, /turf/open/floor/plasteel/airless/asteroid, /area/ruin/unpowered/no_grav) diff --git a/_maps/RandomZLevels/caves.dmm b/_maps/RandomZLevels/caves.dmm index 06ef5c5c79..b1e840ac15 100644 --- a/_maps/RandomZLevels/caves.dmm +++ b/_maps/RandomZLevels/caves.dmm @@ -137,9 +137,6 @@ }, /area/awaymission/caves/BMP_asteroid/level_four) "ax" = ( -/turf/open/floor/engine/cult{ - initial_gas_mix = "n2=23;o2=14" - }, /turf/closed/wall/mineral/cult, /area/awaymission/caves/BMP_asteroid/level_four) "ay" = ( @@ -377,9 +374,6 @@ }, /area/awaymission/caves/BMP_asteroid/level_three) "bd" = ( -/turf/open/floor/plating/asteroid/basalt/lava{ - initial_gas_mix = "n2=23;o2=14" - }, /turf/closed/wall/mineral/cult, /area/awaymission/caves/BMP_asteroid/level_four) "be" = ( diff --git a/_maps/RandomZLevels/centcomAway.dmm b/_maps/RandomZLevels/centcomAway.dmm index 1a58d927e3..94f830e139 100644 --- a/_maps/RandomZLevels/centcomAway.dmm +++ b/_maps/RandomZLevels/centcomAway.dmm @@ -350,9 +350,6 @@ }, /area/awaymission/centcomAway/hangar) "bn" = ( -/turf/open/floor/plasteel/vault{ - dir = 5 - }, /turf/closed/wall/mineral/titanium/interior, /area/awaymission/centcomAway/hangar) "bo" = ( @@ -1884,7 +1881,6 @@ /turf/open/floor/plasteel/dark, /area/awaymission/centcomAway/hangar) "gS" = ( -/turf/open/floor/plating, /obj/structure/shuttle/engine/propulsion/burst{ dir = 8 }, diff --git a/_maps/RandomZLevels/moonoutpost19.dmm b/_maps/RandomZLevels/moonoutpost19.dmm index f4737a3d7c..528f5f7321 100644 --- a/_maps/RandomZLevels/moonoutpost19.dmm +++ b/_maps/RandomZLevels/moonoutpost19.dmm @@ -5685,10 +5685,6 @@ }, /area/awaymission/moonoutpost19/arrivals) "lc" = ( -/turf/open/floor/plating/asteroid{ - initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; - heat_capacity = 1e+006 - }, /turf/closed/wall/mineral/titanium/interior, /area/awaymission/moonoutpost19/arrivals) "ld" = ( diff --git a/_maps/RandomZLevels/research.dmm b/_maps/RandomZLevels/research.dmm index b98b064142..6c9a86a7cc 100644 --- a/_maps/RandomZLevels/research.dmm +++ b/_maps/RandomZLevels/research.dmm @@ -20,8 +20,7 @@ /area/awaymission/research/exterior) "ag" = ( /turf/closed/wall/mineral/plastitanium{ - dir = 8; - icon_state = "diagonalWall3" + dir = 8 }, /area/awaymission/research/interior/engineering) "ah" = ( @@ -42,8 +41,7 @@ /area/awaymission/research/interior/engineering) "ak" = ( /turf/closed/wall/mineral/plastitanium{ - dir = 1; - icon_state = "diagonalWall3" + dir = 1 }, /area/awaymission/research/interior/engineering) "al" = ( @@ -231,9 +229,7 @@ /turf/open/floor/plasteel{ icon_state = "damaged4" }, -/turf/closed/wall/mineral/plastitanium{ - icon_state = "diagonalWall3" - }, +/turf/closed/wall/mineral/plastitanium, /area/awaymission/research/interior/engineering) "aT" = ( /mob/living/simple_animal/hostile/syndicate/melee, @@ -244,8 +240,7 @@ icon_state = "damaged1" }, /turf/closed/wall/mineral/plastitanium{ - dir = 4; - icon_state = "diagonalWall3" + dir = 4 }, /area/awaymission/research/interior/engineering) "aV" = ( @@ -303,9 +298,7 @@ /turf/open/floor/plasteel{ icon_state = "damaged5" }, -/turf/closed/wall/mineral/plastitanium{ - icon_state = "diagonalWall3" - }, +/turf/closed/wall/mineral/plastitanium, /area/awaymission/research/interior/engineering) "bd" = ( /turf/open/floor/plasteel{ @@ -320,12 +313,8 @@ }, /area/awaymission/research/interior/engineering) "bf" = ( -/turf/open/floor/plasteel{ - icon_state = "damaged3" - }, /turf/closed/wall/mineral/plastitanium{ - dir = 4; - icon_state = "diagonalWall3" + dir = 4 }, /area/awaymission/research/interior/engineering) "bg" = ( @@ -4041,7 +4030,6 @@ /turf/closed/wall/mineral/titanium, /area/awaymission/research/exterior) "mf" = ( -/turf/open/floor/plating/asteroid/airless, /obj/structure/shuttle/engine/propulsion/burst{ dir = 4 }, @@ -4152,7 +4140,6 @@ /turf/closed/wall/mineral/titanium/interior, /area/awaymission/research/exterior) "mz" = ( -/turf/open/floor/plating/asteroid/airless, /obj/structure/shuttle/engine/propulsion/burst{ dir = 8 }, @@ -4357,6 +4344,12 @@ "ne" = ( /turf/open/floor/mineral/plasma, /area/space/nearstation) +"nf" = ( +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/awaymission/research/interior/engineering) +"ng" = ( +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/awaymission/research/interior/engineering) (1,1,1) = {" aa @@ -41728,7 +41721,7 @@ ap ap an aJ -al +nf bc bp bH @@ -42499,7 +42492,7 @@ aq ay an aL -al +ng bf bs bK diff --git a/_maps/RandomZLevels/snowdin.dmm b/_maps/RandomZLevels/snowdin.dmm index 84c91c3dd7..2df265cda6 100644 --- a/_maps/RandomZLevels/snowdin.dmm +++ b/_maps/RandomZLevels/snowdin.dmm @@ -1464,7 +1464,6 @@ /turf/open/floor/plating/ice/colder, /area/awaymission/snowdin/dungeon1) "eK" = ( -/turf/open/space, /obj/structure/girder, /turf/open/floor/plating/snowed, /area/awaymission/snowdin/post) diff --git a/_maps/RandomZLevels/spacebattle.dmm b/_maps/RandomZLevels/spacebattle.dmm index 9f3b0c8fc1..d1b199e8a3 100644 --- a/_maps/RandomZLevels/spacebattle.dmm +++ b/_maps/RandomZLevels/spacebattle.dmm @@ -5,12 +5,6 @@ "ab" = ( /turf/open/space, /area/space) -"ac" = ( -/turf/closed/wall/mineral/plastitanium{ - dir = 8; - icon_state = "diagonalWall3" - }, -/area/awaymission/spacebattle/syndicate2) "ad" = ( /obj/structure/shuttle/engine/propulsion/right{ dir = 1 @@ -29,12 +23,6 @@ }, /turf/open/space, /area/awaymission/spacebattle/syndicate2) -"ag" = ( -/turf/closed/wall/mineral/plastitanium{ - dir = 1; - icon_state = "diagonalWall3" - }, -/area/awaymission/spacebattle/syndicate2) "ah" = ( /turf/closed/wall/mineral/plastitanium, /area/awaymission/spacebattle/syndicate2) @@ -98,12 +86,6 @@ /obj/machinery/door/unpowered/shuttle, /turf/open/floor/mineral/titanium/blue, /area/awaymission/spacebattle/syndicate2) -"av" = ( -/turf/closed/wall/mineral/plastitanium{ - dir = 8; - icon_state = "diagonalWall3" - }, -/area/awaymission/spacebattle/syndicate3) "aw" = ( /obj/structure/shuttle/engine/propulsion/right{ dir = 1 @@ -122,12 +104,6 @@ }, /turf/open/space, /area/awaymission/spacebattle/syndicate3) -"az" = ( -/turf/closed/wall/mineral/plastitanium{ - dir = 1; - icon_state = "diagonalWall3" - }, -/area/awaymission/spacebattle/syndicate3) "aA" = ( /obj/structure/table/reinforced, /obj/item/gun/ballistic/automatic/pistol, @@ -150,11 +126,6 @@ /obj/machinery/door/airlock/external, /turf/open/floor/mineral/plastitanium, /area/awaymission/spacebattle/syndicate3) -"aF" = ( -/turf/closed/wall/mineral/plastitanium{ - icon_state = "diagonalWall3" - }, -/area/awaymission/spacebattle/syndicate2) "aG" = ( /mob/living/simple_animal/hostile/syndicate/melee{ deathmessage = "\[src] falls limp as they release their grip from the energy weapons, activating their self-destruct function!"; @@ -162,12 +133,6 @@ }, /turf/open/floor/mineral/plastitanium, /area/awaymission/spacebattle/syndicate2) -"aH" = ( -/turf/closed/wall/mineral/plastitanium{ - dir = 4; - icon_state = "diagonalWall3" - }, -/area/awaymission/spacebattle/syndicate2) "aI" = ( /obj/structure/table/reinforced, /obj/item/clothing/suit/space/hardsuit/syndi, @@ -183,28 +148,10 @@ }, /turf/open/floor/mineral/plastitanium, /area/awaymission/spacebattle/syndicate2) -"aL" = ( -/turf/closed/wall/mineral/plastitanium{ - dir = 8; - icon_state = "diagonalWall3" - }, -/area/awaymission/spacebattle/syndicate2) "aM" = ( /obj/machinery/door/airlock/external, /turf/open/floor/mineral/plastitanium, /area/awaymission/spacebattle/syndicate2) -"aN" = ( -/turf/closed/wall/mineral/plastitanium{ - dir = 1; - icon_state = "diagonalWall3" - }, -/area/awaymission/spacebattle/syndicate2) -"aO" = ( -/turf/closed/wall/mineral/plastitanium{ - dir = 8; - icon_state = "diagonalWall3" - }, -/area/awaymission/spacebattle/syndicate1) "aP" = ( /obj/structure/shuttle/engine/propulsion/right{ dir = 1 @@ -223,12 +170,6 @@ }, /turf/open/space, /area/awaymission/spacebattle/syndicate1) -"aS" = ( -/turf/closed/wall/mineral/plastitanium{ - dir = 1; - icon_state = "diagonalWall3" - }, -/area/awaymission/spacebattle/syndicate1) "aT" = ( /obj/machinery/sleeper, /turf/open/floor/mineral/plastitanium, @@ -358,21 +299,10 @@ /obj/item/restraints/handcuffs, /turf/open/floor/mineral/plastitanium, /area/awaymission/spacebattle/syndicate1) -"bq" = ( -/turf/closed/wall/mineral/plastitanium{ - icon_state = "diagonalWall3" - }, -/area/awaymission/spacebattle/syndicate3) "br" = ( /mob/living/simple_animal/hostile/syndicate, /turf/open/floor/mineral/plastitanium, /area/awaymission/spacebattle/syndicate3) -"bs" = ( -/turf/closed/wall/mineral/plastitanium{ - dir = 4; - icon_state = "diagonalWall3" - }, -/area/awaymission/spacebattle/syndicate3) "bt" = ( /obj/structure/table/reinforced, /obj/item/melee/transforming/energy/sword/saber/red, @@ -384,18 +314,6 @@ }, /turf/open/floor/mineral/plastitanium, /area/awaymission/spacebattle/syndicate3) -"bv" = ( -/turf/closed/wall/mineral/plastitanium{ - dir = 8; - icon_state = "diagonalWall3" - }, -/area/awaymission/spacebattle/syndicate3) -"bw" = ( -/turf/closed/wall/mineral/plastitanium{ - dir = 1; - icon_state = "diagonalWall3" - }, -/area/awaymission/spacebattle/syndicate3) "bx" = ( /obj/structure/table/reinforced, /obj/item/clothing/head/helmet/swat, @@ -409,43 +327,20 @@ }, /turf/open/floor/plating, /area/awaymission/spacebattle/syndicate3) -"bz" = ( -/turf/closed/wall/mineral/plastitanium{ - icon_state = "diagonalWall3" - }, -/area/awaymission/spacebattle/syndicate1) "bA" = ( /obj/structure/chair, /turf/open/floor/mineral/plastitanium, /area/awaymission/spacebattle/syndicate2) -"bB" = ( -/turf/closed/wall/mineral/plastitanium{ - dir = 4; - icon_state = "diagonalWall3" - }, -/area/awaymission/spacebattle/syndicate1) "bC" = ( /obj/machinery/computer/shuttle{ dir = 1 }, /turf/open/floor/mineral/plastitanium, /area/awaymission/spacebattle/syndicate1) -"bD" = ( -/turf/closed/wall/mineral/plastitanium{ - dir = 8; - icon_state = "diagonalWall3" - }, -/area/awaymission/spacebattle/syndicate1) "bE" = ( /obj/machinery/door/airlock/external, /turf/open/floor/mineral/plastitanium, /area/awaymission/spacebattle/syndicate1) -"bF" = ( -/turf/closed/wall/mineral/plastitanium{ - dir = 1; - icon_state = "diagonalWall3" - }, -/area/awaymission/spacebattle/syndicate1) "bG" = ( /obj/machinery/porta_turret{ dir = 8; @@ -526,15 +421,6 @@ "bT" = ( /turf/closed/wall/mineral/titanium, /area/awaymission/spacebattle/cruiser) -"bU" = ( -/turf/closed/wall/mineral/titanium, -/area/awaymission/spacebattle/cruiser) -"bV" = ( -/turf/closed/wall/mineral/titanium, -/area/awaymission/spacebattle/cruiser) -"bW" = ( -/turf/closed/wall/mineral/titanium, -/area/awaymission/spacebattle/cruiser) "bX" = ( /obj/structure/shuttle/engine/propulsion/burst/left{ dir = 8 @@ -576,9 +462,6 @@ /obj/machinery/door/unpowered/shuttle, /turf/open/floor/plasteel, /area/awaymission/spacebattle/cruiser) -"ce" = ( -/turf/closed/wall/mineral/titanium, -/area/awaymission/spacebattle/cruiser) "cf" = ( /obj/structure/shuttle/engine/propulsion{ dir = 8 @@ -589,14 +472,6 @@ /obj/structure/table/reinforced, /turf/open/floor/plasteel, /area/awaymission/spacebattle/cruiser) -"ch" = ( -/turf/open/floor/plasteel{ - icon_state = "damaged5" - }, -/turf/closed/wall/mineral/plastitanium{ - icon_state = "diagonalWall3" - }, -/area/awaymission/spacebattle/cruiser) "ci" = ( /obj/machinery/door/poddoor/preopen{ id = "spacebattlepod"; @@ -604,27 +479,10 @@ }, /turf/open/floor/plating, /area/awaymission/spacebattle/cruiser) -"cj" = ( -/turf/open/floor/plasteel{ - icon_state = "damaged4" - }, -/turf/closed/wall/mineral/plastitanium{ - dir = 4; - icon_state = "diagonalWall3" - }, -/area/awaymission/spacebattle/cruiser) "ck" = ( /mob/living/simple_animal/hostile/syndicate, /turf/open/floor/mineral/plastitanium, /area/awaymission/spacebattle/syndicate1) -"cl" = ( -/turf/open/floor/plasteel{ - icon_state = "damaged2" - }, -/turf/closed/wall/mineral/plastitanium{ - icon_state = "diagonalWall3" - }, -/area/awaymission/spacebattle/cruiser) "cm" = ( /turf/open/floor/plasteel{ icon_state = "damaged4" @@ -635,15 +493,6 @@ icon_state = "damaged3" }, /area/awaymission/spacebattle/cruiser) -"co" = ( -/turf/open/floor/plasteel{ - icon_state = "damaged5" - }, -/turf/closed/wall/mineral/plastitanium{ - dir = 4; - icon_state = "diagonalWall3" - }, -/area/awaymission/spacebattle/cruiser) "cp" = ( /turf/open/floor/plasteel{ icon_state = "damaged1" @@ -661,15 +510,9 @@ /obj/effect/decal/cleanable/blood, /turf/open/floor/plasteel, /area/awaymission/spacebattle/cruiser) -"cs" = ( -/turf/closed/wall/mineral/titanium, -/area/awaymission/spacebattle/cruiser) "ct" = ( /turf/closed/wall/mineral/titanium/nodiagonal, /area/awaymission/spacebattle/cruiser) -"cu" = ( -/turf/closed/wall/mineral/titanium, -/area/awaymission/spacebattle/cruiser) "cv" = ( /obj/machinery/power/smes/magical{ desc = "A high-capacity superconducting magnetic energy storage (SMES) unit."; @@ -790,9 +633,6 @@ /obj/item/stack/sheet/metal, /turf/open/floor/plasteel, /area/awaymission/spacebattle/cruiser) -"cR" = ( -/turf/closed/wall/mineral/titanium, -/area/awaymission/spacebattle/cruiser) "cS" = ( /obj/effect/mob_spawn/human/engineer{ mob_name = "Bill Sanchez"; @@ -916,20 +756,6 @@ /obj/effect/decal/cleanable/blood, /turf/open/floor/plasteel/bar, /area/awaymission/spacebattle/cruiser) -"do" = ( -/turf/closed/wall/mineral/titanium, -/area/awaymission/spacebattle/cruiser) -"dp" = ( -/turf/closed/wall/mineral/titanium, -/area/awaymission/spacebattle/cruiser) -"dq" = ( -/turf/open/floor/plasteel{ - icon_state = "damaged4" - }, -/turf/closed/wall/mineral/plastitanium{ - icon_state = "diagonalWall3" - }, -/area/awaymission/spacebattle/cruiser) "dr" = ( /obj/machinery/door/poddoor/preopen{ id = "spacebattlepod2"; @@ -937,28 +763,10 @@ }, /turf/open/floor/plating, /area/awaymission/spacebattle/cruiser) -"ds" = ( -/turf/open/floor/plasteel{ - icon_state = "damaged1" - }, -/turf/closed/wall/mineral/plastitanium{ - dir = 4; - icon_state = "diagonalWall3" - }, -/area/awaymission/spacebattle/cruiser) -"dt" = ( -/turf/closed/wall/mineral/titanium, -/area/awaymission/spacebattle/cruiser) "du" = ( /obj/effect/decal/cleanable/blood, /turf/closed/wall/mineral/titanium, /area/awaymission/spacebattle/cruiser) -"dv" = ( -/turf/closed/wall/mineral/titanium, -/area/awaymission/spacebattle/cruiser) -"dw" = ( -/turf/closed/wall/mineral/titanium, -/area/awaymission/spacebattle/cruiser) "dx" = ( /obj/structure/chair, /turf/open/floor/plasteel/bar, @@ -1018,15 +826,6 @@ }, /turf/open/floor/engine, /area/awaymission/spacebattle/cruiser) -"dI" = ( -/turf/open/floor/plasteel{ - icon_state = "damaged3" - }, -/turf/closed/wall/mineral/plastitanium{ - dir = 4; - icon_state = "diagonalWall3" - }, -/area/awaymission/spacebattle/cruiser) "dJ" = ( /obj/item/stack/rods, /turf/open/floor/plasteel, @@ -1221,21 +1020,9 @@ }, /turf/open/floor/plasteel/bar, /area/awaymission/spacebattle/cruiser) -"eq" = ( -/turf/closed/wall/mineral/plastitanium{ - dir = 8; - icon_state = "diagonalWall3" - }, -/area/awaymission/spacebattle/syndicate4) "er" = ( /turf/closed/wall/mineral/plastitanium, /area/awaymission/spacebattle/syndicate4) -"es" = ( -/turf/closed/wall/mineral/plastitanium{ - dir = 1; - icon_state = "diagonalWall3" - }, -/area/awaymission/spacebattle/syndicate4) "et" = ( /obj/machinery/gateway{ dir = 10 @@ -1279,9 +1066,6 @@ }, /turf/open/floor/mineral/plastitanium, /area/awaymission/spacebattle/syndicate1) -"eB" = ( -/turf/closed/wall/mineral/titanium, -/area/awaymission/spacebattle/cruiser) "eC" = ( /obj/structure/table/reinforced, /turf/open/floor/plasteel/blue/side{ @@ -1298,12 +1082,6 @@ /obj/structure/table/reinforced, /turf/open/floor/plasteel/blue, /area/awaymission/spacebattle/cruiser) -"eF" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/end{ - dir = 1 - }, -/turf/open/floor/plating, -/area/awaymission/spacebattle/cruiser) "eG" = ( /obj/structure/chair, /turf/open/floor/mineral/plastitanium, @@ -1317,12 +1095,6 @@ /obj/effect/decal/cleanable/blood, /turf/open/floor/plating/airless, /area/awaymission/spacebattle/cruiser) -"eI" = ( -/turf/closed/wall/mineral/titanium, -/area/awaymission/spacebattle/cruiser) -"eJ" = ( -/turf/closed/wall/mineral/titanium, -/area/awaymission/spacebattle/cruiser) "eK" = ( /turf/open/floor/mineral/plastitanium, /area/awaymission/spacebattle/syndicate4) @@ -1351,12 +1123,6 @@ }, /turf/open/floor/plasteel/blue, /area/awaymission/spacebattle/cruiser) -"eQ" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/middle{ - dir = 4 - }, -/turf/open/floor/plating, -/area/awaymission/spacebattle/cruiser) "eR" = ( /obj/machinery/sleeper, /turf/open/floor/mineral/plastitanium, @@ -1468,9 +1234,6 @@ /obj/machinery/computer/security/telescreen, /turf/closed/wall/mineral/titanium, /area/awaymission/spacebattle/cruiser) -"fk" = ( -/turf/closed/wall/mineral/titanium, -/area/awaymission/spacebattle/cruiser) "fl" = ( /obj/machinery/door/airlock/external, /turf/open/floor/mineral/plastitanium, @@ -1889,17 +1652,6 @@ /obj/item/gun/ballistic/shotgun/automatic/combat, /turf/open/floor/plasteel, /area/awaymission/spacebattle/cruiser) -"gA" = ( -/turf/closed/wall/mineral/plastitanium{ - icon_state = "diagonalWall3" - }, -/area/awaymission/spacebattle/syndicate4) -"gB" = ( -/turf/closed/wall/mineral/plastitanium{ - dir = 4; - icon_state = "diagonalWall3" - }, -/area/awaymission/spacebattle/syndicate4) "gC" = ( /obj/structure/closet/crate/secure/weapon, /obj/item/gun/energy/laser, @@ -1911,10 +1663,6 @@ /obj/item/stack/spacecash/c10, /turf/open/floor/plating, /area/awaymission/spacebattle/cruiser) -"gE" = ( -/obj/effect/decal/cleanable/blood, -/turf/closed/wall/mineral/titanium, -/area/awaymission/spacebattle/cruiser) "gF" = ( /obj/effect/mob_spawn/human/doctor{ mob_name = "Adam Smith"; @@ -1975,12 +1723,6 @@ }, /turf/open/floor/plating/airless, /area/awaymission/spacebattle/syndicate7) -"gQ" = ( -/turf/closed/wall/mineral/plastitanium{ - dir = 1; - icon_state = "diagonalWall3" - }, -/area/awaymission/spacebattle/syndicate7) "gR" = ( /obj/structure/shuttle/engine/heater, /obj/structure/window/reinforced{ @@ -2039,12 +1781,6 @@ /obj/effect/spawner/structure/window/hollow/reinforced/end, /turf/open/floor/plating, /area/awaymission/spacebattle/cruiser) -"hb" = ( -/turf/closed/wall/mineral/plastitanium{ - dir = 8; - icon_state = "diagonalWall3" - }, -/area/awaymission/spacebattle/syndicate7) "hc" = ( /turf/closed/wall/mineral/plastitanium, /area/awaymission/spacebattle/syndicate7) @@ -2198,15 +1934,6 @@ icon_state = "damaged3" }, /area/awaymission/spacebattle/cruiser) -"hG" = ( -/turf/closed/wall/mineral/plastitanium{ - dir = 4; - icon_state = "diagonalWall3" - }, -/area/awaymission/spacebattle/syndicate7) -"hH" = ( -/turf/closed/wall/mineral/titanium, -/area/awaymission/spacebattle/cruiser) "hI" = ( /obj/structure/table/reinforced, /turf/open/floor/plasteel/white, @@ -2308,16 +2035,10 @@ /obj/item/storage/firstaid/fire, /turf/open/floor/plasteel/white, /area/awaymission/spacebattle/cruiser) -"ia" = ( -/turf/closed/wall/mineral/titanium, -/area/awaymission/spacebattle/cruiser) "ib" = ( /obj/machinery/door/unpowered/shuttle, /turf/open/floor/plasteel/freezer, /area/awaymission/spacebattle/cruiser) -"ic" = ( -/turf/closed/wall/mineral/titanium, -/area/awaymission/spacebattle/cruiser) "id" = ( /obj/item/storage/firstaid/regular, /turf/open/floor/plasteel/white, @@ -2382,11 +2103,6 @@ /obj/machinery/sleep_console, /turf/open/floor/plasteel/white, /area/awaymission/spacebattle/cruiser) -"in" = ( -/turf/closed/wall/mineral/plastitanium{ - icon_state = "diagonalWall3" - }, -/area/awaymission/spacebattle/syndicate7) "io" = ( /obj/structure/sink{ dir = 4; @@ -2456,12 +2172,6 @@ "iz" = ( /turf/closed/wall/mineral/plastitanium, /area/space/nearstation) -"iA" = ( -/turf/closed/wall/mineral/plastitanium{ - dir = 1; - icon_state = "diagonalWall3" - }, -/area/space/nearstation) "iB" = ( /obj/machinery/sleeper, /turf/open/floor/mineral/plastitanium/airless, @@ -2487,21 +2197,9 @@ /obj/item/stack/rods, /turf/open/floor/mineral/plastitanium/airless, /area/space/nearstation) -"iH" = ( -/turf/closed/wall/mineral/plastitanium{ - dir = 8; - icon_state = "diagonalWall3" - }, -/area/awaymission/spacebattle/syndicate5) "iI" = ( /turf/closed/wall/mineral/plastitanium, /area/awaymission/spacebattle/syndicate5) -"iJ" = ( -/turf/closed/wall/mineral/plastitanium{ - dir = 1; - icon_state = "diagonalWall3" - }, -/area/awaymission/spacebattle/syndicate5) "iK" = ( /obj/machinery/sleeper, /turf/open/floor/plasteel/airless, @@ -2513,17 +2211,6 @@ /obj/machinery/computer/shuttle, /turf/open/floor/mineral/plastitanium, /area/awaymission/spacebattle/syndicate5) -"iN" = ( -/turf/closed/wall/mineral/plastitanium{ - icon_state = "diagonalWall3" - }, -/area/space/nearstation) -"iO" = ( -/turf/closed/wall/mineral/plastitanium{ - dir = 4; - icon_state = "diagonalWall3" - }, -/area/space/nearstation) "iP" = ( /obj/machinery/sleeper, /turf/open/floor/mineral/plastitanium, @@ -2550,17 +2237,6 @@ /obj/machinery/door/airlock/external, /turf/open/floor/mineral/plastitanium, /area/awaymission/spacebattle/syndicate5) -"iU" = ( -/turf/closed/wall/mineral/plastitanium{ - icon_state = "diagonalWall3" - }, -/area/awaymission/spacebattle/syndicate5) -"iV" = ( -/turf/closed/wall/mineral/plastitanium{ - dir = 4; - icon_state = "diagonalWall3" - }, -/area/awaymission/spacebattle/syndicate5) "iW" = ( /obj/structure/shuttle/engine/heater, /obj/structure/window/reinforced{ @@ -2572,21 +2248,9 @@ /obj/structure/shuttle/engine/propulsion, /turf/open/space, /area/awaymission/spacebattle/syndicate5) -"iY" = ( -/turf/closed/wall/mineral/plastitanium{ - dir = 8; - icon_state = "diagonalWall3" - }, -/area/awaymission/spacebattle/syndicate6) "iZ" = ( /turf/closed/wall/mineral/plastitanium, /area/awaymission/spacebattle/syndicate6) -"ja" = ( -/turf/closed/wall/mineral/plastitanium{ - dir = 1; - icon_state = "diagonalWall3" - }, -/area/awaymission/spacebattle/syndicate6) "jb" = ( /turf/open/floor/mineral/plastitanium, /area/awaymission/spacebattle/syndicate6) @@ -2609,17 +2273,6 @@ /obj/machinery/door/airlock/external, /turf/open/floor/mineral/plastitanium, /area/awaymission/spacebattle/syndicate6) -"jg" = ( -/turf/closed/wall/mineral/plastitanium{ - icon_state = "diagonalWall3" - }, -/area/awaymission/spacebattle/syndicate6) -"jh" = ( -/turf/closed/wall/mineral/plastitanium{ - dir = 4; - icon_state = "diagonalWall3" - }, -/area/awaymission/spacebattle/syndicate6) "ji" = ( /obj/structure/shuttle/engine/heater, /obj/structure/window/reinforced{ @@ -2952,12 +2605,6 @@ }, /turf/open/floor/plating, /area/awaymission/spacebattle/cruiser) -"ko" = ( -/obj/effect/spawner/structure/window/hollow/reinforced/end{ - dir = 1 - }, -/turf/open/floor/engine/vacuum, -/area/awaymission/spacebattle/cruiser) "kp" = ( /obj/structure/rack, /obj/item/gun/energy/xray, @@ -3089,6 +2736,27 @@ /obj/effect/mapping_helpers/planet_z, /turf/closed/mineral/random, /area/space/nearstation) +"vw" = ( +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/awaymission/spacebattle/syndicate5) +"zS" = ( +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/awaymission/spacebattle/syndicate6) +"BO" = ( +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/awaymission/spacebattle/syndicate2) +"Dv" = ( +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/awaymission/spacebattle/syndicate3) +"UZ" = ( +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/awaymission/spacebattle/syndicate1) +"Wv" = ( +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/awaymission/spacebattle/cruiser) +"Yq" = ( +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/awaymission/spacebattle/syndicate4) (1,1,1) = {" aa @@ -15808,14 +15476,14 @@ ab ab ab ab -eq +er er er fl fl er er -gA +er ab ab ab @@ -16064,16 +15732,16 @@ ab ab ab ab -eq er +Yq eK eK eK eK eK eR +Yq er -gA ab ab ab @@ -16320,8 +15988,8 @@ ab ab ab ab -eq er +Yq eR eK eK @@ -16330,8 +15998,8 @@ eK eK eK eR +Yq er -gA ab ab ab @@ -16589,7 +16257,7 @@ eK eK eR er -gA +er ab ab ab @@ -17874,7 +17542,7 @@ eK eK eR er -gB +er ab ab ab @@ -18119,8 +17787,8 @@ ab ab ab ab -es er +Yq eR eK eK @@ -18129,8 +17797,8 @@ eK eK eK eR +Yq er -gB ab ab ab @@ -18377,16 +18045,16 @@ ab ab ab ab -es er +Yq eK eK eK eK eK eR +Yq er -gB ab ab ab @@ -18635,14 +18303,14 @@ ab ab ab ab -es +er er er fl fl er er -gB +er ab ab ab @@ -21382,7 +21050,7 @@ ab ab ab ab -aO +aU aU aU bb @@ -21405,7 +21073,8 @@ aU aU aU aU -bz +aU +aU ab ab ab @@ -21500,15 +21169,14 @@ ab ab ab ab -ab -iH +iI iI iI iT iT iI iI -iU +iI ab ab ab @@ -21662,9 +21330,9 @@ bx aU bh bh +UZ aU aU -bz ab ab ab @@ -21757,16 +21425,16 @@ ab ab ab ab -iH iI +vw iL iL iL iL iL iP +vw iI -iU ab ab ab @@ -21925,7 +21593,7 @@ aU aU aU aU -bz +aU ab ab ab @@ -22013,8 +21681,8 @@ ab ab ab ab -iH iI +vw iP iL iL @@ -22023,8 +21691,8 @@ iL iL iL iP +vw iI -iU ab ab ab @@ -22282,7 +21950,7 @@ iL iL iP iI -iU +iI ab ab ab @@ -22434,13 +22102,13 @@ aU aY aY aY -bD +UZ +aU aU aU aU aU aU -bz ab ab ab @@ -22733,7 +22401,7 @@ bM bM bM bM -ch +bM cc cp cc @@ -22990,8 +22658,8 @@ bQ bO bO cb +Wv bM -cl cc cL cc @@ -23567,7 +23235,7 @@ iL iL iP iI -iV +iI ab ab ab @@ -23761,8 +23429,8 @@ bR dN kj bO +Wv bM -co cx cN cM @@ -23812,8 +23480,8 @@ ab ab ab ab -iJ iI +vw iP iL iL @@ -23822,8 +23490,8 @@ iL iL iL iP +vw iI -iV ab ab ab @@ -24018,7 +23686,7 @@ bM bM bM bM -cj +bM cp cc cN @@ -24070,16 +23738,16 @@ ab ab ab ab -iJ iI +vw iL iL iL iL iL iP +vw iI -iV ab ab ab @@ -24233,13 +23901,13 @@ aU aY aY aY -bF +UZ +aU aU aU aU aU aU -bB ab ab ab @@ -24328,14 +23996,14 @@ ab ab ab ab -iJ +iI iI iI iT iT iI iI -iV +iI ab ab ab @@ -24752,7 +24420,7 @@ aU aU aU aU -bB +aU ab ab ab @@ -25003,9 +24671,9 @@ bf aU bh bh +UZ aU aU -bB ab ab ab @@ -25237,7 +24905,7 @@ ab ab ab ab -aS +aU aU aU bb @@ -25260,8 +24928,8 @@ aU aU aU aU -bB -ab +aU +aU ab ab ab @@ -27694,14 +27362,14 @@ ab ab ab ab -iY +iZ iZ iZ jf jf iZ iZ -jg +iZ ab ab ab @@ -27950,16 +27618,16 @@ ab ab ab ab -iY iZ +zS jb jb jb jb jb jd +zS iZ -jg ab ab ab @@ -28206,8 +27874,8 @@ ab ab ab ab -iY iZ +zS jd jb jb @@ -28216,8 +27884,8 @@ jb jb jb jd +zS iZ -jg ab ab ab @@ -28475,7 +28143,7 @@ jb jb jd iZ -jg +iZ ab ab ab @@ -29760,7 +29428,7 @@ jb jb jd iZ -jh +iZ ab ab ab @@ -30005,8 +29673,8 @@ ab ab ab ab -ja iZ +zS jd jb jb @@ -30015,8 +29683,8 @@ jb jb jb jd +zS iZ -jh ab ab ab @@ -30263,16 +29931,16 @@ ab ab ab ab -ja iZ +zS jb jb jb jb jb jd +zS iZ -jh ab ab ab @@ -30521,14 +30189,14 @@ ab ab ab ab -ja +iZ iZ iZ jf jf iZ iZ -jh +iZ ab ab ab @@ -36777,7 +36445,7 @@ ab ab ab ab -ac +ah ah ah ak @@ -36800,8 +36468,8 @@ ah ah ah ah -aF -ab +ah +ah ab ab ab @@ -37057,9 +36725,9 @@ an ah ao ao +BO ah ah -aF ab ab ab @@ -37320,7 +36988,7 @@ ah ah ah ah -aF +ah ab ab ab @@ -37829,13 +37497,13 @@ ah aG aj aj -aL +BO +ah ah ah ah ah ah -aF ab ab ab @@ -38087,7 +37755,6 @@ aj aj aj ah -ac ah ah ah @@ -38096,7 +37763,8 @@ ah ah ah ah -aF +ah +ah ab ab ab @@ -38353,8 +38021,8 @@ aZ aZ aj bj +BO ah -aF ab ab ab @@ -39124,8 +38792,8 @@ ba ba aj aj +BO ah -aH ab ab ab @@ -39372,7 +39040,6 @@ aj aj aj ah -ag ah ah ah @@ -39381,7 +39048,8 @@ ah ah ah ah -aH +ah +ah ab ab ab @@ -39628,13 +39296,13 @@ ah aj aj aj -aN +BO +ah ah ah ah ah ah -aH ab ab ab @@ -40147,7 +39815,7 @@ ah ah ah ah -aH +ah ab ab ab @@ -40398,9 +40066,9 @@ aA ah ao ao +BO ah ah -aH ab ab ab @@ -40632,7 +40300,7 @@ ab ab ab ab -ag +ah ah ah ak @@ -40655,8 +40323,8 @@ ah ah ah ah -aH -ab +ah +ah ab ab ab @@ -45915,7 +45583,7 @@ iF iF iz iz -iN +iz ab ab ab @@ -46173,7 +45841,7 @@ iC iC iK iz -iN +iz ab ab ab @@ -46431,7 +46099,7 @@ iC iC iB iz -iN +iz ab ab ab @@ -46689,7 +46357,7 @@ iC iC iB iz -iN +iz ab ab ab @@ -47974,7 +47642,7 @@ iC iC iB iz -iO +iz ab ab ab @@ -48230,7 +47898,7 @@ iC iC iB iz -iO +iz ab ab ab @@ -48477,7 +48145,7 @@ ab ab ab ab -iA +iz iz iC iC @@ -48486,7 +48154,7 @@ iC iC iB iz -iO +iz ab ab ab @@ -48735,14 +48403,14 @@ ab ab ab ab -iA +iz iz iz iF iF iz iz -iO +iz ab ab ab @@ -50159,7 +49827,7 @@ ab ab ab ab -av +aB aB aB aE @@ -50182,8 +49850,8 @@ aB aB aB aB -bq -ab +aB +aB ab ab ab @@ -50439,9 +50107,9 @@ aJ aB aT aT +Dv aB aB -bq ab ab ab @@ -50702,7 +50370,7 @@ aB aB aB aB -bq +aB ab ab ab @@ -51211,13 +50879,13 @@ aB aD aD aD -bv +Dv +aB aB aB aB aB aB -bq ab ab ab @@ -51524,7 +51192,7 @@ bM bM bM bM -dq +bM cm hR cc @@ -51781,8 +51449,8 @@ bQ bO bO dc +Wv bM -ch cp cc cc @@ -52552,8 +52220,8 @@ bR dN kj bO +Wv bM -dI cc ca cc @@ -52809,7 +52477,7 @@ bM bM bM bM -ds +bM cc cn cp @@ -53010,13 +52678,13 @@ aB aD db aD -bw +Dv +aB aB aB aB aB aB -bs ab ab ab @@ -53529,7 +53197,7 @@ aB aB aB aB -bs +aB ab ab ab @@ -53780,9 +53448,9 @@ aJ aB aT aT +Dv aB aB -bs ab ab ab @@ -54014,7 +53682,7 @@ ab ab ab ab -az +aB aB aB aE @@ -54037,8 +53705,8 @@ aB aB aB aB -bs -ab +aB +aB ab ab ab @@ -61820,7 +61488,7 @@ ab ab ab ab -hb +hc hi hu hu @@ -61828,7 +61496,7 @@ hu hu hu hu -in +hc ab ab ab @@ -62590,7 +62258,7 @@ ab ab ab ab -gQ +hc hc hk hk @@ -62600,7 +62268,7 @@ hk hk hk hc -hG +hc ab ab ab @@ -64390,15 +64058,15 @@ ab ab ab ab -gQ +hc hm hv -hG +hc ab -gQ +hc hm hv -hG +hc ab ab ab diff --git a/_maps/_basemap.dm b/_maps/_basemap.dm new file mode 100644 index 0000000000..f522d569c1 --- /dev/null +++ b/_maps/_basemap.dm @@ -0,0 +1,25 @@ +//#define LOWMEMORYMODE //uncomment this to load centcom and runtime station and thats it. + +#include "map_files\generic\CentCom.dmm" +#include "map_files\generic\SpaceStation.dmm" + +#ifndef LOWMEMORYMODE + + #include "map_files\generic\Space.dmm" + #include "map_files\generic\SpaceDock.dmm" + #include "map_files\Mining\Lavaland.dmm" + #include "map_files\generic\City_of_Cogs.dmm" + + #ifdef ALL_MAPS + #include "map_files\debug\runtimestation.dmm" + #include "cit_map_files\Deltastation\DeltaStation2.dmm" + #include "cit_map_files\MetaStation\MetaStation.dmm" + #include "cit_map_files\OmegaStation\OmegaStation.dmm" + #include "cit_map_files\PubbyStation\PubbyStation.dmm" + #include "cit_map_files\BoxStation\BoxStation.dmm" + + #ifdef TRAVISBUILDING + #include "templates.dm" + #endif + #endif +#endif diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index f1b2f9bf66..eebfbcb040 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -57126,15 +57126,12 @@ /area/science/circuit) "Qpp" = ( /turf/closed/wall, -/turf/open/floor/circuit, /area/science/circuit) "Qpq" = ( /turf/closed/wall, -/turf/open/floor/circuit, /area/science/circuit) "Qpr" = ( /turf/closed/wall, -/turf/open/floor/circuit, /area/science/circuit) "Qps" = ( /turf/closed/wall/r_wall, @@ -57155,7 +57152,6 @@ /area/maintenance/starboard/aft) "Qpw" = ( /turf/closed/wall, -/turf/open/floor/circuit, /area/science/circuit) "Qpx" = ( /obj/structure/table/reinforced, @@ -57186,7 +57182,6 @@ /area/maintenance/starboard/aft) "QpB" = ( /turf/closed/wall, -/turf/open/floor/circuit, /area/science/circuit) "QpC" = ( /obj/structure/table/reinforced, @@ -57212,7 +57207,6 @@ /area/science/circuit) "QpG" = ( /turf/closed/wall, -/turf/open/floor/circuit, /area/science/circuit) "QpH" = ( /turf/open/floor/plasteel/white, @@ -57229,7 +57223,6 @@ /area/science/circuit) "QpK" = ( /turf/closed/wall, -/turf/open/floor/circuit, /area/science/circuit) "QpL" = ( /turf/open/floor/plasteel/white, @@ -57243,7 +57236,6 @@ /area/science/circuit) "QpO" = ( /turf/closed/wall, -/turf/open/floor/circuit, /area/science/circuit) "QpP" = ( /obj/machinery/light_switch{ @@ -57264,9 +57256,8 @@ /turf/open/floor/plasteel, /area/science/circuit) "QpS" = ( -/turf/closed/wall, /obj/structure/sign/nanotrasen, -/turf/open/floor/circuit, +/turf/closed/wall, /area/science/circuit) "QpT" = ( /obj/machinery/light{ @@ -57367,16 +57358,14 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "Qqg" = ( -/turf/closed/wall, /obj/structure/sign/nanotrasen, -/turf/open/floor/circuit, +/turf/closed/wall, /area/science/circuit) "Qqh" = ( -/turf/open/floor/plasteel/white, /obj/structure/table/reinforced, /obj/item/paper_bin, /obj/item/pen, -/turf/open/floor/circuit, +/turf/open/floor/plasteel/white, /area/science/circuit) "Qqi" = ( /obj/machinery/light{ @@ -57391,7 +57380,6 @@ /area/science/misc_lab) "Qqk" = ( /turf/closed/wall, -/turf/open/floor/circuit, /area/science/circuit) "Qql" = ( /obj/structure/table/reinforced, @@ -57413,7 +57401,6 @@ /area/science/circuit) "Qqo" = ( /turf/closed/wall, -/turf/open/floor/circuit, /area/science/circuit) "Qqp" = ( /obj/structure/table/reinforced, diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index dc82b90d33..e20c29861a 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -19457,7 +19457,6 @@ /turf/open/floor/plasteel/redyellow/side, /area/security/prison) "aPt" = ( -/turf/open/floor/plasteel/redyellow/side, /obj/machinery/vending/sustenance, /turf/open/floor/plating{ icon_state = "platingdmg2" @@ -59948,7 +59947,6 @@ /turf/open/floor/plating, /area/maintenance/starboard) "crA" = ( -/turf/open/floor/plating, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating{ icon_state = "platingdmg2" diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm index 1297107dd7..d6a7308f19 100644 --- a/_maps/map_files/OmegaStation/OmegaStation.dmm +++ b/_maps/map_files/OmegaStation/OmegaStation.dmm @@ -2113,7 +2113,6 @@ /turf/open/floor/plasteel, /area/asteroid/nearstation) "aep" = ( -/turf/open/floor/plating, /turf/open/floor/plating{ icon_state = "platingdmg2" }, diff --git a/_maps/shuttles/emergency_mini.dmm b/_maps/shuttles/emergency_mini.dmm index 6a4d35124c..d7d5644336 100644 --- a/_maps/shuttles/emergency_mini.dmm +++ b/_maps/shuttles/emergency_mini.dmm @@ -195,7 +195,6 @@ /turf/open/floor/mineral/titanium, /area/shuttle/escape) "F" = ( -/turf/closed/wall/mineral/titanium, /obj/structure/table, /obj/item/storage/firstaid/fire, /obj/item/storage/firstaid/regular{ @@ -204,7 +203,7 @@ }, /obj/item/crowbar, /obj/item/extinguisher, -/turf/open/floor/mineral/titanium, +/turf/closed/wall/mineral/titanium, /area/shuttle/escape) "G" = ( /turf/closed/wall/mineral/titanium, @@ -246,11 +245,10 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "N" = ( -/turf/closed/wall/mineral/titanium, /obj/machinery/computer/security{ dir = 8 }, -/turf/open/floor/mineral/titanium, +/turf/closed/wall/mineral/titanium, /area/shuttle/escape) "O" = ( /obj/machinery/computer/crew{ diff --git a/_maps/templates/medium_shuttle1.dmm b/_maps/templates/medium_shuttle1.dmm index 07cad627cb..80833ada8d 100644 --- a/_maps/templates/medium_shuttle1.dmm +++ b/_maps/templates/medium_shuttle1.dmm @@ -20,19 +20,6 @@ "d" = ( /turf/closed/wall/mineral/plastitanium, /area/ruin/powered/shuttle/medium_1) -"e" = ( -/turf/closed/wall/mineral/plastitanium{ - dir = 1; - icon_state = "diagonalWall3" - }, -/area/ruin/powered/shuttle/medium_1) -"f" = ( -/turf/closed/wall/mineral/plastitanium{ - dir = 4; - icon_state = "diagonalWall3" - }, -/turf/closed/wall/mineral/titanium, -/area/ruin/powered/shuttle/medium_1) "g" = ( /turf/closed/wall/mineral/titanium, /area/ruin/powered/shuttle/medium_1) @@ -100,19 +87,6 @@ }, /turf/open/space, /area/ruin/powered/shuttle/medium_1) -"x" = ( -/turf/closed/wall/mineral/plastitanium{ - dir = 1; - icon_state = "diagonalWall3" - }, -/turf/closed/wall/mineral/titanium, -/area/ruin/powered/shuttle/medium_1) -"y" = ( -/turf/closed/wall/mineral/plastitanium{ - dir = 4; - icon_state = "diagonalWall3" - }, -/area/ruin/powered/shuttle/medium_1) (1,1,1) = {" a @@ -202,7 +176,7 @@ c (6,1,1) = {" d d -f +g g k g @@ -212,7 +186,7 @@ g g k g -x +g d d "} @@ -248,10 +222,10 @@ j j g d -y +d "} (9,1,1) = {" -e +d d g j @@ -264,12 +238,12 @@ g j j g -y +d a "} (10,1,1) = {" a -e +d g g g diff --git a/_maps/templates/medium_shuttle2.dmm b/_maps/templates/medium_shuttle2.dmm index 537d1db934..3b46d40382 100644 --- a/_maps/templates/medium_shuttle2.dmm +++ b/_maps/templates/medium_shuttle2.dmm @@ -20,37 +20,18 @@ "d" = ( /turf/closed/wall/mineral/plastitanium, /area/ruin/powered/shuttle/medium_2) -"e" = ( -/turf/closed/wall/mineral/plastitanium{ - dir = 1; - icon_state = "diagonalWall3" - }, -/area/ruin/powered/shuttle/medium_2) "f" = ( /obj/structure/shuttle/engine/propulsion/burst/right{ dir = 8 }, /turf/open/space, /area/ruin/powered/shuttle/medium_2) -"g" = ( -/turf/closed/wall/mineral/plastitanium{ - dir = 4; - icon_state = "diagonalWall3" - }, -/turf/closed/wall/mineral/titanium, -/area/ruin/powered/shuttle/medium_2) "h" = ( /turf/closed/wall/mineral/titanium, /area/ruin/powered/shuttle/medium_2) "i" = ( /turf/closed/wall/mineral/titanium/overspace, /area/ruin/powered/shuttle/medium_2) -"j" = ( -/turf/closed/wall/mineral/plastitanium{ - dir = 8; - icon_state = "diagonalWall3" - }, -/area/ruin/powered/shuttle/medium_2) "k" = ( /turf/open/floor/plasteel/dark, /area/ruin/powered/shuttle/medium_2) @@ -71,11 +52,6 @@ "p" = ( /turf/open/floor/plasteel/darkyellow, /area/ruin/powered/shuttle/medium_2) -"q" = ( -/turf/closed/wall/mineral/plastitanium{ - icon_state = "diagonalWall3" - }, -/area/ruin/powered/shuttle/medium_2) "r" = ( /obj/structure/table, /turf/open/floor/plasteel, @@ -114,19 +90,6 @@ }, /turf/open/floor/plasteel/darkyellow, /area/ruin/powered/shuttle/medium_2) -"z" = ( -/turf/closed/wall/mineral/plastitanium{ - dir = 1; - icon_state = "diagonalWall3" - }, -/turf/closed/wall/mineral/titanium, -/area/ruin/powered/shuttle/medium_2) -"A" = ( -/turf/closed/wall/mineral/plastitanium{ - dir = 4; - icon_state = "diagonalWall3" - }, -/area/ruin/powered/shuttle/medium_2) "B" = ( /turf/closed/wall/mineral/titanium/nodiagonal, /area/ruin/powered/shuttle/medium_2) @@ -179,15 +142,15 @@ a (4,1,1) = {" b f -j d d -q +d +d a -j d d -q +d +d b f "} @@ -196,11 +159,11 @@ c c d d -g +h h l h -z +h d d c @@ -209,7 +172,7 @@ c (6,1,1) = {" d d -g +h h h r @@ -217,7 +180,7 @@ m r h h -z +h d d "} @@ -238,7 +201,7 @@ d "} (8,1,1) = {" d -g +h h n h @@ -248,7 +211,7 @@ B h n h -z +h d "} (9,1,1) = {" @@ -267,7 +230,7 @@ h d "} (10,1,1) = {" -e +d h k k @@ -279,7 +242,7 @@ h k k h -A +d "} (11,1,1) = {" a diff --git a/_maps/templates/medium_shuttle3.dmm b/_maps/templates/medium_shuttle3.dmm index 263c52c416..6e9f935242 100644 --- a/_maps/templates/medium_shuttle3.dmm +++ b/_maps/templates/medium_shuttle3.dmm @@ -17,34 +17,13 @@ }, /turf/open/floor/plating/airless, /area/ruin/powered/shuttle/medium_3) -"e" = ( -/turf/closed/wall/mineral/plastitanium{ - dir = 8; - icon_state = "diagonalWall3" - }, -/area/ruin/powered/shuttle/medium_3) -"f" = ( -/turf/closed/wall/mineral/plastitanium{ - dir = 1; - icon_state = "diagonalWall3" - }, -/area/ruin/powered/shuttle/medium_3) "g" = ( -/turf/closed/wall/mineral/plastitanium{ - dir = 4; - icon_state = "diagonalWall3" - }, +/turf/closed/wall/mineral/plastitanium, /turf/closed/wall/mineral/titanium, /area/ruin/powered/shuttle/medium_3) "h" = ( /turf/closed/wall/mineral/titanium, /area/ruin/powered/shuttle/medium_3) -"i" = ( -/turf/closed/wall/mineral/plastitanium{ - icon_state = "diagonalWall3" - }, -/turf/closed/wall/mineral/titanium, -/area/ruin/powered/shuttle/medium_3) "j" = ( /obj/machinery/door/airlock/external/glass, /turf/open/floor/plating, @@ -87,24 +66,10 @@ }, /turf/open/space, /area/ruin/powered/shuttle/medium_3) -"s" = ( -/turf/closed/wall/mineral/plastitanium{ - dir = 1; - icon_state = "diagonalWall3" - }, -/turf/closed/wall/mineral/titanium, -/area/ruin/powered/shuttle/medium_3) "t" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/ruin/powered/shuttle/medium_3) -"u" = ( -/turf/closed/wall/mineral/plastitanium{ - dir = 8; - icon_state = "diagonalWall3" - }, -/turf/closed/wall/mineral/titanium, -/area/ruin/powered/shuttle/medium_3) "v" = ( /obj/structure/table, /turf/open/floor/plasteel/darkyellow, @@ -118,11 +83,6 @@ }, /turf/open/floor/plasteel/darkyellow, /area/ruin/powered/shuttle/medium_3) -"y" = ( -/turf/closed/wall/mineral/plastitanium{ - icon_state = "diagonalWall3" - }, -/area/ruin/powered/shuttle/medium_3) "z" = ( /obj/machinery/sleeper, /turf/open/floor/plasteel/darkblue, @@ -130,12 +90,6 @@ "A" = ( /turf/open/floor/plasteel/dark, /area/ruin/powered/shuttle/medium_3) -"B" = ( -/turf/closed/wall/mineral/plastitanium{ - dir = 4; - icon_state = "diagonalWall3" - }, -/area/ruin/powered/shuttle/medium_3) "C" = ( /turf/open/floor/plasteel/darkblue, /area/ruin/powered/shuttle/medium_3) @@ -210,18 +164,18 @@ a a a a -e +c o c c -y +c a a -e +c c c o -y +c a a a @@ -233,7 +187,7 @@ a a a a -e +c c c c @@ -246,7 +200,7 @@ c c c c -y +c a a a @@ -256,22 +210,22 @@ a a a a -e -g -h -h -s -c -g -j -j -s c g h h -s -y +g +c +g +j +j +g +c +g +h +h +g +c a a a @@ -279,7 +233,7 @@ a (6,1,1) = {" a a -e +c c h k @@ -296,7 +250,7 @@ l k h c -y +c a a "} @@ -329,7 +283,7 @@ a c c c -i +g G l l @@ -342,7 +296,7 @@ l l l G -u +g c c c @@ -375,7 +329,7 @@ F (10,1,1) = {" a a -f +c c g G @@ -390,9 +344,9 @@ A G p G -s +g +c c -B a a "} @@ -447,9 +401,9 @@ a (13,1,1) = {" a a -e c -i +c +g G p G @@ -462,9 +416,9 @@ A G p G -u +g +c c -y a a "} @@ -510,7 +464,7 @@ l l l G -s +g c c c @@ -543,7 +497,7 @@ a (17,1,1) = {" a a -f +c c h k @@ -560,7 +514,7 @@ l k h c -B +c a a "} @@ -568,22 +522,22 @@ a a a a -f -i -h -h -u c -i +g +h +h +g +c +g j j -u +g c -i +g h h -u -B +g +c a a a @@ -593,7 +547,7 @@ a a a a -f +c c c c @@ -606,7 +560,7 @@ c c c c -B +c a a a @@ -618,18 +572,18 @@ a a a a -f +c q c c -B +c a a -f +c c c q -B +c a a a diff --git a/code/__DEFINES/atmospherics.dm b/code/__DEFINES/atmospherics.dm index 0c735844f8..6f4aa69277 100644 --- a/code/__DEFINES/atmospherics.dm +++ b/code/__DEFINES/atmospherics.dm @@ -86,16 +86,18 @@ #define HAZARD_LOW_PRESSURE 20 //This is when the black ultra-low pressure icon is displayed. (This one is set as a constant) #define TEMPERATURE_DAMAGE_COEFFICIENT 1.5 //This is used in handle_temperature_damage() for humans, and in reagents that affect body temperature. Temperature damage is multiplied by this amount. -#define BODYTEMP_AUTORECOVERY_DIVISOR 12 //This is the divisor which handles how much of the temperature difference between the current body temperature and 310.15K (optimal temperature) humans auto-regenerate each tick. The higher the number, the slower the recovery. This is applied each tick, so long as the mob is alive. -#define BODYTEMP_AUTORECOVERY_MINIMUM 10 //Minimum amount of kelvin moved toward 310.15K per tick. So long as abs(310.15 - bodytemp) is more than 50. -#define BODYTEMP_NORMAL 310.15 //98.6F, or 37C, the normal temprature of the human body. -#define BODYTEMP_COLD_DIVISOR 6 //Similar to the BODYTEMP_AUTORECOVERY_DIVISOR, but this is the divisor which is applied at the stage that follows autorecovery. This is the divisor which comes into play when the human's loc temperature is lower than their body temperature. Make it lower to lose bodytemp faster. -#define BODYTEMP_HEAT_DIVISOR 6 //Similar to the BODYTEMP_AUTORECOVERY_DIVISOR, but this is the divisor which is applied at the stage that follows autorecovery. This is the divisor which comes into play when the human's loc temperature is higher than their body temperature. Make it lower to gain bodytemp faster. -#define BODYTEMP_COOLING_MAX 30 //The maximum number of degrees that your body can cool in 1 tick, when in a cold area. -#define BODYTEMP_HEATING_MAX 30 //The maximum number of degrees that your body can heat up in 1 tick, when in a hot area. -#define BODYTEMP_HEAT_DAMAGE_LIMIT 360.15 // The limit the human body can take before it starts taking damage from heat. -#define BODYTEMP_COLD_DAMAGE_LIMIT 260.15 // The limit the human body can take before it starts taking damage from coldness. +#define BODYTEMP_NORMAL 310.15 //The natural temperature for a body +#define BODYTEMP_AUTORECOVERY_DIVISOR 11 //This is the divisor which handles how much of the temperature difference between the current body temperature and 310.15K (optimal temperature) humans auto-regenerate each tick. The higher the number, the slower the recovery. This is applied each tick, so long as the mob is alive. +#define BODYTEMP_AUTORECOVERY_MINIMUM 12 //Minimum amount of kelvin moved toward 310K per tick. So long as abs(310.15 - bodytemp) is more than 50. +#define BODYTEMP_COLD_DIVISOR 6 //Similar to the BODYTEMP_AUTORECOVERY_DIVISOR, but this is the divisor which is applied at the stage that follows autorecovery. This is the divisor which comes into play when the human's loc temperature is lower than their body temperature. Make it lower to lose bodytemp faster. +#define BODYTEMP_HEAT_DIVISOR 15 //Similar to the BODYTEMP_AUTORECOVERY_DIVISOR, but this is the divisor which is applied at the stage that follows autorecovery. This is the divisor which comes into play when the human's loc temperature is higher than their body temperature. Make it lower to gain bodytemp faster. +#define BODYTEMP_COOLING_MAX -100 //The maximum number of degrees that your body can cool in 1 tick, due to the environment, when in a cold area. +#define BODYTEMP_HEATING_MAX 30 //The maximum number of degrees that your body can heat up in 1 tick, due to the environment, when in a hot area. + +#define BODYTEMP_HEAT_DAMAGE_LIMIT (BODYTEMP_NORMAL + 50) // The limit the human body can take before it starts taking damage from heat. +#define BODYTEMP_COLD_DAMAGE_LIMIT (BODYTEMP_NORMAL - 50) // The limit the human body can take before it starts taking damage from coldness. + #define SPACE_HELM_MIN_TEMP_PROTECT 2.0 //what min_cold_protection_temperature is set to for space-helmet quality headwear. MUST NOT BE 0. #define SPACE_HELM_MAX_TEMP_PROTECT 1500 //Thermal insulation works both ways /Malkevin diff --git a/code/__DEFINES/subsystems.dm b/code/__DEFINES/subsystems.dm index 4773cf0664..6e223446fd 100644 --- a/code/__DEFINES/subsystems.dm +++ b/code/__DEFINES/subsystems.dm @@ -75,36 +75,31 @@ // Subsystem fire priority, from lowest to highest priority // If the subsystem isn't listed here it's either DEFAULT or PROCESS (if it's a processing subsystem child) -#define FIRE_PRIORITY_IDLE_NPC 1 -#define FIRE_PRIORITY_SERVER_MAINT 1 - -#define FIRE_PRIORITY_GARBAGE 4 -#define FIRE_PRIORITY_RESEARCH 4 -#define FIRE_PRIORITY_AIR 5 -#define FIRE_PRIORITY_NPC 5 -#define FIRE_PRIORITY_PROCESS 6 -#define FIRE_PRIORITY_THROWING 6 -#define FIRE_PRIORITY_FLIGHTPACKS 7 -#define FIRE_PRIORITY_SPACEDRIFT 7 -#define FIRE_PRIOTITY_SMOOTHING 8 -#define FIRE_PRIORITY_ORBIT 8 -#define FIRE_PRIORITY_OBJ 9 -#define FIRE_PRIORUTY_FIELDS 9 -#define FIRE_PRIORITY_ACID 9 -#define FIRE_PRIOTITY_BURNING 9 -#define FIRE_PRIORITY_INBOUNDS 9 - -#define FIRE_PRIORITY_DEFAULT 10 - -#define FIRE_PRIORITY_PARALLAX 11 -#define FIRE_PRIORITY_NETWORKS 12 -#define FIRE_PRIORITY_MOBS 13 -#define FIRE_PRIORITY_TGUI 14 - -#define FIRE_PRIORITY_TICKER 19 -#define FIRE_PRIORITY_OVERLAYS 20 - -#define FIRE_PRIORITY_INPUT 100 // This must always always be the max highest priority. Player input must never be lost. +#define FIRE_PRIORITY_IDLE_NPC 10 +#define FIRE_PRIORITY_SERVER_MAINT 10 +#define FIRE_PRIORITY_GARBAGE 15 +#define FIRE_PRIORITY_RESEARCH 15 +#define FIRE_PRIORITY_AIR 20 +#define FIRE_PRIORITY_NPC 20 +#define FIRE_PRIORITY_PROCESS 25 +#define FIRE_PRIORITY_THROWING 25 +#define FIRE_PRIORITY_FLIGHTPACKS 30 +#define FIRE_PRIORITY_SPACEDRIFT 30 +#define FIRE_PRIOTITY_SMOOTHING 35 +#define FIRE_PRIORITY_ORBIT 35 +#define FIRE_PRIORITY_OBJ 40 +#define FIRE_PRIORUTY_FIELDS 40 +#define FIRE_PRIORITY_ACID 40 +#define FIRE_PRIOTITY_BURNING 40 +#define FIRE_PRIORITY_INBOUNDS 40 +#define FIRE_PRIORITY_DEFAULT 50 +#define FIRE_PRIORITY_PARALLAX 65 +#define FIRE_PRIORITY_NETWORKS 80 +#define FIRE_PRIORITY_MOBS 100 +#define FIRE_PRIORITY_TGUI 110 +#define FIRE_PRIORITY_TICKER 200 +#define FIRE_PRIORITY_OVERLAYS 500 +#define FIRE_PRIORITY_INPUT 1000 // This must always always be the max highest priority. Player input must never be lost. // SS runlevels diff --git a/code/_compile_options.dm b/code/_compile_options.dm index c0985281c5..5e2cca0cc9 100644 --- a/code/_compile_options.dm +++ b/code/_compile_options.dm @@ -18,6 +18,9 @@ #endif // 1 to use the default behaviour; // 2 for preloading absolutely everything; +#ifdef LOWMEMORYMODE +#define FORCE_MAP "_maps/runtimestation.json" +#endif #define BACKGROUND_ENABLED 0 // The default value for all uses of set background. Set background can cause gradual lag and is recommended you only turn this on if necessary. // 1 will enable set background. 0 will disable set background. diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm index 8046dab41e..90f3380b81 100644 --- a/code/controllers/subsystem/mapping.dm +++ b/code/controllers/subsystem/mapping.dm @@ -42,7 +42,7 @@ SUBSYSTEM_DEF(mapping) repopulate_sorted_areas() process_teleport_locs() //Sets up the wizard teleport locations preloadTemplates() - +#ifndef LOWMEMORYMODE // Create space levels for(var/I in 1 to ZLEVEL_SPACE_RUIN_COUNT) add_new_zlevel("Empty Area [2 + I]", CROSSLINKED, list(ZTRAIT_SPACE_RUINS = TRUE)) @@ -67,7 +67,7 @@ SUBSYSTEM_DEF(mapping) if (space_ruins.len) seedRuins(space_ruins, CONFIG_GET(number/space_budget), /area/space, space_ruins_templates) loading_ruins = FALSE - +#endif repopulate_sorted_areas() // Set up Z-level transitions. setup_map_transitions() diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index b36cc1e4c4..c932c329dd 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -979,7 +979,7 @@ charge.forceMove(get_turf(user)) charge = null return - if( beingcrowbarred && (density && welded && !operating && src.panel_open && (!hasPower()) && !src.locked) ) + if(beingcrowbarred && panel_open && (emagged || (density && welded && !operating && !hasPower() && !locked))) playsound(src.loc, I.usesound, 100, 1) user.visible_message("[user] removes the electronics from the airlock assembly.", \ "You start to remove electronics from the airlock assembly...") diff --git a/code/modules/food_and_drinks/food/snacks_other.dm b/code/modules/food_and_drinks/food/snacks_other.dm index 9691eee144..9398ec2bfe 100644 --- a/code/modules/food_and_drinks/food/snacks_other.dm +++ b/code/modules/food_and_drinks/food/snacks_other.dm @@ -193,7 +193,7 @@ name = "spiderling" desc = "It's slightly twitching in your hand. Ew..." icon_state = "spiderling" - list_reagents = list("nutrient" = 1, "toxin" = 4) + list_reagents = list("nutriment" = 1, "toxin" = 4) filling_color = "#00800" tastes = list("cobwebs" = 1, "guts" = 2) foodtype = MEAT | TOXIC diff --git a/code/modules/jobs/job_types/cargo_service.dm b/code/modules/jobs/job_types/cargo_service.dm index 0f6e1dc117..2c0665dad9 100644 --- a/code/modules/jobs/job_types/cargo_service.dm +++ b/code/modules/jobs/job_types/cargo_service.dm @@ -54,7 +54,7 @@ Cargo Technician belt = /obj/item/device/pda/cargo ears = /obj/item/device/radio/headset/headset_cargo uniform = /obj/item/clothing/under/rank/cargotech - + l_hand = /obj/item/device/export_scanner /* Shaft Miner diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 05cb67cdaa..987484bc8f 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -1623,24 +1623,29 @@ GLOBAL_LIST_EMPTY(roundstart_races) var/loc_temp = H.get_temperature(environment) - //Body temperature is adjusted in two steps. First, your body tries to stabilize itself a bit. - if(H.stat != DEAD) - H.natural_bodytemperature_stabilization() - - //Then, it reacts to the surrounding atmosphere based on your thermal protection + //Body temperature is adjusted in two parts: first there your body tries to naturally preserve homeostasis (shivering/sweating), then it reacts to the surrounding environment + //Thermal protection (insulation) has mixed benefits in two situations (hot in hot places, cold in hot places) if(!H.on_fire) //If you're on fire, you do not heat up or cool down based on surrounding gases - if(loc_temp < H.bodytemperature) - //Place is colder than we are - var/thermal_protection = H.get_cold_protection(loc_temp) //This returns a 0 - 1 value, which corresponds to the percentage of protection based on what you're wearing and what you're exposed to. - if(thermal_protection < 1) - H.bodytemperature += min((1-thermal_protection) * ((loc_temp - H.bodytemperature) / BODYTEMP_COLD_DIVISOR), BODYTEMP_COOLING_MAX) - else - //Place is hotter than we are - var/thermal_protection = H.get_heat_protection(loc_temp) //This returns a 0 - 1 value, which corresponds to the percentage of protection based on what you're wearing and what you're exposed to. - if(thermal_protection < 1) - H.bodytemperature += min((1-thermal_protection) * ((loc_temp - H.bodytemperature) / BODYTEMP_HEAT_DIVISOR), BODYTEMP_HEATING_MAX) + if((abs(BODYTEMP_NORMAL - H.bodytemperature) <= 5) && (abs(BODYTEMP_NORMAL - loc_temp) <= 25)) + return //Performance saver + var/natural = 0 + if(H.stat != DEAD) + natural = H.natural_bodytemperature_stabilization() + var/thermal_protection = 1 + if(loc_temp < H.bodytemperature) //Place is colder than we are + thermal_protection -= H.get_cold_protection(loc_temp) //This returns a 0 - 1 value, which corresponds to the percentage of protection based on what you're wearing and what you're exposed to. + if(H.bodytemperature < BODYTEMP_NORMAL) //we're cold, insulation helps us retain body heat and will reduce the heat we lose to the environment + H.bodytemperature += (thermal_protection+1)*natural + max(thermal_protection * (loc_temp - H.bodytemperature) / BODYTEMP_COLD_DIVISOR, BODYTEMP_COOLING_MAX) + else //we're sweating, insulation hinders our ability to reduce heat - and it will reduce the amount of cooling you get from the environment + H.bodytemperature += natural*(1/(thermal_protection+1)) + max((thermal_protection * (loc_temp - H.bodytemperature) + BODYTEMP_NORMAL - H.bodytemperature) / BODYTEMP_COLD_DIVISOR , BODYTEMP_COOLING_MAX) //Extra calculation for hardsuits to bleed off heat + else //Place is hotter than we are + thermal_protection -= H.get_heat_protection(loc_temp) //This returns a 0 - 1 value, which corresponds to the percentage of protection based on what you're wearing and what you're exposed to. + if(H.bodytemperature < BODYTEMP_NORMAL) //and we're cold, insulation enhances our ability to retain body heat but reduces the heat we get from the environment + H.bodytemperature += (thermal_protection+1)*natural + min(thermal_protection * (loc_temp - H.bodytemperature) / BODYTEMP_HEAT_DIVISOR, BODYTEMP_HEATING_MAX) + else //we're sweating, insulation hinders out ability to reduce heat - but will reduce the amount of heat we get from the environment + H.bodytemperature += natural*(1/(thermal_protection+1)) + min(thermal_protection * (loc_temp - H.bodytemperature) / BODYTEMP_HEAT_DIVISOR, BODYTEMP_HEATING_MAX) - // +/- 50 degrees from 310.15K is the 'safe' zone, where no damage is dealt. + // +/- 50 degrees from 310K is the 'safe' zone, where no damage is dealt. if(H.bodytemperature > BODYTEMP_HEAT_DAMAGE_LIMIT && !(RESISTHOT in species_traits)) //Body temperature is too hot. var/burn_damage diff --git a/code/modules/mob/living/carbon/human/species_types/furrypeople.dm b/code/modules/mob/living/carbon/human/species_types/furrypeople.dm index aeeba86b59..b8d9713d37 100644 --- a/code/modules/mob/living/carbon/human/species_types/furrypeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/furrypeople.dm @@ -214,7 +214,7 @@ default_features = list("slimecoontail" = "Slimecoon Tail", "slimecoonears" = "Slimecoon Ears", "slimecoonsnout" = "Slimecoon Snout")*/ // Fat Shark <3 - +/* /datum/species/shark/datashark name = "DataShark" id = "datashark" @@ -228,6 +228,7 @@ whitelisted = 1 whitelist = list("rubyflamewing") blacklisted = 0 + */ /datum/species/guilmon name = "Guilmon" diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm index 0ac97fba5a..1a610d97a6 100644 --- a/code/modules/mob/living/carbon/life.dm +++ b/code/modules/mob/living/carbon/life.dm @@ -396,15 +396,14 @@ /mob/living/carbon/proc/natural_bodytemperature_stabilization() var/body_temperature_difference = BODYTEMP_NORMAL - bodytemperature switch(bodytemperature) - if(-INFINITY to BODYTEMP_COLD_DAMAGE_LIMIT) //BODYTEMP_COLD_DAMAGE_LIMIT is BODYTEMP_NORMAL(310.15) - 50, the temperature where you start to feel effects. - bodytemperature += max((body_temperature_difference * metabolism_efficiency / BODYTEMP_AUTORECOVERY_DIVISOR), BODYTEMP_AUTORECOVERY_MINIMUM) + if(-INFINITY to BODYTEMP_COLD_DAMAGE_LIMIT) //Cold damage limit is 50 below the default, the temperature where you start to feel effects. + return max((body_temperature_difference * metabolism_efficiency / BODYTEMP_AUTORECOVERY_DIVISOR), BODYTEMP_AUTORECOVERY_MINIMUM) if(BODYTEMP_COLD_DAMAGE_LIMIT to BODYTEMP_NORMAL) - bodytemperature += max(body_temperature_difference * metabolism_efficiency / BODYTEMP_AUTORECOVERY_DIVISOR, min(body_temperature_difference, BODYTEMP_AUTORECOVERY_MINIMUM/4)) - if(BODYTEMP_NORMAL to BODYTEMP_HEAT_DAMAGE_LIMIT) - bodytemperature += min(body_temperature_difference * metabolism_efficiency / BODYTEMP_AUTORECOVERY_DIVISOR, max(body_temperature_difference, -BODYTEMP_AUTORECOVERY_MINIMUM/4)) - if(BODYTEMP_HEAT_DAMAGE_LIMIT to INFINITY) //BODYTEMP_HEAT_DAMAGE_LIMIT is BODYTEMP_NORMAL(310.15) + 50, the temperature where you start to feel effects. - //We totally need a sweat system cause it totally makes sense...~ - bodytemperature += min((body_temperature_difference / BODYTEMP_AUTORECOVERY_DIVISOR), -BODYTEMP_AUTORECOVERY_MINIMUM) //We're dealing with negative numbers + return max(body_temperature_difference * metabolism_efficiency / BODYTEMP_AUTORECOVERY_DIVISOR, min(body_temperature_difference, BODYTEMP_AUTORECOVERY_MINIMUM/4)) + if(BODYTEMP_NORMAL to BODYTEMP_HEAT_DAMAGE_LIMIT) // Heat damage limit is 50 above the default, the temperature where you start to feel effects. + return min(body_temperature_difference * metabolism_efficiency / BODYTEMP_AUTORECOVERY_DIVISOR, max(body_temperature_difference, -BODYTEMP_AUTORECOVERY_MINIMUM/4)) + if(BODYTEMP_HEAT_DAMAGE_LIMIT to INFINITY) + return min((body_temperature_difference / BODYTEMP_AUTORECOVERY_DIVISOR), -BODYTEMP_AUTORECOVERY_MINIMUM) //We're dealing with negative numbers ///////// //LIVER// ///////// @@ -460,4 +459,4 @@ death() var/obj/item/organ/brain/B = getorganslot(ORGAN_SLOT_BRAIN) if(B) - B.damaged_brain = TRUE + B.damaged_brain = TRUE diff --git a/code/modules/mob/living/carbon/monkey/life.dm b/code/modules/mob/living/carbon/monkey/life.dm index ca78e165c2..2b1f49cb7e 100644 --- a/code/modules/mob/living/carbon/monkey/life.dm +++ b/code/modules/mob/living/carbon/monkey/life.dm @@ -66,13 +66,13 @@ var/loc_temp = get_temperature(environment) if(stat != DEAD) - natural_bodytemperature_stabilization() + bodytemperature += natural_bodytemperature_stabilization() if(!on_fire) //If you're on fire, you do not heat up or cool down based on surrounding gases if(loc_temp < bodytemperature) bodytemperature += min(((loc_temp - bodytemperature) / BODYTEMP_COLD_DIVISOR), BODYTEMP_COOLING_MAX) else - bodytemperature += min(((loc_temp - bodytemperature) / BODYTEMP_HEAT_DIVISOR), BODYTEMP_HEATING_MAX) + bodytemperature += max(((loc_temp - bodytemperature) / BODYTEMP_HEAT_DIVISOR), BODYTEMP_HEATING_MAX) if(bodytemperature > BODYTEMP_HEAT_DAMAGE_LIMIT) switch(bodytemperature) diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index 634c1ebb5f..371f19f033 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -231,7 +231,7 @@ var/atom/A = src.loc if(isturf(A)) var/areatemp = get_temperature(environment) - if( abs(areatemp - bodytemperature) > 40 ) + if( abs(areatemp - bodytemperature) > 5) var/diff = areatemp - bodytemperature diff = diff / 5 bodytemperature += diff diff --git a/code/modules/mob/living/simple_animal/slime/life.dm b/code/modules/mob/living/simple_animal/slime/life.dm index 83fcd889d8..d2f743d69b 100644 --- a/code/modules/mob/living/simple_animal/slime/life.dm +++ b/code/modules/mob/living/simple_animal/slime/life.dm @@ -341,7 +341,6 @@ var/ally = FALSE for(var/F in faction) if(F == "neutral") //slimes are neutral so other mobs not target them, but they can target neutral mobs - continue if(F in L.faction) ally = TRUE break diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm index c65e518383..3eec556c95 100644 --- a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm +++ b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm @@ -87,7 +87,7 @@ /obj/item/gun/energy/kinetic_accelerator/dropped() . = ..() - if(!holds_charge) + if(!QDELING(src) && !holds_charge) // Put it on a delay because moving item from slot to hand // calls dropped(). addtimer(CALLBACK(src, .proc/empty_if_not_held), 2) @@ -97,10 +97,13 @@ empty() /obj/item/gun/energy/kinetic_accelerator/proc/empty() - cell.use(cell.charge) + if(cell) + cell.use(cell.charge) update_icon() /obj/item/gun/energy/kinetic_accelerator/proc/attempt_reload(recharge_time) + if(!cell) + return if(overheat) return if(!recharge_time) diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm index 835bcaaad7..e0ea5de450 100644 --- a/code/modules/reagents/chemistry/reagents/food_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm @@ -213,29 +213,31 @@ taste_description = "mint" /datum/reagent/consumable/frostoil/on_mob_life(mob/living/M) - switch(current_cycle) - if(1 to 15) - M.bodytemperature -= 10 * TEMPERATURE_DAMAGE_COEFFICIENT - if(holder.has_reagent("capsaicin")) - holder.remove_reagent("capsaicin", 5) - if(isslime(M)) - M.bodytemperature -= rand(5,20) - if(15 to 25) - M.bodytemperature -= 20 * TEMPERATURE_DAMAGE_COEFFICIENT - if(isslime(M)) - M.bodytemperature -= rand(10,20) - if(25 to 35) - M.bodytemperature -= 30 * TEMPERATURE_DAMAGE_COEFFICIENT - if(prob(1)) - M.emote("shiver") - if(isslime(M)) - M.bodytemperature -= rand(15,20) - if(35 to INFINITY) - M.bodytemperature -= 40 * TEMPERATURE_DAMAGE_COEFFICIENT - if(prob(5)) - M.emote("shiver") - if(isslime(M)) - M.bodytemperature -= rand(20,25) + if(M.bodytemperature > 50) + switch(current_cycle) + if(1 to 15) + M.bodytemperature -= 10 * TEMPERATURE_DAMAGE_COEFFICIENT + if(holder.has_reagent("capsaicin")) + holder.remove_reagent("capsaicin", 5) + if(isslime(M)) + M.bodytemperature -= rand(5,20) + if(15 to 25) + M.bodytemperature -= 20 * TEMPERATURE_DAMAGE_COEFFICIENT + if(isslime(M)) + M.bodytemperature -= rand(10,20) + if(25 to 35) + M.bodytemperature -= 30 * TEMPERATURE_DAMAGE_COEFFICIENT + if(prob(1)) + M.emote("shiver") + if(isslime(M)) + M.bodytemperature -= rand(15,20) + if(35 to INFINITY) + M.bodytemperature -= 40 * TEMPERATURE_DAMAGE_COEFFICIENT + if(prob(5)) + M.emote("shiver") + if(isslime(M)) + M.bodytemperature -= rand(20,25) + M.bodytemperature = max(50, M.bodytemperature) ..() /datum/reagent/consumable/frostoil/reaction_turf(turf/T, reac_volume) diff --git a/html/changelogs/AutoChangeLog-pr-4929.yml b/html/changelogs/AutoChangeLog-pr-4929.yml new file mode 100644 index 0000000000..2f78ca8c6a --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4929.yml @@ -0,0 +1,6 @@ +author: "Robustin" +delete-after: True +changes: + - bugfix: "Fixed frost oil (cryosting) sending insulated crewmembers below absolute zero temperatures." + - bugfix: "Fixed damaging cold temps being a death sentence to simple mobs (they wouldn't heat back up to safe temps at room temperature)." + - refactor: "Refactored human temperature code, insulating clothing now helps you stay warm but going unprotected will help you cool off. However, you will now benefit from colder temps when you're overheating even in full EVA/hardsuit gear and you will warm up faster at room temperature in insulated gear as well (i.e. putting on a winter coat will no longer suppress your temperature if your already cold)." diff --git a/html/changelogs/AutoChangeLog-pr-4954.yml b/html/changelogs/AutoChangeLog-pr-4954.yml new file mode 100644 index 0000000000..fe18bb3685 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4954.yml @@ -0,0 +1,4 @@ +author: "XDTM" +delete-after: True +changes: + - bugfix: "Slimes no longer attack people with their same faction." diff --git a/html/changelogs/AutoChangeLog-pr-4970.yml b/html/changelogs/AutoChangeLog-pr-4970.yml new file mode 100644 index 0000000000..7868682076 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4970.yml @@ -0,0 +1,4 @@ +author: "CitadelStationBot" +delete-after: True +changes: + - rscadd: "All Cargo Techs now come equipped with a standard supply Export Scanner! Get to selling!" diff --git a/html/changelogs/AutoChangeLog-pr-4973.yml b/html/changelogs/AutoChangeLog-pr-4973.yml new file mode 100644 index 0000000000..cd4506e08b --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4973.yml @@ -0,0 +1,4 @@ +author: "CitadelStationBot" +delete-after: True +changes: + - tweak: "Emagged airlocks can now be deconstructed simply by crowbarring when the panel is open" diff --git a/tgstation.dme b/tgstation.dme index 48f6d1694a..e644d1792d 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -13,7 +13,7 @@ // END_PREFERENCES // BEGIN_INCLUDE -#include "_maps\basemap.dm" +#include "_maps\_basemap.dm" #include "code\_compile_options.dm" #include "code\world.dm" #include "code\__DATASTRUCTURES\globals.dm" diff --git a/tools/travis/build_byond.sh b/tools/travis/build_byond.sh index 1387b4174e..b0e3f57aad 100755 --- a/tools/travis/build_byond.sh +++ b/tools/travis/build_byond.sh @@ -35,7 +35,10 @@ if [ "$BUILD_TOOLS" = false ]; then fi; #config folder should not be mandatory - rm -rf config + rm -rf config/* + + #disable all ruins + echo -e "LAVALAND_BUDGET 0\nSPACE_BUDGET 0" > config/config.txt source $HOME/BYOND-${BYOND_MAJOR}.${BYOND_MINOR}/byond/bin/byondsetup if [ "$BUILD_TESTING" = true ]; then