diff --git a/code/game/mecha/equipment/tools/tools.dm b/code/game/mecha/equipment/tools/tools.dm index 6655dbdd2e5..98bf3925b9b 100644 --- a/code/game/mecha/equipment/tools/tools.dm +++ b/code/game/mecha/equipment/tools/tools.dm @@ -200,6 +200,10 @@ var/disabled = 0 //malf action(atom/target) + if(istype(target,/area/shuttle)||istype(target, /turf/space/transit))//>implying these are ever made -Sieve + disabled = 1 + else + disabled = 0 if(!istype(target, /turf) && !istype(target, /obj/machinery/door/airlock)) target = get_turf(target) if(!action_checks(target) || disabled || get_dist(chassis, target)>3) return diff --git a/code/game/objects/items/robot_items.dm b/code/game/objects/items/robot_items.dm index e0daee42505..0da3953db52 100644 --- a/code/game/objects/items/robot_items.dm +++ b/code/game/objects/items/robot_items.dm @@ -188,6 +188,7 @@ // datum/effect/effect/system/spark_spread/spark_system working = 0 mode = 1 + disabled = 0 /* New() @@ -224,7 +225,11 @@ afterattack(atom/A, mob/user as mob) - if(!isrobot(user)) return + if(istype(A,/area/shuttle)||istype(A,/turf/space/transit))//No RCDs on the shuttles -Sieve + disabled = 1 + 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 diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm index 2641c63e742..818ba159f66 100644 --- a/code/game/objects/items/weapons/RCD.dm +++ b/code/game/objects/items/weapons/RCD.dm @@ -69,6 +69,10 @@ RCD afterattack(atom/A, mob/user as mob) + if(istype(A,/area/shuttle)||istype(A,/turf/space/transit))//Nanotrasen Matter Jammer TM -Sieve + disabled = 1 + else + disabled = 0 if(!(istype(A, /turf) || istype(A, /obj/machinery/door/airlock))) return