diff --git a/code/datums/entities/player.dm b/code/datums/entities/player.dm index f30c01b3128b..aefa81672b54 100644 --- a/code/datums/entities/player.dm +++ b/code/datums/entities/player.dm @@ -455,15 +455,19 @@ BSQL_PROTECT_DATUM(/datum/entity/player) LAZYSET(stats, S.stat_id, S) /datum/entity/player/proc/load_byond_account_age() - var/datum/http_request/request = new() - request.prepare(RUSTG_HTTP_METHOD_GET, "https://www.byond.com/members/[ckey]?format=text") - request.execute_blocking() - var/datum/http_response/response = request.into_response() - if(response.errored) + var/list/http_request = world.Export("http://byond.com/members/[ckey]?format=text") + if(!http_request) + log_admin("Could not check BYOND account age for [ckey] - no response from server.") + return + + var/body = file2text(http_request["CONTENT"]) + if(!body) + log_admin("Could not check BYOND account age for [ckey] - invalid response.") return var/static/regex/regex = regex("joined = \"(\\d{4}-\\d{2}-\\d{2})\"") - if(!regex.Find(response.body)) + if(!regex.Find(body)) + log_admin("Could not check BYOND account age for [ckey] - no valid date in response.") return byond_account_age = regex.group[1] diff --git a/code/modules/law/laws/precautionary_charge.dm b/code/modules/law/laws/precautionary_charge.dm index c06cd6ca5287..7be4cb2b2e65 100644 --- a/code/modules/law/laws/precautionary_charge.dm +++ b/code/modules/law/laws/precautionary_charge.dm @@ -10,7 +10,7 @@ /datum/law/precautionary_charge/insanity name = "Insanity" - desc = "Acting in such a manner which makes the offender not sound clear of mind. The CMO or Synthetic can declare insanity on a Marine if the Marine is believed to not be of sound mind. The Marine once cleared to be of sound mind may be released from this particular charge." + desc = "Acting in such a manner which makes the offender not sound clear of mind. The subject, once cleared to be of sound mind, may be released from this particular charge. Excepting in cases of Suicide/Attempted Suicide, only the CMO/Synthetic may declare someone insane." /datum/law/precautionary_charge/prisoner_of_war name = "Prisoner of War" diff --git a/html/changelogs/AutoChangeLog-pr-5932.yml b/html/changelogs/AutoChangeLog-pr-5932.yml deleted file mode 100644 index e7584e57568b..000000000000 --- a/html/changelogs/AutoChangeLog-pr-5932.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "nauticall" -delete-after: True -changes: - - bugfix: "Makes pill bottle caps appear on closed pill bottles again." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-5948.yml b/html/changelogs/AutoChangeLog-pr-5948.yml new file mode 100644 index 000000000000..e6c9d6df01de --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-5948.yml @@ -0,0 +1,4 @@ +author: "realforest2001" +delete-after: True +changes: + - rscadd: "Updated the Insanity law description." \ No newline at end of file diff --git a/html/changelogs/archive/2024-03.yml b/html/changelogs/archive/2024-03.yml index 62e6449f15b3..4bbaead17437 100644 --- a/html/changelogs/archive/2024-03.yml +++ b/html/changelogs/archive/2024-03.yml @@ -180,3 +180,6 @@ vendor. Segrain: - qol: Middleclicking beds/chairs/etc is now a shortcut for buckling to them. +2024-03-16: + nauticall: + - bugfix: Makes pill bottle caps appear on closed pill bottles again.