This commit is contained in:
Fox-McCloud
2015-03-26 10:27:04 -04:00
parent abf409149d
commit 56d6d7c9c8
6 changed files with 16 additions and 9 deletions
+9 -2
View File
@@ -47,11 +47,18 @@
adjustmask(user)
/obj/item/clothing/mask/fakemoustache
name = "fake moustache"
desc = "Warning: moustache is fake."
name = "completely real moustache"
desc = "moustache is totally real."
icon_state = "fake-moustache"
flags_inv = HIDEFACE
/obj/item/clothing/mask/fakemoustache/verb/pontificate()
set name = "Pontificate Evilly"
set category = "Object"
set desc = "Devise evil plans of evilness."
usr.visible_message("<span class = 'danger'>\ [usr] twirls \his moustache and laughs [pick("fiendishly","maniacally","diabolically","evilly","fiendishly")]!</span>")
//scarves (fit in in mask slot)
/obj/item/clothing/mask/bluescarf
@@ -172,7 +172,7 @@
/obj/item/projectile/bullet/dart/metalfoam
New()
..()
reagents.add_reagent("aluminium", 15)
reagents.add_reagent("aluminum", 15)
reagents.add_reagent("foaming_agent", 5)
reagents.add_reagent("pacid", 5)
+1 -1
View File
@@ -283,7 +283,7 @@
dispensable_reagents = list()
var/list/special_reagents = list(list("hydrogen", "oxygen", "silicon", "phosphorus", "sulfur", "carbon", "nitrogen"),
list("lithium", "sugar", "water", "copper", "mercury", "sodium"),
list("ethanol", "chlorine", "potassium", "aluminium","plasma", "radium", "fluorine", "iron"))
list("ethanol", "chlorine", "potassium", "aluminum","plasma", "radium", "fluorine", "iron"))
/obj/machinery/chem_dispenser/constructable/New()
..()
+1 -1
View File
@@ -305,7 +305,7 @@ datum/reagent/salbutamol/on_mob_life(var/mob/living/M as mob)
name = "Salbutamol"
id = "salbutamol"
result = "salbutamol"
required_reagents = list("sal_acid" = 1, "lithium" = 1, "aluminium" = 1, "bromine" = 1, "ammonia" = 1)
required_reagents = list("sal_acid" = 1, "lithium" = 1, "aluminum" = 1, "bromine" = 1, "ammonia" = 1)
result_amount = 5
datum/reagent/perfluorodecalin
+1 -1
View File
@@ -287,7 +287,7 @@ datum/reagent/super_hairgrownium
name = "Super Hairgrownium"
id = "super_hairgrownium"
result = "super_hairgrownium"
required_reagents = list("iron" = 1, "methamphetamine " = 1, "hairgrownium" = 1)
required_reagents = list("iron" = 1, "methamphetamine" = 1, "hairgrownium" = 1)
result_amount = 3
datum/reagent/super_hairgrownium/on_mob_life(var/mob/living/M as mob)
+3 -3
View File
@@ -202,7 +202,7 @@
name = "Flash powder"
id = "flash_powder"
result = "flash_powder"
required_reagents = list("aluminium" = 1, "potassium" = 1, "sulfur" = 1 )
required_reagents = list("aluminum" = 1, "potassium" = 1, "sulfur" = 1 )
result_amount = 3
/datum/chemical_reaction/flash_powder_flash
@@ -429,8 +429,8 @@
/datum/chemical_reaction/napalm
name = "Napalm"
id = "napalm"
result = null
required_reagents = list("aluminium" = 1, "plasma" = 1, "sacid" = 1 )
result = "napalm"
required_reagents = list("sugar" = 1, "fuel" = 1, "ethanol" = 1 )
result_amount = 1
datum/reagent/cryostylane