cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Re-adds recharge station checks.

Browse Source 
Because no one who stuffs non-operational/dead borgs into recharge stations will bother to eject them.
This commit is contained in:
PsiOmega
2015-09-07 08:16:31 +02:00
parent dd81250b1b
commit 8e9705b6c7
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
code/game/machinery/rechargestation.dm
View File

@@ -197,8 +197,7 @@
build_overlays() build_overlays()
/obj/machinery/recharge_station/Bumped(var/mob/living/silicon/robot/R) /obj/machinery/recharge_station/Bumped(var/mob/living/silicon/robot/R)
if(istype(R)) go_in(R)
go_in(R)
/obj/machinery/recharge_station/proc/go_in(var/mob/living/silicon/robot/R) /obj/machinery/recharge_station/proc/go_in(var/mob/living/silicon/robot/R)
if(!istype(R)) if(!istype(R))
@@ -206,10 +205,18 @@
if(occupant) if(occupant)
return return
// TODO : Change to incapacitated() on merge.
if(R.stat || R.lying || R.resting || R.buckled)
return
if(!R.cell)
return
add_fingerprint(R)
R.reset_view(src) R.reset_view(src)
R.forceMove(src) R.forceMove(src)
occupant = R occupant = R
update_icon() update_icon()
return 1
/obj/machinery/recharge_station/proc/go_out() /obj/machinery/recharge_station/proc/go_out()
if(!occupant) if(!occupant)
@@ -238,9 +245,4 @@
set name = "Enter Recharger" set name = "Enter Recharger"
set src in oview(1) set src in oview(1)
// TODO : Change to incapacitated() on merge.
if(usr.stat || usr.lying || usr.resting || usr.buckled)
return
go_in(usr) go_in(usr)
add_fingerprint(usr)