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

# Conflicts:
#	paradise.dme

code/game/objects/items/weapons/caution.dm

@@ -26,7 +26,7 @@
 			return
 		timing = !timing
 		if(timing)
-			processing_objects.Add(src)
+			START_PROCESSING(SSobj, src)
 		else
 			armed = 0
 			timepassed = 0
@@ -34,7 +34,7 @@
 
 /obj/item/caution/proximity_sign/process()
 	if(!timing)
-		processing_objects.Remove(src)
+		STOP_PROCESSING(SSobj, src)
 	timepassed++
 	if(timepassed >= 15 && !armed)
 		armed = 1

code/game/objects/items/weapons/chrono_eraser.dm

@@ -177,7 +177,7 @@
 		update_icon()
 
 		desc = initial(desc) + "<br><span class='info'>It appears to contain [target.name].</span>"
-	processing_objects.Add(src)
+	START_PROCESSING(SSobj, src)
 
 /obj/effect/chrono_field/Destroy()
 	if(gun && gun.field_check(src))

code/game/objects/items/weapons/cigs.dm

@@ -48,7 +48,7 @@ LIGHTERS ARE IN LIGHTERS.DM
 
 /obj/item/clothing/mask/cigarette/Destroy()
 	QDEL_NULL(reagents)
-	processing_objects -= src
+	STOP_PROCESSING(SSobj, src)
 	return ..()
 
 /obj/item/clothing/mask/cigarette/attack(mob/living/M, mob/living/user, def_zone)
@@ -161,7 +161,7 @@ LIGHTERS ARE IN LIGHTERS.DM
 			var/turf/T = get_turf(src)
 			T.visible_message(flavor_text)
 		set_light(2, 0.25, "#E38F46")
-		processing_objects.Add(src)
+		START_PROCESSING(SSobj, src)
 
 
 /obj/item/clothing/mask/cigarette/process()
@@ -213,7 +213,7 @@ LIGHTERS ARE IN LIGHTERS.DM
 		var/mob/living/M = loc
 		to_chat(M, "<span class='notice'>Your [name] goes out.</span>")
 		M.unEquip(src, 1)		//Force the un-equip so the overlays update
-	processing_objects.Remove(src)
+	STOP_PROCESSING(SSobj, src)
 	qdel(src)
 
 
@@ -341,7 +341,7 @@ LIGHTERS ARE IN LIGHTERS.DM
 		if(flavor_text)
 			var/turf/T = get_turf(src)
 			T.visible_message(flavor_text)
-		processing_objects.Add(src)
+		START_PROCESSING(SSobj, src)
 
 /obj/item/clothing/mask/cigarette/pipe/process()
 	var/turf/location = get_turf(src)
@@ -355,7 +355,7 @@ LIGHTERS ARE IN LIGHTERS.DM
 			icon_state = icon_off
 			item_state = icon_off
 			M.update_inv_wear_mask(0)
-		processing_objects.Remove(src)
+		STOP_PROCESSING(SSobj, src)
 		return
 	smoke()
 	return
@@ -366,7 +366,7 @@ LIGHTERS ARE IN LIGHTERS.DM
 		lit = 0
 		icon_state = icon_off
 		item_state = icon_off
-		processing_objects.Remove(src)
+		STOP_PROCESSING(SSobj, src)
 		return
 	if(smoketime <= 0)
 		to_chat(user, "<span class='notice'>You refill the pipe with tobacco.</span>")

code/game/objects/items/weapons/flamethrower.dm

@@ -33,7 +33,7 @@
 
 /obj/item/flamethrower/process()
 	if(!lit)
-		processing_objects.Remove(src)
+		STOP_PROCESSING(SSobj, src)
 		return null
 	var/turf/location = loc
 	if(istype(location, /mob/))
@@ -141,7 +141,7 @@
 		if(!status)	return
 		lit = !lit
 		if(lit)
-			processing_objects.Add(src)
+			START_PROCESSING(SSobj, src)
 	if(href_list["remove"])
 		if(!ptank)	return
 		usr.put_in_hands(ptank)

code/game/objects/items/weapons/garrote.dm

@@ -44,7 +44,7 @@
 
 		strangling = null
 		update_icon()
-		processing_objects.Remove(src)
+		STOP_PROCESSING(SSobj, src)
 
 	else
 		..()
@@ -97,7 +97,7 @@
 			M.AdjustSilence(1)
 
 	garrote_time = world.time + 10
-	processing_objects.Add(src)
+	START_PROCESSING(SSobj, src)
 	strangling = M
 	update_icon()
 
@@ -113,14 +113,14 @@
 	if(!strangling)
 		// Our mark got gibbed or similar
 		update_icon()
-		processing_objects.Remove(src)
+		STOP_PROCESSING(SSobj, src)
 		return
 
 
 	if(!istype(loc, /mob/living/carbon/human))
 		strangling = null
 		update_icon()
-		processing_objects.Remove(src)
+		STOP_PROCESSING(SSobj, src)
 		return
 
 	var/mob/living/carbon/human/user = loc
@@ -138,7 +138,7 @@
 
 		strangling = null
 		update_icon()
