this is better

DaedalusDock · Sep 23, 2024 · 7c6a934 · 7c6a934
1 parent dc19494
commit 7c6a934
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/code/datums/ai/_ai_controller.dm b/code/datums/ai/_ai_controller.dm
@@ -124,14 +124,15 @@ multiple modular subtrees with behaviors
 		set_ai_status(AI_STATUS_ON)
 
 	RegisterSignal(pawn, COMSIG_MOB_LOGIN, PROC_REF(on_sentience_gained))
+	RegisterSignal(pawn, COMSIG_MOB_STATCHANGE, PROC_REF(on_stat_change))
 
 ///Abstract proc for initializing the pawn to the new controller
 /datum/ai_controller/proc/TryPossessPawn(atom/new_pawn)
 	return
 
 ///Proc for deinitializing the pawn to the old controller
 /datum/ai_controller/proc/UnpossessPawn(destroy)
-	UnregisterSignal(pawn, list(COMSIG_MOB_LOGIN, COMSIG_MOB_LOGOUT))
+	UnregisterSignal(pawn, list(COMSIG_MOB_LOGIN, COMSIG_MOB_LOGOUT, COMSIG_MOB_STATCHANGE))
 	if(ai_movement.moving_controllers[src])
 		ai_movement.stop_moving_towards(src)
 	pawn.ai_controller = null
@@ -364,6 +365,17 @@ multiple modular subtrees with behaviors
 	set_ai_status(AI_STATUS_ON) //Can't do anything while player is connected
 	RegisterSignal(pawn, COMSIG_MOB_LOGIN, PROC_REF(on_sentience_gained))
 
+/datum/ai_controller/proc/on_stat_change(datum/source, new_stat, old_stat)
+	SIGNAL_HANDLER
+
+	switch(new_stat)
+		if(CONSCIOUS)
+			REMOVE_TRAIT(pawn, TRAIT_AI_PAUSED, STAT_TRAIT)
+			REMOVE_TRAIT(pawn, TRAIT_AI_DISABLE_PLANNING, STAT_TRAIT)
+		else
+			ADD_TRAIT(pawn, TRAIT_AI_PAUSED, STAT_TRAIT)
+			ADD_TRAIT(pawn, TRAIT_AI_DISABLE_PLANNING, STAT_TRAIT)
+
 /// Use this proc to define how your controller defines what access the pawn has for the sake of pathfinding, likely pointing to whatever ID slot is relevant
 /datum/ai_controller/proc/get_access()
 	if(!isliving(pawn))

diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
@@ -1770,8 +1770,6 @@ GLOBAL_LIST_EMPTY(fire_appearances)
 				ADD_TRAIT(src, TRAIT_HANDS_BLOCKED, STAT_TRAIT)
 				ADD_TRAIT(src, TRAIT_INCAPACITATED, STAT_TRAIT)
 				ADD_TRAIT(src, TRAIT_FLOORED, STAT_TRAIT)
-				ADD_TRAIT(src, TRAIT_AI_PAUSED, STAT_TRAIT)
-				ADD_TRAIT(src, TRAIT_AI_DISABLE_PLANNING, STAT_TRAIT)
 
 		if(UNCONSCIOUS)
 			cure_blind(UNCONSCIOUS_TRAIT)
@@ -1790,8 +1788,6 @@ GLOBAL_LIST_EMPTY(fire_appearances)
 			REMOVE_TRAIT(src, TRAIT_INCAPACITATED, STAT_TRAIT)
 			REMOVE_TRAIT(src, TRAIT_FLOORED, STAT_TRAIT)
 			REMOVE_TRAIT(src, TRAIT_NO_SPRINT, STAT_TRAIT)
-			REMOVE_TRAIT(src, TRAIT_AI_PAUSED, STAT_TRAIT)
-			REMOVE_TRAIT(src, TRAIT_AI_DISABLE_PLANNING, STAT_TRAIT)
 		if(UNCONSCIOUS)
 			become_blind(UNCONSCIOUS_TRAIT)
 			ADD_TRAIT(src, TRAIT_DEAF, STAT_TRAIT)