Conforming to Humphry Davy's wishes. :V

More seriously, silly names for the station added from http://tgstation13.servehttp.com/phpBB3/viewtopic.php?f=3&t=3502 and a fix for some changelog points.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1468 316c924e-a436-60f5-8080-3fe189b3f50e

code/WorkInProgress/Chemistry-Machinery.dm

@@ -10,7 +10,7 @@
 	icon_state = "dispenser"
 	var/energy = 25
 	var/max_energy = 25
-	var/list/dispensable_reagents = list("water","oxygen","nitrogen","hydrogen","potassium","sodium","mercury","copper","sulfur","carbon","chlorine","fluorine","phosphorus","lithium","acid","radium","iron","aluminium","silicon","plasma","sugar","ethanol")
+	var/list/dispensable_reagents = list("water","oxygen","nitrogen","hydrogen","potassium","sodium","mercury","copper","sulfur","carbon","chlorine","fluorine","phosphorus","lithium","acid","radium","iron","aluminum","silicon","plasma","sugar","ethanol")
 
 	proc
 		recharge()

code/WorkInProgress/Chemistry-Reagents.dm

@@ -700,9 +700,9 @@ datum
 				return
 */
 
-		aluminium
+		aluminum
-			name = "Aluminium"
+			name = "aluminum"
-			id = "aluminium"
+			id = "aluminum"
 			description = "A silvery white and ductile member of the boron group of chemical elements."
 			reagent_state = SOLID
 

code/WorkInProgress/Chemistry-Recipes.dm

@@ -39,7 +39,7 @@ datum
 			name = "Silicate"
 			id = "silicate"
 			result = "silicate"
-			required_reagents = list("aluminium" = 1, "silicon" = 1, "oxygen" = 1)
+			required_reagents = list("aluminum" = 1, "silicon" = 1, "oxygen" = 1)
 			result_amount = 3
 
 		sterilizine
@@ -81,7 +81,7 @@ datum
 			name = "Thermite"
 			id = "thermite"
 			result = "thermite"
-			required_reagents = list("aluminium" = 1, "iron" = 1, "oxygen" = 1)
+			required_reagents = list("aluminum" = 1, "iron" = 1, "oxygen" = 1)
 			result_amount = 3
 
 		lexorin
@@ -285,7 +285,7 @@ datum
 			name = "Flash powder"
 			id = "flash_powder"
 			result = null
-			required_reagents = list("aluminium" = 1, "potassium" = 1, "sulfur" = 1 )
+			required_reagents = list("aluminum" = 1, "potassium" = 1, "sulfur" = 1 )
 			result_amount = null
 			on_reaction(var/datum/reagents/holder, var/created_volume)
 				var/location = get_turf(holder.my_atom)
@@ -314,7 +314,7 @@ datum
 			name = "Napalm"
 			id = "napalm"
 			result = null
-			required_reagents = list("aluminium" = 1, "plasma" = 1, "acid" = 1 )
+			required_reagents = list("aluminum" = 1, "plasma" = 1, "acid" = 1 )
 			result_amount = 1
 			on_reaction(var/datum/reagents/holder, var/created_volume)
 				var/turf/location = get_turf(holder.my_atom.loc)
@@ -416,7 +416,7 @@ datum
 			name = "Metal Foam"
 			id = "metalfoam"
 			result = null
-			required_reagents = list("aluminium" = 3, "foaming_agent" = 1, "pacid" = 1)
+			required_reagents = list("aluminum" = 3, "foaming_agent" = 1, "pacid" = 1)
 			result_amount = 5
 
 			on_reaction(var/datum/reagents/holder, var/created_volume)

code/WorkInProgress/Chemistry-Tools.dm

@@ -265,7 +265,7 @@
 		var/obj/item/weapon/reagent_containers/glass/beaker/B1 = new(src)
 		var/obj/item/weapon/reagent_containers/glass/beaker/B2 = new(src)
 
-		B1.reagents.add_reagent("aluminium", 30)
+		B1.reagents.add_reagent("aluminum", 30)
 		B2.reagents.add_reagent("foaming_agent", 10)
 		B2.reagents.add_reagent("pacid", 10)
 