-		processing_objects.Remove(src)
+		STOP_PROCESSING(SSobj, src)
 
 		return
 
@@ -148,7 +148,7 @@
 
 		strangling = null
 		update_icon()
-		processing_objects.Remove(src)
+		STOP_PROCESSING(SSobj, src)
 
 		return
 

code/game/objects/items/weapons/holy_weapons.dm

@@ -402,10 +402,10 @@
 
 /obj/item/nullrod/tribal_knife/New()
 	..()
-	processing_objects.Add(src)
+	START_PROCESSING(SSobj, src)
 
 /obj/item/nullrod/tribal_knife/Destroy()
-	processing_objects.Remove(src)
+	STOP_PROCESSING(SSobj, src)
 	return ..()
 
 /obj/item/nullrod/tribal_knife/process()
@@ -432,10 +432,10 @@
 
 /obj/item/nullrod/rosary/New()
 	..()
-	processing_objects.Add(src)
+	START_PROCESSING(SSobj, src)
 
 /obj/item/nullrod/rosary/Destroy()
-	processing_objects.Remove(src)
+	STOP_PROCESSING(SSobj, src)
 	return ..()
 
 /obj/item/nullrod/rosary/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)

code/game/objects/items/weapons/implants/implant.dm

@@ -14,7 +14,7 @@
 	flags = DROPDEL
 
 
-/obj/item/implant/proc/trigger(emote, mob/source)
+/obj/item/implant/proc/trigger(emote, mob/source, force)
 	return
 
 /obj/item/implant/proc/activate()

code/game/objects/items/weapons/implants/implant_abductor.dm

@@ -13,7 +13,7 @@
 	if(cooldown == total_cooldown)
 		home.Retrieve(imp_in,1)
 		cooldown = 0
-		processing_objects.Add(src)
+		START_PROCESSING(SSobj, src)
 	else
 		to_chat(imp_in, "<span class='warning'>You must wait [(total_cooldown - cooldown)*2] seconds to use [src] again!</span>")
 
@@ -21,7 +21,7 @@
 	if(cooldown < total_cooldown)
 		cooldown++
 		if(cooldown == total_cooldown)
-			processing_objects.Remove(src)
+			STOP_PROCESSING(SSobj, src)
 
 /obj/item/implant/abductor/implant(mob/source, mob/user)
 	if(..())

code/game/objects/items/weapons/implants/implant_chem.dm

@@ -33,8 +33,8 @@
 
 
 
-/obj/item/implant/chem/trigger(emote, mob/source)
-	if(emote == "deathgasp")
+/obj/item/implant/chem/trigger(emote, mob/source, force)
+	if(force && emote == "deathgasp")
 		activate(reagents.total_volume)
 
 /obj/item/implant/chem/activate(cause)

code/game/objects/items/weapons/implants/implant_death_alarm.dm

@@ -18,7 +18,7 @@
 	return dat
 
 /obj/item/implant/death_alarm/Destroy()
-	processing_objects.Remove(src)
+	STOP_PROCESSING(SSobj, src)
 	return ..()
 
 /obj/item/implant/death_alarm/process()
@@ -61,12 +61,12 @@
 /obj/item/implant/death_alarm/implant(mob/target)
 	if(..())
 		mobname = target.real_name
-		processing_objects.Add(src)
+		START_PROCESSING(SSobj, src)
 		return 1
 	return 0
 
 /obj/item/implant/death_alarm/removed(mob/target)
 	if(..())
-		processing_objects.Remove(src)
+		STOP_PROCESSING(SSobj, src)
 		return 1
 	return 0

code/game/objects/items/weapons/implants/implant_explosive.dm

@@ -20,8 +20,8 @@
 				"}
 	return dat
 
-/obj/item/implant/explosive/trigger(emote, mob/source)
-	if(emote == "deathgasp")
+/obj/item/implant/explosive/trigger(emote, mob/source, force)
+	if(force && emote == "deathgasp")
 		activate("death")
 
 /obj/item/implant/explosive/activate(cause)
@@ -148,8 +148,8 @@
 				"}
 	return dat
 
-/obj/item/implant/dust/trigger(emote, mob/source)
-	if(emote == "deathgasp")
+/obj/item/implant/dust/trigger(emote, mob/source, force)
+	if(force && emote == "deathgasp")
 		activate("death")
 
 /obj/item/implant/dust/activate(cause)

code/game/objects/items/weapons/lighters.dm

@@ -58,7 +58,7 @@
 					user.visible_message("<span class='notice'>After a few attempts, [user] manages to light the [src], [user.p_they()] however burn[user.p_s()] [user.p_their()] finger in the process.</span>")
 
 			set_light(2)
-			processing_objects.Add(src)
+			START_PROCESSING(SSobj, src)
 		else
 			lit = 0
 			w_class = WEIGHT_CLASS_TINY
@@ -74,7 +74,7 @@
 				user.visible_message("<span class='notice'>[user] quietly shuts off the [src].")
 
 			set_light(0)
