Merge branch 'dev' into ofChemistryAndStuff

Conflicts:
	code/datums/recipe.dm
	code/game/machinery/bots/farmbot.dm
	code/game/machinery/bots/medbot.dm
	code/game/mecha/equipment/tools/tools.dm
	code/game/objects/effects/chem/chemsmoke.dm
	code/game/objects/effects/effect_system.dm
	code/game/objects/items/toys.dm
	code/game/objects/items/weapons/extinguisher.dm
	code/game/objects/items/weapons/mop.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/organs/organ_internal.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/Chemistry-Recipes.dm
	code/modules/reagents/reagent_containers/food/snacks.dm
	code/modules/reagents/reagent_containers/pill.dm
	code/modules/reagents/reagent_containers/spray.dm
	maps/exodus-1.dmm

code/modules/projectiles/guns/alien.dm

@@ -20,7 +20,7 @@
 	processing_objects.Add(src)
 	last_regen = world.time
 
-/obj/item/weapon/gun/launcher/spikethrower/Del()
+/obj/item/weapon/gun/launcher/spikethrower/Destroy()
 	processing_objects.Remove(src)
 	..()
 

code/modules/projectiles/guns/energy.dm

@@ -31,7 +31,7 @@
 		processing_objects.Add(src)
 	update_icon()
 
-/obj/item/weapon/gun/energy/Del()
+/obj/item/weapon/gun/energy/Destroy()
 	if(self_recharge)
 		processing_objects.Remove(src)
 	..()

code/modules/projectiles/guns/energy/temperature.dm

@@ -2,7 +2,7 @@
 	name = "temperature gun"
 	icon_state = "freezegun"
 	fire_sound = 'sound/weapons/pulse3.ogg'
-	desc = "A gun that changes temperatures."
+	desc = "A gun that changes temperatures. It has a small label on the side, 'More extreme temperatures will cost more charge!'"
 	var/temperature = T20C
 	var/current_temperature = T20C
 	charge_cost = 100
@@ -10,7 +10,7 @@
 	slot_flags = SLOT_BELT|SLOT_BACK
 
 	projectile_type = /obj/item/projectile/temp
-	cell_type = /obj/item/weapon/cell/crap
+	cell_type = /obj/item/weapon/cell/high
 
 
 /obj/item/weapon/gun/energy/temperature/New()
@@ -18,7 +18,7 @@
 	processing_objects.Add(src)
 
 
-/obj/item/weapon/gun/energy/temperature/Del()
+/obj/item/weapon/gun/energy/temperature/Destroy()
 	processing_objects.Remove(src)
 	..()
 

code/modules/projectiles/guns/launcher/crossbow.dm

@@ -43,7 +43,7 @@
 		user  << "[src] shatters into a scattering of overstressed metal shards as it leaves the crossbow."
 		var/obj/item/weapon/shard/shrapnel/S = new()
 		S.loc = get_turf(src)
-		src.Del()
+		qdel(src)
 
 /obj/item/weapon/gun/launcher/crossbow
 	name = "powered crossbow"
@@ -257,7 +257,7 @@
 		if(buildstate == 5)
 			user << "\blue You secure the crossbow's various parts."
 			new /obj/item/weapon/gun/launcher/crossbow(get_turf(src))
-			del(src)
+			qdel(src)
 		return
 	else
 		..()

code/modules/projectiles/guns/launcher/pneumatic.dm

@@ -150,7 +150,7 @@
 	if(istype(W,/obj/item/pipe))
 		if(buildstate == 0)
 			user.drop_item()
-			del(W)
+			qdel(W)
 			user << "\blue You secure the piping inside the frame."
 			buildstate++
 			update_icon()
@@ -168,7 +168,7 @@
 	else if(istype(W,/obj/item/device/transfer_valve))
 		if(buildstate == 4)
 			user.drop_item()
-			del(W)
+			qdel(W)
 			user << "\blue You install the transfer valve and connect it to the piping."
 			buildstate++
 			update_icon()
@@ -197,7 +197,7 @@
 				playsound(src.loc, 'sound/items/Welder2.ogg', 100, 1)
 				user << "\blue You weld the valve into place."
 				new /obj/item/weapon/gun/launcher/pneumatic(get_turf(src))
-				del(src)
+				qdel(src)
 		return
 	else
 		..()

code/modules/projectiles/guns/projectile/automatic.dm

@@ -62,7 +62,7 @@
 
 /obj/item/weapon/gun/projectile/automatic/sts35/update_icon()
 	..()
-	icon_state = (ammo_magazine)? "arifle-0" : "arifle"
+	icon_state = (ammo_magazine)? "arifle" : "arifle-empty"
 	update_held_icon()
 
 /obj/item/weapon/gun/projectile/automatic/wt550

code/modules/projectiles/guns/projectile/dartgun.dm

@@ -27,7 +27,7 @@
 	projectile_type = /obj/item/projectile/bullet/chemdart
 
 /obj/item/ammo_casing/chemdart/expend()
-	del(src)
+	qdel(src)
 
 /obj/item/ammo_magazine/chemdart
 	name = "dart cartridge"

code/modules/projectiles/guns/projectile/pistol.dm

@@ -8,7 +8,7 @@
 	load_method = MAGAZINE
 
 /obj/item/weapon/gun/projectile/colt/detective
-	desc = "A cheap Martian knock-off of a Colt M1911. Uses less-than-lethal .45 rounds."
+	desc = "A cheap Martian knock-off of a Colt M1911. Uses .45 rounds."
 	magazine_type = /obj/item/ammo_magazine/c45m/rubber
 
 /obj/item/weapon/gun/projectile/colt/detective/verb/rename_gun()
@@ -30,7 +30,7 @@
 		return 1
 
 /obj/item/weapon/gun/projectile/sec
-	desc = "A NanoTrasen designed sidearm, found pretty much everywhere humans are. Uses less-than-lethal .45 rounds."
+	desc = "A NanoTrasen designed sidearm, found pretty much everywhere humans are. Uses .45 rounds."
 	name = "\improper NT Mk58"
 	icon_state = "secguncomp"
 	magazine_type = /obj/item/ammo_magazine/c45m/rubber
@@ -40,11 +40,10 @@
 
 /obj/item/weapon/gun/projectile/sec/flash
 	name = "\improper NT Mk58 signal pistol"
-	desc = "A NanoTrasen designed sidearm, found pretty much everywhere humans are. Uses .45 signal flash rounds."
 	magazine_type = /obj/item/ammo_magazine/c45m/flash
 
 /obj/item/weapon/gun/projectile/sec/wood
-	desc = "A Nanotrasen designed sidearm, this one has a sweet wooden grip. Uses less-than-lethal .45 rounds."
+	desc = "A Nanotrasen designed sidearm, this one has a sweet wooden grip. Uses .45 rounds."
 	name = "\improper Custom NT Mk58"
 	icon_state = "secgundark"
 
@@ -118,7 +117,7 @@
 
 /obj/item/weapon/gun/projectile/pistol/flash
 	name = "\improper Stechtkin signal pistol"
-	desc = "A small, easily concealable gun. Uses 9mm signal flash rounds."
+	desc = "A small, easily concealable gun. Uses 9mm rounds."
 	magazine_type = /obj/item/ammo_magazine/mc9mm/flash
 
 /obj/item/weapon/gun/projectile/pistol/attack_hand(mob/user as mob)