diff --git a/_maps/templates/boarding/dropship.dmm b/_maps/templates/boarding/dropship.dmm index 7300023cef8..5aacb2625d6 100644 --- a/_maps/templates/boarding/dropship.dmm +++ b/_maps/templates/boarding/dropship.dmm @@ -1,11 +1,11 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "al" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "94" }, /area/dropship/generic) "aE" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "75" }, /area/dropship/generic) @@ -16,22 +16,22 @@ }, /area/dropship/generic) "bG" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_rearwing_rrb" }, /area/dropship/generic) "bK" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "13" }, /area/dropship/generic) "cf" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_rearwing_lb" }, /area/dropship/generic) "cp" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "34" }, /area/dropship/generic) @@ -44,7 +44,7 @@ }, /area/dropship/generic) "em" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "64" }, /area/dropship/generic) @@ -52,12 +52,12 @@ /obj/structure/sign/ship/smoking{ dir = 4 }, -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "67" }, /area/dropship/generic) "eu" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "72" }, /area/dropship/generic) @@ -66,7 +66,7 @@ dir = 8; name = "FLAMMABLE" }, -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "22" }, /area/dropship/generic) @@ -75,7 +75,7 @@ name = "CAUTION: FASTEN YOUR SEATBELT"; pixel_y = -6 }, -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "53" }, /area/dropship/generic) @@ -107,17 +107,17 @@ }, /area/dropship/generic) "iE" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_rearwing_rrrb" }, /area/dropship/generic) "iK" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "80" }, /area/dropship/generic) "iX" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "47" }, /area/dropship/generic) @@ -127,12 +127,12 @@ }, /area/dropship/generic) "jb" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "96" }, /area/dropship/generic) "jK" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "81" }, /area/dropship/generic) @@ -142,22 +142,22 @@ }, /area/dropship/generic) "kZ" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_fl" }, /area/dropship/generic) "mC" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_fr" }, /area/dropship/generic) "mV" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "32" }, /area/dropship/generic) "nB" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_wing_rt" }, /area/dropship/generic) @@ -171,7 +171,7 @@ }, /area/dropship/generic) "on" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_weapon_lr" }, /area/dropship/generic) @@ -197,7 +197,7 @@ }, /area/dropship/generic) "pe" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_rearwing_llb" }, /area/dropship/generic) @@ -220,7 +220,7 @@ }, /area/dropship/generic) "rx" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_weapon_ll" }, /area/dropship/generic) @@ -229,7 +229,7 @@ name = "NSV Hammerbird Dedication Plaque"; pixel_y = -4 }, -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "81" }, /area/dropship/generic) @@ -237,17 +237,17 @@ /obj/structure/sign/ship/smoking{ dir = 8 }, -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "69" }, /area/dropship/generic) "tg" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_engine_rt" }, /area/dropship/generic) "vC" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "10" }, /area/dropship/generic) @@ -260,22 +260,22 @@ }, /area/dropship/generic) "wn" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_cockpit_fr" }, /area/dropship/generic) "wp" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "11" }, /area/dropship/generic) "wu" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "28" }, /area/dropship/generic) "wJ" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "73" }, /area/dropship/generic) @@ -294,7 +294,7 @@ }, /area/dropship/generic) "yh" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_wing_lt" }, /area/dropship/generic) @@ -302,17 +302,17 @@ /obj/structure/sign/ship/nosmoking{ dir = 8 }, -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "19" }, /area/dropship/generic) "yA" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "39" }, /area/dropship/generic) "zj" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "98" }, /area/dropship/generic) @@ -325,12 +325,12 @@ }, /area/dropship/generic) "zB" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "12" }, /area/dropship/generic) "zX" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_engine_lb" }, /area/dropship/generic) @@ -339,7 +339,7 @@ /turf/open/indestructible/dropship, /area/dropship/generic) "Ap" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "23" }, /area/dropship/generic) @@ -366,7 +366,7 @@ }, /area/dropship/generic) "Bl" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "59" }, /area/dropship/generic) @@ -374,12 +374,12 @@ /obj/structure/sign/ship/nosmoking{ dir = 4 }, -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "18" }, /area/dropship/generic) "CL" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "86" }, /area/dropship/generic) @@ -393,17 +393,17 @@ }, /area/dropship/generic) "DV" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_rearwing_lllb" }, /area/dropship/generic) "Er" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_wing_lb" }, /area/dropship/generic) "EJ" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "97" }, /area/dropship/generic) @@ -417,37 +417,37 @@ }, /area/dropship/generic) "Fj" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_rearwing_rt" }, /area/dropship/generic) "FF" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_front" }, /area/dropship/generic) "Gu" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_middle_lc" }, /area/dropship/generic) "GN" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "35" }, /area/dropship/generic) "Hz" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "66" }, /area/dropship/generic) "HC" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "83" }, /area/dropship/generic) "In" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "62" }, /area/dropship/generic) @@ -460,7 +460,7 @@ }, /area/dropship/generic) "Ip" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "18" }, /area/dropship/generic) @@ -480,12 +480,12 @@ }, /area/dropship/generic) "Jf" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "78" }, /area/dropship/generic) "Jx" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_engine_rb" }, /area/dropship/generic) @@ -501,7 +501,7 @@ }, /area/dropship/generic) "Jz" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_middle_rc" }, /area/dropship/generic) @@ -509,7 +509,7 @@ /obj/structure/sign/ship/securearea/alt{ pixel_y = -3 }, -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "82" }, /area/dropship/generic) @@ -518,12 +518,12 @@ dir = 4; pixel_x = -2 }, -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "92" }, /area/dropship/generic) "LQ" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "56" }, /area/dropship/generic) @@ -537,7 +537,7 @@ }, /area/dropship/generic) "Nn" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "70" }, /area/dropship/generic) @@ -546,7 +546,7 @@ dir = 8; name = "FLAMMABLE" }, -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "31" }, /area/dropship/generic) @@ -571,40 +571,40 @@ dir = 4; name = "FLAMMABLE" }, -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "27" }, /area/dropship/generic) "ON" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "68" }, /area/dropship/generic) "OT" = ( -/turf/closed/wall/indestructible/dropship/entry, +/turf/closed/indestructible/dropship/entry, /area/dropship/generic) "Pd" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "29" }, /area/dropship/generic) "Pm" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "33" }, /area/dropship/generic) "QI" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "25" }, /area/dropship/generic) "QY" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "48" }, /area/dropship/generic) "RC" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "38" }, /area/dropship/generic) @@ -625,22 +625,22 @@ /area/dropship/generic) "Sa" = ( /obj/machinery/squad_vendor, -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "76" }, /area/dropship/generic) "SP" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_cockpit_fl" }, /area/dropship/generic) "SY" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_rearwing_rb" }, /area/dropship/generic) "TT" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "19" }, /area/dropship/generic) @@ -652,12 +652,12 @@ }, /area/dropship/generic) "Ul" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "24" }, /area/dropship/generic) "Ve" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "69" }, /area/dropship/generic) @@ -680,17 +680,17 @@ }, /area/dropship/generic) "Wd" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_engine_lt" }, /area/dropship/generic) "We" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "67" }, /area/dropship/generic) "Wy" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_wing_rb" }, /area/dropship/generic) @@ -708,7 +708,7 @@ dir = 4; name = "FLAMMABLE" }, -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "30" }, /area/dropship/generic) @@ -720,22 +720,22 @@ }, /area/dropship/generic) "XT" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_rearwing_lt" }, /area/dropship/generic) "Ya" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "26" }, /area/dropship/generic) "Zh" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_weapon_rr" }, /area/dropship/generic) "Zq" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "89" }, /area/dropship/generic) diff --git a/_maps/templates/boarding/dropship_main.dmm b/_maps/templates/boarding/dropship_main.dmm index e4783af9c2a..f5bbbed6947 100644 --- a/_maps/templates/boarding/dropship_main.dmm +++ b/_maps/templates/boarding/dropship_main.dmm @@ -1,31 +1,31 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "al" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "94" }, /area/dropship) "aE" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "75" }, /area/dropship) "bG" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_rearwing_rrb" }, /area/dropship) "bK" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "13" }, /area/dropship) "cf" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_rearwing_lb" }, /area/dropship) "cp" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "34" }, /area/dropship) @@ -48,7 +48,7 @@ }, /area/dropship) "em" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "64" }, /area/dropship) @@ -56,12 +56,12 @@ /obj/structure/sign/ship/smoking{ dir = 4 }, -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "67" }, /area/dropship) "eu" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "72" }, /area/dropship) @@ -70,12 +70,12 @@ dir = 8; name = "FLAMMABLE" }, -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "22" }, /area/dropship) "gb" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "53" }, /area/dropship) @@ -114,17 +114,17 @@ }, /area/dropship) "iE" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_rearwing_rrrb" }, /area/dropship) "iK" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "80" }, /area/dropship) "iX" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "47" }, /area/dropship) @@ -134,12 +134,12 @@ }, /area/dropship) "jb" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "96" }, /area/dropship) "jK" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "81" }, /area/dropship) @@ -153,22 +153,22 @@ }, /area/dropship) "kZ" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_fl" }, /area/dropship) "mC" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_fr" }, /area/dropship) "mV" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "32" }, /area/dropship) "nB" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_wing_rt" }, /area/dropship) @@ -195,7 +195,7 @@ }, /area/dropship) "on" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_weapon_lr" }, /area/dropship) @@ -220,7 +220,7 @@ }, /area/dropship) "pe" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_rearwing_llb" }, /area/dropship) @@ -229,7 +229,7 @@ dir = 4; name = "CAUTION: FASTEN YOUR SEATBELT" }, -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "67" }, /area/dropship) @@ -245,7 +245,7 @@ }, /area/dropship) "rx" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_weapon_ll" }, /area/dropship) @@ -266,7 +266,7 @@ name = "NSV Sephora Dedication Plaque"; pixel_y = -4 }, -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "81" }, /area/dropship) @@ -274,12 +274,12 @@ /obj/structure/sign/ship/smoking{ dir = 8 }, -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "69" }, /area/dropship) "tg" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_engine_rt" }, /area/dropship) @@ -306,27 +306,27 @@ }, /area/dropship) "vC" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "10" }, /area/dropship) "wn" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_cockpit_fr" }, /area/dropship) "wp" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "11" }, /area/dropship) "wu" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "28" }, /area/dropship) "wJ" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "73" }, /area/dropship) @@ -335,7 +335,7 @@ dir = 4; name = "CAUTION: FASTEN YOUR SEATBELT" }, -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "18" }, /area/dropship) @@ -344,7 +344,7 @@ dir = 8; name = "CAUTION: FASTEN YOUR SEATBELT" }, -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "69" }, /area/dropship) @@ -356,7 +356,7 @@ }, /area/dropship) "yh" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_wing_lt" }, /area/dropship) @@ -364,12 +364,12 @@ /obj/structure/sign/ship/nosmoking{ dir = 8 }, -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "19" }, /area/dropship) "yA" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "39" }, /area/dropship) @@ -386,7 +386,7 @@ }, /area/dropship) "zj" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "98" }, /area/dropship) @@ -402,12 +402,12 @@ /obj/machinery/telecomms/relay/preset/station{ alpha = 0 }, -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "12" }, /area/dropship) "zX" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_engine_lb" }, /area/dropship) @@ -416,7 +416,7 @@ /turf/open/indestructible/dropship, /area/dropship) "Ap" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "23" }, /area/dropship) @@ -439,7 +439,7 @@ }, /area/dropship) "Bl" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "59" }, /area/dropship) @@ -460,7 +460,7 @@ /obj/structure/sign/ship/nosmoking{ dir = 4 }, -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "18" }, /area/dropship) @@ -468,7 +468,7 @@ /obj/machinery/computer/ship/dradis/console{ dir = 4 }, -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "86" }, /area/dropship) @@ -500,42 +500,42 @@ dir = 8; name = "CAUTION: FASTEN YOUR SEATBELT" }, -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "19" }, /area/dropship) "DV" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_rearwing_lllb" }, /area/dropship) "Er" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_wing_lb" }, /area/dropship) "EJ" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "97" }, /area/dropship) "Fj" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_rearwing_rt" }, /area/dropship) "FF" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_front" }, /area/dropship) "Gu" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_middle_lc" }, /area/dropship) "GN" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "35" }, /area/dropship) @@ -551,17 +551,17 @@ }, /area/dropship) "Hz" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "66" }, /area/dropship) "HC" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "83" }, /area/dropship) "In" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "62" }, /area/dropship) @@ -578,7 +578,7 @@ }, /area/dropship) "Ip" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "18" }, /area/dropship) @@ -591,12 +591,12 @@ }, /area/dropship) "Jf" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "78" }, /area/dropship) "Jx" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_engine_rb" }, /area/dropship) @@ -612,7 +612,7 @@ }, /area/dropship) "Jz" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_middle_rc" }, /area/dropship) @@ -620,17 +620,17 @@ /obj/structure/sign/ship/securearea/alt{ pixel_y = -3 }, -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "82" }, /area/dropship) "LM" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "92" }, /area/dropship) "LQ" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "56" }, /area/dropship) @@ -654,7 +654,7 @@ }, /area/dropship) "Nn" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "70" }, /area/dropship) @@ -677,7 +677,7 @@ dir = 8; name = "FLAMMABLE" }, -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "31" }, /area/dropship) @@ -702,7 +702,7 @@ dir = 4; name = "FLAMMABLE" }, -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "27" }, /area/dropship) @@ -714,35 +714,35 @@ }, /area/dropship) "ON" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "68" }, /area/dropship) "OT" = ( -/turf/closed/wall/indestructible/dropship/entry, +/turf/closed/indestructible/dropship/entry, /area/dropship) "Pd" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "29" }, /area/dropship) "Pm" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "33" }, /area/dropship) "QI" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "25" }, /area/dropship) "QY" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "48" }, /area/dropship) "RC" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "38" }, /area/dropship) @@ -766,22 +766,22 @@ }, /area/dropship) "Sa" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "76" }, /area/dropship) "SP" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_cockpit_fl" }, /area/dropship) "SY" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_rearwing_rb" }, /area/dropship) "TT" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "19" }, /area/dropship) @@ -798,7 +798,7 @@ /obj/structure/sign/ship/shock{ dir = 4 }, -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "24" }, /area/dropship) @@ -836,7 +836,7 @@ }, /area/dropship) "Ve" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "69" }, /area/dropship) @@ -859,17 +859,17 @@ }, /area/dropship) "Wd" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_engine_lt" }, /area/dropship) "We" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "67" }, /area/dropship) "Wy" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_wing_rb" }, /area/dropship) @@ -898,7 +898,7 @@ dir = 4; name = "FLAMMABLE" }, -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "30" }, /area/dropship) @@ -910,17 +910,17 @@ }, /area/dropship) "XT" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_rearwing_lt" }, /area/dropship) "Ya" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "26" }, /area/dropship) "Zh" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_weapon_rr" }, /area/dropship) @@ -928,7 +928,7 @@ /obj/machinery/computer/ship/salvage/console{ dir = 8 }, -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "89" }, /area/dropship) diff --git a/_maps/templates/boarding/dropship_syndicate.dmm b/_maps/templates/boarding/dropship_syndicate.dmm index 63c73af2147..bdba9f42a42 100644 --- a/_maps/templates/boarding/dropship_syndicate.dmm +++ b/_maps/templates/boarding/dropship_syndicate.dmm @@ -1,11 +1,11 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "al" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "94" }, /area/dropship/generic/syndicate) "aE" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "75" }, /area/dropship/generic/syndicate) @@ -18,22 +18,22 @@ }, /area/dropship/generic/syndicate) "bG" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_rearwing_rrb" }, /area/dropship/generic/syndicate) "bK" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "13" }, /area/dropship/generic/syndicate) "cf" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_rearwing_lb" }, /area/dropship/generic/syndicate) "cp" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "34" }, /area/dropship/generic/syndicate) @@ -46,7 +46,7 @@ }, /area/dropship/generic/syndicate) "em" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "64" }, /area/dropship/generic/syndicate) @@ -54,12 +54,12 @@ /obj/structure/sign/ship/smoking{ dir = 4 }, -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "67" }, /area/dropship/generic/syndicate) "eu" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "72" }, /area/dropship/generic/syndicate) @@ -68,7 +68,7 @@ dir = 8; name = "FLAMMABLE" }, -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "22" }, /area/dropship/generic/syndicate) @@ -85,7 +85,7 @@ name = "CAUTION: FASTEN YOUR SEATBELT"; pixel_y = -6 }, -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "53" }, /area/dropship/generic/syndicate) @@ -121,17 +121,17 @@ }, /area/dropship/generic/syndicate) "iE" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_rearwing_rrrb" }, /area/dropship/generic/syndicate) "iK" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "80" }, /area/dropship/generic/syndicate) "iX" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "47" }, /area/dropship/generic/syndicate) @@ -141,12 +141,12 @@ }, /area/dropship/generic/syndicate) "jb" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "96" }, /area/dropship/generic/syndicate) "jK" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "81" }, /area/dropship/generic/syndicate) @@ -156,22 +156,22 @@ }, /area/dropship/generic/syndicate) "kZ" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_fl" }, /area/dropship/generic/syndicate) "mC" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_fr" }, /area/dropship/generic/syndicate) "mV" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "32" }, /area/dropship/generic/syndicate) "nB" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_wing_rt" }, /area/dropship/generic/syndicate) @@ -185,7 +185,7 @@ }, /area/dropship/generic/syndicate) "on" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_weapon_lr" }, /area/dropship/generic/syndicate) @@ -200,7 +200,7 @@ }, /area/dropship/generic/syndicate) "pe" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_rearwing_llb" }, /area/dropship/generic/syndicate) @@ -216,13 +216,13 @@ }, /area/dropship/generic/syndicate) "rx" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_weapon_ll" }, /area/dropship/generic/syndicate) "sh" = ( /obj/structure/sign/ship/plaque/dark, -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "81" }, /area/dropship/generic/syndicate) @@ -230,17 +230,17 @@ /obj/structure/sign/ship/smoking{ dir = 8 }, -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "69" }, /area/dropship/generic/syndicate) "tg" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_engine_rt" }, /area/dropship/generic/syndicate) "vC" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "10" }, /area/dropship/generic/syndicate) @@ -257,22 +257,22 @@ }, /area/dropship/generic/syndicate) "wn" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_cockpit_fr" }, /area/dropship/generic/syndicate) "wp" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "11" }, /area/dropship/generic/syndicate) "wu" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "28" }, /area/dropship/generic/syndicate) "wJ" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "73" }, /area/dropship/generic/syndicate) @@ -291,7 +291,7 @@ }, /area/dropship/generic/syndicate) "yh" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_wing_lt" }, /area/dropship/generic/syndicate) @@ -299,17 +299,17 @@ /obj/structure/sign/ship/nosmoking{ dir = 8 }, -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "19" }, /area/dropship/generic/syndicate) "yA" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "39" }, /area/dropship/generic/syndicate) "zj" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "98" }, /area/dropship/generic/syndicate) @@ -322,12 +322,12 @@ }, /area/dropship/generic/syndicate) "zB" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "12" }, /area/dropship/generic/syndicate) "zX" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_engine_lb" }, /area/dropship/generic/syndicate) @@ -336,7 +336,7 @@ /turf/open/indestructible/dropship, /area/dropship/generic/syndicate) "Ap" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "23" }, /area/dropship/generic/syndicate) @@ -363,7 +363,7 @@ }, /area/dropship/generic/syndicate) "Bl" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "59" }, /area/dropship/generic/syndicate) @@ -371,12 +371,12 @@ /obj/structure/sign/ship/nosmoking{ dir = 4 }, -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "18" }, /area/dropship/generic/syndicate) "CL" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "86" }, /area/dropship/generic/syndicate) @@ -388,17 +388,17 @@ }, /area/dropship/generic/syndicate) "DV" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_rearwing_lllb" }, /area/dropship/generic/syndicate) "Er" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_wing_lb" }, /area/dropship/generic/syndicate) "EJ" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "97" }, /area/dropship/generic/syndicate) @@ -412,37 +412,37 @@ }, /area/dropship/generic/syndicate) "Fj" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_rearwing_rt" }, /area/dropship/generic/syndicate) "FF" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_front" }, /area/dropship/generic/syndicate) "Gu" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_middle_lc" }, /area/dropship/generic/syndicate) "GN" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "35" }, /area/dropship/generic/syndicate) "Hz" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "66" }, /area/dropship/generic/syndicate) "HC" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "83" }, /area/dropship/generic/syndicate) "In" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "62" }, /area/dropship/generic/syndicate) @@ -455,7 +455,7 @@ }, /area/dropship/generic/syndicate) "Ip" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "18" }, /area/dropship/generic/syndicate) @@ -474,12 +474,12 @@ /obj/structure/sign/poster/contraband/c20r{ pixel_y = -4 }, -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "78" }, /area/dropship/generic/syndicate) "Jx" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_engine_rb" }, /area/dropship/generic/syndicate) @@ -495,7 +495,7 @@ }, /area/dropship/generic/syndicate) "Jz" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_middle_rc" }, /area/dropship/generic/syndicate) @@ -503,7 +503,7 @@ /obj/structure/sign/ship/securearea/alt{ pixel_y = -3 }, -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "82" }, /area/dropship/generic/syndicate) @@ -512,12 +512,12 @@ dir = 4; pixel_x = -2 }, -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "92" }, /area/dropship/generic/syndicate) "LQ" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "56" }, /area/dropship/generic/syndicate) @@ -531,7 +531,7 @@ }, /area/dropship/generic/syndicate) "Nn" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "70" }, /area/dropship/generic/syndicate) @@ -540,7 +540,7 @@ dir = 8; name = "FLAMMABLE" }, -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "31" }, /area/dropship/generic/syndicate) @@ -565,25 +565,25 @@ dir = 4; name = "FLAMMABLE" }, -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "27" }, /area/dropship/generic/syndicate) "ON" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "68" }, /area/dropship/generic/syndicate) "OT" = ( -/turf/closed/wall/indestructible/dropship/entry, +/turf/closed/indestructible/dropship/entry, /area/dropship/generic/syndicate) "Pd" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "29" }, /area/dropship/generic/syndicate) "Pm" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "33" }, /area/dropship/generic/syndicate) @@ -598,17 +598,17 @@ }, /area/dropship/generic/syndicate) "QI" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "25" }, /area/dropship/generic/syndicate) "QY" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "48" }, /area/dropship/generic/syndicate) "RC" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "38" }, /area/dropship/generic/syndicate) @@ -628,22 +628,22 @@ }, /area/dropship/generic/syndicate) "Sa" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "76" }, /area/dropship/generic/syndicate) "SP" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_cockpit_fl" }, /area/dropship/generic/syndicate) "SY" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_rearwing_rb" }, /area/dropship/generic/syndicate) "TT" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "19" }, /area/dropship/generic/syndicate) @@ -659,12 +659,12 @@ }, /area/dropship/generic/syndicate) "Ul" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "24" }, /area/dropship/generic/syndicate) "Ve" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "69" }, /area/dropship/generic/syndicate) @@ -684,17 +684,17 @@ }, /area/dropship/generic/syndicate) "Wd" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_engine_lt" }, /area/dropship/generic/syndicate) "We" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "67" }, /area/dropship/generic/syndicate) "Wy" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_wing_rb" }, /area/dropship/generic/syndicate) @@ -712,7 +712,7 @@ dir = 4; name = "FLAMMABLE" }, -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "30" }, /area/dropship/generic/syndicate) @@ -724,22 +724,22 @@ }, /area/dropship/generic/syndicate) "XT" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_rearwing_lt" }, /area/dropship/generic/syndicate) "Ya" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "26" }, /area/dropship/generic/syndicate) "Zh" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_weapon_rr" }, /area/dropship/generic/syndicate) "Zq" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "89" }, /area/dropship/generic/syndicate) diff --git a/_maps/templates/boarding/gunship.dmm b/_maps/templates/boarding/gunship.dmm index cc620059306..4f8fd0448a6 100644 --- a/_maps/templates/boarding/gunship.dmm +++ b/_maps/templates/boarding/gunship.dmm @@ -1,21 +1,21 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "al" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "94" }, /area/dropship/generic) "aE" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "75" }, /area/dropship/generic) "bG" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_rearwing_rrb" }, /area/dropship/generic) "bK" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "13" }, /area/dropship/generic) @@ -26,12 +26,12 @@ }, /area/dropship/generic) "cf" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_rearwing_lb" }, /area/dropship/generic) "cp" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "34" }, /area/dropship/generic) @@ -91,7 +91,7 @@ }, /area/dropship/generic) "eo" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "67"; opacity = 0 }, @@ -100,7 +100,7 @@ /obj/structure/sign/ship/smoking{ dir = 4 }, -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "72"; opacity = 0 }, @@ -110,7 +110,7 @@ dir = 8; name = "FLAMMABLE" }, -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "22" }, /area/dropship/generic) @@ -127,7 +127,7 @@ }, /area/dropship/generic) "eU" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_wing_rb" }, /area/dropship/generic) @@ -176,17 +176,17 @@ }, /area/dropship/generic) "iE" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_rearwing_rrrb" }, /area/dropship/generic) "iK" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "80" }, /area/dropship/generic) "iX" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "47" }, /area/dropship/generic) @@ -199,12 +199,12 @@ }, /area/dropship/generic) "jb" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "96" }, /area/dropship/generic) "jK" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "81" }, /area/dropship/generic) @@ -222,7 +222,7 @@ }, /area/dropship/generic) "kZ" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_fl" }, /area/dropship/generic) @@ -254,17 +254,17 @@ }, /area/dropship/generic) "mC" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_fr" }, /area/dropship/generic) "mV" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "32" }, /area/dropship/generic) "nB" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_wing_rt" }, /area/dropship/generic) @@ -297,7 +297,7 @@ }, /area/dropship/generic) "on" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_weapon_lr" }, /area/dropship/generic) @@ -326,12 +326,12 @@ }, /area/dropship/generic) "pe" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_rearwing_llb" }, /area/dropship/generic) "px" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "62" }, /area/dropship/generic) @@ -346,7 +346,7 @@ }, /area/dropship/generic) "rx" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_weapon_ll" }, /area/dropship/generic) @@ -366,7 +366,7 @@ /obj/structure/sign/ship/plaque/dark{ pixel_y = -4 }, -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "81" }, /area/dropship/generic) @@ -374,7 +374,7 @@ /obj/structure/sign/ship/smoking{ dir = 8 }, -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "69"; opacity = 0 }, @@ -389,7 +389,7 @@ }, /area/dropship/generic) "tg" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_engine_rt" }, /area/dropship/generic) @@ -406,27 +406,27 @@ }, /area/dropship/generic) "vC" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "10" }, /area/dropship/generic) "wn" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_cockpit_fr" }, /area/dropship/generic) "wp" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "11" }, /area/dropship/generic) "wu" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "28" }, /area/dropship/generic) "wJ" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "73"; opacity = 0 }, @@ -436,12 +436,12 @@ dir = 4; name = "CAUTION: EAR PROTECTION MANDATORY" }, -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "18" }, /area/dropship/generic) "xK" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "64" }, /area/dropship/generic) @@ -453,7 +453,7 @@ }, /area/dropship/generic) "yh" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_wing_lt" }, /area/dropship/generic) @@ -461,12 +461,12 @@ /obj/structure/sign/ship/nosmoking{ dir = 8 }, -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "19" }, /area/dropship/generic) "yA" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "39" }, /area/dropship/generic) @@ -480,7 +480,7 @@ }, /area/dropship/generic) "zj" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "98" }, /area/dropship/generic) @@ -494,12 +494,12 @@ /obj/machinery/telecomms/relay/preset/station{ alpha = 0 }, -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "12" }, /area/dropship/generic) "zX" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_engine_lb" }, /area/dropship/generic) @@ -507,7 +507,7 @@ /turf/open/indestructible/dropship, /area/dropship/generic) "Ap" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "23" }, /area/dropship/generic) @@ -551,7 +551,7 @@ /obj/structure/sign/ship/nosmoking{ dir = 4 }, -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "18" }, /area/dropship/generic) @@ -559,7 +559,7 @@ /obj/machinery/computer/ship/dradis/console{ dir = 4 }, -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "86" }, /area/dropship/generic) @@ -568,37 +568,37 @@ dir = 8; name = "CAUTION: EAR PROTECTION MANDATORY" }, -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "19" }, /area/dropship/generic) "DV" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_rearwing_lllb" }, /area/dropship/generic) "EJ" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "97" }, /area/dropship/generic) "Fj" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_rearwing_rt" }, /area/dropship/generic) "FF" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_front" }, /area/dropship/generic) "Gu" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_middle_lc" }, /area/dropship/generic) "GN" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "35" }, /area/dropship/generic) @@ -617,12 +617,12 @@ }, /area/dropship/generic) "Hz" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "66" }, /area/dropship/generic) "HC" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "83" }, /area/dropship/generic) @@ -640,12 +640,12 @@ }, /area/dropship/generic) "Jf" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "78" }, /area/dropship/generic) "Jx" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_engine_rb" }, /area/dropship/generic) @@ -660,22 +660,22 @@ }, /area/dropship/generic) "Jz" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_middle_rc" }, /area/dropship/generic) "Kl" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "19" }, /area/dropship/generic) "LK" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "82" }, /area/dropship/generic) "LM" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "92" }, /area/dropship/generic) @@ -701,7 +701,7 @@ /obj/machinery/vending/wallmed{ products = list(/obj/item/reagent_containers/syringe = 3, /obj/item/stack/medical/gauze = 3, /obj/item/reagent_containers/food/drinks/bottle/vodka = 3, /obj/item/reagent_containers/medspray/sterilizine = 3) }, -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "18" }, /area/dropship/generic) @@ -732,7 +732,7 @@ }, /area/dropship/generic) "Nn" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "70" }, /area/dropship/generic) @@ -741,7 +741,7 @@ dir = 8; name = "FLAMMABLE" }, -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "31" }, /area/dropship/generic) @@ -756,7 +756,7 @@ dir = 4; name = "FLAMMABLE" }, -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "27" }, /area/dropship/generic) @@ -782,25 +782,25 @@ }, /area/dropship/generic) "OT" = ( -/turf/closed/wall/indestructible/dropship/entry, +/turf/closed/indestructible/dropship/entry, /area/dropship/generic) "Pd" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "29" }, /area/dropship/generic) "Pm" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "33" }, /area/dropship/generic) "QI" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "25" }, /area/dropship/generic) "QY" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "48" }, /area/dropship/generic) @@ -815,7 +815,7 @@ }, /area/dropship/generic) "RC" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "38" }, /area/dropship/generic) @@ -839,7 +839,7 @@ }, /area/dropship/generic) "Sa" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "76" }, /area/dropship/generic) @@ -873,12 +873,12 @@ }, /area/dropship/generic) "SP" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_cockpit_fl" }, /area/dropship/generic) "SY" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_rearwing_rb" }, /area/dropship/generic) @@ -904,12 +904,12 @@ /obj/structure/sign/ship/shock{ dir = 4 }, -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "24" }, /area/dropship/generic) "Uq" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_wing_lb" }, /area/dropship/generic) @@ -933,7 +933,7 @@ }, /area/dropship/generic) "Ve" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "69" }, /area/dropship/generic) @@ -974,12 +974,12 @@ }, /area/space/instanced) "Wd" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_engine_lt" }, /area/dropship/generic) "We" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "67" }, /area/dropship/generic) @@ -1010,7 +1010,7 @@ dir = 4; name = "FLAMMABLE" }, -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "30" }, /area/dropship/generic) @@ -1022,17 +1022,17 @@ }, /area/dropship/generic) "XT" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_rearwing_lt" }, /area/dropship/generic) "Ya" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "26" }, /area/dropship/generic) "Zh" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_weapon_rr" }, /area/dropship/generic) @@ -1040,7 +1040,7 @@ /obj/machinery/computer/ship/salvage/console{ dir = 8 }, -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "89" }, /area/dropship/generic) diff --git a/_maps/templates/boarding/sabre_interior.dmm b/_maps/templates/boarding/sabre_interior.dmm index 4ffb2b49847..bfb87758053 100644 --- a/_maps/templates/boarding/sabre_interior.dmm +++ b/_maps/templates/boarding/sabre_interior.dmm @@ -9,32 +9,32 @@ }, /area/dropship/generic) "bn" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "96" }, /area/dropship/generic) "cy" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_rearwing_rt" }, /area/dropship/generic) "cM" = ( -/turf/closed/wall/indestructible/dropship/entry{ +/turf/closed/indestructible/dropship/entry{ icon_state = "60" }, /area/dropship/generic) "dt" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "79" }, /area/dropship/generic) "eJ" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "89" }, /area/dropship/generic) "fa" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_fr" }, /area/dropship/generic) @@ -48,12 +48,12 @@ }, /area/dropship/generic) "fZ" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_fl" }, /area/dropship/generic) "iv" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "12" }, /area/dropship/generic) @@ -69,27 +69,27 @@ }, /area/dropship/generic) "jN" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "66" }, /area/dropship/generic) "jP" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_cockpit_fr" }, /area/dropship/generic) "mI" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_rearwing_lllb" }, /area/dropship/generic) "mM" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "19" }, /area/dropship/generic) "oV" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_rearwing_lb" }, /area/dropship/generic) @@ -113,27 +113,27 @@ }, /area/dropship/generic) "rz" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_front" }, /area/dropship/generic) "rL" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_rearwing_rrb" }, /area/dropship/generic) "sC" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_wing_rt" }, /area/dropship/generic) "ud" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_rearwing_rb" }, /area/dropship/generic) "yU" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_wing_lt" }, /area/dropship/generic) @@ -150,7 +150,7 @@ }, /area/dropship/generic) "zC" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "13" }, /area/dropship/generic) @@ -158,7 +158,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "70" }, /area/dropship/generic) @@ -173,7 +173,7 @@ }, /area/dropship/generic) "Cb" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "11" }, /area/dropship/generic) @@ -189,7 +189,7 @@ }, /area/dropship/generic) "Dt" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "97" }, /area/dropship/generic) @@ -200,17 +200,17 @@ }, /area/dropship/generic) "EC" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_rearwing_rrrb" }, /area/dropship/generic) "EG" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "98" }, /area/dropship/generic) "Ja" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_wing_lb" }, /area/dropship/generic) @@ -251,12 +251,12 @@ }, /area/dropship/generic) "QC" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_rearwing_lt" }, /area/dropship/generic) "SR" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_rearwing_llb" }, /area/dropship/generic) @@ -277,17 +277,17 @@ }, /area/dropship/generic) "Vv" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "18" }, /area/dropship/generic) "VG" = ( -/turf/closed/wall/indestructible/dropship/entry{ +/turf/closed/indestructible/dropship/entry{ icon_state = "57" }, /area/dropship/generic) "VW" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_cockpit_fl" }, /area/dropship/generic) @@ -297,7 +297,7 @@ }, /area/dropship/generic) "WQ" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "70" }, /area/dropship/generic) @@ -310,12 +310,12 @@ }, /area/dropship/generic) "Zh" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "86" }, /area/dropship/generic) "Zt" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_wing_rb" }, /area/dropship/generic) diff --git a/_maps/templates/boarding/sabre_interior_mining.dmm b/_maps/templates/boarding/sabre_interior_mining.dmm index af149e534eb..3a25330809d 100644 --- a/_maps/templates/boarding/sabre_interior_mining.dmm +++ b/_maps/templates/boarding/sabre_interior_mining.dmm @@ -9,32 +9,32 @@ }, /area/dropship/generic) "bn" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "96" }, /area/dropship/generic) "cy" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_rearwing_rt" }, /area/dropship/generic) "cM" = ( -/turf/closed/wall/indestructible/dropship/entry{ +/turf/closed/indestructible/dropship/entry{ icon_state = "60" }, /area/dropship/generic) "dt" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "79" }, /area/dropship/generic) "eJ" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "89" }, /area/dropship/generic) "fa" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_fr" }, /area/dropship/generic) @@ -49,12 +49,12 @@ }, /area/dropship/generic) "fZ" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_fl" }, /area/dropship/generic) "iv" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "12" }, /area/dropship/generic) @@ -72,27 +72,27 @@ }, /area/dropship/generic) "jN" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "66" }, /area/dropship/generic) "jP" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_cockpit_fr" }, /area/dropship/generic) "mI" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_rearwing_lllb" }, /area/dropship/generic) "mM" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "19" }, /area/dropship/generic) "oV" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_rearwing_lb" }, /area/dropship/generic) @@ -106,7 +106,7 @@ }, /area/dropship/generic) "qq" = ( -/turf/closed/wall/indestructible/dropship/entry{ +/turf/closed/indestructible/dropship/entry{ icon_state = "57" }, /area/dropship/generic) @@ -118,27 +118,27 @@ }, /area/dropship/generic) "rz" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_front" }, /area/dropship/generic) "rL" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_rearwing_rrb" }, /area/dropship/generic) "sC" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_wing_rt" }, /area/dropship/generic) "ud" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_rearwing_rb" }, /area/dropship/generic) "yU" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_wing_lt" }, /area/dropship/generic) @@ -155,7 +155,7 @@ }, /area/dropship/generic) "zC" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "13" }, /area/dropship/generic) @@ -163,7 +163,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "70" }, /area/dropship/generic) @@ -178,7 +178,7 @@ }, /area/dropship/generic) "Cb" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "11" }, /area/dropship/generic) @@ -194,7 +194,7 @@ }, /area/dropship/generic) "Dt" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "97" }, /area/dropship/generic) @@ -205,17 +205,17 @@ }, /area/dropship/generic) "EC" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_rearwing_rrrb" }, /area/dropship/generic) "EG" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "98" }, /area/dropship/generic) "Ja" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_wing_lb" }, /area/dropship/generic) @@ -256,12 +256,12 @@ }, /area/dropship/generic) "QC" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_rearwing_lt" }, /area/dropship/generic) "SR" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_rearwing_llb" }, /area/dropship/generic) @@ -282,12 +282,12 @@ }, /area/dropship/generic) "Vv" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "18" }, /area/dropship/generic) "VW" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_cockpit_fl" }, /area/dropship/generic) @@ -297,7 +297,7 @@ }, /area/dropship/generic) "WQ" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "70" }, /area/dropship/generic) @@ -312,12 +312,12 @@ }, /area/dropship/generic) "Zh" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "86" }, /area/dropship/generic) "Zt" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_wing_rb" }, /area/dropship/generic) diff --git a/_maps/templates/boarding/sabre_interior_syndicate.dmm b/_maps/templates/boarding/sabre_interior_syndicate.dmm index 91dbccdec89..9c5072816e3 100644 --- a/_maps/templates/boarding/sabre_interior_syndicate.dmm +++ b/_maps/templates/boarding/sabre_interior_syndicate.dmm @@ -8,32 +8,32 @@ }, /area/dropship/generic) "bn" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "96" }, /area/dropship/generic) "cy" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_rearwing_rt" }, /area/dropship/generic) "cM" = ( -/turf/closed/wall/indestructible/dropship/entry{ +/turf/closed/indestructible/dropship/entry{ icon_state = "60" }, /area/dropship/generic) "dt" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "79" }, /area/dropship/generic) "eJ" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "89" }, /area/dropship/generic) "fa" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_fr" }, /area/dropship/generic) @@ -49,12 +49,12 @@ }, /area/dropship/generic) "fZ" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_fl" }, /area/dropship/generic) "iv" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "12" }, /area/dropship/generic) @@ -70,27 +70,27 @@ }, /area/dropship/generic) "jN" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "66" }, /area/dropship/generic) "jP" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_cockpit_fr" }, /area/dropship/generic) "mI" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_rearwing_lllb" }, /area/dropship/generic) "mM" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "19" }, /area/dropship/generic) "oV" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_rearwing_lb" }, /area/dropship/generic) @@ -114,27 +114,27 @@ }, /area/dropship/generic) "rz" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_front" }, /area/dropship/generic) "rL" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_rearwing_rrb" }, /area/dropship/generic) "sC" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_wing_rt" }, /area/dropship/generic) "ud" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_rearwing_rb" }, /area/dropship/generic) "yU" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_wing_lt" }, /area/dropship/generic) @@ -151,7 +151,7 @@ }, /area/dropship/generic) "zC" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "13" }, /area/dropship/generic) @@ -159,7 +159,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "70" }, /area/dropship/generic) @@ -174,7 +174,7 @@ }, /area/dropship/generic) "Cb" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "11" }, /area/dropship/generic) @@ -193,7 +193,7 @@ }, /area/dropship/generic) "Dt" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "97" }, /area/dropship/generic) @@ -204,22 +204,22 @@ }, /area/dropship/generic) "EC" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_rearwing_rrrb" }, /area/dropship/generic) "EG" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "98" }, /area/dropship/generic) "HD" = ( -/turf/closed/wall/indestructible/dropship/entry{ +/turf/closed/indestructible/dropship/entry{ icon_state = "57" }, /area/dropship/generic) "Ja" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_wing_lb" }, /area/dropship/generic) @@ -260,12 +260,12 @@ }, /area/dropship/generic) "QC" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_rearwing_lt" }, /area/dropship/generic) "SR" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_rearwing_llb" }, /area/dropship/generic) @@ -285,12 +285,12 @@ }, /area/dropship/generic) "Vv" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "18" }, /area/dropship/generic) "VW" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_cockpit_fl" }, /area/dropship/generic) @@ -300,7 +300,7 @@ }, /area/dropship/generic) "WQ" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "70" }, /area/dropship/generic) @@ -316,12 +316,12 @@ }, /area/dropship/generic) "Zh" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "86" }, /area/dropship/generic) "Zt" = ( -/turf/closed/wall/indestructible/dropship{ +/turf/closed/indestructible/dropship{ icon_state = "blue_wing_rb" }, /area/dropship/generic) diff --git a/nsv13/code/game/general_quarters/dropship.dm b/nsv13/code/game/general_quarters/dropship.dm index 54fa037683d..c1001826649 100644 --- a/nsv13/code/game/general_quarters/dropship.dm +++ b/nsv13/code/game/general_quarters/dropship.dm @@ -1,6 +1,6 @@ //FULL CREDIT FOR THE DROPSHIP INTERIORS GOES TO CM. -/turf/closed/wall/indestructible/dropship +/turf/closed/indestructible/dropship name = "dropship" desc = "A piece of a mighty spaceship." icon = 'nsv13/icons/turf/dropship.dmi' @@ -16,12 +16,12 @@ name = "dropship entry point" var/linked = FALSE -/turf/closed/wall/indestructible/dropship/entry +/turf/closed/indestructible/dropship/entry name = "Hangar Bay Doors" desc = "Heavyset doors that lock mid-flight." icon_state = "79" -/turf/closed/wall/indestructible/dropship/entry/Bumped(atom/movable/AM) +/turf/closed/indestructible/dropship/entry/Bumped(atom/movable/AM) . = ..() var/obj/structure/overmap/small_craft/transport/OM = get_overmap() if(OM && istype(OM) && !(SSmapping.level_trait(OM.z, ZTRAIT_OVERMAP))) diff --git a/nsv13/code/game/objects/items/stacks/tiles/tile_types.dm b/nsv13/code/game/objects/items/stacks/tiles/tile_types.dm index 9ca553a28d2..4fa15a79e35 100644 --- a/nsv13/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/nsv13/code/game/objects/items/stacks/tiles/tile_types.dm @@ -31,6 +31,7 @@ mineralType = "durasteel" armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 70, "stamina" = 0) resistance_flags = FIRE_PROOF + merge_type = /obj/item/stack/tile/durasteel var/catwalk_type = null var/list/tilelist = list( \ "durasteel_tile", \ diff --git a/nsv13/code/modules/munitions/ship_weapons/ballistic_weapons/gauss_gun.dm b/nsv13/code/modules/munitions/ship_weapons/ballistic_weapons/gauss_gun.dm index 5092f0a1223..7cdbab1b12a 100644 --- a/nsv13/code/modules/munitions/ship_weapons/ballistic_weapons/gauss_gun.dm +++ b/nsv13/code/modules/munitions/ship_weapons/ballistic_weapons/gauss_gun.dm @@ -38,7 +38,7 @@ if(!isliving(user)) return FALSE if(istype(A, /obj/structure/closet)) - if(!LAZYFIND(A.contents, /obj/item/ship_weapon/ammunition/gauss)) + if(!locate(/obj/item/ship_weapon/ammunition/gauss) in A.contents) to_chat(user, "There's nothing in [A] that can be loaded into [src]...") return FALSE if(length(ammo) >= max_ammo) @@ -467,7 +467,7 @@ if(!isliving(user)) return if(istype(A, /obj/structure/closet)) - if(!LAZYFIND(A.contents, /obj/item/ship_weapon/ammunition/gauss)) + if(!locate(/obj/item/ship_weapon/ammunition/gauss) in A.contents) to_chat(user, "There's nothing in [A] that can be loaded into [src]...") return FALSE to_chat(user, "You start to load [src] with the contents of [A]...") diff --git a/nsv13/code/modules/power/stormdrive.dm b/nsv13/code/modules/power/stormdrive.dm index 53382b6ef45..60bd2e9f19c 100644 --- a/nsv13/code/modules/power/stormdrive.dm +++ b/nsv13/code/modules/power/stormdrive.dm @@ -721,10 +721,13 @@ Control Rods return FALSE /obj/machinery/atmospherics/components/binary/stormdrive_reactor/proc/handle_control_rod_efficiency() - var/control_rod_effectiveness_total = 0 - for(var/obj/item/control_rod/cr in contents) - control_rod_effectiveness_total += cr.rod_effectiveness - control_rod_modifier = control_rod_effectiveness_total / control_rods.len + if(control_rods.len > 0) + var/control_rod_effectiveness_total = 0 + for(var/obj/item/control_rod/cr in contents) + control_rod_effectiveness_total += cr.rod_effectiveness + control_rod_modifier = control_rod_effectiveness_total / control_rods.len + else + control_rod_modifier = 1 /obj/machinery/atmospherics/components/binary/stormdrive_reactor/proc/handle_control_rod_integrity() if(control_rods.len > 0) diff --git a/nsv13/code/modules/vehicles/_vehicle.dm b/nsv13/code/modules/vehicles/_vehicle.dm index 222582e3ad4..38472519329 100644 --- a/nsv13/code/modules/vehicles/_vehicle.dm +++ b/nsv13/code/modules/vehicles/_vehicle.dm @@ -396,12 +396,15 @@ MASSIVE THANKS TO MONSTER860 FOR HELP WITH THIS. HE EXPLAINED PHYSICS AND MATH T internal_tank = new /obj/machinery/portable_atmospherics/canister/air(src) -/obj/vehicle/sealed/car/realistic/return_air() - return cabin_air - /obj/vehicle/sealed/car/realistic/remove_air(amount) return cabin_air.remove(amount) +/obj/vehicle/sealed/car/realistic/remove_air_ratio(ratio) + return cabin_air.remove_ratio(ratio) + +/obj/vehicle/sealed/car/realistic/return_air() + return cabin_air + /obj/vehicle/sealed/car/realistic/return_analyzable_air() return cabin_air @@ -432,8 +435,7 @@ MASSIVE THANKS TO MONSTER860 FOR HELP WITH THIS. HE EXPLAINED PHYSICS AND MATH T if(pressure_delta > 0) //cabin pressure lower than release pressure if(tank_air.return_temperature() > 0) transfer_moles = pressure_delta*cabin_air.return_volume()/(cabin_air.return_temperature() * R_IDEAL_GAS_EQUATION) - var/datum/gas_mixture/removed = tank_air.remove(transfer_moles) - cabin_air.merge(removed) + tank_air.transfer_to(cabin_air,transfer_moles) else if(pressure_delta < 0) //cabin pressure higher than release pressure var/turf/T = get_turf(src) var/datum/gas_mixture/t_air = T.return_air() @@ -442,8 +444,4 @@ MASSIVE THANKS TO MONSTER860 FOR HELP WITH THIS. HE EXPLAINED PHYSICS AND MATH T pressure_delta = min(cabin_pressure - t_air.return_pressure(), pressure_delta) if(pressure_delta > 0) //if location pressure is lower than cabin pressure transfer_moles = pressure_delta*cabin_air.return_volume()/(cabin_air.return_temperature() * R_IDEAL_GAS_EQUATION) - var/datum/gas_mixture/removed = cabin_air.remove(transfer_moles) - if(T) - T.assume_air(removed) - else //just delete the cabin gas, we're in space or some shit - qdel(removed) + cabin_air.transfer_to(t_air, transfer_moles)