From f7c59fc6216d94d01801cbd1735ba1bf5d6d609a Mon Sep 17 00:00:00 2001 From: Jix S4v Date: Sun, 21 May 2023 23:35:04 +0200 Subject: [PATCH 1/3] server config --- config/admins.txt | 4 +--- config/config.txt | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/config/admins.txt b/config/admins.txt index 362a4378a6f8f..7b4c9ceee4a1e 100644 --- a/config/admins.txt +++ b/config/admins.txt @@ -9,8 +9,6 @@ # If SQL-based admin loading is enabled, admins listed here will always be loaded first # # and will override any duplicate entries in the database. # ############################################################################################### -Ike709 = Host -Crossedfall = Host -CthulhuOnIce = Host +joelogbybolb = Host # the rest are in the db diff --git a/config/config.txt b/config/config.txt index b46fff95e27a8..8352592912d2d 100644 --- a/config/config.txt +++ b/config/config.txt @@ -30,7 +30,7 @@ $include policies.txt # There are various options which are hard-locked for security reasons. ## Server name: This appears at the top of the screen in-game and in the BYOND hub. Uncomment and replace 'beestation' with the name of your choice. -#@SERVERNAME beestation +#@SERVERNAME joestation ## Server SQL name: This is the name used to identify the server to the SQL DB, distinct from SERVERNAME as it must be at most 32 characters. #@SERVERSQLNAME ss13newbs @@ -260,7 +260,7 @@ CHECK_RANDOMIZER ## set a server location for world reboot. Don't include the byond://, just give the address and port. ## Don't set this to the same server, BYOND will automatically restart players to the server when it has restarted. -SERVER byond://sage.beestation13.com:7878 +SERVER 127.0.0.1:7973 ## forum address FORUMURL https://forums.beestation13.com From 970c2f50e35d92593ad34cb4dd759272deb0d064 Mon Sep 17 00:00:00 2001 From: Jix S4v Date: Tue, 23 May 2023 16:10:01 +0200 Subject: [PATCH 2/3] Revert "server config" This reverts commit f7c59fc6216d94d01801cbd1735ba1bf5d6d609a. --- config/admins.txt | 4 +++- config/config.txt | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/config/admins.txt b/config/admins.txt index 7b4c9ceee4a1e..362a4378a6f8f 100644 --- a/config/admins.txt +++ b/config/admins.txt @@ -9,6 +9,8 @@ # If SQL-based admin loading is enabled, admins listed here will always be loaded first # # and will override any duplicate entries in the database. # ############################################################################################### -joelogbybolb = Host +Ike709 = Host +Crossedfall = Host +CthulhuOnIce = Host # the rest are in the db diff --git a/config/config.txt b/config/config.txt index 8352592912d2d..b46fff95e27a8 100644 --- a/config/config.txt +++ b/config/config.txt @@ -30,7 +30,7 @@ $include policies.txt # There are various options which are hard-locked for security reasons. ## Server name: This appears at the top of the screen in-game and in the BYOND hub. Uncomment and replace 'beestation' with the name of your choice. -#@SERVERNAME joestation +#@SERVERNAME beestation ## Server SQL name: This is the name used to identify the server to the SQL DB, distinct from SERVERNAME as it must be at most 32 characters. #@SERVERSQLNAME ss13newbs @@ -260,7 +260,7 @@ CHECK_RANDOMIZER ## set a server location for world reboot. Don't include the byond://, just give the address and port. ## Don't set this to the same server, BYOND will automatically restart players to the server when it has restarted. -SERVER 127.0.0.1:7973 +SERVER byond://sage.beestation13.com:7878 ## forum address FORUMURL https://forums.beestation13.com From 37ce82d7ba658a79f0175ad46fee6db974f3305d Mon Sep 17 00:00:00 2001 From: Jix S4v Date: Mon, 5 Jun 2023 11:09:21 +0200 Subject: [PATCH 3/3] minor spelling mistake, argument destroyed --- code/__DEFINES/aquarium.dm | 2 +- code/modules/reagents/chemistry/machinery/chem_dispenser.dm | 2 +- code/modules/reagents/chemistry/reagents/toxin_reagents.dm | 2 +- code/modules/reagents/reagent_containers/bottle.dm | 4 ++-- code/modules/reagents/reagent_containers/glass.dm | 2 +- code/modules/reagents/reagent_containers/spray.dm | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/code/__DEFINES/aquarium.dm b/code/__DEFINES/aquarium.dm index 47813eb23c11c..492a1cfe5a524 100644 --- a/code/__DEFINES/aquarium.dm +++ b/code/__DEFINES/aquarium.dm @@ -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" diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm index d98b0e4e29e83..4a87cbad4c28d 100644 --- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm +++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm @@ -1,7 +1,7 @@ /proc/translate_legacy_chem_id(id) switch (id) if ("sacid") - return "sulphuricacid" + return "sulfuricacid" if ("facid") return "fluorosulfuricacid" if ("co2") diff --git a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm index 7e23257546ee6..8e2ec12a2d201 100644 --- a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm @@ -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 diff --git a/code/modules/reagents/reagent_containers/bottle.dm b/code/modules/reagents/reagent_containers/bottle.dm index 8765bcf943b10..3e68004c80045 100644 --- a/code/modules/reagents/reagent_containers/bottle.dm +++ b/code/modules/reagents/reagent_containers/bottle.dm @@ -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 diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index b30bded2906d1..21f2345694e53 100755 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -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 diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm index d0743aed672e4..8d206befeb7f6 100644 --- a/code/modules/reagents/reagent_containers/spray.dm +++ b/code/modules/reagents/reagent_containers/spray.dm @@ -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