diff --git a/_maps/shuttles/emergency_asteroid.dmm b/_maps/shuttles/emergency_asteroid.dmm index 5be7f75170d..190db4d5240 100644 --- a/_maps/shuttles/emergency_asteroid.dmm +++ b/_maps/shuttles/emergency_asteroid.dmm @@ -36,7 +36,7 @@ name = "Emergency Shuttle Airlock" }, /obj/effect/mapping_helpers/airlock/access/all/security/brig, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "am" = ( /obj/machinery/power/shuttle_engine/propulsion{ @@ -68,16 +68,16 @@ /obj/structure/chair/comfy/shuttle{ dir = 4 }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "aw" = ( -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "ax" = ( /obj/structure/chair/comfy/shuttle{ dir = 8 }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "az" = ( /turf/closed/wall/mineral/titanium/nodiagonal, @@ -90,7 +90,7 @@ dir = 4 }, /obj/item/radio/intercom/directional/west, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "aF" = ( /obj/machinery/suit_storage_unit, @@ -143,11 +143,11 @@ name = "Emergency Shuttle Brig" }, /obj/effect/mapping_helpers/airlock/access/all/security/brig, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "aQ" = ( /obj/structure/bed, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "aR" = ( /obj/machinery/computer/station_alert{ @@ -203,7 +203,7 @@ /obj/machinery/computer/security{ dir = 4 }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "bc" = ( /obj/structure/table, @@ -383,7 +383,7 @@ /area/shuttle/escape) "bM" = ( /obj/machinery/light/directional/south, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "bN" = ( /obj/machinery/light/directional/north, diff --git a/_maps/shuttles/emergency_bar.dmm b/_maps/shuttles/emergency_bar.dmm index 6c91a01682a..c96ecb9e6de 100644 --- a/_maps/shuttles/emergency_bar.dmm +++ b/_maps/shuttles/emergency_bar.dmm @@ -128,7 +128,7 @@ /area/shuttle/escape) "aC" = ( /obj/structure/chair/comfy/shuttle, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "aD" = ( /obj/machinery/flasher/directional/north{ @@ -167,10 +167,10 @@ pixel_y = -6 }, /obj/machinery/light/small/directional/west, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "aI" = ( -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "aJ" = ( /obj/machinery/door/airlock/public/glass{ @@ -185,17 +185,17 @@ name = "Emergency Shuttle Airlock" }, /obj/effect/mapping_helpers/airlock/access/all/security/general, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "aL" = ( /obj/structure/extinguisher_cabinet/directional/south, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "aM" = ( /obj/structure/chair/comfy/shuttle{ dir = 1 }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "aN" = ( /obj/structure/chair/stool/bar/directional/north{ diff --git a/_maps/shuttles/emergency_bballhooper.dmm b/_maps/shuttles/emergency_bballhooper.dmm index 03deb4d5add..0f29021aed6 100644 --- a/_maps/shuttles/emergency_bballhooper.dmm +++ b/_maps/shuttles/emergency_bballhooper.dmm @@ -22,9 +22,9 @@ /area/shuttle/escape) "bF" = ( /obj/structure/chair{ + desc = "Do keep in mind, we will assess your account 2000 credits for sitting in this chair upon arrival."; dir = 1; - name = "Ringside Seat"; - desc = "Do keep in mind, we will assess your account 2000 credits for sitting in this chair upon arrival." + name = "Ringside Seat" }, /turf/open/floor/mineral/titanium, /area/shuttle/escape) @@ -33,10 +33,10 @@ /obj/structure/window/reinforced/spawner/west, /obj/structure/chair/stool/directional/south{ can_buckle = 1; - name = "FOOLS-SIT-DOWNER"; - desc = "GET THAT BAD PLAYA SAT DOWN. MAKE SURE THEY ARE STILL ORIENTED IN THE DIRECTION OF THE GAME, HOWEVER." + desc = "GET THAT BAD PLAYA SAT DOWN. MAKE SURE THEY ARE STILL ORIENTED IN THE DIRECTION OF THE GAME, HOWEVER."; + name = "FOOLS-SIT-DOWNER" }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "cD" = ( /obj/effect/turf_decal/stripes/white/line{ @@ -50,18 +50,18 @@ /area/shuttle/escape) "df" = ( /obj/structure/chair{ + desc = "Do keep in mind, we will assess your account 2000 credits for sitting in this chair upon arrival."; dir = 8; - name = "Ringside Seat"; - desc = "Do keep in mind, we will assess your account 2000 credits for sitting in this chair upon arrival." + name = "Ringside Seat" }, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "ea" = ( /obj/machinery/light/cold/directional/south, /obj/structure/chair{ + desc = "Do keep in mind, we will assess your account 2000 credits for sitting in this chair upon arrival."; dir = 1; - name = "Ringside Seat"; - desc = "Do keep in mind, we will assess your account 2000 credits for sitting in this chair upon arrival." + name = "Ringside Seat" }, /obj/machinery/status_display/evac/directional/south, /turf/open/floor/mineral/titanium, @@ -95,7 +95,7 @@ /area/shuttle/escape) "gl" = ( /obj/machinery/light/small/red/directional/east, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "go" = ( /obj/effect/spawner/structure/window/reinforced/shuttle, @@ -286,8 +286,8 @@ "rb" = ( /obj/structure/window/reinforced/spawner/north, /obj/structure/reagent_dispensers/watertank{ - name = "HATERADE"; - desc = "Use this to water down those salty haters." + desc = "Use this to water down those salty haters."; + name = "HATERADE" }, /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) @@ -315,27 +315,27 @@ /area/shuttle/escape) "su" = ( /obj/machinery/light/cold/directional/north, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape) "sQ" = ( /obj/machinery/door/airlock/public/glass{ name = "TIMEOUT BOX" }, /obj/effect/mapping_helpers/airlock/access/all/security/general, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "td" = ( /obj/structure/window/reinforced/spawner, /obj/item/restraints/handcuffs{ - pixel_y = -7; - pixel_x = -5 + pixel_x = -5; + pixel_y = -7 }, /obj/structure/chair/stool/directional/south{ can_buckle = 1; - name = "FOOLS-SIT-DOWNER"; - desc = "GET THAT BAD PLAYA SAT DOWN. MAKE SURE THEY ARE STILL ORIENTED IN THE DIRECTION OF THE GAME, HOWEVER." + desc = "GET THAT BAD PLAYA SAT DOWN. MAKE SURE THEY ARE STILL ORIENTED IN THE DIRECTION OF THE GAME, HOWEVER."; + name = "FOOLS-SIT-DOWNER" }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "tQ" = ( /obj/machinery/light/small/directional/east, @@ -370,9 +370,9 @@ /area/shuttle/escape) "vz" = ( /obj/structure/chair{ + desc = "Do keep in mind, we will assess your account 2000 credits for sitting in this chair upon arrival."; dir = 4; - name = "Ringside Seat"; - desc = "Do keep in mind, we will assess your account 2000 credits for sitting in this chair upon arrival." + name = "Ringside Seat" }, /turf/open/floor/mineral/titanium, /area/shuttle/escape) @@ -380,18 +380,18 @@ /obj/structure/window/reinforced/spawner/north, /obj/structure/chair/stool/directional/south{ can_buckle = 1; - name = "FOOLS-SIT-DOWNER"; - desc = "GET THAT BAD PLAYA SAT DOWN. MAKE SURE THEY ARE STILL ORIENTED IN THE DIRECTION OF THE GAME, HOWEVER." + desc = "GET THAT BAD PLAYA SAT DOWN. MAKE SURE THEY ARE STILL ORIENTED IN THE DIRECTION OF THE GAME, HOWEVER."; + name = "FOOLS-SIT-DOWNER" }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "xA" = ( /obj/structure/window/reinforced/spawner/north, /obj/structure/table, /obj/item/tank/internals/anesthetic, /obj/item/clothing/mask/breath/medical{ - pixel_y = 2; - pixel_x = 5 + pixel_x = 5; + pixel_y = 2 }, /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) @@ -421,7 +421,7 @@ pixel_x = -26; pixel_y = -8 }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "zB" = ( /obj/effect/turf_decal/stripes/white/line{ @@ -455,8 +455,8 @@ /obj/structure/table, /obj/machinery/light/small/directional/west, /obj/item/storage/medkit/fire{ - pixel_y = 3; - pixel_x = -4 + pixel_x = -4; + pixel_y = 3 }, /obj/item/storage/medkit/regular{ pixel_x = 3; @@ -494,9 +494,7 @@ /obj/effect/turf_decal/trimline/red/filled/warning{ dir = 8 }, -/obj/effect/turf_decal/trimline/red/line{ - dir = 2 - }, +/obj/effect/turf_decal/trimline/red/line, /turf/open/floor/iron/dark, /area/shuttle/escape) "BO" = ( @@ -512,14 +510,14 @@ }, /obj/effect/mapping_helpers/airlock/access/all/security/general, /obj/effect/decal/cleanable/oil/slippery, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "Ce" = ( /obj/machinery/light/cold/directional/south, /obj/structure/chair{ + desc = "Do keep in mind, we will assess your account 2000 credits for sitting in this chair upon arrival."; dir = 1; - name = "Ringside Seat"; - desc = "Do keep in mind, we will assess your account 2000 credits for sitting in this chair upon arrival." + name = "Ringside Seat" }, /turf/open/floor/mineral/titanium, /area/shuttle/escape) @@ -694,7 +692,7 @@ /turf/open/floor/mineral/titanium, /area/shuttle/escape) "KW" = ( -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape) "MD" = ( /obj/machinery/light/cold/directional/east, @@ -780,9 +778,7 @@ dir = 1 }, /obj/structure/table, -/obj/item/reagent_containers/cup/glass/trophy/gold_cup{ - pixel_x = 0 - }, +/obj/item/reagent_containers/cup/glass/trophy/gold_cup, /turf/open/floor/mineral/titanium/purple, /area/shuttle/escape) "Sd" = ( @@ -818,34 +814,34 @@ "Tg" = ( /obj/structure/table, /obj/item/clothing/head/utility/hardhat/dblue{ + name = "Hopping Jezzerton's Helmet"; pixel_x = 8; - pixel_y = -5; - name = "Hopping Jezzerton's Helmet" + pixel_y = -5 }, /obj/item/clothing/head/utility/hardhat/dblue{ + name = "Hopping Jezzerton's Helmet"; pixel_x = 8; - pixel_y = 1; - name = "Hopping Jezzerton's Helmet" + pixel_y = 1 }, /obj/item/clothing/head/utility/hardhat/dblue{ + name = "Hopping Jezzerton's Helmet"; pixel_x = 8; - pixel_y = 9; - name = "Hopping Jezzerton's Helmet" + pixel_y = 9 }, /obj/item/clothing/head/utility/hardhat/dblue{ + name = "Hopping Jezzerton's Helmet"; pixel_x = -7; - pixel_y = -5; - name = "Hopping Jezzerton's Helmet" + pixel_y = -5 }, /obj/item/clothing/head/utility/hardhat/dblue{ + name = "Hopping Jezzerton's Helmet"; pixel_x = -7; - pixel_y = 1; - name = "Hopping Jezzerton's Helmet" + pixel_y = 1 }, /obj/item/clothing/head/utility/hardhat/dblue{ + name = "Hopping Jezzerton's Helmet"; pixel_x = -7; - pixel_y = 9; - name = "Hopping Jezzerton's Helmet" + pixel_y = 9 }, /turf/open/floor/mineral/titanium, /area/shuttle/escape) @@ -916,7 +912,7 @@ /area/shuttle/escape) "YB" = ( /obj/effect/decal/cleanable/blood, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "YF" = ( /obj/effect/turf_decal/stripes/white/line{ @@ -936,10 +932,10 @@ /obj/structure/window/reinforced/spawner/east, /obj/structure/chair/stool/directional/south{ can_buckle = 1; - name = "FOOLS-SIT-DOWNER"; - desc = "GET THAT BAD PLAYA SAT DOWN. MAKE SURE THEY ARE STILL ORIENTED IN THE DIRECTION OF THE GAME, HOWEVER." + desc = "GET THAT BAD PLAYA SAT DOWN. MAKE SURE THEY ARE STILL ORIENTED IN THE DIRECTION OF THE GAME, HOWEVER."; + name = "FOOLS-SIT-DOWNER" }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) (1,1,1) = {" diff --git a/_maps/shuttles/emergency_birdboat.dmm b/_maps/shuttles/emergency_birdboat.dmm index 9bb08fae34b..ee543017ed5 100644 --- a/_maps/shuttles/emergency_birdboat.dmm +++ b/_maps/shuttles/emergency_birdboat.dmm @@ -54,12 +54,12 @@ /area/shuttle/escape) "al" = ( /obj/structure/chair/comfy/shuttle, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "am" = ( /obj/structure/chair/comfy/shuttle, /obj/machinery/light/directional/north, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "an" = ( /obj/structure/table/optable, @@ -96,7 +96,7 @@ /turf/open/floor/mineral/titanium, /area/shuttle/escape) "at" = ( -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "au" = ( /obj/machinery/power/shuttle_engine/propulsion/left{ @@ -116,19 +116,19 @@ pixel_y = 4; use_power = 0 }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "ay" = ( /obj/structure/table, /obj/item/storage/box/handcuffs, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "az" = ( /obj/machinery/door/airlock/security/glass{ name = "Security Airlock" }, /obj/effect/mapping_helpers/airlock/access/all/security/general, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "aA" = ( /obj/machinery/door/airlock/public/glass, diff --git a/_maps/shuttles/emergency_box.dmm b/_maps/shuttles/emergency_box.dmm index dae8056a248..3e61b0a1fb7 100644 --- a/_maps/shuttles/emergency_box.dmm +++ b/_maps/shuttles/emergency_box.dmm @@ -105,7 +105,7 @@ /area/shuttle/escape) "aA" = ( /obj/structure/chair/comfy/shuttle, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "aB" = ( /obj/machinery/flasher/directional/north{ @@ -141,10 +141,10 @@ /obj/machinery/flasher/directional/west{ id = "shuttle_flasher" }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "aG" = ( -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "aH" = ( /obj/machinery/door/airlock/public/glass{ @@ -158,13 +158,13 @@ name = "Emergency Shuttle Airlock" }, /obj/effect/mapping_helpers/airlock/access/all/security/general, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "aJ" = ( /obj/structure/chair/comfy/shuttle{ dir = 1 }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "aK" = ( /obj/structure/chair/comfy/shuttle, diff --git a/_maps/shuttles/emergency_casino.dmm b/_maps/shuttles/emergency_casino.dmm index 7b3db5109d8..a8b585a9aa7 100644 --- a/_maps/shuttles/emergency_casino.dmm +++ b/_maps/shuttles/emergency_casino.dmm @@ -100,7 +100,7 @@ /area/shuttle/escape) "dp" = ( /obj/effect/decal/cleanable/blood/splatter, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "dr" = ( /obj/structure/window/reinforced/tinted{ @@ -109,7 +109,7 @@ /turf/open/floor/carpet/green, /area/shuttle/escape) "dy" = ( -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "dL" = ( /obj/machinery/space_heater, @@ -123,7 +123,7 @@ "ep" = ( /obj/structure/chair/comfy/shuttle, /obj/effect/decal/cleanable/blood, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "et" = ( /obj/structure/chair/sofa/corp{ @@ -357,7 +357,7 @@ "kn" = ( /obj/structure/chair/comfy/shuttle, /obj/machinery/light/directional/north, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "kz" = ( /obj/structure/chair/stool/directional/west, @@ -540,7 +540,7 @@ pixel_y = 4 }, /obj/item/clothing/head/collectable/police, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "ok" = ( /obj/structure/chair/stool/bar/directional/west, @@ -548,7 +548,7 @@ /area/shuttle/escape) "oz" = ( /obj/effect/decal/cleanable/blood/old, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "oB" = ( /obj/machinery/computer/slot_machine, @@ -678,7 +678,7 @@ /obj/item/grown/bananapeel, /obj/item/bikehorn, /obj/effect/mapping_helpers/airlock/access/all/security/general, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "sj" = ( /obj/effect/spawner/random/entertainment/arcade, @@ -715,7 +715,7 @@ "vi" = ( /obj/structure/table, /obj/item/toy/gun, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "vn" = ( /obj/effect/turf_decal/siding{ @@ -760,7 +760,7 @@ name = "Brig" }, /obj/effect/mapping_helpers/airlock/access/all/security/general, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "vL" = ( /obj/structure/table/optable, @@ -909,7 +909,7 @@ use_power = 0 }, /obj/item/toy/figure/clown, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "Ab" = ( /obj/effect/turf_decal/siding/wood, @@ -1044,7 +1044,7 @@ /obj/structure/chair/comfy/shuttle, /obj/machinery/light/directional/north, /obj/item/radio/intercom/directional/north, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "Ff" = ( /obj/machinery/light/directional/east, @@ -1171,7 +1171,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 1 }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "Lz" = ( /obj/effect/turf_decal/siding/wood{ @@ -1224,7 +1224,7 @@ idle_power_usage = 0; use_power = 0 }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "Nw" = ( /obj/effect/turf_decal/siding/thinplating{ @@ -1283,7 +1283,7 @@ /area/shuttle/escape) "Pg" = ( /obj/structure/extinguisher_cabinet/directional/west, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "Pj" = ( /obj/machinery/recharge_station, @@ -1342,7 +1342,7 @@ /area/shuttle/escape) "PW" = ( /obj/structure/reagent_dispensers/wall/peppertank/directional/east, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "Qk" = ( /obj/effect/turf_decal/siding{ @@ -1358,7 +1358,7 @@ /area/shuttle/escape) "Ru" = ( /obj/structure/chair/comfy/shuttle, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "RQ" = ( /obj/structure/table, @@ -1393,7 +1393,7 @@ dir = 1 }, /obj/machinery/light/directional/south, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "Tb" = ( /obj/structure/chair/stool/directional/north, @@ -1528,7 +1528,7 @@ /obj/item/storage/box/handcuffs, /obj/machinery/status_display/evac/directional/south, /obj/item/coin/antagtoken, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "YF" = ( /obj/structure/table/wood/poker, diff --git a/_maps/shuttles/emergency_cere.dmm b/_maps/shuttles/emergency_cere.dmm index 5b81526e3b8..f516b50c903 100644 --- a/_maps/shuttles/emergency_cere.dmm +++ b/_maps/shuttles/emergency_cere.dmm @@ -187,23 +187,23 @@ /area/shuttle/escape) "aS" = ( /obj/structure/chair/comfy/shuttle, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "aT" = ( /obj/structure/chair/comfy/shuttle, /obj/machinery/light/directional/north, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "aU" = ( /obj/structure/table, /obj/machinery/recharger, /obj/structure/reagent_dispensers/wall/peppertank/directional/west, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "aV" = ( /obj/structure/table, /obj/item/book/manual/wiki/security_space_law, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "aZ" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -230,10 +230,10 @@ /obj/structure/chair/comfy/shuttle{ dir = 4 }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "be" = ( -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "bf" = ( /obj/structure/chair/comfy/shuttle{ @@ -242,7 +242,7 @@ /obj/machinery/flasher/directional/east{ id = "shuttle_flasher" }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "bg" = ( /obj/machinery/button/flasher{ @@ -252,7 +252,7 @@ }, /obj/structure/table, /obj/machinery/recharger, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "bj" = ( /turf/open/floor/iron/recharge_floor, @@ -261,14 +261,14 @@ /obj/structure/chair/comfy/shuttle{ dir = 8 }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "bn" = ( /obj/machinery/door/airlock/security/glass{ name = "Emergency Shuttle Brig" }, /obj/effect/mapping_helpers/airlock/access/all/security/general, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "bo" = ( /obj/machinery/computer/mech_bay_power_console, @@ -281,14 +281,14 @@ /obj/machinery/flasher/directional/west{ id = "shuttle_flasher" }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "bq" = ( /obj/machinery/door/airlock/public/glass{ name = "Emergency Shuttle Brig" }, /obj/effect/mapping_helpers/airlock/access/all/security/general, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "bs" = ( /obj/effect/turf_decal/stripes/line{ @@ -329,13 +329,13 @@ /obj/structure/chair/comfy/shuttle{ dir = 1 }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "by" = ( /obj/structure/table, /obj/item/storage/box/teargas, /obj/item/storage/box/zipties, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "bA" = ( /obj/machinery/door/airlock/shuttle{ diff --git a/_maps/shuttles/emergency_clown.dmm b/_maps/shuttles/emergency_clown.dmm index 76ada61f3e7..22b326751dc 100644 --- a/_maps/shuttles/emergency_clown.dmm +++ b/_maps/shuttles/emergency_clown.dmm @@ -121,7 +121,7 @@ /obj/item/greentext/quiet{ anchored = 1 }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "aA" = ( /obj/machinery/door/airlock/bananium/glass{ diff --git a/_maps/shuttles/emergency_delta.dmm b/_maps/shuttles/emergency_delta.dmm index ac595921cff..ce93f86a47e 100644 --- a/_maps/shuttles/emergency_delta.dmm +++ b/_maps/shuttles/emergency_delta.dmm @@ -562,7 +562,7 @@ name = "Holding Area" }, /obj/effect/mapping_helpers/airlock/access/all/security/general, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "bu" = ( /obj/machinery/door/airlock/command/glass{ @@ -583,16 +583,16 @@ /turf/open/floor/iron/white, /area/shuttle/escape/brig) "bw" = ( -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "bx" = ( /obj/structure/chair/comfy/shuttle, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "by" = ( /obj/structure/table/reinforced, /obj/machinery/recharger, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "bz" = ( /obj/item/kirbyplants{ @@ -639,7 +639,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 4 }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "bF" = ( /obj/effect/turf_decal/tile/red{ @@ -682,18 +682,18 @@ dir = 4 }, /obj/machinery/status_display/evac/directional/west, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "bN" = ( /obj/structure/chair/comfy/shuttle{ dir = 8 }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "bO" = ( /obj/structure/table/reinforced, /obj/item/storage/lockbox/loyalty, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "bP" = ( /obj/structure/table/reinforced, @@ -731,13 +731,13 @@ /obj/structure/chair/comfy/shuttle{ dir = 1 }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "bV" = ( /obj/structure/table/reinforced, /obj/item/storage/box/zipties, /obj/item/radio/intercom/directional/south, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "bW" = ( /obj/structure/table/reinforced, @@ -871,7 +871,7 @@ dir = 1 }, /obj/machinery/light/directional/south, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "cH" = ( /obj/effect/turf_decal/bot, diff --git a/_maps/shuttles/emergency_donut.dmm b/_maps/shuttles/emergency_donut.dmm index 002ecb8de3f..ece77a95cd3 100644 --- a/_maps/shuttles/emergency_donut.dmm +++ b/_maps/shuttles/emergency_donut.dmm @@ -126,7 +126,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 4 }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "az" = ( /obj/machinery/button/flasher{ @@ -134,45 +134,45 @@ pixel_x = 8; pixel_y = 24 }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "aA" = ( /obj/structure/chair, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "aB" = ( /obj/structure/chair, /obj/machinery/flasher/directional/north{ id = "shuttle_flasher" }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "aC" = ( -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "aD" = ( /obj/machinery/door/airlock/public/glass{ name = "Containment Cell" }, /obj/effect/mapping_helpers/airlock/access/all/security/general, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "aE" = ( /obj/machinery/light/directional/east, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "aF" = ( /obj/structure/chair{ dir = 1 }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "aG" = ( /obj/structure/chair/comfy/shuttle{ dir = 4 }, /obj/machinery/light/directional/west, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "aH" = ( /obj/machinery/status_display/evac, @@ -183,7 +183,7 @@ /obj/item/storage/fancy/donut_box, /obj/item/book/manual/wiki/security_space_law, /obj/item/storage/box/handcuffs, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "aJ" = ( /obj/machinery/light/directional/south, @@ -196,7 +196,7 @@ /obj/structure/table, /obj/machinery/recharger, /obj/structure/reagent_dispensers/wall/peppertank/directional/north, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "aL" = ( /obj/machinery/door/airlock/public/glass{ @@ -228,7 +228,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 1 }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "aR" = ( /obj/machinery/door/airlock/titanium{ diff --git a/_maps/shuttles/emergency_fish.dmm b/_maps/shuttles/emergency_fish.dmm index 8b25e6619ed..673baf97589 100644 --- a/_maps/shuttles/emergency_fish.dmm +++ b/_maps/shuttles/emergency_fish.dmm @@ -65,7 +65,7 @@ /obj/effect/turf_decal/stripes, /obj/structure/bed/dogbed/mcgriff, /obj/effect/turf_decal/tile/dark/opposingcorners, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "ec" = ( /obj/structure/chair/pew{ @@ -108,7 +108,7 @@ amount = 5 }, /obj/effect/turf_decal/tile/dark/opposingcorners, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "gd" = ( /obj/item/fishing_hook/magnet, @@ -151,7 +151,7 @@ pixel_y = 6 }, /obj/effect/turf_decal/tile/dark/opposingcorners, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "gY" = ( /obj/structure/chair/pew/right, @@ -178,7 +178,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/security/general, /obj/effect/turf_decal/tile/dark/fourcorners, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "jL" = ( /turf/closed/wall/mineral/titanium/nodiagonal, @@ -386,7 +386,7 @@ pixel_y = 3 }, /obj/effect/turf_decal/tile/dark/opposingcorners, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "tR" = ( /obj/machinery/light/directional/west, @@ -424,12 +424,12 @@ /obj/effect/turf_decal/stripes/corner, /obj/machinery/flasher/portable, /obj/effect/turf_decal/tile/dark/opposingcorners, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "xA" = ( /obj/effect/turf_decal/stripes, /obj/effect/turf_decal/tile/dark/opposingcorners, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "xH" = ( /obj/structure/sign/warning/yes_smoking/circle/directional/south, @@ -458,7 +458,7 @@ }, /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/tile/dark/opposingcorners, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "AV" = ( /obj/structure/chair/stool/directional/east, @@ -514,7 +514,7 @@ }, /obj/item/restraints/handcuffs, /obj/effect/turf_decal/tile/dark/opposingcorners, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "DB" = ( /obj/effect/turf_decal/tile/brown/half/contrasted{ @@ -593,7 +593,7 @@ pixel_y = 3 }, /obj/effect/turf_decal/tile/dark/opposingcorners, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "Id" = ( /obj/effect/turf_decal/tile/dark/half/contrasted{ @@ -643,7 +643,7 @@ pixel_y = 3 }, /obj/effect/turf_decal/tile/dark/opposingcorners, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "Ju" = ( /obj/structure/table/reinforced, @@ -652,7 +652,7 @@ pixel_x = -1 }, /obj/effect/turf_decal/tile/dark/opposingcorners, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "Kg" = ( /obj/machinery/power/shuttle_engine/propulsion, @@ -665,7 +665,7 @@ dir = 1 }, /obj/effect/turf_decal/tile/dark/opposingcorners, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "KJ" = ( /obj/structure/table/wood, @@ -727,7 +727,7 @@ /obj/effect/turf_decal/tile/dark{ dir = 4 }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "NM" = ( /obj/structure/chair/stool/directional/east, @@ -778,7 +778,7 @@ dir = 1 }, /obj/effect/turf_decal/tile/dark/opposingcorners, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "PQ" = ( /obj/effect/turf_decal/tile/dark/half/contrasted, @@ -849,7 +849,7 @@ pixel_y = 2 }, /obj/effect/turf_decal/tile/dark/opposingcorners, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "TN" = ( /obj/structure/sign/calendar/directional/east, @@ -929,7 +929,7 @@ }, /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/tile/dark/opposingcorners, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "Xx" = ( /obj/structure/chair/comfy/shuttle{ @@ -937,7 +937,7 @@ }, /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/tile/dark/opposingcorners, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "XZ" = ( /obj/machinery/door/airlock/mining/glass, @@ -961,7 +961,7 @@ }, /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/tile/dark/opposingcorners, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) (1,1,1) = {" diff --git a/_maps/shuttles/emergency_goon.dmm b/_maps/shuttles/emergency_goon.dmm index 8b5fa43d6d6..0d50631bf86 100644 --- a/_maps/shuttles/emergency_goon.dmm +++ b/_maps/shuttles/emergency_goon.dmm @@ -56,7 +56,7 @@ /obj/machinery/vending/wallmed/directional/south{ use_power = 0 }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "m" = ( /obj/effect/spawner/structure/window/reinforced/shuttle, @@ -168,7 +168,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 4 }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "I" = ( /obj/structure/table/reinforced, @@ -180,14 +180,14 @@ /turf/open/floor/mineral/titanium/yellow, /area/shuttle/escape) "J" = ( -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "K" = ( /obj/machinery/door/airlock/public/glass{ name = "Emergency Shuttle Brig" }, /obj/effect/mapping_helpers/airlock/access/all/security/general, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "L" = ( /obj/structure/table/reinforced, @@ -215,7 +215,7 @@ dir = 4 }, /obj/machinery/light/small/directional/north, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "V" = ( /obj/machinery/light/directional/north, diff --git a/_maps/shuttles/emergency_kilo.dmm b/_maps/shuttles/emergency_kilo.dmm index 25875502cc6..03aaa51e27e 100644 --- a/_maps/shuttles/emergency_kilo.dmm +++ b/_maps/shuttles/emergency_kilo.dmm @@ -644,7 +644,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 1 }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "iA" = ( /obj/effect/turf_decal/stripes/line, @@ -695,7 +695,7 @@ /turf/open/floor/mineral/plastitanium, /area/shuttle/escape) "kB" = ( -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "lG" = ( /obj/effect/turf_decal/stripes/corner{ @@ -746,7 +746,7 @@ /obj/structure/table, /obj/item/crowbar/red, /obj/item/storage/lockbox/loyalty, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "nv" = ( /obj/effect/turf_decal/stripes/line, @@ -901,7 +901,7 @@ }, /obj/structure/table, /obj/machinery/recharger, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "wo" = ( /obj/effect/turf_decal/stripes/line{ @@ -925,7 +925,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 8 }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "zu" = ( /obj/effect/turf_decal/stripes/line{ @@ -944,7 +944,7 @@ }, /obj/item/restraints/handcuffs, /obj/item/restraints/handcuffs, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "BB" = ( /obj/effect/turf_decal/tile/brown/opposingcorners, @@ -962,7 +962,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 4 }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "DM" = ( /obj/effect/turf_decal/stripes/line{ @@ -1007,7 +1007,7 @@ dir = 1 }, /obj/structure/chair/comfy/shuttle, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "Gu" = ( /obj/effect/turf_decal/stripes/line{ @@ -1017,7 +1017,7 @@ dir = 8 }, /obj/machinery/light/directional/north, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "GV" = ( /obj/effect/turf_decal/stripes/line{ @@ -1073,7 +1073,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 4 }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "JM" = ( /obj/structure/chair/office/light, @@ -1127,7 +1127,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 4 }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "LH" = ( /obj/effect/turf_decal/stripes/corner{ @@ -1151,7 +1151,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 8 }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "MQ" = ( /obj/effect/turf_decal/stripes/line{ @@ -1218,14 +1218,14 @@ dir = 4 }, /obj/machinery/light/directional/west, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "Re" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "Rk" = ( /obj/effect/turf_decal/stripes/line{ diff --git a/_maps/shuttles/emergency_lance.dmm b/_maps/shuttles/emergency_lance.dmm index 194a60c9613..17b7e7bcefe 100644 --- a/_maps/shuttles/emergency_lance.dmm +++ b/_maps/shuttles/emergency_lance.dmm @@ -240,7 +240,7 @@ /area/shuttle/escape) "iz" = ( /obj/structure/chair/comfy/shuttle, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "ji" = ( /obj/effect/turf_decal/stripes/red/line{ @@ -341,7 +341,7 @@ /obj/effect/turf_decal/stripes/red/line{ dir = 1 }, -/turf/open/floor/mineral/plastitanium/red/brig{ +/turf/open/floor/mineral/plastitanium/red{ icon_state = "darkfull" }, /area/shuttle/escape/brig) @@ -416,7 +416,7 @@ dir = 1 }, /obj/effect/turf_decal/stripes/red/line, -/turf/open/floor/mineral/plastitanium/red/brig{ +/turf/open/floor/mineral/plastitanium/red{ icon_state = "darkfull" }, /area/shuttle/escape/brig) @@ -727,7 +727,7 @@ "yB" = ( /obj/structure/window/reinforced/survival_pod/spawner/north, /obj/effect/decal/cleanable/blood/old, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "zc" = ( /obj/structure/chair/comfy/shuttle{ @@ -771,7 +771,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 1 }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "AE" = ( /obj/machinery/computer/operating{ @@ -853,7 +853,7 @@ /area/shuttle/escape) "Dd" = ( /obj/structure/window/reinforced/survival_pod/spawner, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "Dg" = ( /obj/structure/chair/comfy/shuttle{ @@ -869,7 +869,7 @@ /obj/effect/turf_decal/stripes/red/end{ dir = 4 }, -/turf/open/floor/mineral/plastitanium/red/brig{ +/turf/open/floor/mineral/plastitanium/red{ icon_state = "darkfull" }, /area/shuttle/escape/brig) @@ -911,7 +911,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 8 }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "FX" = ( /obj/structure/table/reinforced, @@ -1077,7 +1077,7 @@ /obj/item/toy/nuke, /obj/machinery/light/small/directional/south, /obj/item/storage/medkit/regular, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "Ke" = ( /obj/effect/turf_decal/stripes/line{ @@ -1268,7 +1268,7 @@ pixel_y = 3 }, /obj/item/restraints/handcuffs, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "OE" = ( /obj/structure/cable, @@ -1522,7 +1522,7 @@ name = "Holding Cell B"; req_access = list("security") }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "WO" = ( /obj/effect/decal/cleanable/oil/streak, @@ -1575,7 +1575,7 @@ name = "Holding Cell A"; req_access = list("security") }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "Yq" = ( /obj/effect/turf_decal/trimline/dark_blue/arrow_ccw{ @@ -1595,7 +1595,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 8 }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "YN" = ( /obj/effect/decal/cleanable/dirt, diff --git a/_maps/shuttles/emergency_medisim.dmm b/_maps/shuttles/emergency_medisim.dmm index 7ef241ffb48..ae75cb53799 100644 --- a/_maps/shuttles/emergency_medisim.dmm +++ b/_maps/shuttles/emergency_medisim.dmm @@ -198,7 +198,7 @@ idle_power_usage = 0; use_power = 0 }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "ir" = ( /obj/structure/chair/comfy/shuttle{ @@ -314,7 +314,7 @@ /turf/open/floor/mineral/titanium/tiled/blue, /area/shuttle/escape) "ls" = ( -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape) "mq" = ( /obj/structure/railing{ @@ -653,7 +653,7 @@ dir = 4 }, /obj/machinery/light/directional/west, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "CM" = ( /obj/effect/turf_decal/siding/wood, @@ -1005,7 +1005,7 @@ pixel_x = -4; pixel_y = 4 }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "Ov" = ( /obj/effect/turf_decal/stripes/corner{ @@ -1076,7 +1076,7 @@ name = "Brig" }, /obj/effect/mapping_helpers/airlock/access/all/security/general, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "RV" = ( /obj/structure/rack, @@ -1129,7 +1129,7 @@ /obj/structure/table/reinforced, /obj/item/binoculars, /obj/item/binoculars, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "TK" = ( /obj/structure/flora/bush/ferny/style_random, @@ -1172,7 +1172,7 @@ "Vn" = ( /obj/structure/reagent_dispensers/wall/peppertank/directional/west, /obj/machinery/light/directional/west, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "Vv" = ( /obj/structure/rack, @@ -1207,7 +1207,7 @@ /turf/open/floor/mineral/titanium/white, /area/shuttle/escape) "Xb" = ( -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "Xk" = ( /obj/structure/closet/crate/critter, @@ -1232,14 +1232,14 @@ /obj/structure/chair/comfy/shuttle{ dir = 4 }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "Ya" = ( /obj/structure/table/reinforced, /obj/item/restraints/handcuffs{ pixel_y = 3 }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "Ye" = ( /obj/structure/table/reinforced, @@ -1248,7 +1248,7 @@ pixel_y = 2 }, /obj/item/storage/lockbox/loyalty, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "Yj" = ( /turf/open/floor/carpet/blue, @@ -1257,7 +1257,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 8 }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "Yn" = ( /obj/structure/table, diff --git a/_maps/shuttles/emergency_meta.dmm b/_maps/shuttles/emergency_meta.dmm index 93cb58c35e4..729b5478fe3 100644 --- a/_maps/shuttles/emergency_meta.dmm +++ b/_maps/shuttles/emergency_meta.dmm @@ -301,7 +301,7 @@ name = "Brig" }, /obj/effect/mapping_helpers/airlock/access/all/security/general, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "aZ" = ( /obj/machinery/door/airlock/medical/glass{ @@ -342,11 +342,11 @@ /obj/structure/chair/comfy/shuttle{ dir = 4 }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "bi" = ( /obj/structure/chair/comfy/shuttle, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "bj" = ( /obj/structure/table, @@ -397,7 +397,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 8 }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "bu" = ( /obj/structure/table, @@ -493,14 +493,14 @@ pixel_x = -4; pixel_y = 4 }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "bE" = ( /obj/structure/table, /obj/item/restraints/handcuffs{ pixel_y = 3 }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "bF" = ( /obj/structure/table, @@ -509,7 +509,7 @@ idle_power_usage = 0; use_power = 0 }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "bG" = ( /obj/structure/table, @@ -517,7 +517,7 @@ pixel_x = 2; pixel_y = 2 }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "bH" = ( /obj/structure/table, @@ -640,7 +640,7 @@ /turf/closed/wall/mineral/titanium/nodiagonal, /area/shuttle/escape) "bU" = ( -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "bV" = ( /obj/structure/chair/comfy/shuttle, @@ -761,7 +761,7 @@ }, /obj/machinery/light/directional/east, /obj/structure/reagent_dispensers/wall/peppertank/directional/east, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "qi" = ( /obj/structure/chair/comfy/shuttle, @@ -780,7 +780,7 @@ dir = 4 }, /obj/machinery/status_display/evac/directional/west, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "Lk" = ( /obj/structure/chair/comfy/shuttle{ diff --git a/_maps/shuttles/emergency_mini.dmm b/_maps/shuttles/emergency_mini.dmm index e2cd10de2b4..04b8155ec9e 100644 --- a/_maps/shuttles/emergency_mini.dmm +++ b/_maps/shuttles/emergency_mini.dmm @@ -41,16 +41,16 @@ /obj/structure/chair/comfy/shuttle{ dir = 4 }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "i" = ( -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "j" = ( /obj/structure/chair/comfy/shuttle{ dir = 8 }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "k" = ( /obj/machinery/light/small/directional/west, @@ -67,7 +67,7 @@ dir = 8 }, /obj/machinery/light/small/directional/east, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "n" = ( /obj/effect/spawner/structure/window/reinforced/shuttle, @@ -78,7 +78,7 @@ name = "Escape Shuttle Cell" }, /obj/effect/mapping_helpers/airlock/access/all/security/general, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "p" = ( /obj/machinery/door/airlock/medical/glass{ diff --git a/_maps/shuttles/emergency_monastery.dmm b/_maps/shuttles/emergency_monastery.dmm index e6e666b3472..81e0b9df0c6 100644 --- a/_maps/shuttles/emergency_monastery.dmm +++ b/_maps/shuttles/emergency_monastery.dmm @@ -718,7 +718,7 @@ /obj/structure/chair/wood{ dir = 4 }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "ka" = ( /obj/structure/flora/bush/ferny/style_random, @@ -1442,7 +1442,7 @@ /obj/structure/chair/wood{ dir = 4 }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "uX" = ( /obj/machinery/power/smes, @@ -1852,7 +1852,7 @@ /turf/open/floor/iron/dark, /area/shuttle/escape) "Ax" = ( -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "Ay" = ( /obj/structure/chair/wood, @@ -2979,7 +2979,7 @@ /area/shuttle/escape) "OY" = ( /obj/structure/window/reinforced, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "Pb" = ( /obj/machinery/power/shuttle_engine/heater, @@ -3368,7 +3368,7 @@ dir = 4; layer = 2.9 }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "SV" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ @@ -3905,7 +3905,7 @@ dir = 4; req_access = list("security") }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "Zj" = ( /mob/living/simple_animal/butterfly, @@ -3923,7 +3923,7 @@ dir = 4; layer = 2.9 }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "Zr" = ( /obj/machinery/power/apc/auto_name/directional/north, diff --git a/_maps/shuttles/emergency_omega.dmm b/_maps/shuttles/emergency_omega.dmm index 500ec577485..4dfd930403f 100644 --- a/_maps/shuttles/emergency_omega.dmm +++ b/_maps/shuttles/emergency_omega.dmm @@ -13,14 +13,14 @@ /area/shuttle/escape) "ae" = ( /obj/structure/chair/comfy/shuttle, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "af" = ( /obj/structure/chair/comfy/shuttle{ dir = 8 }, /obj/item/radio/intercom/directional/north, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "ak" = ( /obj/structure/chair/comfy/shuttle{ @@ -28,15 +28,15 @@ }, /obj/machinery/status_display/evac/directional/west, /obj/machinery/light/directional/west, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "al" = ( -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "ar" = ( /obj/structure/table/reinforced, /obj/machinery/recharger, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "aw" = ( /obj/machinery/status_display/ai, @@ -503,7 +503,7 @@ }, /obj/machinery/newscaster/directional/north, /obj/structure/reagent_dispensers/wall/peppertank/directional/west, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "eA" = ( /obj/structure/chair/comfy/shuttle{ @@ -663,7 +663,7 @@ name = "Holding Area" }, /obj/effect/mapping_helpers/airlock/access/all/security/general, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "UY" = ( /obj/item/storage/medkit/fire, diff --git a/_maps/shuttles/emergency_pubby.dmm b/_maps/shuttles/emergency_pubby.dmm index 07234536b0d..370991d1fc3 100644 --- a/_maps/shuttles/emergency_pubby.dmm +++ b/_maps/shuttles/emergency_pubby.dmm @@ -113,7 +113,7 @@ /turf/open/floor/iron/dark, /area/shuttle/escape) "ax" = ( -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "ay" = ( /obj/machinery/door/airlock/titanium{ @@ -471,7 +471,7 @@ /obj/item/kirbyplants{ icon_state = "plant-22" }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "bv" = ( /obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, @@ -481,47 +481,47 @@ /obj/structure/chair/comfy/shuttle{ dir = 4 }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "bx" = ( /obj/structure/chair/comfy/shuttle{ dir = 8 }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "by" = ( /obj/structure/table/reinforced, /obj/machinery/recharger, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "bz" = ( /obj/structure/table/reinforced, /obj/item/restraints/handcuffs, /obj/item/melee/baton/security, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "bA" = ( /obj/machinery/door/airlock/public/glass, /obj/effect/mapping_helpers/airlock/access/all/security/general, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "bB" = ( /obj/structure/window/reinforced{ dir = 4; layer = 2.9 }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "bC" = ( /obj/structure/window/reinforced{ dir = 8; layer = 2.9 }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "bD" = ( /obj/structure/bed, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "bE" = ( /obj/machinery/power/shuttle_engine/heater, @@ -537,11 +537,11 @@ /area/shuttle/escape) "bH" = ( /obj/machinery/light/directional/north, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "bI" = ( /obj/machinery/light/directional/south, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "bK" = ( /obj/machinery/door/airlock/public/glass{ @@ -600,7 +600,7 @@ /obj/structure/bed{ dir = 4 }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) (1,1,1) = {" diff --git a/_maps/shuttles/emergency_raven.dmm b/_maps/shuttles/emergency_raven.dmm index a88cfd4b001..52a921528c3 100644 --- a/_maps/shuttles/emergency_raven.dmm +++ b/_maps/shuttles/emergency_raven.dmm @@ -258,7 +258,7 @@ dir = 9 }, /obj/structure/chair/comfy/shuttle, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "aQ" = ( /obj/effect/turf_decal/stripes/line{ @@ -267,14 +267,14 @@ /obj/machinery/light/directional/north, /obj/structure/chair/comfy/shuttle, /obj/machinery/status_display/evac/directional/north, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "aR" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 }, /obj/structure/chair/comfy/shuttle, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "aS" = ( /obj/machinery/door/airlock/command/glass{ @@ -332,22 +332,22 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/reagent_dispensers/wall/peppertank/directional/west, /obj/structure/table/reinforced, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "aX" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "aY" = ( -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "aZ" = ( /obj/effect/turf_decal/stripes/corner{ dir = 8 }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "ba" = ( /obj/effect/turf_decal/stripes/line{ @@ -356,7 +356,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 8 }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "bb" = ( /obj/effect/turf_decal/delivery/white, @@ -418,13 +418,13 @@ /obj/item/storage/lockbox/loyalty, /obj/item/radio/intercom/directional/west, /obj/structure/table/reinforced, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "bj" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "bk" = ( /obj/machinery/door/airlock/security/glass{ @@ -491,7 +491,7 @@ /obj/machinery/shieldgen{ anchored = 1 }, -/turf/open/floor/mineral/plastitanium/red/brig{ +/turf/open/floor/mineral/plastitanium/red{ icon_state = "darkfull" }, /area/shuttle/escape/brig) @@ -499,17 +499,17 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "bu" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "bv" = ( /obj/effect/turf_decal/stripes/corner, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "bw" = ( /obj/effect/turf_decal/stripes/line{ @@ -518,7 +518,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 8 }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "bx" = ( /obj/machinery/door/airlock/command/glass{ @@ -566,11 +566,11 @@ /obj/structure/chair/comfy/shuttle{ dir = 1 }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "bE" = ( /obj/effect/turf_decal/stripes/line, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "bF" = ( /obj/effect/turf_decal/stripes/line{ @@ -579,7 +579,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 1 }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "bG" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted, diff --git a/_maps/shuttles/emergency_russiafightpit.dmm b/_maps/shuttles/emergency_russiafightpit.dmm index e0bc3172230..90ac3963e87 100644 --- a/_maps/shuttles/emergency_russiafightpit.dmm +++ b/_maps/shuttles/emergency_russiafightpit.dmm @@ -124,7 +124,7 @@ /area/shuttle/escape) "av" = ( /obj/structure/chair/comfy/shuttle, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "aw" = ( /obj/machinery/flasher/directional/north{ @@ -168,14 +168,14 @@ id = "shuttle_flasher" }, /obj/machinery/light/small/directional/west, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "aG" = ( /obj/effect/decal/cleanable/dirt, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "aH" = ( -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "aI" = ( /obj/machinery/door/airlock/security/glass{ @@ -222,7 +222,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 1 }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "aQ" = ( /obj/effect/decal/cleanable/robot_debris/old, @@ -552,12 +552,12 @@ id = "shuttle_flasher"; pixel_x = -24 }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "Jl" = ( /obj/structure/chair/comfy/shuttle, /obj/machinery/status_display/evac/directional/north, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) (1,1,1) = {" diff --git a/_maps/shuttles/emergency_scrapheap.dmm b/_maps/shuttles/emergency_scrapheap.dmm index f0e78038050..e7426601db0 100644 --- a/_maps/shuttles/emergency_scrapheap.dmm +++ b/_maps/shuttles/emergency_scrapheap.dmm @@ -88,7 +88,7 @@ name = "Emergency Shuttle Airlock" }, /obj/effect/mapping_helpers/airlock/access/all/command/general, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "ar" = ( /obj/machinery/door/airlock/public/glass{ @@ -105,7 +105,7 @@ /area/shuttle/escape) "at" = ( /obj/structure/chair/comfy/shuttle, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "au" = ( /obj/machinery/flasher/directional/north{ @@ -131,10 +131,10 @@ pixel_y = -6 }, /obj/machinery/light/small/directional/west, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "ay" = ( -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "az" = ( /obj/structure/grille, @@ -163,13 +163,13 @@ /obj/structure/table, /obj/item/extinguisher, /obj/item/crowbar, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "aE" = ( /obj/structure/chair/comfy/shuttle{ dir = 1 }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "aF" = ( /obj/item/kirbyplants/random, diff --git a/_maps/shuttles/emergency_tram.dmm b/_maps/shuttles/emergency_tram.dmm index c167b8bb1ac..454674280f6 100644 --- a/_maps/shuttles/emergency_tram.dmm +++ b/_maps/shuttles/emergency_tram.dmm @@ -138,11 +138,11 @@ "aB" = ( /obj/structure/chair/comfy/shuttle, /obj/structure/reagent_dispensers/wall/peppertank/directional/north, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "aC" = ( /obj/structure/chair/comfy/shuttle, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "aD" = ( /obj/machinery/flasher/directional/west{ @@ -173,17 +173,17 @@ /obj/machinery/flasher/directional/west{ id = "shuttle_flasher" }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "aI" = ( -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "aJ" = ( /obj/machinery/door/airlock/public/glass{ name = "Emergency Shuttle Brig" }, /obj/effect/mapping_helpers/airlock/access/all/security/general, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "aK" = ( /obj/structure/chair/comfy/shuttle{ @@ -208,13 +208,13 @@ name = "Emergency Shuttle Airlock" }, /obj/effect/mapping_helpers/airlock/access/all/security/general, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "aN" = ( /obj/structure/chair/comfy/shuttle{ dir = 1 }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "aO" = ( /turf/closed/wall/mineral/titanium/interior, diff --git a/_maps/shuttles/emergency_venture.dmm b/_maps/shuttles/emergency_venture.dmm index 46c5584138a..bc885b0e488 100644 --- a/_maps/shuttles/emergency_venture.dmm +++ b/_maps/shuttles/emergency_venture.dmm @@ -172,7 +172,7 @@ "iq" = ( /obj/machinery/light/directional/north, /obj/structure/chair/comfy/shuttle, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "iD" = ( /turf/open/floor/mineral/titanium/yellow, @@ -187,7 +187,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 1 }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "jn" = ( /obj/machinery/suit_storage_unit/standard_unit, @@ -237,7 +237,7 @@ /turf/open/floor/mineral/titanium/yellow, /area/shuttle/escape) "lB" = ( -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "lE" = ( /obj/machinery/computer/station_alert{ @@ -425,11 +425,11 @@ name = "Brig" }, /obj/effect/mapping_helpers/airlock/access/any/security/general, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "vB" = ( /obj/effect/decal/cleanable/blood/old, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "vX" = ( /turf/open/floor/iron/herringbone, @@ -495,7 +495,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 8 }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "zF" = ( /obj/structure/chair/office{ @@ -508,7 +508,7 @@ /area/shuttle/escape) "Ao" = ( /obj/structure/chair/comfy/shuttle, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "AC" = ( /turf/closed/wall/mineral/titanium/nodiagonal, @@ -610,7 +610,7 @@ dir = 1 }, /obj/machinery/light/directional/south, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "Gq" = ( /obj/machinery/shower/directional/south, @@ -680,7 +680,7 @@ /obj/structure/table, /obj/machinery/recharger, /obj/structure/reagent_dispensers/wall/peppertank/directional/east, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "LE" = ( /turf/closed/wall/mineral/titanium, @@ -744,14 +744,14 @@ "NR" = ( /obj/structure/table, /obj/item/storage/fancy/donut_box, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "Oa" = ( /obj/structure/chair/comfy/shuttle{ dir = 8 }, /obj/effect/decal/cleanable/blood/old, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "OS" = ( /obj/item/radio/intercom/directional/north, @@ -823,7 +823,7 @@ }, /obj/item/restraints/handcuffs, /obj/item/radio/intercom/directional/west, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "TS" = ( /obj/structure/window/reinforced, diff --git a/_maps/shuttles/emergency_wabbajack.dmm b/_maps/shuttles/emergency_wabbajack.dmm index b06dbd1bb4a..040632407a1 100644 --- a/_maps/shuttles/emergency_wabbajack.dmm +++ b/_maps/shuttles/emergency_wabbajack.dmm @@ -50,16 +50,16 @@ id = "shuttle_flasher"; pixel_x = -24 }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "al" = ( -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "am" = ( /obj/structure/chair/comfy/shuttle{ dir = 8 }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "an" = ( /obj/structure/table/wood, @@ -87,7 +87,7 @@ /obj/machinery/flasher/directional/west{ id = "shuttle_flasher" }, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "au" = ( /obj/structure/chair/wood, @@ -135,7 +135,7 @@ name = "Emergency Shuttle Brig" }, /obj/effect/mapping_helpers/airlock/access/all/security/general, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "aC" = ( /obj/machinery/door/airlock/titanium, @@ -286,7 +286,7 @@ /area/shuttle/escape) "bj" = ( /obj/machinery/light/small/directional/north, -/turf/open/floor/mineral/plastitanium/red/brig, +/turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "bk" = ( /obj/structure/chair/wood, diff --git a/code/game/turfs/open/floor/mineral_floor.dm b/code/game/turfs/open/floor/mineral_floor.dm index 43c6d6ad0cb..ba59edf6d87 100644 --- a/code/game/turfs/open/floor/mineral_floor.dm +++ b/code/game/turfs/open/floor/mineral_floor.dm @@ -174,9 +174,6 @@ /turf/open/floor/mineral/plastitanium/red/snow_cabin temperature = 180 -/turf/open/floor/mineral/plastitanium/red/brig - name = "brig floor" - //BANANIUM /turf/open/floor/mineral/bananium diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm index 7fe6cdb0550..1eb7510fea2 100644 --- a/code/modules/shuttle/emergency.dm +++ b/code/modules/shuttle/emergency.dm @@ -397,9 +397,9 @@ continue if(shuttle_areas[get_area(player)]) has_people = TRUE - var/location = get_turf(player.mind.current) + var/location = get_area(player.mind.current) //Non-antag present. Can't hijack. - if(!(player.mind.has_antag_datum(/datum/antagonist)) && !istype(location, /turf/open/floor/mineral/plastitanium/red/brig)) + if(!(player.mind.has_antag_datum(/datum/antagonist)) && !istype(location, /area/shuttle/escape/brig)) return FALSE //Antag present, doesn't stop but let's see if we actually want to hijack var/prevent = FALSE diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm index 722325f0456..076ca28692a 100644 --- a/code/modules/shuttle/shuttle.dm +++ b/code/modules/shuttle/shuttle.dm @@ -782,7 +782,7 @@ for(var/turf/turfs as anything in return_turfs()) for(var/mob/living/sunset_mobs in turfs.get_all_contents()) // If they have a mind and they're not in the brig, they escaped - if(sunset_mobs.mind && !istype(turfs, /turf/open/floor/mineral/plastitanium/red/brig)) + if(sunset_mobs.mind && !istype(get_area(sunset_mobs), /area/shuttle/escape/brig)) sunset_mobs.mind.force_escaped = TRUE // Ghostize them and put them in nullspace stasis (for stat & possession checks) sunset_mobs.notransform = TRUE diff --git a/tools/UpdatePaths/Scripts/74100_removes_shuttle_brig_floors.txt b/tools/UpdatePaths/Scripts/74100_removes_shuttle_brig_floors.txt new file mode 100644 index 00000000000..55168363b62 --- /dev/null +++ b/tools/UpdatePaths/Scripts/74100_removes_shuttle_brig_floors.txt @@ -0,0 +1,3 @@ +# removes the plastitanium brig floor subtype + +/turf/open/floor/mineral/plastitanium/red/brig : /turf/open/floor/mineral/plastitanium/red{@OLD}