@@ -284,7 +284,7 @@
 		var/obj/item/weapon/reagent_containers/glass/beaker/B1 = new(src)
 		var/obj/item/weapon/reagent_containers/glass/beaker/B2 = new(src)
 
-		B1.reagents.add_reagent("aluminium", 25)
+		B1.reagents.add_reagent("aluminum", 25)
 		B2.reagents.add_reagent("plasma", 25)
 		B2.reagents.add_reagent("acid", 25)
 

code/defines/procs/station_name.dm

@@ -9,12 +9,12 @@
 		name += " "
 
 	// Prefix
-	name += pick("", "Dorf", "Alium", "Carp", "Ork", "Pete", "Control", "Nettle", "Aspie", "Class", "Crab", "Fist","Corrogated","Skeleton","Race", "Fatguy", "Gentleman", "Touhou", "Capitalist", "Communist", "Bear", "Beard", "Derp", "Space", "Star", "Moon", "System", "Mining", "Neckbeard", "Research", "Supply", "Military", "Orbital", "Battle", "Science", "Asteroid", "Home", "Production", "Transport", "Delivery", "Extraplanetary", "Orbital", "Correctional", "Robot")
+	name += pick("", "Dorf", "Alium", "Prefix", "Clowning", "Aegis", "Ishimura", "Scaredy", "Death-World", "Mime", "Honk", "Rogue", "Pony", "MacRagge", "Ultrameens", "Safety", "Paranoia", "Explosive", "Neckbear", "Donk", "Muppet", "North", "West", "East", "South", "Slant-ways", "Widdershins", "Rimward", "Expensive", "Procreatory", "Imperial", "Unidentified", "Immoral", "Carp", "Ork", "Pete", "Control", "Nettle", "Aspie", "Class", "Crab", "Fist","Corrogated","Skeleton","Race", "Fatguy", "Gentleman", "Touhou", "Capitalist", "Communist", "Bear", "Beard", "Derp", "Space", "Star", "Moon", "System", "Mining", "Neckbeard", "Research", "Supply", "Military", "Orbital", "Battle", "Science", "Asteroid", "Home", "Production", "Transport", "Delivery", "Extraplanetary", "Orbital", "Correctional", "Robot")
 	if (name)
 		name += " "
 
 	// Suffix
-	name += pick("Station", "Fortress", "Frontier", "Village", "Town", "City", "Edition", "Hive", "Complex", "Base", "Facility", "Depot", "Outpost", "Installation", "Drydock", "Observatory", "Array", "Relay", "Monitor", "Platform", "Construct", "Hangar", "Prison", "Center", "Port", "Waystation", "Factory", "Waypoint", "Stopover", "Hub", "HQ", "Office", "Object", "Fortification", "Colony", "Planet-Cracker")
+	name += pick("Station", "Fortress", "Frontier", "Suffix", "Death-trap", "Space-hulk", "Lab", "Hazard","Spess Junk", "Fishery", "No-Moon", "Tomb", "Crypt", "Hut", "Monkey", "Bomb", "Trade Post", "Fortress", "Village", "Town", "City", "Edition", "Hive", "Complex", "Base", "Facility", "Depot", "Outpost", "Installation", "Drydock", "Observatory", "Array", "Relay", "Monitor", "Platform", "Construct", "Hangar", "Prison", "Center", "Port", "Waystation", "Factory", "Waypoint", "Stopover", "Hub", "HQ", "Office", "Object", "Fortification", "Colony", "Planet-Cracker")
 	name += " "
 
 	// ID Number

code/game/objects/effect_system.dm

@@ -852,7 +852,7 @@ steam.start() -- spawns the effect
 	anchored = 1
 	name = "foamed metal"
 	desc = "A lightweight foamed metal wall."
-	var/metal = 1		// 1=aluminium, 2=iron
+	var/metal = 1		// 1=aluminum, 2=iron
 
 	New()
 		..()

icons/changelog.html

@@ -48,25 +48,24 @@ should be listed in the changelog upon commit tho. Thanks. -->
 <b><font color='blue'>17 April 2011, World Hemophilia Day</font><b>
 	<li><b>Microwave updated:</b>
 	<ul>	
