More cleanup

Removes dynamic member lookup in rechargestation.dm. Removes unused proc allow_drop().
This commit is contained in:
mwerezak
2015-07-23 01:56:39 -04:00
parent f0bfd03898
commit 8b81dadfc5
8 changed files with 10 additions and 40 deletions

View File

@@ -66,9 +66,6 @@
/atom/proc/meteorhit(obj/meteor as obj) /atom/proc/meteorhit(obj/meteor as obj)
return return
/atom/proc/allow_drop()
return 1
/atom/proc/CheckExit() /atom/proc/CheckExit()
return 1 return 1

View File

@@ -64,9 +64,6 @@
component_parts += new /obj/item/stack/cable_coil(src) component_parts += new /obj/item/stack/cable_coil(src)
RefreshParts() RefreshParts()
/obj/machinery/dna_scannernew/allow_drop()
return 0
/obj/machinery/dna_scannernew/relaymove(mob/user as mob) /obj/machinery/dna_scannernew/relaymove(mob/user as mob)
if (user.stat) if (user.stat)
return return

View File

@@ -177,11 +177,6 @@
return return
return return
allow_drop()
return 0
process() process()
if (stat & (NOPOWER|BROKEN)) if (stat & (NOPOWER|BROKEN))
return return

View File

@@ -14,9 +14,6 @@
idle_power_usage = 60 idle_power_usage = 60
active_power_usage = 10000 //10 kW. It's a big all-body scanner. 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) /obj/machinery/bodyscanner/relaymove(mob/user as mob)
if (user.stat) if (user.stat)
return return

View File

@@ -58,11 +58,6 @@
return 1 return 1
/obj/machinery/atmospherics/unary/cryo_cell/allow_drop()
return 0
/obj/machinery/atmospherics/unary/cryo_cell/relaymove(mob/user as mob) /obj/machinery/atmospherics/unary/cryo_cell/relaymove(mob/user as mob)
if(user.stat) if(user.stat)
return return

View File

@@ -104,9 +104,6 @@
if(wire_rate && R.getFireLoss() && cell.checked_use(wire_power_use * wire_rate * CELLRATE)) if(wire_rate && R.getFireLoss() && cell.checked_use(wire_power_use * wire_rate * CELLRATE))
R.adjustFireLoss(-wire_rate) R.adjustFireLoss(-wire_rate)
/obj/machinery/recharge_station/allow_drop()
return 0
/obj/machinery/recharge_station/examine(mob/user) /obj/machinery/recharge_station/examine(mob/user)
..(user) ..(user)
user << "The charge meter reads: [round(chargepercentage())]%" user << "The charge meter reads: [round(chargepercentage())]%"
@@ -220,25 +217,23 @@
/obj/machinery/recharge_station/verb/move_inside() /obj/machinery/recharge_station/verb/move_inside()
set category = "Object" set category = "Object"
set src in oview(1) 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 if(usr.stat == DEAD)
return
if(!(istype(usr, /mob/living/silicon/)))
usr << "<span class='notice'>Only synthetics may enter the recharger!</span>"
return return
if(occupant) if(occupant)
usr << "<span class='notice'>\The [src] is already occupied!</span>" usr << "<span class='notice'>\The [src] is already occupied!</span>"
return return
if(!usr:cell)
usr << "<span class='notice'>Without a powercell, you can't be recharged.</span>" var/mob/living/silicon/robot/R = usr
//Make sure they actually HAVE a cell, now that they can get in while powerless. --NEO if(!istype(R))
usr << "<span class='notice'>Only synthetics may enter the recharger!</span>"
return return
usr.stop_pulling() if(!R.cell)
usr << "<span class='notice'>Without a powercell, you can't be recharged.</span>"
return
usr.reset_view(src) usr.reset_view(src)
usr.loc = src usr.loc = src
occupant = usr occupant = usr
/*for(var/obj/O in src)
O.loc = loc*/
add_fingerprint(usr) add_fingerprint(usr)
update_icon() update_icon()
return

View File

@@ -21,9 +21,6 @@
pr_mech_sleeper.set_delay(equip_cooldown) pr_mech_sleeper.set_delay(equip_cooldown)
return return
allow_drop()
return 0
destroy() destroy()
for(var/atom/movable/AM in src) for(var/atom/movable/AM in src)
AM.forceMove(get_turf(src)) AM.forceMove(get_turf(src))

View File

@@ -1080,9 +1080,6 @@
var/door_locked = 1 var/door_locked = 1
salvageable = 0 salvageable = 0
/obj/item/mecha_parts/mecha_equipment/tool/passenger/allow_drop()
return 0
/obj/item/mecha_parts/mecha_equipment/tool/passenger/destroy() /obj/item/mecha_parts/mecha_equipment/tool/passenger/destroy()
for(var/atom/movable/AM in src) for(var/atom/movable/AM in src)
AM.forceMove(get_turf(src)) AM.forceMove(get_turf(src))