From f17525173ce7cfbe11bd687b7e96b942a490f9d3 Mon Sep 17 00:00:00 2001
From: SkyMarshal <joehe.inemeyer@gmail.com>
Date: Fri, 8 Jun 2012 04:09:49 -0700
Subject: [PATCH] Plasma and welder fuel no longer create stupid amounts of
 plasma in the air.

---
 code/modules/chemical/Chemistry-Reagents.dm | 30 +++++++--------------
 code/modules/mob/dead/observer/observer.dm  |  1 -
 2 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/code/modules/chemical/Chemistry-Reagents.dm b/code/modules/chemical/Chemistry-Reagents.dm
index cf4de6539e5..31bfd9f0759 100644
--- a/code/modules/chemical/Chemistry-Reagents.dm
+++ b/code/modules/chemical/Chemistry-Reagents.dm
@@ -524,14 +524,14 @@ datum
 				src = null
 				var/turf/the_turf = get_turf(O)
 				var/datum/gas_mixture/napalm = new
-				napalm.oxygen = volume*10
+				napalm.oxygen = volume/10
 				napalm.temperature = T0C
 				napalm.update_values()
 				the_turf.assume_air(napalm)
 			reaction_turf(var/turf/T, var/volume)
 				src = null
 				var/datum/gas_mixture/napalm = new
-				napalm.oxygen = volume*10
+				napalm.oxygen = volume/10
 				napalm.temperature = T0C
 				napalm.update_values()
 				T.assume_air(napalm)
@@ -554,14 +554,14 @@ datum
 				src = null
 				var/turf/the_turf = get_turf(O)
 				var/datum/gas_mixture/napalm = new
-				napalm.nitrogen = volume*10
+				napalm.nitrogen = volume/10
 				napalm.temperature = T0C
 				napalm.update_values()
 				the_turf.assume_air(napalm)
 			reaction_turf(var/turf/T, var/volume)
 				src = null
 				var/datum/gas_mixture/napalm = new
-				napalm.nitrogen = volume*10
+				napalm.nitrogen = volume/10
 				napalm.temperature = T0C
 				napalm.update_values()
 				T.assume_air(napalm)
@@ -1036,18 +1036,10 @@ datum
 				var/turf/the_turf = get_turf(O)
 				if(!the_turf)
 					return //No sense trying to start a fire if you don't have a turf to set on fire. --NEO
-				var/datum/gas_mixture/napalm = new
-				napalm.toxins = volume*10
-				napalm.temperature = T0C
-				napalm.update_values()
-				the_turf.assume_air(napalm)
+				new /obj/liquid_fuel(the_turf, volume)
 			reaction_turf(var/turf/T, var/volume)
 				src = null
-				var/datum/gas_mixture/napalm = new
-				napalm.toxins = volume*10
-				napalm.temperature = T0C
-				napalm.update_values()
-				T.assume_air(napalm)
+				new /obj/liquid_fuel(T, volume)
 				return
 			on_mob_life(var/mob/living/M as mob)
 				if(!M) M = holder.my_atom
@@ -1155,19 +1147,17 @@ datum
 				src = null
 				var/turf/the_turf = get_turf(O)
 				var/datum/gas_mixture/napalm = new
-				var/datum/gas/volatile_fuel/fuel = new
-				fuel.moles = 5
-				napalm.trace_gases += fuel
+				napalm.toxins = volume/5
 				napalm.update_values()
 				the_turf.assume_air(napalm)
+				new /obj/liquid_fuel(the_turf, volume)
 			reaction_turf(var/turf/T, var/volume)
 				src = null
 				var/datum/gas_mixture/napalm = new
-				var/datum/gas/volatile_fuel/fuel = new
-				fuel.moles = 5
-				napalm.trace_gases += fuel
+				napalm.toxins = volume/5
 				napalm.update_values()
 				T.assume_air(napalm)
+				new /obj/liquid_fuel(T, volume)
 				return
 
 		leporazine
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index 49cb49d38b6..8340911662c 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -63,7 +63,6 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 /mob/proc/ghost()
 	set category = "Ghost"
 	set name = "Ghost"
-	set desc = "You cannot be revived as a ghost."
 
 	/*if(stat != 2) //this check causes nothing but troubles. Commented out for Nar-Sie's sake. --rastaf0
 		src << "Only dead people and admins get to ghost, and admins don't use this verb to ghost while alive."