-		<li>Rabbit ears have a small tail, Night vision on-mob sprite updated.</li>
+		<li>Rabbit ears have a small tail, night vision goggle sprites updated.</li>
-		<li>Space tea now calms you down instead of making you jittery.</li>
+		<li>Space tea has a nice, calming effect.</li>
 		<li>Space drugs? Liberty cap... something like that. Microwave, make your changelog entries more understandable!</li>
 		<li>Brobot merged with Service Borg with a Rapid Service Fabricator.</li>
 		<li>Arcade machine prizes look and sound realistic once again.</li>
 		<li>New arcade toy: Syndicate space suit costume, can hold arcade toys in suit storage.</li>
-		<li>"Please recycle your cap gun ammo in your local autolathe when you're out of caps!"</li>
+		<li>Empty cap gun loaders can be recycled in an autolathe.</li>
 		<li>Seizure man has laying down sprites now. Update to wizard den.</li>
 		<li>Mech bay has two more borg chargers.</li>
 		<li>Beepsky is back!</li>
-		<li>Detective's office grille is electrified once again.</li>
+		<li>Detective's office grille has been electrified.</li>
-		<li>New sprites for gold, silver iron and plasma ore, gold and silver ingots and solid plasma. (Sprites by Matty406)</li>
 		<li>You can now see if someone is wearing an emergency oxygen tank on their belt on the mob itself.</li>
 		<li>Lexorin - Now deals 3 oxygen damage per tick. Countered with Dexalin or Dexalin Pkus, which remove 2 units of it from your body per tick.</li>
 		<li>Bilk - Shares the effects of beer and milk. Disgusting!</li>
-		<li>Sugar - Gives more nutrition! Space twinkies will now be able to make you fat. Sugar also no longer makes you jittery.</li>
+		<li>Sugar - Gives nutrition!</li>
 		<li>Arithrazine - Now extremely good against radiation damage.</li>
 		<li>Hyronalin - Stronger radiation removal</li>
-		<li>Space cleaner now contains enough cleaner for 50 uses. Making space cleaner now yields more cleaner.</li>
+		<li>Space cleaner spray bottles now contain enough cleaner for 50 uses. Making space cleaner now yields more cleaner.</li>
 	</ul>
 	</li>
 	<li><b>Errorage updated:</b>
@@ -135,9 +134,8 @@ should be listed in the changelog upon commit tho. Thanks. -->
 	</li>
 	<li><b>Rastaf0 and Farart updated:</b>
 	<ul>
-		<li>Security borgs now have side sprites.</li>
 		<li>Ghosts should now always properly hear people.</li>
-		<li>Monkeyized people (genetics or jungle fever disease) no longer loose their genetic mutations and diseases.</li>
+		<li>Monkeyized people (genetics or jungle fever disease) no longer lose their genetic mutations and diseases.</li>
 		<li>People who get bitten by monkeys get jungle fever.</li>
 		<li>Most chemicals should now heal and harm humans properly.</li>
 		<li>Many new (and updated) recipes for the microwave including Pizza, Meatball Soup, Hot Chili and many more.</li>
@@ -157,11 +155,17 @@ should be listed in the changelog upon commit tho. Thanks. -->
 	</li>
 	<li><b>Deeaych updated:</b>
 	<ul>
-		<li>Updated satchel, bananium, shovel, jackhammer and pick-in-hand sprites.</li>
+		<li>Updated satchel, bananimum, shovel, jackhammer and pick-in-hand sprites.</li>
 		<li>Many unneeded r-walls removed, detective's office reinforced.</li>
 		<li>Captain armor now acts as a space suit, added a unique captain's space helmet to captain's quarters.</li>
-		<li>Golems (WHAT?!) cannot speak. Also added golem fat sprite.</li>
+		<li>Golems cannot speak, but should be perfectly spawnable. Also added golem fat sprite.</li>
-		<li>Dorf AI status added. (Sprite by Matty406)</li>
+		<li>Security borgs have side sprites.</li>
+	</ul>
+	</li>
+	<li><b>Matty406 updated:</b>
+	<ul>
+		<li>AIs can now feel a little more dorfy.</li>
+		<li>Many ores, both raw and smelted, look much better.</li>
 	</ul>
 	</li>
 	<li><b>Urist_McDorf updated:</b>