From 892b3b43078f0bca9a6c0a55c5056eeae1f182a0 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 5 Mar 2018 13:02:08 -0600 Subject: [PATCH] [MIRROR] Allows the auxbase camera console to place airlocks on fans (#5813) * Allows the auxbase camera console to place airlocks on fans (#35975) * - Allows the aux base rcd to commit the same atrocities as the regular rcd - Rids us of another value that does nothing * first and only webeditor commit * Allows the auxbase camera console to place airlocks on fans --- code/modules/mining/aux_base_camera.dm | 17 ++++++----------- code/modules/mining/equipment/survival_pod.dm | 1 - 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/code/modules/mining/aux_base_camera.dm b/code/modules/mining/aux_base_camera.dm index 3aa963ef5e..02c54ffbd3 100644 --- a/code/modules/mining/aux_base_camera.dm +++ b/code/modules/mining/aux_base_camera.dm @@ -173,18 +173,13 @@ if(!check_spot()) return - - var/atom/movable/rcd_target var/turf/target_turf = get_turf(remote_eye) + var/atom/rcd_target = target_turf - //Find airlocks - rcd_target = locate(/obj/machinery/door/airlock) in target_turf - - if(!rcd_target) - rcd_target = locate (/obj/structure) in target_turf - - if(!rcd_target || !rcd_target.anchored) - rcd_target = target_turf + //Find airlocks and other shite + for(var/obj/S in target_turf) + if(LAZYLEN(S.rcd_vals(owner,B.RCD))) + rcd_target = S //If we don't break out of this loop we'll get the last placed thing owner.changeNext_move(CLICK_CD_RANGE) B.RCD.afterattack(rcd_target, owner, TRUE) //Activate the RCD and force it to work remotely! @@ -276,4 +271,4 @@ datum/action/innate/aux_base/install_turret/Activate() B.turret_stock-- to_chat(owner, "Turret installation complete!") - playsound(turret_turf, 'sound/items/drill_use.ogg', 65, 1) \ No newline at end of file + playsound(turret_turf, 'sound/items/drill_use.ogg', 65, 1) diff --git a/code/modules/mining/equipment/survival_pod.dm b/code/modules/mining/equipment/survival_pod.dm index 66faa7cb2c..632c9e1cba 100644 --- a/code/modules/mining/equipment/survival_pod.dm +++ b/code/modules/mining/equipment/survival_pod.dm @@ -203,7 +203,6 @@ desc = "A large machine releasing a constant gust of air." anchored = TRUE density = TRUE - var/arbitraryatmosblockingvar = TRUE var/buildstacktype = /obj/item/stack/sheet/metal var/buildstackamount = 5 CanAtmosPass = ATMOS_PASS_NO