From 62155433c216fd3d9eb6ec2649ae8cfaa943a171 Mon Sep 17 00:00:00 2001
From: PsiOmegaDelta <git@psiomega.se>
Date: Thu, 13 Aug 2015 10:15:48 +0200
Subject: [PATCH] Merge corrections.

Fixes the todo:s I claimed I'd fix at merge.
---
 code/modules/mob/living/carbon/human/human.dm     | 3 +--
 code/modules/mob/living/carbon/human/stripping.dm | 3 +--
 code/modules/mob/living/living_defense.dm         | 4 ----
 code/modules/mob/mob.dm                           | 2 +-
 4 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index dc34cfec3c..59a8f2c812 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -207,8 +207,7 @@
 
 
 /mob/living/carbon/human/show_inv(mob/user as mob)
-	// TODO :  Change to incapacitated() on merge.
-	if(user.stat || user.lying || user.resting || user.buckled)
+	if(user.incapacitated())
 		return
 
 	var/obj/item/clothing/under/suit = null
diff --git a/code/modules/mob/living/carbon/human/stripping.dm b/code/modules/mob/living/carbon/human/stripping.dm
index aa08a0efd5..72b7ae0aba 100644
--- a/code/modules/mob/living/carbon/human/stripping.dm
+++ b/code/modules/mob/living/carbon/human/stripping.dm
@@ -3,8 +3,7 @@
 	if(!slot_to_strip || !istype(user))
 		return
 
-	// TODO :  Change to incapacitated() on merge.
-	if(user.stat || user.lying || user.resting || user.buckled)
+	if(user.incapacitated())
 		user << browse(null, text("window=mob[src.name]"))
 		return
 
diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index 2a64304401..009d7d191c 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -378,7 +378,3 @@
 	src.attack_log += "\[[time_stamp()]\]<font color='orange'> Got knifed by [user.name] ([user.ckey]) with [W.name] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(W.damtype)])</font>"
 	msg_admin_attack("[key_name(user)] knifed [key_name(src)] with [W.name] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(W.damtype)])" )
 	return
-
-/mob/living/incapacitated()
-	if(stat || paralysis || stunned || weakened || restrained())
-		return 1
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 9f24c4e1a1..9aec67001e 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -153,7 +153,7 @@
 	return
 
 /mob/proc/incapacitated()
-	return
+	return (stat || paralysis || stunned || weakened || restrained())
 
 /mob/proc/restrained()
 	return