Merge branch 'master' into assu

...and its still coming together...

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

@@ -6,30 +6,28 @@
 	icon_state = "s-ninja"
 	item_state = "s-ninja"
 
-/obj/item/clothing/glasses/phantomthief/Initialize()
+/obj/item/clothing/glasses/phantomthief/ComponentInitialize()
 	. = ..()
-	AddComponent(/datum/component/phantomthief)
+	AddComponent(/datum/component/wearertargeting/phantomthief)
 
 /obj/item/clothing/glasses/phantomthief/syndicate
 	name = "suspicious plastic mask"
 	desc = "A cheap, bulky, Syndicate-branded plastic face mask. You have to break in to break out."
 	var/nextadrenalinepop
-	var/datum/component/redirect/combattoggle_redir
 
-/obj/item/clothing/glasses/phantomthief/syndicate/examine(user)
+/obj/item/clothing/glasses/phantomthief/syndicate/examine(mob/user)
 	. = ..()
-	if(combattoggle_redir)
+	if(user.get_item_by_slot(SLOT_GLASSES) == src)
 		if(world.time >= nextadrenalinepop)
 			to_chat(user, "<span class='notice'>The built-in adrenaline injector is ready for use.</span>")
 		else
 			to_chat(user, "<span class='notice'>[DisplayTimeText(nextadrenalinepop - world.time)] left before the adrenaline injector can be used again.")
 
 /obj/item/clothing/glasses/phantomthief/syndicate/proc/injectadrenaline(mob/user, combatmodestate)
-	if(istype(user))
-		if(combatmodestate && world.time >= nextadrenalinepop)
-			nextadrenalinepop = world.time + 5 MINUTES
-			user.reagents.add_reagent("syndicateadrenals", 5)
-			user.playsound_local(user, 'modular_citadel/sound/misc/adrenalinject.ogg', 100, 0, pressure_affected = FALSE)
+	if(istype(user) && combatmodestate && world.time >= nextadrenalinepop)
+		nextadrenalinepop = world.time + 5 MINUTES
+		user.reagents.add_reagent("syndicateadrenals", 5)
+		user.playsound_local(user, 'modular_citadel/sound/misc/adrenalinject.ogg', 100, 0, pressure_affected = FALSE)
 
 /obj/item/clothing/glasses/phantomthief/syndicate/equipped(mob/user, slot)
 	. = ..()
@@ -37,12 +35,10 @@
 		return
 	if(slot != SLOT_GLASSES)
 		return
-	if(!combattoggle_redir)
-		combattoggle_redir = user.AddComponent(/datum/component/redirect, list(COMSIG_COMBAT_TOGGLED = CALLBACK(src, .proc/injectadrenaline)))
+	RegisterSignal(user, COMSIG_COMBAT_TOGGLED, .proc/injectadrenaline)
 
 /obj/item/clothing/glasses/phantomthief/syndicate/dropped(mob/user)
 	. = ..()
 	if(!istype(user))
 		return
-	if(combattoggle_redir)
-		QDEL_NULL(combattoggle_redir)
+	UnregisterSignal(user, COMSIG_COMBAT_TOGGLED)

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

@@ -143,7 +143,7 @@ SLEEPER CODE IS IN game/objects/items/devices/dogborg_sleeper.dm !
 
 /obj/item/storage/bag/borgdelivery/ComponentInitialize()
 	. = ..()
-	GET_COMPONENT(STR, /datum/component/storage)
+	var/datum/component/storage/STR = GetComponent(/datum/component/storage)
 	STR.max_w_class = WEIGHT_CLASS_BULKY
 	STR.max_combined_w_class = 5
 	STR.max_items = 1

modular_citadel/code/modules/mob/mob.dm

@@ -3,9 +3,11 @@
 
 /mob/say_mod(input, message_mode)
 	var/customsayverb = findtext(input, "*")
-	if(customsayverb)
+	if(customsayverb && message_mode != MODE_WHISPER_CRIT)
+		message_mode = MODE_CUSTOM_SAY
 		return lowertext(copytext(input, 1, customsayverb))
-	. = ..()
+	else
+		return ..()
 
 /atom/movable/proc/attach_spans(input, list/spans)
 	var/customsayverb = findtext(input, "*")

modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm

@@ -182,7 +182,7 @@
 
 /datum/reagent/fermi/nanite_b_gone/on_mob_life(mob/living/carbon/C)
 	//var/component/nanites/N = M.GetComponent(/datum/component/nanites)
-	GET_COMPONENT_FROM(N, /datum/component/nanites, C)
+	var/datum/component/nanites/N = C.GetComponent(/datum/component/nanites)
 	if(isnull(N))
 		return ..()
 	N.nanite_volume = -purity//0.5 seems to be the default to me, so it'll neuter them.
@@ -190,7 +190,7 @@
 
 /datum/reagent/fermi/nanite_b_gone/overdose_process(mob/living/carbon/C)
 	//var/component/nanites/N = M.GetComponent(/datum/component/nanites)
-	GET_COMPONENT_FROM(N, /datum/component/nanites, C)
+	var/datum/component/nanites/N = C.GetComponent(/datum/component/nanites)
 	if(prob(5))
 		to_chat(C, "<span class='warning'>The residual voltage from the nanites causes you to seize up!</b></span>")
 		C.electrocute_act(10, (get_turf(C)), 1, FALSE, FALSE, FALSE, TRUE)

modular_citadel/code/modules/vehicles/secway.dm

@@ -24,7 +24,7 @@
 		if(H.sprinting && charge)
 			charge--
 			new_speed = chargespeed
-	GET_COMPONENT(D, /datum/component/riding)
+	var/datum/component/riding/D = GetComponent(/datum/component/riding)
 	D.vehicle_move_delay = new_speed
 	for(var/i in progressbars_by_rider)
 		var/datum/progressbar/B = progressbars_by_rider[i]