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

modular_citadel/code/modules/clothing/glasses/phantomthief.dm

@@ -35,6 +35,8 @@
 	. = ..()
 	if(!istype(user))
 		return
+	if(slot != SLOT_GLASSES)
+		return
 	if(!combattoggle_redir)
 		combattoggle_redir = user.AddComponent(/datum/component/redirect, list(COMSIG_COMBAT_TOGGLED = CALLBACK(src, .proc/injectadrenaline)))
 

modular_citadel/code/modules/mob/living/carbon/carbon.dm

@@ -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()

modular_citadel/code/modules/mob/living/living.dm

@@ -116,7 +116,7 @@
 			to_chat(src, "<span class='notice'>You're too exhausted to keep going...</span>")
 			resting = TRUE
 			if(combatmode)
-				toggle_combat_mode()
+				toggle_combat_mode(TRUE)
 			recoveringstam = TRUE
 			filters += CIT_FILTER_STAMINACRIT
 			update_canmove()

modular_citadel/code/modules/mob/living/silicon/robot/robot_modules.dm

@@ -13,7 +13,7 @@
 /mob/living/silicon/robot/proc/get_cit_modules()
 	var/list/modulelist = list()
 	modulelist["MediHound"] = /obj/item/robot_module/medihound
-	if(!CONFIG_GET(flag/disable_secborg))
+	if(BORG_SEC_AVAILABLE)
 		modulelist["Security K-9"] = /obj/item/robot_module/k9
 	modulelist["Scrub Puppy"] = /obj/item/robot_module/scrubpup
 	modulelist["Borgi"] = /obj/item/robot_module/borgi

modular_citadel/code/modules/projectiles/projectile/energy.dm

@@ -1,2 +0,0 @@
-/obj/item/projectile/energy/electrode
-	stamina = 36