diff --git a/baystation12.dme b/baystation12.dme
index bff4edbeca..397b7cde37 100644
--- a/baystation12.dme
+++ b/baystation12.dme
@@ -94,6 +94,7 @@
 #define FILE_DIR "code/modules/clothing/uniforms"
 #define FILE_DIR "code/modules/critters"
 #define FILE_DIR "code/modules/critters/hivebots"
+#define FILE_DIR "code/modules/DetectiveWork"
 #define FILE_DIR "code/modules/flufftext"
 #define FILE_DIR "code/modules/food"
 #define FILE_DIR "code/modules/mining"
@@ -802,6 +803,8 @@
 #include "code\modules\critters\critter_defenses.dm"
 #include "code\modules\critters\critters.dm"
 #include "code\modules\critters\hivebots\hivebot.dm"
+#include "code\modules\DetectiveWork\detective_work.dm"
+#include "code\modules\DetectiveWork\evidence.dm"
 #include "code\modules\flufftext\Dreaming.dm"
 #include "code\modules\flufftext\Hallucination.dm"
 #include "code\modules\flufftext\TextFilters.dm"
@@ -1022,7 +1025,6 @@
 #include "code\modules\security levels\security levels.dm"
 #include "code\WorkInProgress\AI_Visibility.dm"
 #include "code\WorkInProgress\buildmode.dm"
-#include "code\WorkInProgress\detective_work.dm"
 #include "code\WorkInProgress\explosion_particles.dm"
 #include "code\WorkInProgress\Cael_Aislinn\Tajara\examine.dm"
 #include "code\WorkInProgress\Cael_Aislinn\Tajara\tajaran.dm"
@@ -1041,7 +1043,6 @@
 #include "code\WorkInProgress\Ported\ZeroPoint\LaserComputer.dm"
 #include "code\WorkInProgress\Ported\ZeroPoint\SuperMatter.dm"
 #include "code\WorkInProgress\SkyMarshal\coatrack.dm"
-#include "code\WorkInProgress\SkyMarshal\evidence.dm"
 #include "code\WorkInProgress\SkyMarshal\traitoritems.dm"
 #include "code\WorkInProgress\SkyMarshal\wardrobes.dm"
 #include "code\WorkInProgress\Tastyfish\Eliza.dm"
diff --git a/code/defines/obj/machinery.dm b/code/defines/obj/machinery.dm
index 5365249ca4..bb45e2ab07 100644
--- a/code/defines/obj/machinery.dm
+++ b/code/defines/obj/machinery.dm
@@ -454,13 +454,3 @@
 		h_r = 245.0
 		h_g = 245.0
 		h_b = 245.0
-
-/obj/machinery/coatrack
-	name = "coat rack"
-	desc = "A fancy stand for the Detective's coat and hat."
-	icon_state = "coatrack0"
-	icon = 'coatrack.dmi'
-	density = 1
-	anchored = 1.0
-	var/obj/item/clothing/suit/storage/det_suit/coat
-	var/obj/item/clothing/head/det_hat/hat
diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index fe5606c369..c618fc3a5e 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -1556,8 +1556,11 @@ About the new airlock wires panel:
 		name = "CentCom Secure Airlock"
 		desc = "I hope you have insulated gloves...."
 		icon = 'Doorhatchele.dmi'
+		var/list/mob/morons
 
 		pulse(var/wireColor)
+			if(prob(25))
+				usr.ex_act(rand(1,3))
 			if (src.secondsElectrified==0)
 				src.secondsElectrified = 10
 				spawn(10)
@@ -1637,6 +1640,8 @@ About the new airlock wires panel:
 								robotPlayer.triggerUnmarkedAlarm("AirlockHacking", src.loc.loc)
 
 		cut(var/wireColor)
+			if(prob(25))
+				usr.ex_act(rand(1,3))
 			if (src.secondsElectrified==0)
 				src.secondsElectrified = 30
 				spawn(10)
@@ -1693,4 +1698,14 @@ About the new airlock wires panel:
 								aiPlayer.triggerUnmarkedAlarm("AirlockHacking", src.loc.loc)
 						for (var/mob/living/silicon/robot/robotPlayer in world)
 							if (robotPlayer.stat != 2)
-								robotPlayer.triggerUnmarkedAlarm("AirlockHacking", src.loc.loc)
\ No newline at end of file
+								robotPlayer.triggerUnmarkedAlarm("AirlockHacking", src.loc.loc)
+
+		attack_ai(mob/user as mob, obj/item/device/hacktool/C)
+			if(!(user in morons))
+				user << "\red Do that again, and you will die horribly."
+				if(prob(50))
+					morons.Add(user)
+			else
+				user << "\red You were warned..."
+				world << "\red [user.name] has been found attempting to hack a CentCom Secure Door via AI/Hacktool.  Better luck next time."
+				user.ex_act(1)
\ No newline at end of file
diff --git a/code/WorkInProgress/detective_work.dm b/code/modules/DetectiveWork/detective_work.dm
similarity index 100%
rename from code/WorkInProgress/detective_work.dm
rename to code/modules/DetectiveWork/detective_work.dm
diff --git a/code/WorkInProgress/SkyMarshal/evidence.dm b/code/modules/DetectiveWork/evidence.dm
similarity index 100%
rename from code/WorkInProgress/SkyMarshal/evidence.dm
rename to code/modules/DetectiveWork/evidence.dm
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index cd3f96c2d0..f3bb6616cf 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -189,16 +189,15 @@
 
 
 			if (mutations & mRegen)
-				src.bruteloss -= 2
-				src.fireloss -= 2
-				src.oxyloss -= 2
-				src.toxloss -= 2
+				adjustBruteLoss(-2)
+				adjustToxLoss(-2)
+				adjustOxyLoss(-2)
+				adjustFireLoss(-2)
 
 				for(var/datum/organ/external/org in organs)
-					org.brute_dam -= 2
-					org.burn_dam -= 2
-					org.brute_dam = max(org.brute_dam, 0)
-					org.burn_dam = max(org.burn_dam, 0)
+					org.brute_dam = max(org.brute_dam - 2, 0)
+					org.burn_dam = max(org.burn_dam - 2, 0)
+				updatehealth()
 
 			if(!(/mob/living/carbon/human/proc/morph in src.verbs))
 				if(mutations & mMorph)
diff --git a/code/modules/mob/living/silicon/pai/software.dm b/code/modules/mob/living/silicon/pai/software.dm
index 15ef10914c..f5d9676013 100644
--- a/code/modules/mob/living/silicon/pai/software.dm
+++ b/code/modules/mob/living/silicon/pai/software.dm
@@ -550,7 +550,7 @@
 
 	var/obj/machinery/machine = src.cable.machine
 	dat += "<font color=#55FF55>Connected</font> <br>"
-	if(!istype(machine, /obj/machinery/door))
+	if(!istype(machine, /obj/machinery/door) || istype(machine, /obj/machinery/door/airlock/secure/centcom))
 		dat += "Connected device's firmware does not appear to be compatible with Airlock Jack protocols.<br>"
 		return dat
 //	var/obj/machinery/airlock/door = machine