From de551bc0c6fa61db93866d6170bb1c87e569e0e1 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Wed, 2 Jan 2019 02:21:23 -0500 Subject: [PATCH 08/12] Revert "Adds fans to each white ship hopefully at all doors leading to space! - Requested by Seras/Others (#7862)" This reverts commit addea6f21c325a3e534a069b4fef91e597f0132a. --- _maps/shuttles/whiteship_box.dmm | 7 ------- _maps/shuttles/whiteship_delta.dmm | 7 ------- _maps/shuttles/whiteship_meta.dmm | 11 ----------- _maps/shuttles/whiteship_pubby.dmm | 2 -- 4 files changed, 27 deletions(-) diff --git a/_maps/shuttles/whiteship_box.dmm b/_maps/shuttles/whiteship_box.dmm index 3385f89dbd..8dc007ec95 100644 --- a/_maps/shuttles/whiteship_box.dmm +++ b/_maps/shuttles/whiteship_box.dmm @@ -14,7 +14,6 @@ /area/shuttle/abandoned/crew) "ae" = ( /obj/machinery/door/airlock/external, -/obj/structure/fans, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/docking_port/mobile{ callTime = 250; @@ -149,7 +148,6 @@ /area/shuttle/abandoned/crew) "ap" = ( /obj/machinery/door/airlock/external, -/obj/structure/fans, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, @@ -739,7 +737,6 @@ /obj/effect/turf_decal/bot, /obj/item/reagent_containers/glass/bucket, /obj/item/mop, -/obj/item/assembly/prox_sensor, /obj/item/storage/bag/trash{ pixel_x = 6 }, @@ -957,7 +954,6 @@ /area/shuttle/abandoned/engine) "bm" = ( /obj/machinery/door/airlock/external, -/obj/structure/fans, /obj/effect/decal/cleanable/dirt{ desc = "A thin layer of dust coating the floor."; name = "dust" @@ -1134,7 +1130,6 @@ /area/shuttle/abandoned/bridge) "by" = ( /obj/machinery/door/airlock/external, -/obj/structure/fans, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /turf/open/floor/plating, /area/shuttle/abandoned/engine) @@ -2604,7 +2599,6 @@ /area/shuttle/abandoned/medbay) "do" = ( /obj/machinery/door/airlock/external, -/obj/structure/fans, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/effect/decal/cleanable/dirt{ desc = "A thin layer of dust coating the floor."; @@ -2676,7 +2670,6 @@ /area/shuttle/abandoned/medbay) "dt" = ( /obj/machinery/door/airlock/external, -/obj/structure/fans, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, diff --git a/_maps/shuttles/whiteship_delta.dmm b/_maps/shuttles/whiteship_delta.dmm index 88027243fb..160f6adfd5 100644 --- a/_maps/shuttles/whiteship_delta.dmm +++ b/_maps/shuttles/whiteship_delta.dmm @@ -19,7 +19,6 @@ /area/shuttle/abandoned/crew) "ad" = ( /obj/machinery/door/airlock/external, -/obj/structure/fans, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/docking_port/mobile{ callTime = 250; @@ -440,7 +439,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/structure/fans, /obj/machinery/door/airlock/external/glass{ name = "E.V.A Access" }, @@ -626,7 +624,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/structure/fans, /obj/machinery/door/airlock/external/glass{ name = "E.V.A Access" }, @@ -2531,7 +2528,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/structure/fans, /obj/machinery/door/airlock/external/glass{ name = "E.V.A Access" }, @@ -2556,7 +2552,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/structure/fans, /obj/machinery/door/airlock/external/glass{ name = "E.V.A Access" }, @@ -2787,7 +2782,6 @@ /area/shuttle/abandoned/medbay) "dI" = ( /obj/machinery/door/airlock/external, -/obj/structure/fans, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/effect/decal/cleanable/dirt{ desc = "A thin layer of dust coating the floor."; @@ -3109,7 +3103,6 @@ /area/shuttle/abandoned/cargo) "eb" = ( /obj/machinery/door/airlock/external, -/obj/structure/fans, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, diff --git a/_maps/shuttles/whiteship_meta.dmm b/_maps/shuttles/whiteship_meta.dmm index 0a6a5d9b71..a7f977c34e 100644 --- a/_maps/shuttles/whiteship_meta.dmm +++ b/_maps/shuttles/whiteship_meta.dmm @@ -34,7 +34,6 @@ /area/shuttle/abandoned/crew) "ah" = ( /obj/machinery/door/airlock/external, -/obj/structure/fans, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/docking_port/mobile{ callTime = 250; @@ -459,7 +458,6 @@ /area/shuttle/abandoned/crew) "aI" = ( /obj/machinery/door/airlock/external, -/obj/structure/fans, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, @@ -585,7 +583,6 @@ name = "dust" }, /obj/machinery/door/airlock/external, -/obj/structure/fans, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, @@ -707,7 +704,6 @@ name = "dust" }, /obj/machinery/door/airlock/external, -/obj/structure/fans, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, @@ -1897,7 +1893,6 @@ /area/shuttle/abandoned/bridge) "ch" = ( /obj/machinery/door/airlock/external, -/obj/structure/fans, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, @@ -1920,7 +1915,6 @@ /area/shuttle/abandoned/engine) "cj" = ( /obj/machinery/door/airlock/external, -/obj/structure/fans, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, @@ -3100,7 +3094,6 @@ name = "dust" }, /obj/machinery/door/airlock/external, -/obj/structure/fans, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, @@ -3171,7 +3164,6 @@ name = "dust" }, /obj/machinery/door/airlock/external, -/obj/structure/fans, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, @@ -3440,7 +3432,6 @@ /obj/item/shovel, /obj/item/pickaxe, /obj/item/storage/box/lights/mixed, -/obj/item/storage/box/lights/mixed, /obj/item/mining_scanner, /obj/effect/turf_decal/bot, /turf/open/floor/plating, @@ -3523,7 +3514,6 @@ /area/shuttle/abandoned/bar) "dP" = ( /obj/machinery/door/airlock/external, -/obj/structure/fans, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/effect/decal/cleanable/dirt{ desc = "A thin layer of dust coating the floor."; @@ -3818,7 +3808,6 @@ /area/shuttle/abandoned/cargo) "ej" = ( /obj/machinery/door/airlock/external, -/obj/structure/fans, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, diff --git a/_maps/shuttles/whiteship_pubby.dmm b/_maps/shuttles/whiteship_pubby.dmm index 25c3250668..11214ef260 100644 --- a/_maps/shuttles/whiteship_pubby.dmm +++ b/_maps/shuttles/whiteship_pubby.dmm @@ -15,7 +15,6 @@ /obj/machinery/door/airlock/public/glass{ name = "Shuttle Airlock" }, -/obj/structure/fans, /turf/open/floor/plasteel/dark, /area/shuttle/abandoned) "e" = ( @@ -97,7 +96,6 @@ preferred_direction = 1; width = 9 }, -/obj/structure/fans, /turf/open/floor/plasteel/dark, /area/shuttle/abandoned) "p" = ( From 02761a38c9487d36a6dfe31ff7655f40aa0579e2 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Wed, 2 Jan 2019 02:29:53 -0500 Subject: [PATCH 09/12] Correct fans --- _maps/shuttles/whiteship_box.dmm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/_maps/shuttles/whiteship_box.dmm b/_maps/shuttles/whiteship_box.dmm index 8dc007ec95..0404cede34 100644 --- a/_maps/shuttles/whiteship_box.dmm +++ b/_maps/shuttles/whiteship_box.dmm @@ -15,6 +15,7 @@ "ae" = ( /obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/structure/fans/tiny, /obj/docking_port/mobile{ callTime = 250; dheight = 0; @@ -148,6 +149,7 @@ /area/shuttle/abandoned/crew) "ap" = ( /obj/machinery/door/airlock/external, +/obj/structure/fans/tiny, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, @@ -737,6 +739,7 @@ /obj/effect/turf_decal/bot, /obj/item/reagent_containers/glass/bucket, /obj/item/mop, +/obj/item/assembly/prox_sensor, /obj/item/storage/bag/trash{ pixel_x = 6 }, @@ -954,6 +957,7 @@ /area/shuttle/abandoned/engine) "bm" = ( /obj/machinery/door/airlock/external, +/obj/structure/fans/tiny, /obj/effect/decal/cleanable/dirt{ desc = "A thin layer of dust coating the floor."; name = "dust" @@ -1130,6 +1134,7 @@ /area/shuttle/abandoned/bridge) "by" = ( /obj/machinery/door/airlock/external, +/obj/structure/fans/tiny, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /turf/open/floor/plating, /area/shuttle/abandoned/engine) @@ -2600,6 +2605,7 @@ "do" = ( /obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/structure/fans/tiny, /obj/effect/decal/cleanable/dirt{ desc = "A thin layer of dust coating the floor."; name = "dust" @@ -2670,6 +2676,7 @@ /area/shuttle/abandoned/medbay) "dt" = ( /obj/machinery/door/airlock/external, +/obj/structure/fans/tiny, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, From fc5b9117f249d363ac562edbfd689b0dfb6feaf6 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Wed, 2 Jan 2019 02:35:23 -0500 Subject: [PATCH 10/12] Correct fans --- _maps/shuttles/whiteship_delta.dmm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/_maps/shuttles/whiteship_delta.dmm b/_maps/shuttles/whiteship_delta.dmm index 160f6adfd5..cc8eb19bab 100644 --- a/_maps/shuttles/whiteship_delta.dmm +++ b/_maps/shuttles/whiteship_delta.dmm @@ -19,6 +19,7 @@ /area/shuttle/abandoned/crew) "ad" = ( /obj/machinery/door/airlock/external, +/obj/structure/fans/tiny, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/docking_port/mobile{ callTime = 250; @@ -443,6 +444,7 @@ name = "E.V.A Access" }, /turf/open/floor/plasteel, +/obj/structure/fans/tiny, /area/shuttle/abandoned/crew) "aK" = ( /obj/effect/decal/cleanable/dirt{ @@ -628,6 +630,7 @@ name = "E.V.A Access" }, /obj/effect/decal/cleanable/dirt, +/obj/structure/fans/tiny, /turf/open/floor/plasteel, /area/shuttle/abandoned/bar) "aX" = ( @@ -2531,6 +2534,7 @@ /obj/machinery/door/airlock/external/glass{ name = "E.V.A Access" }, +/obj/structure/fans/tiny, /obj/effect/decal/cleanable/dirt{ desc = "A thin layer of dust coating the floor."; name = "dust" @@ -2555,6 +2559,7 @@ /obj/machinery/door/airlock/external/glass{ name = "E.V.A Access" }, +/obj/structure/fans/tiny, /turf/open/floor/plasteel, /area/shuttle/abandoned/cargo) "ds" = ( @@ -2782,6 +2787,7 @@ /area/shuttle/abandoned/medbay) "dI" = ( /obj/machinery/door/airlock/external, +/obj/structure/fans/tiny, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/effect/decal/cleanable/dirt{ desc = "A thin layer of dust coating the floor."; @@ -3103,6 +3109,7 @@ /area/shuttle/abandoned/cargo) "eb" = ( /obj/machinery/door/airlock/external, +/obj/structure/fans/tiny, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, From 0b556a46af2a345c65694430ba307146b48e1f91 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Wed, 2 Jan 2019 02:39:19 -0500 Subject: [PATCH 11/12] correct fans --- _maps/shuttles/whiteship_meta.dmm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/_maps/shuttles/whiteship_meta.dmm b/_maps/shuttles/whiteship_meta.dmm index a7f977c34e..84fff43a44 100644 --- a/_maps/shuttles/whiteship_meta.dmm +++ b/_maps/shuttles/whiteship_meta.dmm @@ -34,6 +34,7 @@ /area/shuttle/abandoned/crew) "ah" = ( /obj/machinery/door/airlock/external, +/obj/structure/fans/tiny, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/docking_port/mobile{ callTime = 250; @@ -458,6 +459,7 @@ /area/shuttle/abandoned/crew) "aI" = ( /obj/machinery/door/airlock/external, +/obj/structure/fans/tiny, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, @@ -583,6 +585,7 @@ name = "dust" }, /obj/machinery/door/airlock/external, +/obj/structure/fans/tiny, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, @@ -704,6 +707,7 @@ name = "dust" }, /obj/machinery/door/airlock/external, +/obj/structure/fans/tiny, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, @@ -1893,6 +1897,7 @@ /area/shuttle/abandoned/bridge) "ch" = ( /obj/machinery/door/airlock/external, +/obj/structure/fans/tiny, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, @@ -1915,6 +1920,7 @@ /area/shuttle/abandoned/engine) "cj" = ( /obj/machinery/door/airlock/external, +/obj/structure/fans/tiny, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, @@ -3094,6 +3100,7 @@ name = "dust" }, /obj/machinery/door/airlock/external, +/obj/structure/fans/tiny, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, @@ -3164,6 +3171,7 @@ name = "dust" }, /obj/machinery/door/airlock/external, +/obj/structure/fans/tiny, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, @@ -3432,6 +3440,7 @@ /obj/item/shovel, /obj/item/pickaxe, /obj/item/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /obj/item/mining_scanner, /obj/effect/turf_decal/bot, /turf/open/floor/plating, @@ -3514,6 +3523,7 @@ /area/shuttle/abandoned/bar) "dP" = ( /obj/machinery/door/airlock/external, +/obj/structure/fans/tiny, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/effect/decal/cleanable/dirt{ desc = "A thin layer of dust coating the floor."; @@ -3808,6 +3818,7 @@ /area/shuttle/abandoned/cargo) "ej" = ( /obj/machinery/door/airlock/external, +/obj/structure/fans/tiny, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, From 9618fecfb7133111cc4ee14a90c90172ae70d07e Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Wed, 2 Jan 2019 02:40:10 -0500 Subject: [PATCH 12/12] Correct fans --- _maps/shuttles/whiteship_pubby.dmm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/_maps/shuttles/whiteship_pubby.dmm b/_maps/shuttles/whiteship_pubby.dmm index 11214ef260..fef3918e1d 100644 --- a/_maps/shuttles/whiteship_pubby.dmm +++ b/_maps/shuttles/whiteship_pubby.dmm @@ -15,6 +15,7 @@ /obj/machinery/door/airlock/public/glass{ name = "Shuttle Airlock" }, +/obj/structure/fans/tiny, /turf/open/floor/plasteel/dark, /area/shuttle/abandoned) "e" = ( @@ -96,6 +97,7 @@ preferred_direction = 1; width = 9 }, +/obj/structure/fans/tiny, /turf/open/floor/plasteel/dark, /area/shuttle/abandoned) "p" = (