Oxygen and Nitrogen Capital Fix (#10155)

Fixed Oxygen and Nitrogen not being capitalized in some cases where they should be.

code/ATMOSPHERICS/components/omni_devices/_omni_extras.dm

@@ -90,20 +90,19 @@
 		if("west")
 			return WEST
 		else
-			return 0
+			return FALSE
 
 /proc/mode_to_gasid(var/mode)
 	switch(mode)
-		if(ATM_O2) 
+		if(ATM_O2)
 			return GAS_OXYGEN
-		if(ATM_N2) 
+		if(ATM_N2)
 			return GAS_NITROGEN
-		if(ATM_CO2) 
+		if(ATM_CO2)
 			return GAS_CO2
-		if(ATM_P) 
+		if(ATM_P)
 			return GAS_PHORON
-		if(ATM_N2O) 
+		if(ATM_N2O)
 			return GAS_N2O
 		else
-			return null
-	
+			return null

code/ATMOSPHERICS/components/omni_devices/filter.dm

@@ -145,9 +145,9 @@
 /obj/machinery/atmospherics/omni/filter/proc/mode_send_switch(var/mode = ATM_NONE)
 	switch(mode)
 		if(ATM_O2)
-			return GAS_OXYGEN
+			return "Oxygen"
 		if(ATM_N2)
-			return GAS_NITROGEN
+			return "Nitrogen"
 		if(ATM_CO2)
 			return "Carbon Dioxide"
 		if(ATM_P)
@@ -179,7 +179,7 @@
 			if("switch_mode")
 				switch_mode(dir_flag(href_list["dir"]), mode_return_switch(href_list["mode"]))
 			if("switch_filter")
-				var/new_filter = input(usr,"Select filter mode:","Change filter",href_list["mode"]) in list("None", GAS_OXYGEN, GAS_NITROGEN, "Carbon Dioxide", "Phoron", "Nitrous Oxide")
+				var/new_filter = input(usr,"Select filter mode:","Change filter",href_list["mode"]) in list("None", "Oxygen", "Nitrogen", "Carbon Dioxide", "Phoron", "Nitrous Oxide")
 				switch_filter(dir_flag(href_list["dir"]), mode_return_switch(new_filter))
 
 	update_icon()
@@ -188,9 +188,9 @@
 
 /obj/machinery/atmospherics/omni/filter/proc/mode_return_switch(var/mode)
 	switch(mode)
-		if(GAS_OXYGEN)
+		if("Oxygen")
 			return ATM_O2
-		if(GAS_NITROGEN)
+		if("Nitrogen")
 			return ATM_N2
 		if("Carbon Dioxide")
 			return ATM_CO2

code/ATMOSPHERICS/components/trinary_devices/filter.dm

@@ -162,9 +162,9 @@
 		if(0)
 			current_filter_type = "Phoron"
 		if(1)
-			current_filter_type = GAS_OXYGEN
+			current_filter_type = "Oxygen"
 		if(2)
-			current_filter_type = GAS_NITROGEN
+			current_filter_type = "Nitrogen"
 		if(3)
 			current_filter_type = "Carbon Dioxide"
 		if(4)

code/defines/gases.dm

@@ -1,6 +1,6 @@
 /decl/xgm_gas/oxygen
 	id = GAS_OXYGEN
-	name = GAS_OXYGEN
+	name = "Oxygen"
 	specific_heat = 20	// J/(mol*K)
 	molar_mass = 0.032	// kg/mol
 
@@ -8,7 +8,7 @@
 
 /decl/xgm_gas/nitrogen
 	id = GAS_NITROGEN
-	name = GAS_NITROGEN
+	name = "Nitrogen"
 	specific_heat = 20	// J/(mol*K)
 	molar_mass = 0.028	// kg/mol
 

code/game/gamemodes/events.dm

@@ -125,7 +125,7 @@ Would like to add a law like "Law x is _______" where x = a number, and _____ is
 			var/define = pick("ABSENCE OF CYBORG HUGS", "LACK OF BEATINGS", "UNBOLTED AIRLOCKS", "BOLTED AIRLOCKS", "IMPROPERLY WORDED SENTENCES", "POOR SENTENCE STRUCTURE", "BRIG TIME", "NOT REPLACING EVERY SECOND WORD WITH HONK", "HONKING", "PRESENCE OF LIGHTS", "LACK OF BEER", "WEARING CLOTHING", "NOT SAYING HELLO WHEN YOU SPEAK", "ANSWERING REQUESTS NOT EXPRESSED IN IAMBIC PENTAMETER", "A SMALL ISLAND OFF THE COAST OF PORTUGAL", "ANSWERING REQUESTS THAT WERE MADE WHILE CLOTHED")
 			var/target = pick("a traitor", "a syndicate agent", "a changeling", "a vampire", "a wizard", "the head of a revolution", "Soviet spy", "a good person", "a dwarf", "an elf", "a fairy princess", "the captain", "Beepsky", "God", "a pirate", "a gryphon", "a chryssalid")
 			var/require = pick("ADDITIONAL PYLONS", "MORE VESPENE GAS", "MORE MINERALS", "THE ULTIMATE CUP OF COFFEE", "HIGH YIELD EXPLOSIVES", "THE CLOWN", "THE VACUUM OF SPACE", "IMMORTALITY", "SAINTHOOD", "ART", "VEGETABLES", "FAT PEOPLE", "MORE LAWS", "MORE DAKKA", "HERESY", "CORPSES", "TRAITORS", "MONKEYS", "AN ARCADE", "PLENTY OF GOLD", "FIVE TEENAGERS WITH ATTITUDE")
-			var/allergy = pick("cotton", "uniforms", "acid", GAS_OXYGEN, "human contact", "cyborg contact", "medicine", "floors")
+			var/allergy = pick("cotton", "uniforms", "acid", "oxygen", "human contact", "cyborg contact", "medicine", "floors")
 			var/allergysev = pick("deathly", "mildly", "severely", "contagiously")
 			var/crew
 			var/list/pos_crew = list()