Skip to content

Commit

Permalink
Merge branch 'master' into PRI_V1
Browse files Browse the repository at this point in the history
  • Loading branch information
spartanbobby authored Mar 16, 2024
2 parents b8adbcb + d05c21d commit d2c554e
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 11 deletions.
16 changes: 10 additions & 6 deletions code/datums/entities/player.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion code/modules/law/laws/precautionary_charge.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 0 additions & 4 deletions html/changelogs/AutoChangeLog-pr-5932.yml

This file was deleted.

4 changes: 4 additions & 0 deletions html/changelogs/AutoChangeLog-pr-5948.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
author: "realforest2001"
delete-after: True
changes:
- rscadd: "Updated the Insanity law description."
3 changes: 3 additions & 0 deletions html/changelogs/archive/2024-03.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.

0 comments on commit d2c554e

Please sign in to comment.