Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into item-color

Conflicts:
	code/game/machinery/washing_machine.dm
	code/modules/mob/living/carbon/human/update_icons.dm

code/modules/customitems/item_defines.dm

@@ -552,7 +552,7 @@
 		kit.uses--
 		if(kit.uses<1)
 			user.drop_item()
-			del(O)
+			qdel(O)
 
 /obj/item/clothing/suit/space/void/attackby(var/obj/item/O as obj, mob/user as mob)
 	..()
@@ -571,7 +571,7 @@
 		kit.uses--
 		if(kit.uses<1)
 			user.drop_item()
-			del(O)
+			qdel(O)
 
 ///////// Salvage crew hardsuit - Cybele Petit - solaruin ///////////////
 /obj/item/device/kit/suit/fluff/salvage

code/modules/customitems/item_spawning.dm

@@ -35,7 +35,7 @@
 					if(M.ckey == "nerezza" && M.real_name == "Asher Spock" && M.mind.role_alt_title && M.mind.role_alt_title != "Emergency Physician")
 						//only spawn ID if asher is joining as an emergency physician
 						ok = 1
-						del(Item)
+						qdel(Item)
 						goto skip
 					var/obj/item/weapon/card/id/I = Item
 					for(var/obj/item/weapon/card/id/C in M)
@@ -59,18 +59,18 @@
 							I.name = "[M.real_name]'s Technician ID ([M.mind.role_alt_title ? M.mind.role_alt_title : M.mind.assigned_role])"
 
 						//replace old ID
-						del(C)
+						qdel(C)
 						ok = M.equip_to_slot_if_possible(I, slot_wear_id, 0)	//if 1, last argument deletes on fail
 						break
 				else if(istype(Item,/obj/item/weapon/storage/belt))
 					if(M.ckey == "jakksergal" && M.real_name == "Nashi Ra'hal" && M.mind.role_alt_title && M.mind.role_alt_title != "Nurse" && M.mind.role_alt_title != "Chemist")
 						ok = 1
-						del(Item)
+						qdel(Item)
 						goto skip
 					var/obj/item/weapon/storage/belt/medical/fluff/nashi_belt/I = Item
 					if(istype(M.belt,/obj/item/weapon/storage/belt))
 						for(var/obj/item/weapon/storage/belt/B in M)
-							del(B)
+							qdel(B)
 							M.belt=null
 						ok = M.equip_to_slot_if_possible(I, slot_belt, 0)
 						break