From 4d236debd8c82604757ecf542e74d0279c72b0ce Mon Sep 17 00:00:00 2001 From: "rockdtben@gmail.com" Date: Fri, 28 Sep 2012 23:13:50 +0000 Subject: [PATCH] Applied Aranclanos's patch. http://www.nanotrasen.com/phpBB3/viewtopic.php?f=16&t=10099 Fixes issue 928 Fixes issue 936 Remove a small bit of code rot in robot_items.dm git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4768 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/objects/items/robot/robot_items.dm | 12 ++++-------- code/game/objects/items/weapons/RCD.dm | 7 +++---- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm index 161d65e3aa7..b7341d829e7 100644 --- a/code/game/objects/items/robot/robot_items.dm +++ b/code/game/objects/items/robot/robot_items.dm @@ -148,13 +148,13 @@ else disabled = 0 if(!isrobot(user)|| disabled == 1) return - if(!(istype(A, /turf) || istype(A, /obj/machinery/door/airlock))) return var/mob/living/silicon/robot/R = user var/obj/item/weapon/cell/cell = R.cell + if(!cell) return - if(istype(A, /turf)) + if((istype(A, /turf) || istype(A, /obj/machinery/door/airlock))) switch(mode) if(1) if(istype(A, /turf/space)) @@ -166,7 +166,7 @@ if(istype(A, /turf/simulated/floor)) if(!cell.use(90)) return - user << "Building Wall (3)..." + user << "Building Wall ..." playsound(src.loc, 'sound/machines/click.ogg', 50, 1) if(do_after(user, 20)) activate() @@ -180,7 +180,6 @@ playsound(src.loc, 'sound/machines/click.ogg', 50, 1) if(do_after(user, 50)) activate() - if(locate(/obj/machinery/door) in get_turf(src)) return var/obj/machinery/door/airlock/T = new /obj/machinery/door/airlock( A ) T.autoclose = 1 return @@ -195,9 +194,6 @@ A:ReplaceWithPlating() return - if(istype(A, /turf/simulated/wall/r_wall)) //by order of muskets -pete - return - if(istype(A, /turf/simulated/floor)) user << "Deconstructing Floor..." playsound(src.loc, 'sound/machines/click.ogg', 50, 1) @@ -210,7 +206,7 @@ user << "Deconstructing Airlock..." playsound(src.loc, 'sound/machines/click.ogg', 50, 1) if(do_after(user, 50)) - playsound(src.loc, 'sound/machines/click.ogg', 50, 1) + activate() del(A) return return diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm index d413668f266..90f135d9211 100644 --- a/code/game/objects/items/weapons/RCD.dm +++ b/code/game/objects/items/weapons/RCD.dm @@ -107,7 +107,6 @@ RCD if(!disabled && matter >= 10) spark_system.set_up(5, 0, src) src.spark_system.start() - if(locate(/obj/machinery/door) in get_turf(src)) return var/obj/machinery/door/airlock/T = new /obj/machinery/door/airlock( A ) var/obj/structure/window/killthis = (locate(/obj/structure/window) in get_turf(src)) if(killthis) @@ -119,7 +118,9 @@ RCD desc = "A RCD. It currently holds [matter]/30 matter-units." return else if(mode == 3 && (istype(A, /turf) || istype(A, /obj/machinery/door/airlock) ) ) - if(istype(A, /turf/simulated/wall) && !istype(A, /turf/simulated/wall/r_wall) && matter >= 4) + if(istype(A, /turf/simulated/wall/r_wall)) + return + if(istype(A, /turf/simulated/wall) && matter >= 4) user << "Deconstructing Wall (4)..." playsound(src.loc, 'sound/machines/click.ogg', 50, 1) if(do_after(user, 40)) @@ -131,8 +132,6 @@ RCD matter -= 4 desc = "A RCD. It currently holds [matter]/30 matter-units." return - if(istype(A, /turf/simulated/wall/r_wall)) - return if(istype(A, /turf/simulated/floor) && matter >= 5) user << "Deconstructing Floor (5)..." playsound(src.loc, 'sound/machines/click.ogg', 50, 1)