changes

code/datums/status_effects/status_effect.dm

@@ -11,8 +11,6 @@
 	var/on_remove_on_mob_delete = FALSE //if we call on_remove() when the mob is deleted
 	var/examine_text //If defined, this text will appear when the mob is examined - to use he, she etc. use "SUBJECTPRONOUN" and replace it in the examines themselves
 	var/alert_type = /obj/screen/alert/status_effect //the alert thrown by the status effect, contains name and description
-	/// If this is TRUE, the user will have combt mode forcefully disabled while this is active.
-	var/blocks_combatmode = FALSE
 	/// If this is TRUE, the user will have sprint forcefully disabled while this is active.
 	var/blocks_sprint = FALSE
 	var/obj/screen/alert/status_effect/linked_alert = null //the alert itself, if it exists
@@ -61,8 +59,6 @@
 
 /datum/status_effect/proc/on_apply() //Called whenever the buff is applied; returning FALSE will cause it to autoremove itself.
 	SHOULD_CALL_PARENT(TRUE)
-	if(blocks_combatmode)
-		ADD_TRAIT(owner, TRAIT_COMBAT_MODE_LOCKED, src)
 	if(blocks_sprint)
 		ADD_TRAIT(owner, TRAIT_SPRINT_LOCKED, src)
 	return TRUE
@@ -74,8 +70,6 @@
 
 /datum/status_effect/proc/on_remove() //Called whenever the buff expires or is removed; do note that at the point this is called, it is out of the owner's status_effects but owner is not yet null
 	SHOULD_CALL_PARENT(TRUE)
-	if(blocks_combatmode)
-		REMOVE_TRAIT(owner, TRAIT_COMBAT_MODE_LOCKED, src)
 	if(blocks_sprint)
 		REMOVE_TRAIT(owner, TRAIT_SPRINT_LOCKED, src)
 	return TRUE
@@ -83,8 +77,6 @@
 /datum/status_effect/proc/be_replaced() //Called instead of on_remove when a status effect is replaced by itself or when a status effect with on_remove_on_mob_delete = FALSE has its mob deleted
 	owner.clear_alert(id)
 	LAZYREMOVE(owner.status_effects, src)
-	if(blocks_combatmode)
-		REMOVE_TRAIT(owner, TRAIT_COMBAT_MODE_LOCKED, src)
 	if(blocks_sprint)
 		REMOVE_TRAIT(owner, TRAIT_SPRINT_LOCKED, src)
 	owner = null