Merge remote-tracking branch 'upstream/master' into third_times_the_charm_questionmark

Conflicts:
	code/modules/mob/living/carbon/human/human.dm
	 ^ This shit is haunted. It's conflicted on two branches for 0
	 reason, the automatic merge wouldn't work on the fucking end of
	 file.

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

@@ -59,7 +59,7 @@
 		else
 			user.visible_message("<span class='warning'>[user] begins to do [H]'s lips with \the [src].</span>", \
 								 "<span class='notice'>You begin to apply \the [src].</span>")
-			if(do_after(user, 20, target = H) && do_after(H, 20, 5, 0))	//user needs to keep their active hand, H does not.
+			if(do_after(user, 20, target = H))
 				user.visible_message("<span class='notice'>[user] does [H]'s lips with \the [src].</span>", \
 									 "<span class='notice'>You apply \the [src].</span>")
 				H.lip_style = "lipstick"

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

@@ -25,10 +25,13 @@
 /obj/item/weapon/flamethrower/Destroy()
 	if(weldtool)
 		qdel(weldtool)
+		weldtool = null
 	if(igniter)
 		qdel(igniter)
+		igniter = null
 	if(ptank)
 		qdel(ptank)
+		ptank = null
 	return ..()
 
 

code/game/objects/items/weapons/grenades/smokebomb.dm

@@ -15,6 +15,7 @@
 
 	Destroy()
 		qdel(smoke)
+		smoke = null
 		return ..()
 
 	prime()

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

@@ -168,7 +168,7 @@
 		playsound(loc, 'sound/weapons/bladeslice.ogg', 50, 1, -1)
 	else
 		usr << "All the leaves have fallen off the nettle from violent whacking."
-		del(src)
+		qdel(src)
 
 /obj/item/weapon/grown/nettle/changePotency(newValue) //-QualityVan
 	potency = newValue
@@ -220,7 +220,7 @@
 
 	else
 		usr << "All the leaves have fallen off the deathnettle from violent whacking."
-		del(src)
+		qdel(src)
 
 /obj/item/weapon/grown/deathnettle/changePotency(newValue) //-QualityVan
 	potency = newValue
@@ -235,6 +235,6 @@
 	if(istype(W, /obj/item/weapon/circular_saw) || istype(W, /obj/item/weapon/hatchet) || istype(W, /obj/item/weapon/kitchen/utensil/knife) || istype(W, /obj/item/weapon/kitchenknife) || istype(W, /obj/item/weapon/kitchenknife/ritual))
 		user << "<span class='notice'>You use [W] to fashion a pipe out of the corn cob!</span>"
 		new /obj/item/clothing/mask/cigarette/pipe/cobpipe (user.loc)
-		del(src)
+		qdel(src)
 		return
 */

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

@@ -1,32 +0,0 @@
-/obj/item/weapon/module
-	icon = 'icons/obj/module.dmi'
-	icon_state = "std_module"
-	w_class = 2.0
-	item_state = "electronic"
-	flags = CONDUCT
-	var/mtype = 1						// 1=electronic 2=hardware
-
-/obj/item/weapon/module/card_reader
-	name = "card reader module"
-	icon_state = "card_mod"
-	desc = "An electronic module for reading data and ID cards."
-
-/obj/item/weapon/module/power_control
-	name = "power control module"
-	icon_state = "power_mod"
-	desc = "Heavy-duty switching circuits for power control."
-
-/obj/item/weapon/module/id_auth
-	name = "\improper ID authentication module"
-	icon_state = "id_mod"
-	desc = "A module allowing secure authorization of ID cards."
-
-/obj/item/weapon/module/cell_power
-	name = "power cell regulator module"
-	icon_state = "power_mod"
-	desc = "A converter and regulator allowing the use of power cells."
-
-/obj/item/weapon/module/cell_power
-	name = "power cell charger module"
-	icon_state = "power_mod"
-	desc = "Charging circuits for power cells."

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

@@ -35,10 +35,6 @@
 		else
 	..()
 
-/obj/item/weapon/shard/Destroy()
-	..()
-	return QDEL_HINT_PUTINPOOL
-
 /obj/item/weapon/shard/attackby(obj/item/I, mob/user, params)
 	if(istype(I, /obj/item/weapon/weldingtool))
 		var/obj/item/weapon/weldingtool/WT = I

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

@@ -37,7 +37,7 @@
 	max_w_class = 2
 	storage_slots = 30
 	can_hold = list() // any
-	cant_hold = list("/obj/item/weapon/disk/nuclear","/obj/item/flag/nation")
+	cant_hold = list("/obj/item/weapon/disk/nuclear")
 
 /obj/item/weapon/storage/bag/trash/suicide_act(mob/user)
 	user.visible_message("<span class='suicide'>[user] puts the [src.name] over their head and starts chomping at the insides! Disgusting!</span>")
@@ -88,7 +88,7 @@
 	storage_slots = 7
 	display_contents_with_number = 0 //or else this will lead to stupid behavior.
 	can_hold = list() // any
-	cant_hold = list("/obj/item/weapon/disk/nuclear","/obj/item/flag/nation")
+	cant_hold = list("/obj/item/weapon/disk/nuclear")
 	var/head = 0
 
 /obj/item/weapon/storage/bag/plasticbag/mob_can_equip(M as mob, slot)
@@ -248,7 +248,7 @@
 				usr.client.screen -= S
 			S.dropped(usr)
 			if(!S.amount)
-				del(S)
+				qdel(S)
 			else
 				S.loc = src
 
@@ -293,7 +293,7 @@
 				N.amount = stacksize
 				S.amount -= stacksize
 			if(!S.amount)
-				del(S) // todo: there's probably something missing here
+				qdel(S) // todo: there's probably something missing here
 		orient2hud(usr)
 		if(usr.s_active)
 			usr.s_active.show_to(usr)

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

@@ -476,9 +476,9 @@
 				else target.ex_act(1)
 				if (isobj(target))
 					if (target)
-						del(target)
+						qdel(target)
 				if (src)
-					del(src)
+					qdel(src)
 */
 
 /obj/item/weapon/storage/belt/bluespace/attack(mob/M as mob, mob/user as mob, def_zone)

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

@@ -10,6 +10,10 @@
 	verbs -= /obj/item/verb/verb_pickup	//make sure this is never picked up.
 	..()
 
+/obj/item/weapon/storage/internal/Destroy()
+	master_item = null
+	return ..()
+
 /obj/item/weapon/storage/internal/attack_hand()
 	return		//make sure this is never picked up
 

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

@@ -19,6 +19,10 @@
 	src.ion_trail.set_up(src)
 	return
 
+/obj/item/weapon/tank/jetpack/Destroy()
+	qdel(ion_trail)
+	ion_trail = null
+	return ..()
 
 /obj/item/weapon/tank/jetpack/examine(mob/user)
 	if(!..(user, 0))
@@ -160,4 +164,4 @@
 	var/allgases = G.carbon_dioxide + G.nitrogen + G.oxygen + G.toxins
 	if(allgases >= 0.005)
 		. = 1
-	qdel(G)
+	qdel(G)