cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Conforming to Humphry Davy's wishes. :V

Browse Source 
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
This commit is contained in:
bizarre.babel@gmail.com
2011-04-18 00:01:28 +00:00
parent a95f87d6bc
commit 2cabf3edc6
7 changed files with 30 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/WorkInProgress/Chemistry-Machinery.dm
View File

@@ -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()

6
code/WorkInProgress/Chemistry-Reagents.dm
View File

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

10
code/WorkInProgress/Chemistry-Recipes.dm
View File

@@ -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)

4
code/WorkInProgress/Chemistry-Tools.dm
View File

@@ -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)