Merge remote-tracking branch 'upstream/master' into botany-rework

code/game/objects/items/devices/debugger.dm

@@ -1,44 +0,0 @@
-/**
- * Multitool -- A multitool is used for hacking electronic devices.
- * TO-DO -- Using it as a power measurement tool for cables etc. Nannek.
- *
- */
-
-/obj/item/device/debugger
-	icon = 'icons/obj/hacktool.dmi'
-	name = "debugger"
-	desc = "Used to debug electronic equipment."
-	icon_state = "hacktool-g"
-	flags = CONDUCT
-	force = 5.0
-	w_class = 2
-	throwforce = 5.0
-	throw_range = 15
-	throw_speed = 3
-	desc = "You can use this on airlocks or APCs to try to hack them without cutting wires."
-	materials = list(MAT_METAL=50, MAT_GLASS=20)
-	origin_tech = "magnets=1;engineering=1"
-	var/obj/machinery/telecomms/buffer // simple machine buffer for device linkage
-
-/obj/item/device/debugger/is_used_on(obj/O, mob/user)
-	if(istype(O, /obj/machinery/power/apc))
-		var/obj/machinery/power/apc/A = O
-		if(A.emagged || A.malfhack)
-			to_chat(user, "\red There is a software error with the device.")
-		else
-			to_chat(user, "\blue The device's software appears to be fine.")
-		return 1
-	if(istype(O, /obj/machinery/door))
-		var/obj/machinery/door/D = O
-		if(D.operating == -1)
-			to_chat(user, "\red There is a software error with the device.")
-		else
-			to_chat(user, "\blue The device's software appears to be fine.")
-		return 1
-	else if(istype(O, /obj/machinery))
-		var/obj/machinery/A = O
-		if(A.emagged)
-			to_chat(user, "\red There is a software error with the device.")
-		else
-			to_chat(user, "\blue The device's software appears to be fine.")
-		return 1

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

@@ -42,11 +42,13 @@ LIGHTERS ARE IN LIGHTERS.DM
 
 /obj/item/clothing/mask/cigarette/New()
 	..()
-	flags |= NOREACT // so it doesn't react until you light it
 	create_reagents(chem_volume) // making the cigarrete a chemical holder with a maximum volume of 30
+	reagents.set_reacting(FALSE) // so it doesn't react until you light it
 
 /obj/item/clothing/mask/cigarette/Destroy()
-	qdel(reagents)
+	if(reagents)
+		qdel(reagents)
+	processing_objects -= src
 	return ..()
 
 /obj/item/clothing/mask/cigarette/attack(var/mob/living/M, var/mob/living/user, def_zone)
@@ -135,7 +137,7 @@ LIGHTERS ARE IN LIGHTERS.DM
 				M.unEquip(src, 1)
 			qdel(src)
 			return
-		flags &= ~NOREACT // allowing reagents to react after being lit
+		reagents.set_reacting(TRUE)
 		reagents.handle_reactions()
 		icon_state = icon_on
 		item_state = icon_on

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

@@ -176,8 +176,8 @@
 
 /obj/item/weapon/storage/fancy/cigarettes/New()
 	..()
-	flags |= NOREACT
 	create_reagents(30 * storage_slots)//so people can inject cigarettes without opening a packet, now with being able to inject the whole one
+	reagents.set_reacting(FALSE)
 	for(var/i = 1 to storage_slots)
 		var/obj/item/clothing/mask/cigarette/C = new cigarette_type(src)
 		unlaced_cigarettes += C