From 05b3a96ac7ef2f9dcf6cf4cd5e2b83e9b169b813 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Tue, 8 Feb 2022 00:53:54 +0000 Subject: [PATCH 1/6] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-15444.yml | 4 --- html/changelogs/AutoChangeLog-pr-15448.yml | 4 --- html/changelogs/AutoChangeLog-pr-15466.yml | 7 ---- html/changelogs/AutoChangeLog-pr-15480.yml | 4 --- html/changelogs/AutoChangeLog-pr-15482.yml | 4 --- html/changelogs/AutoChangeLog-pr-15484.yml | 4 --- html/changelogs/AutoChangeLog-pr-15485.yml | 4 --- html/changelogs/AutoChangeLog-pr-15487.yml | 5 --- html/changelogs/AutoChangeLog-pr-15491.yml | 6 ---- html/changelogs/AutoChangeLog-pr-15492.yml | 4 --- html/changelogs/AutoChangeLog-pr-15493.yml | 5 --- html/changelogs/AutoChangeLog-pr-15494.yml | 4 --- html/changelogs/AutoChangeLog-pr-15499.yml | 4 --- html/changelogs/archive/2022-02.yml | 39 ++++++++++++++++++++++ 14 files changed, 39 insertions(+), 59 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-15444.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-15448.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-15466.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-15480.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-15482.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-15484.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-15485.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-15487.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-15491.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-15492.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-15493.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-15494.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-15499.yml diff --git a/html/changelogs/AutoChangeLog-pr-15444.yml b/html/changelogs/AutoChangeLog-pr-15444.yml deleted file mode 100644 index 58a745168f..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15444.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "LiteralMushroom" -delete-after: True -changes: - - rscadd: "Slimes can have wings now." diff --git a/html/changelogs/AutoChangeLog-pr-15448.yml b/html/changelogs/AutoChangeLog-pr-15448.yml deleted file mode 100644 index 6de9c39d46..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15448.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "CoreFlare" -delete-after: True -changes: - - rscadd: "Humanity is... Ok. Blood is fuel. IPCs have wings." diff --git a/html/changelogs/AutoChangeLog-pr-15466.yml b/html/changelogs/AutoChangeLog-pr-15466.yml deleted file mode 100644 index ae3094a427..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15466.yml +++ /dev/null @@ -1,7 +0,0 @@ -author: "SakuraOran" -delete-after: True -changes: - - rscadd: "Ashwalkers can now heal, even from death, by being incapacitated (asleep/dead) near the tendril" - - rscadd: "Added the ability for antags to have the \"protect object\" objective, which the ashwalkers now have to protect the tendril. This is determined by if the object is broken or not, and can be set to any object or structure that can reasonably be destroyed" - - balance: "Ashwalkers get one life, and have a 40% chance to earn an additional life when they sacrifice to the tendril." - - bugfix: "fixed mobs not dropping guaranteed_butcher_results when gibbed" diff --git a/html/changelogs/AutoChangeLog-pr-15480.yml b/html/changelogs/AutoChangeLog-pr-15480.yml deleted file mode 100644 index 4a03278ac5..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15480.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "SandPoot" -delete-after: True -changes: - - rscadd: "Adds a keybinding where you can cancel actions." diff --git a/html/changelogs/AutoChangeLog-pr-15482.yml b/html/changelogs/AutoChangeLog-pr-15482.yml deleted file mode 100644 index 568eb001e2..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15482.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "SandPoot" -delete-after: True -changes: - - qol: "Changing a reagent container's transfer amount will now give you feedback in the form of text on the container itself." diff --git a/html/changelogs/AutoChangeLog-pr-15484.yml b/html/changelogs/AutoChangeLog-pr-15484.yml deleted file mode 100644 index 449836f16b..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15484.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "DeltaFire15" -delete-after: True -changes: - - balance: "The Space Adaptation mutation when applied to Synthetics now nullifies the penalty for passive cooling if in low-pressure environments." diff --git a/html/changelogs/AutoChangeLog-pr-15485.yml b/html/changelogs/AutoChangeLog-pr-15485.yml deleted file mode 100644 index 1ef80faa47..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15485.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "SandPoot" -delete-after: True -changes: - - bugfix: "You can once again see your previews for picking target bodyparts on your hud." diff --git a/html/changelogs/AutoChangeLog-pr-15487.yml b/html/changelogs/AutoChangeLog-pr-15487.yml deleted file mode 100644 index f7c9d1923c..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15487.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "DeltaFire15" -delete-after: True -changes: - - balance: "Stabilized orange extracts can only cool by -5 degrees per tick base instead of by as much as the difference is." - - balance: "Stabilized orange extracts only have halved cooling effects on Synthetics (2.5 per status tick / 5 per life), but also cool them towards ~-100°C instead of base bodytemp." diff --git a/html/changelogs/AutoChangeLog-pr-15491.yml b/html/changelogs/AutoChangeLog-pr-15491.yml deleted file mode 100644 index 5f93c6a8b6..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15491.yml +++ /dev/null @@ -1,6 +0,0 @@ -author: "SandPoot" -delete-after: True -changes: - - rscadd: "TGUI autolathe -tweak: You can now input a custom amount to print(hard limit at 50 or maximum stack size) -tweak: Can now search and change categories while the autolathe is busy, line up those designs!" diff --git a/html/changelogs/AutoChangeLog-pr-15492.yml b/html/changelogs/AutoChangeLog-pr-15492.yml deleted file mode 100644 index fad54223c1..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15492.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "SandPoot" -delete-after: True -changes: - - refactor: "Converted the changelog popup to TGUI" diff --git a/html/changelogs/AutoChangeLog-pr-15493.yml b/html/changelogs/AutoChangeLog-pr-15493.yml deleted file mode 100644 index 18bbbc577b..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15493.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "SandPoot" -delete-after: True -changes: - - rscadd: "All of your favorite simple bot friends aboard the station now have a much better interface in TGUI" - - qol: "You can now lock and unlock bots, including their maintenance hatches, via the UI." diff --git a/html/changelogs/AutoChangeLog-pr-15494.yml b/html/changelogs/AutoChangeLog-pr-15494.yml deleted file mode 100644 index 54d1fd8a7e..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15494.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "SandPoot" -delete-after: True -changes: - - rscadd: "Made a cool UI for the custom shuttles." diff --git a/html/changelogs/AutoChangeLog-pr-15499.yml b/html/changelogs/AutoChangeLog-pr-15499.yml deleted file mode 100644 index b4895ab709..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15499.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "SandPoot" -delete-after: True -changes: - - bugfix: "Removes \"Convert Lineendings\" git action." diff --git a/html/changelogs/archive/2022-02.yml b/html/changelogs/archive/2022-02.yml index c3aaa04f7c..af963dd2c0 100644 --- a/html/changelogs/archive/2022-02.yml +++ b/html/changelogs/archive/2022-02.yml @@ -11,3 +11,42 @@ and has been relocated from D to w. - bugfix: The language Rachnidian's shortcut was getting in the way of the Ratvarian language, so it's been moved from r to c. +2022-02-08: + CoreFlare: + - rscadd: Humanity is... Ok. Blood is fuel. IPCs have wings. + DeltaFire15: + - balance: Stabilized orange extracts can only cool by -5 degrees per tick base + instead of by as much as the difference is. + - balance: "Stabilized orange extracts only have halved cooling effects on Synthetics\ + \ (2.5 per status tick / 5 per life), but also cool them towards ~-100\xB0C\ + \ instead of base bodytemp." + - balance: The Space Adaptation mutation when applied to Synthetics now nullifies + the penalty for passive cooling if in low-pressure environments. + LiteralMushroom: + - rscadd: Slimes can have wings now. + SakuraOran: + - rscadd: Ashwalkers can now heal, even from death, by being incapacitated (asleep/dead) + near the tendril + - rscadd: Added the ability for antags to have the "protect object" objective, which + the ashwalkers now have to protect the tendril. This is determined by if the + object is broken or not, and can be set to any object or structure that can + reasonably be destroyed + - balance: Ashwalkers get one life, and have a 40% chance to earn an additional + life when they sacrifice to the tendril. + - bugfix: fixed mobs not dropping guaranteed_butcher_results when gibbed + SandPoot: + - qol: Changing a reagent container's transfer amount will now give you feedback + in the form of text on the container itself. + - rscadd: 'TGUI autolathe tweak: You can now input a custom amount to print(hard + limit at 50 or maximum stack size) tweak: Can now search and change categories + while the autolathe is busy, line up those designs!' + - bugfix: You can once again see your previews for picking target bodyparts on your + hud. + - refactor: Converted the changelog popup to TGUI + - rscadd: Adds a keybinding where you can cancel actions. + - rscadd: Made a cool UI for the custom shuttles. + - bugfix: Removes "Convert Lineendings" git action. + - rscadd: All of your favorite simple bot friends aboard the station now have a + much better interface in TGUI + - qol: You can now lock and unlock bots, including their maintenance hatches, via + the UI. From 93ccd18061fec4365a4a423e29399dba8d57c911 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Mon, 14 Feb 2022 00:29:57 +0000 Subject: [PATCH 2/6] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-15265.yml | 22 ---------------------- html/changelogs/archive/2022-02.yml | 22 ++++++++++++++++++++++ 2 files changed, 22 insertions(+), 22 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-15265.yml diff --git a/html/changelogs/AutoChangeLog-pr-15265.yml b/html/changelogs/AutoChangeLog-pr-15265.yml deleted file mode 100644 index 58ac4f6353..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15265.yml +++ /dev/null @@ -1,22 +0,0 @@ -author: "keronshb" -delete-after: True -changes: - - rscadd: "Adds the new MRP version of Families" - - rscadd: "Adds the new Antag UI panel for Families, disables it for other antags (for now)" - - rscadd: "Adds High Fives (needed for the Handshake)" - - rscdel: "Removed old Gang War" - - bugfix: "Fixed Observer Alerts and general alerts for give/take/restraints." - - soundadd: "Adds related sounds for Families" - - imageadd: "Adds related icons for Families" - - code_imp: "Changed the petehat/gang to just petehat on the jungle away mission" - - code_imp: "Adds HAND_ITEM" - - code_imp: "A bunch of UI code for Antags/Families" - - code_imp: "Adds IS_DEAD_OR_INCAP" - - code_imp: "Adds GLOBAL_LIST_EMPTY(pre_setup_antags)" - - code_imp: "Adds Queued Deletions" - - code_imp: "Sanity check for attached_effect" - - code_imp: "Adds Suicide cries for antags" - - code_imp: "Adds preview_outfits for antags" - - refactor: "Refactors give/take > offer/receive" - - config: "Added Families to the dynamic config" - - admin: "Adds admin tp Family stuff" diff --git a/html/changelogs/archive/2022-02.yml b/html/changelogs/archive/2022-02.yml index a0157fce1a..d38f2b34a7 100644 --- a/html/changelogs/archive/2022-02.yml +++ b/html/changelogs/archive/2022-02.yml @@ -52,3 +52,25 @@ the UI. silicons: - refactor: clickcatchers, parallax +2022-02-14: + keronshb: + - rscadd: Adds the new MRP version of Families + - rscadd: Adds the new Antag UI panel for Families, disables it for other antags + (for now) + - rscadd: Adds High Fives (needed for the Handshake) + - rscdel: Removed old Gang War + - bugfix: Fixed Observer Alerts and general alerts for give/take/restraints. + - soundadd: Adds related sounds for Families + - imageadd: Adds related icons for Families + - code_imp: Changed the petehat/gang to just petehat on the jungle away mission + - code_imp: Adds HAND_ITEM + - code_imp: A bunch of UI code for Antags/Families + - code_imp: Adds IS_DEAD_OR_INCAP + - code_imp: Adds GLOBAL_LIST_EMPTY(pre_setup_antags) + - code_imp: Adds Queued Deletions + - code_imp: Sanity check for attached_effect + - code_imp: Adds Suicide cries for antags + - code_imp: Adds preview_outfits for antags + - refactor: Refactors give/take > offer/receive + - config: Added Families to the dynamic config + - admin: Adds admin tp Family stuff From 52a8fe276b5b9f667df4d82130704d93911f4194 Mon Sep 17 00:00:00 2001 From: SandPoot Date: Tue, 15 Feb 2022 18:27:33 -0300 Subject: [PATCH 3/6] Update files --- code/modules/admin/topic.dm | 9 -------- code/modules/jobs/job_report.dm | 38 +++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 9 deletions(-) diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 11270e0d96..b2cc84633f 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -53,15 +53,6 @@ return cmd_show_exp_panel(M.client) - else if(href_list["toggleexempt"]) - if(!check_rights(R_ADMIN)) - return - var/client/C = locate(href_list["toggleexempt"]) in GLOB.clients - if(!C) - to_chat(usr, "ERROR: Client not found.") - return - toggle_exempt_status(C) - else if(href_list["makeAntag"]) if(!check_rights(R_ADMIN)) return diff --git a/code/modules/jobs/job_report.dm b/code/modules/jobs/job_report.dm index 88c7f7ad19..016e34f525 100644 --- a/code/modules/jobs/job_report.dm +++ b/code/modules/jobs/job_report.dm @@ -17,6 +17,13 @@ ui = new(user, src, "TrackedPlaytime") ui.open() +/datum/job_report_menu/ui_data(mob/user) + var/list/data = list() + + data["exemptStatus"] = (owner.prefs?.db_flags & DB_FLAG_EXEMPT) + + return data + /datum/job_report_menu/ui_static_data() if (!CONFIG_GET(flag/use_exp_tracking)) return list("failReason" = JOB_REPORT_MENU_FAIL_REASON_TRACKING_DISABLED) @@ -42,8 +49,39 @@ data["livingTime"] = play_records[EXP_TYPE_LIVING] data["ghostTime"] = play_records[EXP_TYPE_GHOST] + data["adminTime"] = play_records[EXP_TYPE_ADMIN] ? play_records[EXP_TYPE_ADMIN] : 0 + + data["isAdmin"] = check_rights(R_ADMIN, show_msg = FALSE) return data +/datum/job_report_menu/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) + . = ..() + if(.) + return + + switch(action) + if("toggle_exempt") + if(!check_rights(R_ADMIN)) + message_admins("[ADMIN_LOOKUPFLW(usr)] attempted to toggle job playtime exempt status without admin rights.") + log_admin("[ADMIN_LOOKUPFLW(usr)] attempted to toggle job playtime exempt status without admin rights.") + to_chat(usr, span_danger("ERROR: Insufficient admin rights."), confidential = TRUE) + return TRUE + + var/datum/admins/viewer_admin_datum = GLOB.admin_datums[usr.ckey] + + if(!viewer_admin_datum) + message_admins("[ADMIN_LOOKUPFLW(usr)] attempted to toggle job playtime exempt status without admin datum for their ckey.") + log_admin("[ADMIN_LOOKUPFLW(usr)] attempted to toggle job playtime exempt status without admin datum for their ckey.") + to_chat(usr, span_danger("ERROR: Insufficient admin rights."), confidential = TRUE) + return TRUE + + if(QDELETED(owner)) + to_chat(usr, span_danger("ERROR: Client not found."), confidential = TRUE) + return TRUE + + viewer_admin_datum.toggle_exempt_status(owner) + return TRUE + #undef JOB_REPORT_MENU_FAIL_REASON_TRACKING_DISABLED #undef JOB_REPORT_MENU_FAIL_REASON_NO_RECORDS From ce6e8c99c628d8432f133c40823601f20cda4e03 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Tue, 15 Feb 2022 21:56:36 -0700 Subject: [PATCH 4/6] fixes --- code/__HELPERS/type2type.dm | 4 ++-- code/datums/brain_damage/severe.dm | 1 + code/datums/diseases/dna_spread.dm | 2 +- code/game/machinery/requests_console.dm | 2 +- .../atmospherics/machinery/pipes/layermanifold.dm | 4 ++-- code/modules/hydroponics/hydroponics_chemreact.dm | 1 + code/modules/mob/mob_helpers.dm | 1 + code/modules/power/singularity/singularity.dm | 4 ++-- .../ruins/lavalandruin_code/elephantgraveyard.dm | 2 ++ code/modules/surgery/advanced/lobotomy.dm | 15 ++++++++------- code/modules/vending/_vending.dm | 1 + .../modules/eventmaps/Spookystation/JTGSZwork.dm | 8 ++++---- 12 files changed, 26 insertions(+), 19 deletions(-) diff --git a/code/__HELPERS/type2type.dm b/code/__HELPERS/type2type.dm index 87187a4c3d..36de9d281b 100644 --- a/code/__HELPERS/type2type.dm +++ b/code/__HELPERS/type2type.dm @@ -591,9 +591,9 @@ switch(child) if(/datum) return null - if(/obj || /mob) + if(/obj, /mob) return /atom/movable - if(/area || /turf) + if(/area, /turf) return /atom else return /datum diff --git a/code/datums/brain_damage/severe.dm b/code/datums/brain_damage/severe.dm index ed0a9fbab8..88008920b9 100644 --- a/code/datums/brain_damage/severe.dm +++ b/code/datums/brain_damage/severe.dm @@ -224,6 +224,7 @@ else to_chat(owner, "You feel your heart lurching in your chest...") owner.adjustOxyLoss(8) + else /datum/brain_trauma/severe/discoordination name = "Discoordination" diff --git a/code/datums/diseases/dna_spread.dm b/code/datums/diseases/dna_spread.dm index 3a67230d36..07b3d5fe8a 100644 --- a/code/datums/diseases/dna_spread.dm +++ b/code/datums/diseases/dna_spread.dm @@ -30,7 +30,7 @@ return switch(stage) - if(2 || 3) //Pretend to be a cold and give time to spread. + if(2, 3) //Pretend to be a cold and give time to spread. if(prob(8)) affected_mob.emote("sneeze") if(prob(8)) diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm index d4807e377c..a273aad0dd 100644 --- a/code/game/machinery/requests_console.dm +++ b/code/game/machinery/requests_console.dm @@ -374,7 +374,7 @@ GLOBAL_LIST_EMPTY(allConsoles) radio_freq = FREQ_ENGINEERING if("security") radio_freq = FREQ_SECURITY - if("cargobay" || "mining") + if("cargobay", "mining") radio_freq = FREQ_SUPPLY Radio.set_frequency(radio_freq) diff --git a/code/modules/atmospherics/machinery/pipes/layermanifold.dm b/code/modules/atmospherics/machinery/pipes/layermanifold.dm index bc8fd6777d..d019a03140 100644 --- a/code/modules/atmospherics/machinery/pipes/layermanifold.dm +++ b/code/modules/atmospherics/machinery/pipes/layermanifold.dm @@ -70,9 +70,9 @@ /obj/machinery/atmospherics/pipe/layer_manifold/SetInitDirections() switch(dir) - if(NORTH || SOUTH) + if(NORTH, SOUTH) initialize_directions = NORTH|SOUTH - if(EAST || WEST) + if(EAST, WEST) initialize_directions = EAST|WEST /obj/machinery/atmospherics/pipe/layer_manifold/isConnectable(obj/machinery/atmospherics/target, given_layer) diff --git a/code/modules/hydroponics/hydroponics_chemreact.dm b/code/modules/hydroponics/hydroponics_chemreact.dm index a4ef78a21f..9c19e40bbc 100644 --- a/code/modules/hydroponics/hydroponics_chemreact.dm +++ b/code/modules/hydroponics/hydroponics_chemreact.dm @@ -30,3 +30,4 @@ if(1 to 10) mutatepest(user) return + else diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index 5bfc6fe652..561425c710 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -144,6 +144,7 @@ newletter = "nglu" if(5) newletter = "glor" + else . += newletter return sanitize(.) diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm index 256e128ff4..8490daa681 100644 --- a/code/modules/power/singularity/singularity.dm +++ b/code/modules/power/singularity/singularity.dm @@ -347,10 +347,10 @@ var/dir2 = 0 var/dir3 = 0 switch(direction) - if(NORTH||SOUTH) + if(NORTH, SOUTH) dir2 = 4 dir3 = 8 - if(EAST||WEST) + if(EAST, WEST) dir2 = 1 dir3 = 2 var/turf/T2 = T diff --git a/code/modules/ruins/lavalandruin_code/elephantgraveyard.dm b/code/modules/ruins/lavalandruin_code/elephantgraveyard.dm index 088683ccd2..d9dfdd8c19 100644 --- a/code/modules/ruins/lavalandruin_code/elephantgraveyard.dm +++ b/code/modules/ruins/lavalandruin_code/elephantgraveyard.dm @@ -145,6 +145,8 @@ if(7) new /obj/item/clothing/glasses/sunglasses(src) new /obj/item/clothing/mask/cigarette/rollie(src) + else + return /obj/structure/closet/crate/grave/open(mob/living/user, obj/item/S) if(!opened) diff --git a/code/modules/surgery/advanced/lobotomy.dm b/code/modules/surgery/advanced/lobotomy.dm index 4a52e446bc..b3b3b4aa1d 100644 --- a/code/modules/surgery/advanced/lobotomy.dm +++ b/code/modules/surgery/advanced/lobotomy.dm @@ -41,13 +41,14 @@ target.cure_all_traumas(TRAUMA_RESILIENCE_LOBOTOMY) if(target.mind && target.mind.has_antag_datum(/datum/antagonist/brainwashed)) target.mind.remove_antag_datum(/datum/antagonist/brainwashed) - switch(rand(1,6))//Now let's see what hopefully-not-important part of the brain we cut off - if(1) - target.gain_trauma_type(BRAIN_TRAUMA_MILD, TRAUMA_RESILIENCE_SURGERY) - if(2) - target.gain_trauma_type(BRAIN_TRAUMA_SEVERE, TRAUMA_RESILIENCE_SURGERY) - if(3) - target.gain_trauma_type(BRAIN_TRAUMA_SPECIAL, TRAUMA_RESILIENCE_SURGERY) + if(prob(50)) + switch(rand(1,3))//Now let's see what hopefully-not-important part of the brain we cut off + if(1) + target.gain_trauma_type(BRAIN_TRAUMA_MILD, TRAUMA_RESILIENCE_SURGERY) + if(2) + target.gain_trauma_type(BRAIN_TRAUMA_SEVERE, TRAUMA_RESILIENCE_SURGERY) + if(3) + target.gain_trauma_type(BRAIN_TRAUMA_SPECIAL, TRAUMA_RESILIENCE_SURGERY) // you're cutting off a part of the brain.w var/obj/item/organ/brain/B = target.getorganslot(ORGAN_SLOT_BRAIN) B.applyOrganDamage(50, 100) diff --git a/code/modules/vending/_vending.dm b/code/modules/vending/_vending.dm index 16caef5b4e..cea7502540 100644 --- a/code/modules/vending/_vending.dm +++ b/code/modules/vending/_vending.dm @@ -469,6 +469,7 @@ GLOBAL_LIST_EMPTY(vending_products) freebie(user, 2) if(16 to 25) freebie(user, 1) + if(26 to 75) if(76 to 90) tilt(user) if(91 to 100) diff --git a/modular_citadel/code/modules/eventmaps/Spookystation/JTGSZwork.dm b/modular_citadel/code/modules/eventmaps/Spookystation/JTGSZwork.dm index e3f23a4992..dbf5ad0648 100644 --- a/modular_citadel/code/modules/eventmaps/Spookystation/JTGSZwork.dm +++ b/modular_citadel/code/modules/eventmaps/Spookystation/JTGSZwork.dm @@ -630,19 +630,19 @@ GLOBAL_LIST_EMPTY(rain_sounds) playchime = 1 switch(hour) - if(1 || 2) + if(1, 2) HRimgstate = "asshouroverlay-2" //Now it is ass, mostly because someones going to kill me for the other names. if(3) HRimgstate = "asshouroverlay-3" - if(4 || 5) + if(4, 5) HRimgstate = "asshouroverlay-4" if(6) HRimgstate = "asshouroverlay-6" - if(7 || 8) + if(7, 8) HRimgstate = "asshouroverlay-7" if(9) HRimgstate = "asshouroverlay-9" - if(10 || 11) + if(10, 11) HRimgstate = "asshouroverlay-10" else HRimgstate = "asshouroverlay-0" //Station time wraps to 0, and so does our hours. From ad6d9a15ec94d86d696abc17abb3da59421e9fe9 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Tue, 15 Feb 2022 22:58:45 -0600 Subject: [PATCH 5/6] Automatic changelog generation for PR #15504 [ci skip] --- html/changelogs/AutoChangeLog-pr-15504.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-15504.yml diff --git a/html/changelogs/AutoChangeLog-pr-15504.yml b/html/changelogs/AutoChangeLog-pr-15504.yml new file mode 100644 index 0000000000..9875b2b633 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-15504.yml @@ -0,0 +1,4 @@ +author: "[Timberpoes](https://github.com/Timberpoes)" +delete-after: True +changes: + - admin: "Re-added the button to the player playtime panel that lets admins toggle a player's job playtime exemption status." From 984f37cc80ba7eea2e037542d315ac3f2e6bf595 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Tue, 15 Feb 2022 22:03:27 -0700 Subject: [PATCH 6/6] fix --- code/modules/hydroponics/hydroponics_chemreact.dm | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/code/modules/hydroponics/hydroponics_chemreact.dm b/code/modules/hydroponics/hydroponics_chemreact.dm index 9c19e40bbc..640784aed8 100644 --- a/code/modules/hydroponics/hydroponics_chemreact.dm +++ b/code/modules/hydroponics/hydroponics_chemreact.dm @@ -12,22 +12,16 @@ /obj/machinery/hydroponics/proc/mutation_roll(mob/user) - switch(rand(100)) + switch(rand(1, 100)) if(91 to 100) adjustHealth(-10) visible_message("\The [myseed.plantname] starts to wilt and burn!") - return if(41 to 90) if(myseed && !self_sustaining) //Stability myseed.adjust_instability(5) - return if(21 to 40) visible_message("\The [myseed.plantname] appears unusually reactive...") - return if(11 to 20) mutateweed() - return if(1 to 10) mutatepest(user) - return - else