From 3acce269826b922a0a3fa558884411b90e04d28e Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Tue, 12 Jul 2016 18:21:02 -0400 Subject: [PATCH 1/2] Fantastic PR --- _maps/map_files/cyberiad/cyberiad.dmm | 6 ++-- code/modules/mining/mine_items.dm | 48 +++++++++++++++++++++++++- icons/obj/lavaland/survival_pod.dmi | Bin 0 -> 7962 bytes 3 files changed, 50 insertions(+), 4 deletions(-) create mode 100644 icons/obj/lavaland/survival_pod.dmi diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm index 553d98e3ebd..d933dfb899a 100644 --- a/_maps/map_files/cyberiad/cyberiad.dmm +++ b/_maps/map_files/cyberiad/cyberiad.dmm @@ -2105,7 +2105,7 @@ "aOy" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/maintenance/fsmaint2) "aOz" = (/obj/machinery/mass_driver{dir = 4; id_tag = "chapelgun"},/obj/machinery/door/window{dir = 8; name = "Mass Driver"; req_access_txt = "22"},/turf/simulated/floor/plating{tag = "icon-warnplate (WEST)"; icon_state = "warnplate"; dir = 8},/area/maintenance/fsmaint2) "aOA" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_x = 0; pixel_y = 32},/obj/machinery/atmospherics/unary/vent_pump,/turf/simulated/floor/plating{tag = "icon-warnplate (EAST)"; icon_state = "warnplate"; dir = 4},/area/maintenance/fsmaint2) -"aOB" = (/obj/machinery/door/poddoor{id_tag = "chapelgun"; name = "Chapel Launcher Door"; protected = 0},/turf/simulated/floor/plating,/area/maintenance/fsmaint2) +"aOB" = (/obj/machinery/door/poddoor{id_tag = "chapelgun"; name = "Chapel Launcher Door"; protected = 0},/obj/structure/fans/tiny,/turf/simulated/floor/plating,/area/maintenance/fsmaint2) "aOC" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8; initialize_directions = 11; level = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/chapel/main) "aOD" = (/turf/simulated/shuttle/wall{icon_state = "swall11"; dir = 2},/area/shuttle/arrival/station) "aOE" = (/obj/effect/landmark{name = "HONKsquad"},/obj/structure/closet/walllocker/emerglocker/north,/turf/simulated/shuttle/floor,/area/shuttle/arrival/station) @@ -4243,7 +4243,7 @@ "bDE" = (/obj/effect/spawner/window/reinforced,/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_x = 0; pixel_y = 0},/obj/machinery/door/firedoor{dir = 2},/turf/simulated/floor/plating,/area/hallway/secondary/entry) "bDF" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor{dir = 2},/turf/simulated/floor/plating,/area/hallway/secondary/entry) "bDG" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor{dir = 2},/turf/simulated/floor/plating,/area/hallway/secondary/entry) -"bDH" = (/obj/machinery/door/poddoor{id_tag = "trash"; name = "disposal bay door"; protected = 0},/turf/simulated/floor/plating/airless,/area/maintenance/disposal) +"bDH" = (/obj/machinery/door/poddoor{id_tag = "trash"; name = "disposal bay door"; protected = 0},/obj/structure/fans/tiny,/turf/simulated/floor/plating,/area/maintenance/disposal) "bDI" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor/plasteel{dir = 8; icon_state = "warning"},/area/quartermaster/storage) "bDJ" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 8; initialize_directions = 11; level = 1},/turf/simulated/floor/plasteel,/area/quartermaster/storage) "bDK" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/plasteel,/area/quartermaster/storage) @@ -5847,7 +5847,7 @@ "ciw" = (/obj/machinery/mass_driver{dir = 4; id_tag = "toxinsdriver"},/turf/simulated/floor/plating,/area/toxins/mixing) "cix" = (/turf/simulated/floor/plating,/area/toxins/mixing) "ciy" = (/obj/machinery/light,/turf/simulated/floor/plating,/area/toxins/mixing) -"ciz" = (/obj/machinery/door/poddoor{id_tag = "toxinsdriver"; name = "Toxins Launcher Bay Door"; protected = 0},/turf/simulated/floor/plating,/area/toxins/mixing) +"ciz" = (/obj/machinery/door/poddoor{id_tag = "toxinsdriver"; name = "Toxins Launcher Bay Door"; protected = 0},/obj/structure/fans/tiny,/turf/simulated/floor/plating,/area/toxins/mixing) "ciA" = (/obj/machinery/door/poddoor{id_tag = "toxinsdriver"; name = "Toxins Launcher Bay Door"; protected = 0},/turf/simulated/floor/plating/airless,/area/toxins/test_area) "ciB" = (/obj/item/device/radio/beacon,/obj/effect/decal/warning_stripes/red/hollow,/turf/simulated/floor/plasteel/airless,/area/toxins/test_area) "ciC" = (/turf/simulated/shuttle/wall{dir = 4; icon_state = "wall3"},/area/toxins/test_area) diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index 431e6ea028b..f729ee8fd69 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -249,4 +249,50 @@ if(colorindex >= 6) colorindex = 0 icon_state = "mobcap[colorindex]" - update_icon() \ No newline at end of file + update_icon() + +//Fans +/obj/structure/fans + icon = 'icons/obj/lavaland/survival_pod.dmi' + icon_state = "fans" + name = "environmental regulation system" + desc = "A large machine releasing a constant gust of air." + anchored = 1 + density = 1 + var/arbitraryatmosblockingvar = 1 + var/buildstacktype = /obj/item/stack/sheet/metal + var/buildstackamount = 5 + +/obj/structure/fans/proc/deconstruct() + if(buildstacktype) + new buildstacktype(loc, buildstackamount) + qdel(src) + +/obj/structure/fans/attackby(obj/item/weapon/W, mob/user, params) + if(istype(W, /obj/item/weapon/wrench)) + playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) + user.visible_message("[user] disassembles the fan.", \ + "You start to disassemble the fan...", "You hear clanking and banging noises.") + if(do_after(user, 20, target = src)) + deconstruct() + return ..() + +/obj/structure/fans/tiny + name = "tiny fan" + desc = "A tiny fan, releasing a thin gust of air." + layer = TURF_LAYER+0.1 + density = 0 + icon_state = "fan_tiny" + buildstackamount = 2 + +/obj/structure/fans/New(loc) + ..() + air_update_turf(1) + +/obj/structure/fans/Destroy() + arbitraryatmosblockingvar = 0 + air_update_turf(1) + return ..() + +/obj/structure/fans/CanAtmosPass(turf/T) + return !arbitraryatmosblockingvar \ No newline at end of file diff --git a/icons/obj/lavaland/survival_pod.dmi b/icons/obj/lavaland/survival_pod.dmi new file mode 100644 index 0000000000000000000000000000000000000000..62aad7854d29c0ab87e3a3c63299965c25d0e4cb GIT binary patch literal 7962 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 literal 0 HcmV?d00001 From cb111fbec4aab211e7ad819959fbc1f2b8caf647 Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Wed, 13 Jul 2016 19:14:57 -0400 Subject: [PATCH 2/2] tweak --- code/modules/mining/mine_items.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index f729ee8fd69..f82975572a2 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -270,7 +270,7 @@ /obj/structure/fans/attackby(obj/item/weapon/W, mob/user, params) if(istype(W, /obj/item/weapon/wrench)) - playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) + playsound(loc, 'sound/items/Ratchet.ogg', 50, 1) user.visible_message("[user] disassembles the fan.", \ "You start to disassemble the fan...", "You hear clanking and banging noises.") if(do_after(user, 20, target = src))