From 4617dafe1eb779a68801b4fb139b9f17ac054060 Mon Sep 17 00:00:00 2001 From: Shadow-Quill <44811257+Shadow-Quill@users.noreply.github.com> Date: Tue, 5 Nov 2024 10:00:14 -0700 Subject: [PATCH 1/4] Changes remark logging to reflect whether an applied remark is secret or not (#87522) ## About The Pull Request Adds a ternary statement to the logging for adding admin remarks (notes, messages, watchlists) to specify if a note is secret. No change to actual administrative functions, just the logging. ## Why It's Good For The Game Accurately reflects the note added! ## Changelog :cl: admin: When a secret note is applied, it'll now be logged as a secret note (instead of appearing like a regular note). /:cl: --- code/modules/admin/sql_message_system.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/admin/sql_message_system.dm b/code/modules/admin/sql_message_system.dm index 68b96e41ae30f..7aab49d1c3649 100644 --- a/code/modules/admin/sql_message_system.dm +++ b/code/modules/admin/sql_message_system.dm @@ -93,8 +93,8 @@ INSERT INTO [format_table_name("messages")] (type, targetckey, adminckey, text, timestamp, server, server_ip, server_port, round_id, secret, expire_timestamp, severity, playtime) VALUES (:type, :target_ckey, :admin_ckey, :text, [timestamp? ":timestamp" : "Now()"], :server, INET_ATON(:internet_address), :port, :round_id, :secret, :expiry, :note_severity, (SELECT `minutes` FROM [format_table_name("role_time")] WHERE `ckey` = :target_ckey AND `job` = 'Living')) "}, parameters) - var/pm = "[key_name(usr)] has created a [type][(type == "note" || type == "message" || type == "watchlist entry") ? " for [target_key]" : ""]: [text]" - var/header = "[key_name_admin(usr)] has created a [type][(type == "note" || type == "message" || type == "watchlist entry") ? " for [target_key]" : ""]" + var/pm = "[key_name(usr)] has created a [secret ? "secret " : ""][type][(type == "note" || type == "message" || type == "watchlist entry") ? " for [target_key]" : ""]: [text]" + var/header = "[key_name_admin(usr)] has created a [secret ? "secret " : ""][type][(type == "note" || type == "message" || type == "watchlist entry") ? " for [target_key]" : ""]" if(!query_create_message.warn_execute()) qdel(query_create_message) return From 126bcf86fbdf223a1b3c8b3ae793c03e32a1cace Mon Sep 17 00:00:00 2001 From: "tgstation-ci[bot]" <179393467+tgstation-ci[bot]@users.noreply.github.com> Date: Tue, 5 Nov 2024 17:00:38 +0000 Subject: [PATCH 2/4] Automatic changelog for PR #87522 [ci skip] --- html/changelogs/AutoChangeLog-pr-87522.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-87522.yml diff --git a/html/changelogs/AutoChangeLog-pr-87522.yml b/html/changelogs/AutoChangeLog-pr-87522.yml new file mode 100644 index 0000000000000..e30b11dcd801d --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-87522.yml @@ -0,0 +1,4 @@ +author: "Shadow-Quill" +delete-after: True +changes: + - admin: "When a secret note is applied, it'll now be logged as a secret note (instead of appearing like a regular note)." \ No newline at end of file From 4e54abc6ef8060640f0faa6296767d136e9f201d Mon Sep 17 00:00:00 2001 From: SmArtKar <44720187+SmArtKar@users.noreply.github.com> Date: Tue, 5 Nov 2024 18:01:08 +0100 Subject: [PATCH 3/4] Fixes MODsuit deactivation not disabling modules (#87649) ## About The Pull Request Closes #87618 Technically either part of this fix (moving the active check in seal_part and removing the parts check in control_activation) is enough to fix this particular issue but I'm doing both for sanity reasons (and possibly edge cases with modules that modify their required parts? not sure if we have those) also yeah it didn't call deactivate() ## Changelog :cl: fix: Fixed MODsuit deactivation not disabling modules /:cl: --- code/modules/mod/mod_activation.dm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/code/modules/mod/mod_activation.dm b/code/modules/mod/mod_activation.dm index ed19d0a4f6a2d..ee4725075aadc 100644 --- a/code/modules/mod/mod_activation.dm +++ b/code/modules/mod/mod_activation.dm @@ -262,9 +262,9 @@ wearer.update_obscured_slots(part.visor_flags_inv) if((part.clothing_flags & (MASKINTERNALS|HEADINTERNALS)) && wearer.invalid_internals()) wearer.cutoff_internals() - if(!active) - return if(is_sealed) + if (!active) + return for(var/obj/item/mod/module/module as anything in modules) if(module.part_activated || !module.has_required_parts(mod_parts, need_active = TRUE)) continue @@ -293,10 +293,13 @@ module.part_activated = TRUE else for(var/obj/item/mod/module/module as anything in modules) - if(!module.part_activated || module.has_required_parts(mod_parts, need_active = TRUE)) + if(!module.part_activated) continue module.on_part_deactivation() module.part_activated = FALSE + if(!module.active || (module.allow_flags & MODULE_ALLOW_INACTIVE)) + continue + module.deactivate(display_message = FALSE) update_speed() update_charge_alert() update_appearance(UPDATE_ICON_STATE) From 62000f876a0f9aa5581b8685113b487e42466265 Mon Sep 17 00:00:00 2001 From: "tgstation-ci[bot]" <179393467+tgstation-ci[bot]@users.noreply.github.com> Date: Tue, 5 Nov 2024 17:01:33 +0000 Subject: [PATCH 4/4] Automatic changelog for PR #87649 [ci skip] --- html/changelogs/AutoChangeLog-pr-87649.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-87649.yml diff --git a/html/changelogs/AutoChangeLog-pr-87649.yml b/html/changelogs/AutoChangeLog-pr-87649.yml new file mode 100644 index 0000000000000..0c64a1ffee5d3 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-87649.yml @@ -0,0 +1,4 @@ +author: "SmArtKar" +delete-after: True +changes: + - bugfix: "Fixed MODsuit deactivation not disabling modules" \ No newline at end of file