diff --git a/code/game/atoms.dm b/code/game/atoms.dm index fca6effc22..4e56b4158f 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -66,9 +66,6 @@ /atom/proc/meteorhit(obj/meteor as obj) return -/atom/proc/allow_drop() - return 1 - /atom/proc/CheckExit() return 1 diff --git a/code/game/dna/dna_modifier.dm b/code/game/dna/dna_modifier.dm index 53086de252..585131edc1 100644 --- a/code/game/dna/dna_modifier.dm +++ b/code/game/dna/dna_modifier.dm @@ -64,9 +64,6 @@ component_parts += new /obj/item/stack/cable_coil(src) RefreshParts() -/obj/machinery/dna_scannernew/allow_drop() - return 0 - /obj/machinery/dna_scannernew/relaymove(mob/user as mob) if (user.stat) return diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index 91c96fcfc9..2b8e493d9c 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -177,11 +177,6 @@ return return - - allow_drop() - return 0 - - process() if (stat & (NOPOWER|BROKEN)) return diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm index 98ebc5a626..f7229accd3 100644 --- a/code/game/machinery/adv_med.dm +++ b/code/game/machinery/adv_med.dm @@ -14,9 +14,6 @@ idle_power_usage = 60 active_power_usage = 10000 //10 kW. It's a big all-body scanner. -/*/obj/machinery/bodyscanner/allow_drop() - return 0*/ - /obj/machinery/bodyscanner/relaymove(mob/user as mob) if (user.stat) return diff --git a/code/game/machinery/cryo.dm b/code/game/machinery/cryo.dm index 0f511d1944..28c2d8e89d 100644 --- a/code/game/machinery/cryo.dm +++ b/code/game/machinery/cryo.dm @@ -58,11 +58,6 @@ return 1 - -/obj/machinery/atmospherics/unary/cryo_cell/allow_drop() - return 0 - - /obj/machinery/atmospherics/unary/cryo_cell/relaymove(mob/user as mob) if(user.stat) return diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm index d4c3ff5734..61e4a947e3 100644 --- a/code/game/machinery/rechargestation.dm +++ b/code/game/machinery/rechargestation.dm @@ -104,9 +104,6 @@ if(wire_rate && R.getFireLoss() && cell.checked_use(wire_power_use * wire_rate * CELLRATE)) R.adjustFireLoss(-wire_rate) -/obj/machinery/recharge_station/allow_drop() - return 0 - /obj/machinery/recharge_station/examine(mob/user) ..(user) user << "The charge meter reads: [round(chargepercentage())]%" @@ -220,25 +217,23 @@ /obj/machinery/recharge_station/verb/move_inside() set category = "Object" set src in oview(1) - if(usr.stat == 2) - //Whoever had it so that a borg with a dead cell can't enter this thing should be shot. --NEO - return - if(!(istype(usr, /mob/living/silicon/))) - usr << "Only synthetics may enter the recharger!" + + if(usr.stat == DEAD) return if(occupant) usr << "\The [src] is already occupied!" return - if(!usr:cell) - usr << "Without a powercell, you can't be recharged." - //Make sure they actually HAVE a cell, now that they can get in while powerless. --NEO + + var/mob/living/silicon/robot/R = usr + if(!istype(R)) + usr << "Only synthetics may enter the recharger!" return - usr.stop_pulling() + if(!R.cell) + usr << "Without a powercell, you can't be recharged." + return + usr.reset_view(src) usr.loc = src occupant = usr - /*for(var/obj/O in src) - O.loc = loc*/ add_fingerprint(usr) update_icon() - return \ No newline at end of file diff --git a/code/game/mecha/equipment/tools/medical_tools.dm b/code/game/mecha/equipment/tools/medical_tools.dm index 08d6f2cca4..3a0693400e 100644 --- a/code/game/mecha/equipment/tools/medical_tools.dm +++ b/code/game/mecha/equipment/tools/medical_tools.dm @@ -21,9 +21,6 @@ pr_mech_sleeper.set_delay(equip_cooldown) return - allow_drop() - return 0 - destroy() for(var/atom/movable/AM in src) AM.forceMove(get_turf(src)) diff --git a/code/game/mecha/equipment/tools/tools.dm b/code/game/mecha/equipment/tools/tools.dm index b124c4c226..ade3cdc812 100644 --- a/code/game/mecha/equipment/tools/tools.dm +++ b/code/game/mecha/equipment/tools/tools.dm @@ -1080,9 +1080,6 @@ var/door_locked = 1 salvageable = 0 -/obj/item/mecha_parts/mecha_equipment/tool/passenger/allow_drop() - return 0 - /obj/item/mecha_parts/mecha_equipment/tool/passenger/destroy() for(var/atom/movable/AM in src) AM.forceMove(get_turf(src))