diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm index 220931d805e..b57c4022e5f 100644 --- a/code/modules/clothing/masks/miscellaneous.dm +++ b/code/modules/clothing/masks/miscellaneous.dm @@ -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("\ [usr] twirls \his moustache and laughs [pick("fiendishly","maniacally","diabolically","evilly","fiendishly")]!") + //scarves (fit in in mask slot) /obj/item/clothing/mask/bluescarf diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm index ac1710d2cbb..e8e27782ccb 100644 --- a/code/modules/projectiles/projectile/bullets.dm +++ b/code/modules/projectiles/projectile/bullets.dm @@ -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) diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm index 2304b239c63..6abe0deff5e 100644 --- a/code/modules/reagents/Chemistry-Machinery.dm +++ b/code/modules/reagents/Chemistry-Machinery.dm @@ -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() ..() diff --git a/code/modules/reagents/newchem/medicine.dm b/code/modules/reagents/newchem/medicine.dm index be4ef97cf9e..2ad2c3708ec 100644 --- a/code/modules/reagents/newchem/medicine.dm +++ b/code/modules/reagents/newchem/medicine.dm @@ -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 diff --git a/code/modules/reagents/newchem/other.dm b/code/modules/reagents/newchem/other.dm index 0e4b3461c11..1b336a8df66 100644 --- a/code/modules/reagents/newchem/other.dm +++ b/code/modules/reagents/newchem/other.dm @@ -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) diff --git a/code/modules/reagents/newchem/pyro.dm b/code/modules/reagents/newchem/pyro.dm index 71682be5caa..6699a688ffe 100644 --- a/code/modules/reagents/newchem/pyro.dm +++ b/code/modules/reagents/newchem/pyro.dm @@ -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