-			processing_objects.Remove(src)
+			STOP_PROCESSING(SSobj, src)
 	else
 		return ..()
 	return
@@ -181,7 +181,7 @@
 		name = "lit match"
 		desc = "A match. This one is lit."
 		attack_verb = list("burnt","singed")
-		processing_objects.Add(src)
+		START_PROCESSING(SSobj, src)
 		update_icon()
 		return TRUE
 
@@ -196,7 +196,7 @@
 		name = "burnt match"
 		desc = "A match. This one has seen better days."
 		attack_verb = list("flicked")
-		processing_objects.Remove(src)
+		STOP_PROCESSING(SSobj, src)
 		return TRUE
 
 /obj/item/match/dropped(mob/user)

code/game/objects/items/weapons/mop.dm

@@ -89,14 +89,14 @@
 
 /obj/item/mop/advanced/New()
 	..()
-	processing_objects.Add(src)
+	START_PROCESSING(SSobj, src)
 
 /obj/item/mop/advanced/attack_self(mob/user)
 	refill_enabled = !refill_enabled
 	if(refill_enabled)
-		processing_objects.Add(src)
+		START_PROCESSING(SSobj, src)
 	else
-		processing_objects.Remove(src)
+		STOP_PROCESSING(SSobj, src)
 	to_chat(user, "<span class='notice'>You set the condenser switch to the '[refill_enabled ? "ON" : "OFF"]' position.</span>")
 	playsound(user, 'sound/machines/click.ogg', 30, 1)
 
@@ -111,7 +111,7 @@
 
 /obj/item/mop/advanced/Destroy()
 	if(refill_enabled)
-		processing_objects.Remove(src)
+		STOP_PROCESSING(SSobj, src)
 	return ..()
 
 

code/game/objects/items/weapons/storage/bags.dm

@@ -107,7 +107,7 @@
 /obj/item/storage/bag/plasticbag/equipped(var/mob/user, var/slot)
 	if(slot==slot_head)
 		storage_slots = 0
-		processing_objects.Add(src)
+		START_PROCESSING(SSobj, src)
 	return
 
 /obj/item/storage/bag/plasticbag/process()
@@ -120,7 +120,7 @@
 				H.AdjustLoseBreath(1)
 	else
 		storage_slots = 7
-		processing_objects.Remove(src)
+		STOP_PROCESSING(SSobj, src)
 	return
 
 // -----------------------------

code/game/objects/items/weapons/storage/belt.dm

@@ -642,9 +642,13 @@
 	new /obj/item/grenade/smokebomb(src)
 	new /obj/item/restraints/legcuffs/bola(src)
 	new /obj/item/restraints/legcuffs/bola(src)
-	processing_objects.Add(src)
+	START_PROCESSING(SSobj, src)
 	cooldown = world.time
 
+/obj/item/storage/belt/bluespace/owlman/Destroy()
+	STOP_PROCESSING(SSobj, src)
+	return ..()
+
 /obj/item/storage/belt/bluespace/owlman/process()
 	if(cooldown < world.time - 600)
 		smokecount = 0

code/game/objects/items/weapons/tanks/tanks.dm

@@ -27,13 +27,13 @@
 	air_contents.volume = volume //liters
 	air_contents.temperature = T20C
 
-	processing_objects.Add(src)
+	START_PROCESSING(SSobj, src)
 	return
 
 /obj/item/tank/Destroy()
 	QDEL_NULL(air_contents)
 
-	processing_objects.Remove(src)
+	STOP_PROCESSING(SSobj, src)
 
 	return ..()
 

code/game/objects/items/weapons/tools.dm

@@ -377,7 +377,7 @@
 			damtype = "brute"
 			update_icon()
 			if(!can_off_process)
-				processing_objects.Remove(src)
+				STOP_PROCESSING(SSobj, src)
 			return
 	//Welders left on now use up fuel, but lets not have them run out quite that fast
 		if(1)
@@ -539,7 +539,7 @@
 			damtype = "fire"
 			hitsound = 'sound/items/welder.ogg'
 			update_icon()
-			processing_objects.Add(src)
+			START_PROCESSING(SSobj, src)
 		else
 			to_chat(user, "<span class='warning'>You need more fuel!</span>")
 			switched_off(user)

code/game/objects/items/weapons/twohanded.dm

@@ -557,10 +557,10 @@
 
 /obj/item/twohanded/singularityhammer/New()
 	..()
-	processing_objects.Add(src)
+	START_PROCESSING(SSobj, src)
 
 /obj/item/twohanded/singularityhammer/Destroy()
-	processing_objects.Remove(src)
+	STOP_PROCESSING(SSobj, src)
 	return ..()
 
 /obj/item/twohanded/singularityhammer/process()
@@ -664,10 +664,10 @@
 
 /obj/item/twohanded/knighthammer/New()
 	..()
-	processing_objects.Add(src)
+	START_PROCESSING(SSobj, src)
 
 /obj/item/twohanded/knighthammer/Destroy()
-	processing_objects.Remove(src)
+	STOP_PROCESSING(SSobj, src)
 	return ..()
 
 /obj/item/twohanded/knighthammer/process()