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

You can now put people and borgs in rechargers

Browse Source
This commit is contained in:
Anewbe
2017-11-26 19:37:56 -06:00
parent 99a0c6cd67
commit 17244aec13
1 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -146,9 +146,21 @@
return
if(default_part_replacement(user, O))
return
if (istype(O, /obj/item/weapon/grab) && get_dist(src,user)<2)
var/obj/item/weapon/grab/G = O
if(istype(G.affecting,/mob/living))
var/mob/living/M = G.affecting
qdel(O)
go_in(M)
..()
/obj/machinery/recharge_station/MouseDrop_T(var/mob/target, var/mob/user)
if(user.stat || user.lying || !Adjacent(user) || !target.Adjacent(user))
return
go_in(target)
/obj/machinery/recharge_station/RefreshParts()
..()
var/man_rating = 0
@@ -207,15 +219,16 @@
if(icon_update_tick == 0)
build_overlays()
/obj/machinery/recharge_station/Bumped(var/mob/living/silicon/robot/R)
go_in(R)
/obj/machinery/recharge_station/Bumped(var/mob/living/L)
go_in(L)
/obj/machinery/recharge_station/proc/go_in(var/mob/living/silicon/robot/R)
/obj/machinery/recharge_station/proc/go_in(var/mob/living/L)
if(occupant)
return
if(istype(R, /mob/living/silicon/robot))
if(istype(L, /mob/living/silicon/robot))
var/mob/living/silicon/robot/R = L
if(R.incapacitated())
return
@@ -230,8 +243,8 @@
update_icon()
return 1
else if(istype(R, /mob/living/carbon/human))
var/mob/living/carbon/human/H = R
else if(istype(L, /mob/living/carbon/human))
var/mob/living/carbon/human/H = L
if(!isnull(H.internal_organs_by_name["cell"]))
add_fingerprint(H)
H.reset_view(src)