From 911bb109579fe3f4b563fc7d843e08ef504d3d73 Mon Sep 17 00:00:00 2001
From: Markolie <markvanalphen2@gmail.com>
Date: Sun, 30 Aug 2015 07:48:14 +0200
Subject: [PATCH] Fix IPC's entering occupied rechargers

---
 code/game/machinery/rechargestation.dm | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm
index 37220d43956..c8e02fb67cd 100644
--- a/code/game/machinery/rechargestation.dm
+++ b/code/game/machinery/rechargestation.dm
@@ -241,8 +241,15 @@
 	
 	else if(istype(user, /mob/living/carbon/human))
 		var/mob/living/carbon/human/H = user
-		if(!isnull(H.internal_organs_by_name["cell"]))
-			can_accept_user = 1
+		
+		if(H.stat == DEAD)
+			return		
+		if(occupant)
+			R << "<span class='warning'>The cell is already occupied!</span>"
+			return			
+		if(isnull(H.internal_organs_by_name["cell"]))
+			return
+		can_accept_user = 1
 
 	if(!can_accept_user)
 		user << "<span class='notice'>Only non-organics may enter the recharger!</span>"