cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changes all instances of sulfuric acid to sulphuric acid (#16914)

Browse Source 
* Colonisation

* i had maps excluded
This commit is contained in:
Simplehorror
2022-12-05 01:57:38 +00:00
committed by GitHub
parent 6d8d5ac9ab
commit ee496538d6
18 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
_maps/RandomRuins/SpaceRuins/gasthelizards.dmm
View File

@@ -271,7 +271,7 @@
pixel_y = 1
},
/obj/item/reagent_containers/glass/bottle/facid{
name = "fluorosulfuric acid bottle";
name = "fluorosulphuric acid bottle";
pixel_x = -3;
pixel_y = 6
},

2
_maps/RandomRuins/StationRuins/maint/10x5/10x5_maintmedical.dmm
View File

@@ -196,7 +196,7 @@
/obj/item/reagent_containers/glass/bottle/sugar{
pixel_x = 6
},
/obj/item/reagent_containers/glass/bottle/sulfur{
/obj/item/reagent_containers/glass/bottle/sulphur{
pixel_x = -6
},
/obj/effect/decal/cleanable/dirt,

2
_maps/map_files/Yogsmeta/Yogsmeta.dmm
View File

@@ -918,7 +918,7 @@
},
/obj/item/reagent_containers/syringe,
/obj/item/reagent_containers/glass/bottle/facid{
name = "fluorosulfuric acid bottle";
name = "fluorosulphuric acid bottle";
pixel_x = -3;
pixel_y = 6
},

4
code/datums/diseases/fake_gbs.dm
View File

@@ -3,8 +3,8 @@
max_stages = 5
spread_text = "On contact"
spread_flags = DISEASE_SPREAD_BLOOD | DISEASE_SPREAD_CONTACT_SKIN | DISEASE_SPREAD_CONTACT_FLUIDS
cure_text = "Synaptizine & Sulfur"
cures = list(/datum/reagent/medicine/synaptizine,/datum/reagent/sulfur)
cure_text = "Synaptizine & sulphur"
cures = list(/datum/reagent/medicine/synaptizine,/datum/reagent/sulphur)
agent = "Gravitokinetic Bipotential SADS-"
viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey)
desc = "If left untreated death will occur."

4
code/datums/diseases/gbs.dm
View File

@@ -3,8 +3,8 @@
max_stages = 4
spread_text = "On contact"
spread_flags = DISEASE_SPREAD_BLOOD | DISEASE_SPREAD_CONTACT_SKIN | DISEASE_SPREAD_CONTACT_FLUIDS
cure_text = "Synaptizine & Sulfur"
cures = list(/datum/reagent/medicine/synaptizine,/datum/reagent/sulfur)
cure_text = "Synaptizine & sulphur"
cures = list(/datum/reagent/medicine/synaptizine,/datum/reagent/sulphur)
cure_chance = 15//higher chance to cure, since two reagents are required
agent = "Gravitokinetic Bipotential SADS+"
viable_mobtypes = list(/mob/living/carbon/human)

4
code/game/objects/items/devices/flashlight.dm
View File

@@ -280,7 +280,7 @@
var/frng_max = 1000
heat = 1000
light_color = LIGHT_COLOR_FLARE
grind_results = list(/datum/reagent/sulfur = 15)
grind_results = list(/datum/reagent/sulphur = 15)
/obj/item/flashlight/flare/Initialize()
. = ..()
@@ -371,7 +371,7 @@
frng_min = 540
frng_max = 700
heat = 2500
grind_results = list(/datum/reagent/sulfur = 15, /datum/reagent/potassium = 10)
grind_results = list(/datum/reagent/sulphur = 15, /datum/reagent/potassium = 10)
/obj/item/flashlight/flare/torch
name = "torch"

4
code/modules/antagonists/devil/imp/imp.dm
View File

@@ -54,7 +54,7 @@
/mob/living/simple_animal/imp/death()
..(1)
playsound(get_turf(src),'sound/magic/demon_dies.ogg', 200, 1)
visible_message(span_danger("[src] screams in agony as it sublimates into a sulfurous smoke."))
visible_message(span_danger("[src] screams in agony as it sublimates into a sulphurous smoke."))
ghostize()
qdel(src)
@@ -72,4 +72,4 @@
var/datum/objective/newobjective = new
newobjective.explanation_text = "Try to get a promotion to a higher devilic rank."
newobjective.owner = owner
objectives += newobjective
objectives += newobjective

2
code/modules/hydroponics/hydroponics.dm
View File

