Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods

2019-10-21 19:13:19 -05:00
parent c7e1449a3c b77a94bd7d
commit 6fc750dca0
59 changed files with 565 additions and 161 deletions
@@ -18,9 +18,13 @@
 					return FALSE
 	return .

-/mob/living/carbon/proc/toggle_combat_mode()
+/mob/living/carbon/proc/toggle_combat_mode(forced)
 	if(recoveringstam)
 		return TRUE
+	if(!forced)
+		for(var/datum/status_effect/S in status_effects)
+			if(S.blocks_combatmode)
+				return TRUE
 	combatmode = !combatmode
 	if(voremode)
 		toggle_vore_mode()