diff --git a/code/__byond_version_compat.dm b/code/__byond_version_compat.dm index b9b36d93869f..4ab8dee335c9 100644 --- a/code/__byond_version_compat.dm +++ b/code/__byond_version_compat.dm @@ -11,10 +11,10 @@ //If you update these values, update the message in the #error #define MAX_BYOND_MAJOR 516 -#define MAX_BYOND_MINOR 1659 +#define MAX_BYOND_MINOR 1667 #if ((DM_VERSION > MAX_BYOND_MAJOR) || (DM_BUILD > MAX_BYOND_MINOR)) && !defined(SPACEMAN_DMM) #error Your version of BYOND is too new to compile this project. -#error Download version 515.1659 at www.byond.com/download/build/515/515.1659_byond.exe +#error Download version 516.1667 at www.byond.com/download/build/515/515.1659_byond.exe #endif // 515 split call for external libraries into call_ext diff --git a/code/controllers/subsystem/echelon.dm b/code/controllers/subsystem/echelon.dm index cd0f2c2448a1..9ddecef4c4c3 100644 --- a/code/controllers/subsystem/echelon.dm +++ b/code/controllers/subsystem/echelon.dm @@ -1,7 +1,7 @@ SUBSYSTEM_DEF(echelon) name = "ECHELON" init_order = INIT_ORDER_ECHELON - flags = SS_NO_FIRE + flags = SS_NO_FIRE | SS_NO_INIT var/enabled = TRUE /datum/controller/subsystem/echelon/Initialize(timeofday, zlevel) @@ -32,6 +32,7 @@ SUBSYSTEM_DEF(echelon) if(IsAdminAdvancedProcCall()) return + /* var/datum/DBQuery/query_get_cached_matches = SSdbcore.NewQuery({" SELECT JSON_VALUE(data, "$.should_block") @@ -88,6 +89,10 @@ SUBSYSTEM_DEF(echelon) return json["should_block"] == "true" + */ + var/datum/ipintel/val = get_ip_intel(ip) + var/rating_bad = CONFIG_GET(number/ipintel_rating_bad) + return rating_bad < val.intel /datum/controller/subsystem/echelon/proc/is_match(ckey, ip, allow_exceptions=TRUE) @@ -101,4 +106,4 @@ SUBSYSTEM_DEF(echelon) return is_using_proxy(ip) - \ No newline at end of file + diff --git a/code/game/machinery/pipe/pipe_dispenser.dm b/code/game/machinery/pipe/pipe_dispenser.dm index 528bbedda4e7..e049707c8c64 100644 --- a/code/game/machinery/pipe/pipe_dispenser.dm +++ b/code/game/machinery/pipe/pipe_dispenser.dm @@ -101,14 +101,14 @@ //Allow you to drag-drop disposal pipes and transit tubes into it -/obj/machinery/pipedispenser/disposal/MouseDrop_T(obj/structure/pipe, mob/usr) - if(usr.incapacitated()) +/obj/machinery/pipedispenser/disposal/MouseDrop_T(obj/structure/pipe, mob/user) + if(user.incapacitated()) return if (!istype(pipe, /obj/structure/disposalconstruct) && !istype(pipe, /obj/structure/c_transit_tube) && !istype(pipe, /obj/structure/c_transit_tube_pod)) return - if (get_dist(usr, src) > 1 || get_dist(src,pipe) > 1 ) + if (get_dist(user, src) > 1 || get_dist(src,pipe) > 1 ) return if (pipe.anchored) diff --git a/code/modules/admin/ipintel.dm b/code/modules/admin/ipintel.dm index 7ec466f29a87..cd415b849da9 100644 --- a/code/modules/admin/ipintel.dm +++ b/code/modules/admin/ipintel.dm @@ -84,13 +84,18 @@ if (!SSipintel.enabled) return - var/list/http[] = world.Export("http://[CONFIG_GET(string/ipintel_domain)]/check.php?ip=[ip]&contact=[CONFIG_GET(string/ipintel_email)]&format=json&flags=f") + var/datum/http_request/http = new() + http.prepare(RUSTG_HTTP_METHOD_GET, "http://[CONFIG_GET(string/ipintel_domain)]/check.php?ip=[ip]&contact=[CONFIG_GET(string/ipintel_email)]&format=json&flags=f") + http.begin_async() + UNTIL(http.is_complete()) + var/datum/http_response/res = http.into_response() + //var/list/http[] = world.Export("http://[CONFIG_GET(string/ipintel_domain)]/check.php?ip=[ip]&contact=[CONFIG_GET(string/ipintel_email)]&format=json&flags=f") - if (http) - var/status = text2num(http["STATUS"]) + if (res) + var/status = text2num(res.status_code) if (status == 200) - var/response = json_decode(file2text(http["CONTENT"])) + var/response = json_decode(res.body) if (response) if (response["status"] == "success") var/intelnum = text2num(response["result"]) diff --git a/code/modules/client/verbs/linkforum.dm b/code/modules/client/verbs/linkforum.dm index 57f15ee169dc..bccae3800720 100644 --- a/code/modules/client/verbs/linkforum.dm +++ b/code/modules/client/verbs/linkforum.dm @@ -1,3 +1,4 @@ +/* Forum won't be used. /client/verb/linkforum() set category = "OOC" set name = "Link Forum Account" @@ -21,3 +22,4 @@ /client/proc/givelinkforum() add_verb(src, /client/verb/linkforum) to_chat(src, span_notice("Your forum verification link has expired, and the verb has been returned to you. You can ignore this if you have already linked your accounts."), confidential = TRUE) +*/ diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm index 8373f79aa8fb..c428ff8b2a50 100644 --- a/code/modules/clothing/chameleon.dm +++ b/code/modules/clothing/chameleon.dm @@ -153,7 +153,7 @@ var/copying = FALSE var/in_use = FALSE -/datum/action/cooldown/chameleon_copy/InterceptClickOn(mob/living/caller, params, atom/target) +/datum/action/cooldown/chameleon_copy/InterceptClickOn(mob/living/caller_but_not_a_byond_built_in_proc, params, atom/target) click_with_power(target) /datum/action/cooldown/chameleon_copy/Grant(mob/M) diff --git a/config/admin_ranks.txt b/config/admin_ranks.txt index ea37384eaef6..c79fe9362efe 100644 --- a/config/admin_ranks.txt +++ b/config/admin_ranks.txt @@ -19,7 +19,7 @@ # +BAN = the ability to ban, jobban and fullban # +STEALTH = the ability to stealthmin (make yourself appear with a fake name to everyone but other admins # +POSSESS = the ability to possess objects -# +POLL (or +POLL) = the ability to create in game server polls (requires DB) +# +POLL = the ability to create in game server polls (requires DB) # +BUILD (or +BUILDMODE) = the ability to use buildmode # +SERVER = higher-risk admin verbs and abilities, such as those which affect the server configuration. # +DEBUG = debug tools used for diagnosing and fixing problems. It's useful to give this to coders so they can investigate problems on a live server. @@ -27,23 +27,17 @@ # +RIGHTS (or +PERMISSIONS) = allows you to promote and/or demote people. # +SOUND (or +SOUNDS) = allows you to upload and play sounds # +SPAWN (or +CREATE) = mob transformations, spawning of most atoms including mobs (high-risk atoms, e.g. blackholes, will require the +FUN flag too) -# +AUTOLOGIN = admin gains powers upon connect. This defaults to on, you can use -AUTOLOGIN to make a role require using the readmin verb to gain powers. (this does not effect the admin's ability to walk past bans or other on-connect limitations like panic bunker or pop limit.) -# +DBRANKS = when sql-based admin loading is enabled, allows for non-temporary changes in the permissions panel to be saved (requires DB) +# +AUTOLOGIN (or +AUTOADMIN) = admin gains powers upon connect. This defaults to on, you can use -AUTOLOGIN to make a role require using the readmin verb to gain powers. (this does not effect the admin's ability to walk past bans or other on-connect limitations like panic bunker or pop limit.) +# +DBRANKS (or +PERSISTPERMS) = when sql-based admin loading is enabled, allows for non-temporary changes in the permissions panel to be saved (requires DB) # +EVERYTHING (or +HOST or +ALL) = Simply gives you everything without having to type every flag # +DEV = For potentially server ending procs # END_KEYWORDS -Host = +EVERYTHING - -Council Member = +EVERYTHING - -Head Developer = +EVERYTHING - -SysOp = +EVERYTHING +Host = +ADMIN +BAN +BUILDMODE +DEBUG +FUN +PERMISSIONS +PERSISTPERMS +POSSESS +SERVER +SOUND +SPAWN +STEALTH +VAREDIT -Administrator = +STEALTH +ADMIN +BASIC +BAN +SPAWN +VAREDIT +DEBUG +SERVER +FUN +TICKET +BUILD +AUTOLOGIN +Administrator = +ADMIN +AUTOLOGIN +BAN +BUILDMODE +DEBUG +FUN +POSSESS +SERVER +SOUND +SPAWN +STEALTH +VAREDIT -Admin Observer = +STEALTH +AUTOLOGIN +Admin Observer = +AUTOLOGIN +STEALTH -Maintainer = +STEALTH +ADMIN +VAREDIT +DEBUG +SERVER +BASIC +SPAWN +POLL +DEV +Maintainer = +ADMIN +DEBUG +SERVER +SPAWN +STEALTH +VAREDIT diff --git a/config/motd.txt b/config/motd.txt index b0d253158b6c..77e526028492 100644 --- a/config/motd.txt +++ b/config/motd.txt @@ -1,15 +1,12 @@ -