@@ -563,7 +563,7 @@
adjustHealth(round(S.get_reagent_amount(/datum/reagent/water/holywater) * 0.1))
// A variety of nutrients are dissolved in club soda, without sugar.
// These nutrients include carbon, oxygen, hydrogen, phosphorous, potassium, sulfur and sodium, all of which are needed for healthy plant growth.
// These nutrients include carbon, oxygen, hydrogen, phosphorous, potassium, sulphur and sodium, all of which are needed for healthy plant growth.
if(S.has_reagent(/datum/reagent/consumable/sodawater, 1))
adjustWater(round(S.get_reagent_amount(/datum/reagent/consumable/sodawater) * 1))
adjustHealth(round(S.get_reagent_amount(/datum/reagent/consumable/sodawater) * 0.1))

6
code/modules/reagents/chemistry/machinery/chem_dispenser.dm
View File

@@ -3,7 +3,7 @@
if ("sacid")
return "sulphuricacid"
if ("facid")
return "fluorosulfuricacid"
return "fluorosulphuricacid"
if ("co2")
return "carbondioxide"
if ("mine_salve")
@@ -61,7 +61,7 @@
/datum/reagent/oil,
/datum/reagent/uranium/radium,
/datum/reagent/stable_plasma,
/datum/reagent/sulfur
/datum/reagent/sulphur
)
var/list/t2_upgrade_reagents = list(
/datum/reagent/consumable/sugar,
@@ -720,7 +720,7 @@
/datum/reagent/sodium,
/datum/reagent/stable_plasma,
/datum/reagent/consumable/sugar,
/datum/reagent/sulfur,
/datum/reagent/sulphur,
/datum/reagent/toxin/acid,
/datum/reagent/water,
/datum/reagent/fuel,

4
code/modules/reagents/chemistry/reagents/other_reagents.dm
View File

@@ -850,8 +850,8 @@
M.adjustOrganLoss(ORGAN_SLOT_BRAIN, 1)
..()
/datum/reagent/sulfur
name = "Sulfur"
/datum/reagent/sulphur
name = "sulphur"
description = "A sickly yellow solid mostly known for its nasty smell. It's actually much more helpful than it looks in biochemisty."
reagent_state = SOLID
color = "#BF8C00" // rgb: 191, 140, 0

4
code/modules/reagents/chemistry/reagents/toxin_reagents.dm
View File

@@ -828,8 +828,8 @@
T.acid_act(acidpwr, reac_volume)
/datum/reagent/toxin/acid/fluacid
name = "Fluorosulfuric acid"
description = "Fluorosulfuric acid is an extremely corrosive chemical substance."
name = "Fluorosulphuric acid"
description = "Fluorosulphuric acid is an extremely corrosive chemical substance."
color = "#5050FF"
toxpwr = 2
acidpwr = 42.0

4
code/modules/reagents/chemistry/recipes/cat2_medicines.dm
View File

@@ -19,7 +19,7 @@
name = "lenturi"
id = /datum/reagent/medicine/c2/lenturi
results = list(/datum/reagent/medicine/c2/lenturi = 5)
required_reagents = list(/datum/reagent/ammonia = 1, /datum/reagent/silver = 1, /datum/reagent/sulfur = 1, /datum/reagent/oxygen = 1, /datum/reagent/bromine = 1)
required_reagents = list(/datum/reagent/ammonia = 1, /datum/reagent/silver = 1, /datum/reagent/sulphur = 1, /datum/reagent/oxygen = 1, /datum/reagent/bromine = 1)
/datum/chemical_reaction/medicine/aiuri
name = "aiuri"
@@ -56,4 +56,4 @@
name = "thializid"
id = /datum/reagent/medicine/c2/thializid
results = list(/datum/reagent/medicine/c2/thializid = 5)
required_reagents = list(/datum/reagent/sulfur = 1, /datum/reagent/fluorine = 1, /datum/reagent/toxin = 1, /datum/reagent/nitrous_oxide = 2)
required_reagents = list(/datum/reagent/sulphur = 1, /datum/reagent/fluorine = 1, /datum/reagent/toxin = 1, /datum/reagent/nitrous_oxide = 2)

2
code/modules/reagents/chemistry/recipes/medicine.dm
View File

@@ -47,7 +47,7 @@
name = "Silver Sulfadiazine"
id = /datum/reagent/medicine/silver_sulfadiazine
results = list(/datum/reagent/medicine/silver_sulfadiazine = 5)
required_reagents = list(/datum/reagent/ammonia = 1, /datum/reagent/silver = 1, /datum/reagent/sulfur = 1, /datum/reagent/oxygen = 1, /datum/reagent/chlorine = 1)
required_reagents = list(/datum/reagent/ammonia = 1, /datum/reagent/silver = 1, /datum/reagent/sulphur = 1, /datum/reagent/oxygen = 1, /datum/reagent/chlorine = 1)
/datum/chemical_reaction/salglu_solution
name = "Saline-Glucose Solution"

4
code/modules/reagents/chemistry/recipes/others.dm
View File

@@ -829,11 +829,11 @@
for(var/i = 1, i <= created_volume, i++)
new /obj/item/stack/medical/aloe(location)
/datum/chemical_reaction/sulfuric_acid
/datum/chemical_reaction/sulphuric_acid
name = /datum/reagent/toxin/acid
id = /datum/reagent/toxin/acid
results = list(/datum/reagent/toxin/acid = 2)
required_reagents = list(/datum/reagent/sulfur = 1, /datum/reagent/water = 1)
required_reagents = list(/datum/reagent/sulphur = 1, /datum/reagent/water = 1)
/datum/chemical_reaction/sugar
name = /datum/reagent/consumable/sugar

4
code/modules/reagents/chemistry/recipes/pyrotechnics.dm
View File

@@ -94,7 +94,7 @@
name = "Black Powder"
id = /datum/reagent/blackpowder
results = list(/datum/reagent/blackpowder = 3)
required_reagents = list(/datum/reagent/saltpetre = 1, /datum/reagent/medicine/charcoal = 1, /datum/reagent/sulfur = 1)
required_reagents = list(/datum/reagent/saltpetre = 1, /datum/reagent/medicine/charcoal = 1, /datum/reagent/sulphur = 1)
/datum/chemical_reaction/reagent_explosion/blackpowder_explosion
name = "Black Powder Kaboom"
@@ -241,7 +241,7 @@
name = "Flash powder"
id = /datum/reagent/flash_powder
results = list(/datum/reagent/flash_powder = 3)
required_reagents = list(/datum/reagent/aluminium = 1, /datum/reagent/potassium = 1, /datum/reagent/sulfur = 1 )
required_reagents = list(/datum/reagent/aluminium = 1, /datum/reagent/potassium = 1, /datum/reagent/sulphur = 1 )
/datum/chemical_reaction/flash_powder/on_reaction(datum/reagents/holder, created_volume)
if(holder.has_reagent(/datum/reagent/stabilizing_agent))

4
code/modules/reagents/chemistry/recipes/toxins.dm
View File

@@ -22,7 +22,7 @@
/datum/chemical_reaction/facid
name = "Fluorosulfuric acid"
name = "Fluorosulphuric acid"
id = /datum/reagent/toxin/acid/fluacid
results = list(/datum/reagent/toxin/acid/fluacid = 4)
required_reagents = list(/datum/reagent/toxin/acid = 1, /datum/reagent/fluorine = 1, /datum/reagent/hydrogen = 1, /datum/reagent/potassium = 1)
@@ -32,7 +32,7 @@
name = /datum/reagent/toxin/sulfonal
id = /datum/reagent/toxin/sulfonal
results = list(/datum/reagent/toxin/sulfonal = 3)
required_reagents = list(/datum/reagent/acetone = 1, /datum/reagent/diethylamine = 1, /datum/reagent/sulfur = 1)
required_reagents = list(/datum/reagent/acetone = 1, /datum/reagent/diethylamine = 1, /datum/reagent/sulphur = 1)
/datum/chemical_reaction/lipolicide
name = /datum/reagent/toxin/lipolicide

10
code/modules/reagents/reagent_containers/bottle.dm
View File

@@ -116,8 +116,8 @@
list_reagents = list(/datum/reagent/diethylamine = 30)
/obj/item/reagent_containers/glass/bottle/facid
name = "Fluorosulfuric Acid Bottle"
desc = "A small bottle. Contains a small amount of fluorosulfuric acid."
name = "Fluorosulphuric Acid Bottle"
desc = "A small bottle. Contains a small amount of fluorosulphuric acid."
list_reagents = list(/datum/reagent/toxin/acid/fluacid = 30)
/obj/item/reagent_containers/glass/bottle/adminordrazine
@@ -379,9 +379,9 @@
name = "phosphorus bottle"
list_reagents = list(/datum/reagent/phosphorus = 30)
/obj/item/reagent_containers/glass/bottle/sulfur
name = "sulfur bottle"
list_reagents = list(/datum/reagent/sulfur = 30)
/obj/item/reagent_containers/glass/bottle/sulphur
name = "sulphur bottle"
list_reagents = list(/datum/reagent/sulphur = 30)
/obj/item/reagent_containers/glass/bottle/chlorine
name = "chlorine bottle"

2
code/modules/research/xenobiology/crossbreeding/_status_effects.dm
View File

@@ -862,7 +862,7 @@ datum/status_effect/stabilized/blue/on_remove()
/datum/status_effect/stabilized/oil
id = "stabilizedoil"
colour = "oil"
examine_text = span_warning("SUBJECTPRONOUN smells of sulfur and oil!")
examine_text = span_warning("SUBJECTPRONOUN smells of sulphur and oil!")
/datum/status_effect/stabilized/oil/tick()
if(owner.stat == DEAD)