From c946ca7468b2cbb5b907598e9444fbe889b94c20 Mon Sep 17 00:00:00 2001
From: NullSnapshot <Noneofyourbusiness@cent.com>
Date: Thu, 3 Dec 2015 23:45:13 -0800
Subject: [PATCH] cleaning up recharge station's go_in proc by implementing a
 helper.

---
 code/game/machinery/rechargestation.dm | 54 ++++++++++++--------------
 1 file changed, 24 insertions(+), 30 deletions(-)

diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm
index 1891170020..980a2b3ee2 100644
--- a/code/game/machinery/rechargestation.dm
+++ b/code/game/machinery/rechargestation.dm
@@ -88,7 +88,7 @@
 
 //Processes the occupant, drawing from the internal power cell if needed.
 /obj/machinery/recharge_station/proc/process_occupant()
-	if(istype(occupant, /mob/living/silicon/robot))
+	if(isrobot(occupant))
 		var/mob/living/silicon/robot/R = occupant
 
 		if(R.module)
@@ -103,7 +103,7 @@
 			R.adjustBruteLoss(-weld_rate)
 		if(wire_rate && R.getFireLoss() && cell.checked_use(wire_power_use * wire_rate * CELLRATE))
 			R.adjustFireLoss(-wire_rate)
-	else if(istype(occupant, /mob/living/carbon/human))
+	else if(ishuman(occupant))
 		var/mob/living/carbon/human/H = occupant
 		if(!isnull(H.internal_organs_by_name["cell"]) && H.nutrition < 450)
 			H.nutrition = min(H.nutrition+10, 450)
@@ -205,38 +205,30 @@
 /obj/machinery/recharge_station/Bumped(var/mob/living/silicon/robot/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/M)
 	if(occupant)
 		return
-
-	if(istype(R, /mob/living/silicon/robot))
-
-		if(R.incapacitated())
-			return
-
-		if(!R.cell)
-			return
-
-		add_fingerprint(R)
-		R.reset_view(src)
-		R.forceMove(src)
-		occupant = R
-		update_icon()
-		return 1
-
-	else if(istype(R,  /mob/living/carbon/human))
-		var/mob/living/carbon/human/H = R
-		if(!isnull(H.internal_organs_by_name["cell"]))
-			add_fingerprint(H)
-			H.reset_view(src)
-			H.forceMove(src)
-			occupant = H
-			update_icon()
-			return 1
-	else
+	if(!hascell(M))
 		return
 
+	add_fingerprint(M)
+	M.reset_view(src)
+	M.forceMove(src)
+	occupant = M
+	update_icon()
+	return 1
+
+/obj/machinery/recharge_station/proc/hascell(var/mob/M)
+	if(isrobot(M))
+		var/mob/living/silicon/robot/R = M
+		if(R.cell)
+			return 1
+	if(ishuman(M))
+		var/mob/living/carbon/human/H = M
+		if(!isnull(H.internal_organs_by_name["cell"]))
+			return 1
+	return 0
+
 /obj/machinery/recharge_station/proc/go_out()
 	if(!occupant)
 		return
@@ -263,4 +255,6 @@
 	set name = "Enter Recharger"
 	set src in oview(1)
 
+	if(!usr.incapacitated())
+		return
 	go_in(usr)