Merge pull request #9589 from Ghommie/Ghommie-cit259

Porting GetComponent macros removal, and few other updates.

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

@@ -142,7 +142,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/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]