Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs

# Conflicts:
#	code/controllers/subsystem/mapping.dm
#	paradise.dme

code/modules/reagents/chemistry/holder.dm

@@ -16,7 +16,7 @@ var/const/INGEST = 2
 /datum/reagents/New(maximum = 100)
 	maximum_volume = maximum
 	if(!(flags & REAGENT_NOREACT))
-		processing_objects |= src
+		START_PROCESSING(SSobj, src)
 	//I dislike having these here but map-objects are initialised before world/New() is called. >_>
 	if(!GLOB.chemical_reagents_list)
 		//Chemical Reagents - Initialises all /datum/reagent into a list indexed by reagent id
@@ -333,9 +333,9 @@ var/const/INGEST = 2
 			od_chems.Add(R.id)
 	return od_chems
 
-/datum/reagents/proc/process()
+/datum/reagents/process()
 	if(flags & REAGENT_NOREACT)
-		processing_objects -= src
+		STOP_PROCESSING(SSobj, src)
 		return
 
 	for(var/datum/reagent/R in reagent_list)
@@ -346,9 +346,9 @@ var/const/INGEST = 2
 		// Order is important, process() can remove from processing if
 		// the flag is present
 		flags &= ~(REAGENT_NOREACT)
-		processing_objects |= src
+		START_PROCESSING(SSobj, src)
 	else
-		processing_objects -= src
+		STOP_PROCESSING(SSobj, src)
 		flags |= REAGENT_NOREACT
 
 /*
@@ -819,7 +819,7 @@ var/const/INGEST = 2
 
 /datum/reagents/Destroy()
 	. = ..()
-	processing_objects -= src
+	STOP_PROCESSING(SSobj, src)
 	QDEL_LIST(reagent_list)
 	reagent_list = null
 	QDEL_LIST(addiction_list)

code/modules/reagents/chemistry/reagents/drinks.dm

@@ -8,7 +8,7 @@
 	drink_desc = "Vitamins! Yay!"
 	taste_message = "orange juice"
 
-/datum/reagent/consumable/drink/orangejuicde/on_mob_life(mob/living/M)
+/datum/reagent/consumable/drink/orangejuice/on_mob_life(mob/living/M)
 	var/update_flags = STATUS_UPDATE_NONE
 	if(prob(30))
 		update_flags |= M.adjustOxyLoss(-1*REAGENTS_EFFECT_MULTIPLIER, FALSE)
@@ -89,7 +89,7 @@
 	drink_desc = "A healthy mixture of juices, guaranteed to keep you healthy until the next toolboxing takes place."
 	taste_message = "healthy dietary choices"
 
-/datum/reagent/consumable/drink/doctors_delight/on_mob_life(mob/living/M)
+/datum/reagent/consumable/drink/doctor_delight/on_mob_life(mob/living/M)
 	var/update_flags = STATUS_UPDATE_NONE
 	if(prob(20))
 		update_flags |= M.adjustToxLoss(-1, FALSE)

code/modules/reagents/reagent_containers/borghydro.dm

@@ -38,10 +38,10 @@
 	for(var/R in reagent_ids)
 		add_reagent(R)
 
-	processing_objects.Add(src)
+	START_PROCESSING(SSobj, src)
 
 /obj/item/reagent_containers/borghypo/Destroy()
-	processing_objects.Remove(src)
+	STOP_PROCESSING(SSobj, src)
 	return ..()
 
 /obj/item/reagent_containers/borghypo/process() //Every [recharge_time] seconds, recharge some reagents for the cyborg

code/modules/reagents/reagent_containers/iv_bag.dm

@@ -42,11 +42,11 @@
 
 /obj/item/reagent_containers/iv_bag/proc/begin_processing(mob/target)
 	injection_target = target
-	processing_objects.Add(src)
+	START_PROCESSING(SSobj, src)
 
 /obj/item/reagent_containers/iv_bag/proc/end_processing()
 	injection_target = null
-	processing_objects.Remove(src)
+	STOP_PROCESSING(SSobj, src)
 
 /obj/item/reagent_containers/iv_bag/process()
 	if(!injection_target)