From 17244aec13e76709ad2e1d48a6ace6fd5ca40c9c Mon Sep 17 00:00:00 2001
From: Anewbe <matthwledder@gmail.com>
Date: Sun, 26 Nov 2017 19:37:56 -0600
Subject: [PATCH] You can now put people and borgs in rechargers

---
 code/game/machinery/rechargestation.dm | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm
index 7a2aed9770..34e89ac6fd 100644
--- a/code/game/machinery/rechargestation.dm
+++ b/code/game/machinery/rechargestation.dm
@@ -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)