Welcome to Yogstation 13!


-We have a support ticket system at Yogstation. If you have an issue, please file a ticket by pressing F1 or going to the admin tab and clicking Ahelp. An admin will help you as soon as possible.
-We are constantly seeking dedicated new admins, coders, spriters, mappers, Wiki Editors, and mentors to improve our server. Without them, you wouldn't have a server to play on. If you feel you may be a good addition to our Admin or Mentor team, are interested in joining the development team, or would like to get involved with editing the Wiki, please see the links listed below.
+

Welcome to HogStation!


+If you need to report a problem to the server administrators, press F1 or go to the admin tab and click Ahelp.

+If you need help learning how to play, press F2 or go to the mentor tab and click Mhelp.

+Speaking of staff, as a newly-minted server rising from the ashes of Yogstation 13, we are in need of admins, coders, spriters, and mentors to build our server. Preference will be given first to former Yogstation staff and then to their players, but all are welcome to apply. If you'd like to help out or simply hang out, please see the links listed below:

+We host on a non-24/7 basis, so please join the Discord to know on what days and times that we're open.

- ¤ Admin Application - ¤ Mentor Application - ¤ GitHub Repo - ¤ Yogstation Wiki contribution guide. -
-We are running a high power server and we need donations to keep the server running. Donators get multiple benefits such as fun hats, custom cyborg skins and Quiet Mode!

-Discord: https://discord.gg/0keg6hQH05Ha8OfO
-If you need to create an account on the forums please use this keyword to register: assistantgreytide
- - + ¤ GitHub Repo
+ ¤ Discord +

+
+

"The yogging is done; let the hogging begin."


diff --git a/html/templates/header.html b/html/templates/header.html index af04adbc6bf6..2cbe0c450f13 100644 --- a/html/templates/header.html +++ b/html/templates/header.html @@ -1,7 +1,7 @@ - Yogstation Changelog + HogStation Changelog