Merge remote-tracking branch 'citadel/master' into mobility_flags

code/modules/research/nanites/nanite_programs/buffing.dm

@@ -34,7 +34,7 @@
 	host_mob.adjustStaminaLoss(-10) //stimulants give stamina heal now
 	host_mob.set_resting(FALSE, TRUE, FALSE)
 	host_mob.update_mobility()
-	host_mob.reagents.add_reagent("stimulants", 1.5)
+	host_mob.reagents.add_reagent(/datum/reagent/medicine/stimulants, 1.5)
 
 /datum/nanite_program/hardening
 	name = "Dermal Hardening"

code/modules/research/nanites/nanite_programs/healing.dm

@@ -61,10 +61,10 @@
 /datum/nanite_program/purging/active_effect()
 	host_mob.adjustToxLoss(-1)
 	for(var/datum/reagent/R in host_mob.reagents.reagent_list)
-		if(R.id == "nanite_b_gone")
+		if(R.type == /datum/reagent/fermi/nanite_b_gone)
 			host_mob.adjustToxLoss(4)
 			continue
-		host_mob.reagents.remove_reagent(R.id,1)
+		host_mob.reagents.remove_reagent(R.type,1)
 
 /datum/nanite_program/brain_heal
 	name = "Neural Regeneration"
@@ -164,7 +164,7 @@
 /datum/nanite_program/purging_advanced/active_effect()
 	host_mob.adjustToxLoss(-1, forced = TRUE)
 	for(var/datum/reagent/toxin/R in host_mob.reagents.reagent_list)
-		host_mob.reagents.remove_reagent(R.id,1)
+		host_mob.reagents.remove_reagent(R.type,1)
 
 /datum/nanite_program/regenerative_advanced
 	name = "Bio-Reconstruction"