Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minor spelling mistake #9176

Merged
merged 6 commits into from
Jun 6, 2023
Merged

Minor spelling mistake #9176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f7c59fc
server config
JixS4v May 21, 2023
970c2f5
Revert "server config"
JixS4v May 23, 2023
66ba057
Merge branch 'master' of https://github.com/JixS4v/BeeStation-Hornet
JixS4v May 25, 2023
64dce4c
Merge branch 'BeeStation:master' into master
JixS4v May 28, 2023
ffbd3ee
Merge branch 'master' of https://github.com/JixS4v/BeeStation-Hornet
JixS4v May 30, 2023
37ce82d
minor spelling mistake, argument destroyed
JixS4v Jun 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/__DEFINES/aquarium.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@

#define AQUARIUM_FLUID_FRESHWATER "Freshwater"
#define AQUARIUM_FLUID_SALTWATER "Saltwater"
#define AQUARIUM_FLUID_SULPHWATEVER "Sulphuric Water"
#define AQUARIUM_FLUID_SULPHWATEVER "Sulfuric Water"
#define AQUARIUM_FLUID_AIR "Air"
2 changes: 1 addition & 1 deletion code/modules/reagents/chemistry/machinery/chem_dispenser.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/proc/translate_legacy_chem_id(id)
switch (id)
if ("sacid")
return "sulphuricacid"
return "sulfuricacid"
if ("facid")
return "fluorosulfuricacid"
if ("co2")
Expand Down
2 changes: 1 addition & 1 deletion code/modules/reagents/chemistry/reagents/toxin_reagents.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -790,7 +790,7 @@


/datum/reagent/toxin/acid
name = "Sulphuric Acid"
name = "Sulfuric Acid"
description = "A strong mineral acid with the molecular formula H2SO4."
color = "#00FF32"
chem_flags = CHEMICAL_RNG_GENERAL | CHEMICAL_RNG_FUN | CHEMICAL_RNG_BOTANY
Expand Down
4 changes: 2 additions & 2 deletions code/modules/reagents/reagent_containers/bottle.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,8 +497,8 @@
list_reagents = list(/datum/reagent/consumable/sugar = 30)

/obj/item/reagent_containers/glass/bottle/sacid
name = "sulphuric acid bottle"
label_name = "sulphuric acid"
name = "sulfuric acid bottle"
label_name = "sulfuric acid"
list_reagents = list(/datum/reagent/toxin/acid = 30)

/obj/item/reagent_containers/glass/bottle/welding_fuel
Expand Down
2 changes: 1 addition & 1 deletion code/modules/reagents/reagent_containers/glass.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@
/obj/item/reagent_containers/glass/beaker/cryoxadone
list_reagents = list(/datum/reagent/medicine/cryoxadone = 30)

/obj/item/reagent_containers/glass/beaker/sulphuric
/obj/item/reagent_containers/glass/beaker/sulfuric
list_reagents = list(/datum/reagent/toxin/acid = 50)

/obj/item/reagent_containers/glass/beaker/slime
Expand Down
2 changes: 1 addition & 1 deletion code/modules/reagents/reagent_containers/spray.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,6 +384,6 @@

/obj/item/reagent_containers/spray/cyborg/acid
name = "acid spray"
desc = "A spray filled with sulphuric acid for offensive use."
desc = "A spray filled with sulfuric acid for offensive use."
color = "#00FF32"
set_reagent = /datum/reagent/toxin/acid