From 7c918d0f791aec73f97e7f5acc958b7dae3892a8 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Tue, 14 Sep 2021 15:11:58 -0700 Subject: [PATCH 01/28] Update prisoner.dm --- code/modules/jobs/job_types/prisoner.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/jobs/job_types/prisoner.dm b/code/modules/jobs/job_types/prisoner.dm index 13c18c21ca..3cd6585af2 100644 --- a/code/modules/jobs/job_types/prisoner.dm +++ b/code/modules/jobs/job_types/prisoner.dm @@ -1,11 +1,11 @@ -datum/job/prisoner +/datum/job/prisoner title = "Prisoner" flag = PRISONER department_head = list("The Security Team") department_flag = CIVILIAN faction = "Station" - total_positions = 2 - spawn_positions = 2 + total_positions = 0 + spawn_positions = 0 supervisors = "the security team" outfit = /datum/outfit/job/prisoner From c169a0408a251688941f69515a8e64ac5f8750a5 Mon Sep 17 00:00:00 2001 From: Putnam3145 Date: Sun, 26 Sep 2021 13:13:22 -0700 Subject: [PATCH 02/28] more ashwalker lung adjustments --- code/datums/atmosphere/planetary.dm | 6 +++--- code/modules/surgery/organs/lungs.dm | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/datums/atmosphere/planetary.dm b/code/datums/atmosphere/planetary.dm index a8b77f7394..a2d771af01 100644 --- a/code/datums/atmosphere/planetary.dm +++ b/code/datums/atmosphere/planetary.dm @@ -7,9 +7,9 @@ GAS_N2=10, ) normal_gases = list( - GAS_O2=10, - GAS_N2=10, - GAS_CO2=10, + GAS_O2=5, + GAS_N2=5, + GAS_CO2=5, ) restricted_gases = list( GAS_BZ=0.1, diff --git a/code/modules/surgery/organs/lungs.dm b/code/modules/surgery/organs/lungs.dm index e10b05822b..4cd6728e8a 100644 --- a/code/modules/surgery/organs/lungs.dm +++ b/code/modules/surgery/organs/lungs.dm @@ -529,8 +529,8 @@ gas_max[GAS_N2] = PP(breath, GAS_N2) + 5 var/o2_pp = PP(breath, GAS_O2) - safe_breath_min = 0.3 * o2_pp - safe_breath_max = 1.3 * o2_pp + safe_breath_min = min(3, 0.3 * o2_pp) + safe_breath_max = max(18, 1.3 * o2_pp + 1) ..() #undef SAFE_THRESHOLD_RATIO From 1c754b814e54e70d5af878c80b0270e10e5835c0 Mon Sep 17 00:00:00 2001 From: keronshb Date: Sat, 9 Oct 2021 00:47:16 -0400 Subject: [PATCH 03/28] Pirates pay raise documented --- code/modules/events/pirates.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/events/pirates.dm b/code/modules/events/pirates.dm index 7d1ae2642e..31859b4fc0 100644 --- a/code/modules/events/pirates.dm +++ b/code/modules/events/pirates.dm @@ -24,7 +24,7 @@ var/pirate_type = PIRATES_ROGUES //pick(PIRATES_ROGUES, PIRATES_SILVERSCALES, PIRATES_DUTCHMAN) var/datum/comm_message/threat_msg = new var/payoff = 0 - var/payoff_min = 10000 + var/payoff_min = 10000 //documented this time var/ship_template var/ship_name = "Space Privateers Association" var/initial_send_time = world.time From d0eade8fe18158a3edf0bcd7287549f15731bf3b Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Thu, 14 Oct 2021 19:20:32 -0700 Subject: [PATCH 04/28] fix --- code/modules/admin/verbs/adminhelp.dm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm index b026847702..d48f679bb3 100644 --- a/code/modules/admin/verbs/adminhelp.dm +++ b/code/modules/admin/verbs/adminhelp.dm @@ -161,13 +161,14 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) var/client/initiator //semi-misnomer, it's the person who ahelped/was bwoinked var/initiator_ckey var/initiator_key_name - var/heard_by_no_admins = FALSE var/list/_interactions //use AddInteraction() or, preferably, admin_ticket_log() var/obj/effect/statclick/ahelp/statclick var/static/ticket_counter = 0 + /// did we send "answered" to irc yet + var/answered = FALSE //call this on its own to create a ticket, don't manually assign current_ticket //msg is the title of the ticket: usually the ahelp text @@ -209,7 +210,6 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) log_admin_private("Ticket #[id]: [key_name(initiator)]: [name] - heard by [admin_number_present] non-AFK admins who have +BAN.") if(admin_number_present <= 0) to_chat(C, "No active admins are online, your adminhelp was sent to the admin irc.") - heard_by_no_admins = TRUE else // citadel edit: send anyways send2adminchat(initiator_ckey, "Ticket #[id]: [name] - Heard by [admin_number_present] admins present with +BAN.") @@ -223,9 +223,8 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) return ..() /datum/admin_help/proc/AddInteraction(formatted_message) - // if(heard_by_no_admins usr && usr.ckey != initiator_ckey) - // heard_by_no_admins = FALSE - if(usr && (usr.ckey != initiator_ckey)) + if(usr && (usr.ckey != initiator_ckey) && !answered) + answered = TRUE send2adminchat(initiator_ckey, "Ticket #[id]: Answered by [key_name(usr)]") _interactions += "[TIME_STAMP("hh:mm:ss", FALSE)]: [formatted_message]" From 84a94cb8ce0c950d67ed48ac397fe7c230f4b37d Mon Sep 17 00:00:00 2001 From: Changelogs Date: Sat, 16 Oct 2021 00:28:46 +0000 Subject: [PATCH 05/28] Automatic changelog compile [ci skip] --- html/changelog.html | 27 ++++++++++++++++++++++ html/changelogs/.all_changelog.yml | 20 ++++++++++++++++ html/changelogs/AutoChangeLog-pr-15253.yml | 4 ---- html/changelogs/AutoChangeLog-pr-15256.yml | 5 ---- html/changelogs/AutoChangeLog-pr-15262.yml | 5 ---- html/changelogs/AutoChangeLog-pr-15263.yml | 4 ---- html/changelogs/AutoChangeLog-pr-15266.yml | 5 ---- html/changelogs/AutoChangeLog-pr-15267.yml | 5 ---- html/changelogs/AutoChangeLog-pr-15268.yml | 4 ---- 9 files changed, 47 insertions(+), 32 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-15253.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-15256.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-15262.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-15263.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-15266.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-15267.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-15268.yml diff --git a/html/changelog.html b/html/changelog.html index 51b4091b78..a9206c180f 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -50,6 +50,33 @@ -->
+

16 October 2021

+

Ryll/Shaps updated:

+
    +
  • Asay now supports pings (via using @[adminckey])
    • +
+

SandPoot updated:

+
    +
  • If a gamemode fails to load too many times, a safe gamemode will be loaded instead.
    • +
  • Dynamic is no longer hardcoded, and you can now set a gamemode to be forced in the configs.
    • +
  • Equip delays are a bit less weird now, only relevant for coders/people who use straight jackets... on themself, since that's the only thing that uses it right now.
    • +
  • Toggling arousal will properly update your sprite.
    • +
  • That also means no spam when moving it in your hands.
    • +
+

WanderingFox95 updated:

+
    +
  • Removes the quick attack loop (like TG did it)
    • +
+

dapnee updated:

+
    +
  • BEPIS to science tweak: moved the courtroom
    • +
+

keronshb updated:

+
    +
  • Adds the fat dart cigarette and to vendors
    • +
  • Adds the sprites for the fat dart
    • +
+

13 October 2021

Hatterhat updated:

    diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 1f74ec90d2..71db5b168f 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -30127,3 +30127,23 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. MrJWhit: - rscadd: Adds more fire-saftey closets and trashpiles to boxstation - rscadd: Adds trashpiles to delta. +2021-10-16: + Ryll/Shaps: + - rscadd: Asay now supports pings (via using @[adminckey]) + SandPoot: + - bugfix: If a gamemode fails to load too many times, a safe gamemode will be loaded + instead. + - code_imp: Dynamic is no longer hardcoded, and you can now set a gamemode to be + forced in the configs. + - bugfix: Equip delays are a bit less weird now, only relevant for coders/people + who use straight jackets... on themself, since that's the only thing that uses + it right now. + - bugfix: Toggling arousal will properly update your sprite. + - bugfix: That also means no spam when moving it in your hands. + WanderingFox95: + - bugfix: Removes the quick attack loop (like TG did it) + dapnee: + - rscadd: 'BEPIS to science tweak: moved the courtroom' + keronshb: + - rscadd: Adds the fat dart cigarette and to vendors + - imageadd: Adds the sprites for the fat dart diff --git a/html/changelogs/AutoChangeLog-pr-15253.yml b/html/changelogs/AutoChangeLog-pr-15253.yml deleted file mode 100644 index 3cb842403b..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15253.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "SandPoot" -delete-after: True -changes: - - bugfix: "That also means no spam when moving it in your hands." diff --git a/html/changelogs/AutoChangeLog-pr-15256.yml b/html/changelogs/AutoChangeLog-pr-15256.yml deleted file mode 100644 index 7ec97ab969..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15256.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "keronshb" -delete-after: True -changes: - - rscadd: "Adds the fat dart cigarette and to vendors" - - imageadd: "Adds the sprites for the fat dart" diff --git a/html/changelogs/AutoChangeLog-pr-15262.yml b/html/changelogs/AutoChangeLog-pr-15262.yml deleted file mode 100644 index 4b2dd301fc..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15262.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "dapnee" -delete-after: True -changes: - - rscadd: "BEPIS to science -tweak: moved the courtroom" diff --git a/html/changelogs/AutoChangeLog-pr-15263.yml b/html/changelogs/AutoChangeLog-pr-15263.yml deleted file mode 100644 index 04be8aae9e..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15263.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Ryll/Shaps" -delete-after: True -changes: - - rscadd: "Asay now supports pings (via using @[adminckey])" diff --git a/html/changelogs/AutoChangeLog-pr-15266.yml b/html/changelogs/AutoChangeLog-pr-15266.yml deleted file mode 100644 index e82b5664ea..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15266.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "SandPoot" -delete-after: True -changes: - - bugfix: "Equip delays are a bit less weird now, only relevant for coders/people who use straight jackets... on themself, since that's the only thing that uses it right now." - - bugfix: "Toggling arousal will properly update your sprite." diff --git a/html/changelogs/AutoChangeLog-pr-15267.yml b/html/changelogs/AutoChangeLog-pr-15267.yml deleted file mode 100644 index 5aac657e16..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15267.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "SandPoot" -delete-after: True -changes: - - bugfix: "If a gamemode fails to load too many times, a safe gamemode will be loaded instead." - - code_imp: "Dynamic is no longer hardcoded, and you can now set a gamemode to be forced in the configs." diff --git a/html/changelogs/AutoChangeLog-pr-15268.yml b/html/changelogs/AutoChangeLog-pr-15268.yml deleted file mode 100644 index 09f49f25b5..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15268.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "WanderingFox95" -delete-after: True -changes: - - bugfix: "Removes the quick attack loop (like TG did it)" From daeaacd81c64de0a3e34b0eb1c95a87e96702e04 Mon Sep 17 00:00:00 2001 From: keronshb Date: Fri, 15 Oct 2021 22:04:01 -0400 Subject: [PATCH 06/28] Removes Dynamic's ability to hijack loneop --- code/modules/events/operative.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/events/operative.dm b/code/modules/events/operative.dm index 4ad307731e..6ef693a886 100644 --- a/code/modules/events/operative.dm +++ b/code/modules/events/operative.dm @@ -3,7 +3,6 @@ typepath = /datum/round_event/ghost_role/operative weight = 0 //Admin only max_occurrences = 1 - dynamic_should_hijack = TRUE /datum/round_event/ghost_role/operative minimum_required = 1 From eb3f2817d7ee4b5c8a9e99a8146b9ebdac8e2f7a Mon Sep 17 00:00:00 2001 From: Changelogs Date: Mon, 18 Oct 2021 00:26:57 +0000 Subject: [PATCH 07/28] Automatic changelog compile [ci skip] --- html/changelog.html | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/html/changelog.html b/html/changelog.html index a9206c180f..e811c87938 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -510,16 +510,6 @@
    • lets you select 4 prosthetic limbs instead of only 2
    - -

    16 August 2021

    -

    BlueWildrose updated:

    -
      -
    • Incapacitated mobs are blacklisted from being human-level intelligence sentience event candidates. This is particularly important due to slimes in BZ stasis on the station.
      • -
    -

    bunny232 updated:

    -
      -
    • Polyvitiligo actually changes your color now
      • -
GoonStation 13 Development Team From 42da1e2079e2a45294114bee775684cb8ce9af5a Mon Sep 17 00:00:00 2001 From: Putnam3145 Date: Sun, 17 Oct 2021 19:55:13 -0700 Subject: [PATCH 08/28] Allows setting vents to siphon --- code/modules/atmospherics/machinery/airalarm.dm | 3 +++ .../machinery/components/unary_devices/vent_pump.dm | 2 +- tgui/packages/tgui/interfaces/common/AtmosControls.js | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/code/modules/atmospherics/machinery/airalarm.dm b/code/modules/atmospherics/machinery/airalarm.dm index 806126e684..2313d9c71d 100644 --- a/code/modules/atmospherics/machinery/airalarm.dm +++ b/code/modules/atmospherics/machinery/airalarm.dm @@ -403,6 +403,9 @@ if("incheck") send_signal(device_id, list("checks" = text2num(params["val"])^2), usr) . = TRUE + if("direction") + send_signal(device_id, list("direction" = text2num(params["val"])), usr) + . = TRUE if("set_external_pressure", "set_internal_pressure") var/target = params["value"] diff --git a/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm b/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm index 1a53a5299f..a3644ed084 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm @@ -144,7 +144,7 @@ "device" = "VP", "timestamp" = world.time, "power" = on, - "direction" = pump_direction ? "release" : "siphon", + "direction" = pump_direction, "checks" = pressure_checks, "internal" = internal_pressure_bound, "external" = external_pressure_bound, diff --git a/tgui/packages/tgui/interfaces/common/AtmosControls.js b/tgui/packages/tgui/interfaces/common/AtmosControls.js index 76348a956f..fcca00188a 100644 --- a/tgui/packages/tgui/interfaces/common/AtmosControls.js +++ b/tgui/packages/tgui/interfaces/common/AtmosControls.js @@ -37,7 +37,7 @@ export const Vent = (props, context) => {