Merge pull request #11218 from PsiOmegaDelta/dev

Dev

.travis.yml

@@ -5,7 +5,7 @@ sudo: false
 env:
   BYOND_MAJOR="508"
   BYOND_MINOR="1293"
-  MACRO_COUNT=1154
+  MACRO_COUNT=1151
   
 cache:
   directories:

baystation12.dme

@@ -1442,6 +1442,7 @@
 #include "code\modules\nano\nanoui.dm"
 #include "code\modules\nano\interaction\admin.dm"
 #include "code\modules\nano\interaction\base.dm"
+#include "code\modules\nano\interaction\conscious.dm"
 #include "code\modules\nano\interaction\contained.dm"
 #include "code\modules\nano\interaction\default.dm"
 #include "code\modules\nano\interaction\inventory.dm"

code/modules/mob/living/silicon/subystems.dm

@@ -76,7 +76,7 @@
 	set name = "Law Manager"
 	set category = "Subystems"
 
-	law_manager.ui_interact(usr, state = self_state)
+	law_manager.ui_interact(usr, state = conscious_state)
 
 /********************
 *	Power Monitor	*

code/modules/nano/interaction/conscious.dm

@@ -0,0 +1,7 @@
+/*
+	This state only checks if user is conscious.
+*/
+/var/global/datum/topic_state/conscious_state/conscious_state = new()
+
+/datum/topic_state/conscious_state/can_use_topic(var/src_object, var/mob/user)
+	return user.stat == CONSCIOUS ? STATUS_INTERACTIVE : STATUS_CLOSE