From 3a611d6af9f4263e238ca5a0c0a753bf11ebeaa5 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Wed, 4 Dec 2024 06:16:47 +0000 Subject: [PATCH 1/9] Automatic changelog compile [ci skip] --- html/changelog.html | 31 +++++----------------- html/changelogs/.all_changelog.yml | 5 ++++ html/changelogs/AutoChangelog-pr-22829.yml | 5 ---- 3 files changed, 12 insertions(+), 29 deletions(-) delete mode 100644 html/changelogs/AutoChangelog-pr-22829.yml diff --git a/html/changelog.html b/html/changelog.html index 4d3805ffe607..337604766cf3 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -57,6 +57,13 @@ -->
+

04 December 2024

+

SapphicOverload updated:

+ +

03 December 2024

13spacemen updated:

- -

04 September 2024

-

JohnFulpWillard updated:

- -

SapphicOverload updated:

- -

ToasterBiome updated:

- -

ToasterBiome, Cowbot93 updated:

- -

ktlwjec updated:

-
GoonStation 13 Development Team diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index fd9622bc2092..75de7a76f4fa 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -45761,3 +45761,8 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. 2024-12-03: 13spacemen: - bugfix: Vox spawn with the correct tank and mask at roundstart +2024-12-04: + SapphicOverload: + - rscadd: Adds lactose intolerance quirk + - tweak: Lizards are now lactose intolerant instead of not liking vegetables and + sugar diff --git a/html/changelogs/AutoChangelog-pr-22829.yml b/html/changelogs/AutoChangelog-pr-22829.yml deleted file mode 100644 index 3a5f80600b53..000000000000 --- a/html/changelogs/AutoChangelog-pr-22829.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "SapphicOverload" -delete-after: true -changes: - - rscadd: "Adds lactose intolerance quirk" - - tweak: "Lizards are now lactose intolerant instead of not liking vegetables and sugar" From 255004a1be1db2ce8f2484d5d9b88bb95481f8bc Mon Sep 17 00:00:00 2001 From: Changelogs Date: Sat, 7 Dec 2024 06:15:09 +0000 Subject: [PATCH 2/9] Automatic changelog compile [ci skip] --- html/changelog.html | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/html/changelog.html b/html/changelog.html index 337604766cf3..ad77f5ae498b 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -811,17 +811,6 @@

ToasterBiome updated:

  • Scrubs instances of the word retard/retarded
  • centcom ban DB check now works again
    • - -

    07 September 2024

    -

    AMyriad updated:

    - -

    ToasterBiome updated:

    - GoonStation 13 Development Team From ca304a0037ee167db18f04d12c125531ca5e1eda Mon Sep 17 00:00:00 2001 From: SapphicOverload <93578146+SapphicOverload@users.noreply.github.com> Date: Sun, 8 Dec 2024 00:13:53 -0500 Subject: [PATCH 3/9] fix (#22836) --- code/datums/components/storage/storage.dm | 4 ++-- code/datums/progressbar.dm | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/code/datums/components/storage/storage.dm b/code/datums/components/storage/storage.dm index 508819994666..035ebe694aaf 100644 --- a/code/datums/components/storage/storage.dm +++ b/code/datums/components/storage/storage.dm @@ -239,7 +239,7 @@ GLOBAL_LIST_EMPTY(cached_storage_typecaches) to_chat(M, span_notice("You failed to pick up anything with [parent].")) return var/list/rejections = list() - while(do_after(M, 1 SECONDS, parent, TRUE, FALSE, CALLBACK(src, PROC_REF(handle_mass_pickup), things, I.loc, rejections))) + while(do_after(M, 1 SECONDS, parent, NONE, TRUE, CALLBACK(src, PROC_REF(handle_mass_pickup), things, I.loc, rejections))) continue to_chat(M, span_notice("You put everything you could [insert_preposition] [parent].")) @@ -291,7 +291,7 @@ GLOBAL_LIST_EMPTY(cached_storage_typecaches) to_chat(M, span_notice("You start dumping out [parent].")) var/turf/T = get_turf(A) var/list/things = contents() - while (do_after(M, 1 SECONDS, T, TRUE, FALSE, CALLBACK(src, PROC_REF(mass_remove_from_storage), T, things))) + while (do_after(M, 1 SECONDS, T, NONE, TRUE, CALLBACK(src, PROC_REF(mass_remove_from_storage), T, things))) continue /datum/component/storage/proc/mass_remove_from_storage(atom/target, list/things, trigger_on_found = TRUE) diff --git a/code/datums/progressbar.dm b/code/datums/progressbar.dm index bc9df3f6f5d5..20e3a7ab5b7f 100644 --- a/code/datums/progressbar.dm +++ b/code/datums/progressbar.dm @@ -22,7 +22,7 @@ var/progress_ended = FALSE -/datum/progressbar/New(mob/User, goal_number, atom/target, timed_action_flags = NONE) +/datum/progressbar/New(mob/User, goal_number, atom/target, timed_action_flags = NONE, datum/callback/extra_checks) . = ..() if (!istype(target)) stack_trace("Invalid target [target] passed in") @@ -42,6 +42,7 @@ SET_PLANE_EXPLICIT(bar, ABOVE_HUD_PLANE, User) //yogs change, increased so it draws ontop of ventcrawling overlays bar.appearance_flags = APPEARANCE_UI_IGNORE_ALPHA user = User + src.extra_checks = extra_checks LAZYADDASSOCLIST(user.progressbars, bar_loc, src) var/list/bars = user.progressbars[bar_loc] @@ -59,7 +60,7 @@ var/obj/mecha/mech = user.loc if(ismecha(user.loc) && user == mech.occupant) RegisterSignal(mech, COMSIG_MOVABLE_MOVED, PROC_REF(on_moved)) - if(!(timed_action_flags & IGNORE_TARGET_LOC_CHANGE)) + if(!(timed_action_flags & IGNORE_TARGET_LOC_CHANGE) && target != user) RegisterSignal(target, COMSIG_MOVABLE_MOVED, PROC_REF(on_moved)) if(!(timed_action_flags & IGNORE_HELD_ITEM)) var/obj/item/held = user.get_active_held_item() @@ -70,6 +71,9 @@ RegisterSignal(user, COMSIG_MOB_PICKUP_ITEM, PROC_REF(end_progress)) RegisterSignal(user, COMSIG_MOB_SWAPPING_HANDS, PROC_REF(end_progress)) if(!(timed_action_flags & IGNORE_INCAPACITATED)) + if(HAS_TRAIT(user, TRAIT_INCAPACITATED)) + end_progress() + return RegisterSignal(user, SIGNAL_ADDTRAIT(TRAIT_INCAPACITATED), PROC_REF(end_progress)) From ca67ed6e20cca13abdb71c3be496bdea3c89c127 Mon Sep 17 00:00:00 2001 From: Yogbot-13 Date: Sun, 8 Dec 2024 00:13:55 -0500 Subject: [PATCH 4/9] Automatic changelog generation #22836 [ci skip] --- html/changelogs/AutoChangelog-pr-22836.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangelog-pr-22836.yml diff --git a/html/changelogs/AutoChangelog-pr-22836.yml b/html/changelogs/AutoChangelog-pr-22836.yml new file mode 100644 index 000000000000..0f13a0d0f312 --- /dev/null +++ b/html/changelogs/AutoChangelog-pr-22836.yml @@ -0,0 +1,5 @@ +author: "SapphicOverload" +delete-after: true +changes: + - bugfix: "Fixed movement canceling certain timed actions when it shouldn't" + - bugfix: "Fixed containers not picking up and emptying items properly" From 0dfd427ee46e6150fb8e13ce9cec7e45bd80dc60 Mon Sep 17 00:00:00 2001 From: Oblisk234 <61151679+Oblisk234@users.noreply.github.com> Date: Sun, 8 Dec 2024 05:17:18 +0000 Subject: [PATCH 5/9] [s] Fixes cursed stomach vomitcrawl CC exploit (#22828) * Who knew vomit could be useful * Revert "Who knew vomit could be useful" This reverts commit c875342e76d9484f16372eed70ead60480f7c5d5. * Vomitcrawling prevention * Mapping helpers --- yogstation/code/datums/components/crawl.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yogstation/code/datums/components/crawl.dm b/yogstation/code/datums/components/crawl.dm index afd1e1ea028c..a47c86295d95 100644 --- a/yogstation/code/datums/components/crawl.dm +++ b/yogstation/code/datums/components/crawl.dm @@ -447,5 +447,5 @@ GLOBAL_LIST_EMPTY(vomit_spots) /obj/effect/dummy/crawling/vomit/proc/follow_vomit() var/turf/T = get_turf(currentvomit) - if(T) + if(T && !(is_centcom_level(T.z)||is_reserved_level(T.z))) forceMove(T) From cf2c8f781e8dda1983ed4f8c77ec4ffaf4a1c685 Mon Sep 17 00:00:00 2001 From: Yogbot-13 Date: Sun, 8 Dec 2024 00:17:20 -0500 Subject: [PATCH 6/9] Automatic changelog generation #22828 [ci skip] --- html/changelogs/AutoChangelog-pr-22828.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangelog-pr-22828.yml diff --git a/html/changelogs/AutoChangelog-pr-22828.yml b/html/changelogs/AutoChangelog-pr-22828.yml new file mode 100644 index 000000000000..139dda62513f --- /dev/null +++ b/html/changelogs/AutoChangelog-pr-22828.yml @@ -0,0 +1,4 @@ +author: "Oblisk234" +delete-after: true +changes: + - bugfix: "Fixed an exploit where you could use the cursed stomach to vomitcrawl to Centcomm" From b1b3677f08c3d9866cba5cf882e68b64b43c878a Mon Sep 17 00:00:00 2001 From: Byemoh Date: Sat, 7 Dec 2024 23:18:29 -0600 Subject: [PATCH 7/9] fix (#22833) --- code/__DEFINES/misc.dm | 1 + code/__HELPERS/mobs.dm | 3 +++ .../modular_computers/file_system/programs/ntpda_msg.dm | 4 ++-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm index 03b586f933a8..795472e44f63 100644 --- a/code/__DEFINES/misc.dm +++ b/code/__DEFINES/misc.dm @@ -226,6 +226,7 @@ GLOBAL_LIST_INIT(donor_pdas, list(PDA_COLOR_NORMAL, PDA_COLOR_TRANSPARENT, PDA_C #define DEADCHAT_DEATHRATTLE "deathrattle" #define DEADCHAT_REGULAR "regular-deadchat" #define DEADCHAT_ANNOUNCEMENT "announcement" +#define DEADCHAT_PDA "pdamessage" // Bluespace shelter deploy checks #define SHELTER_DEPLOY_ALLOWED "allowed" diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm index 8c44e6f77688..75f91ddf1209 100644 --- a/code/__HELPERS/mobs.dm +++ b/code/__HELPERS/mobs.dm @@ -449,6 +449,9 @@ GLOBAL_LIST_EMPTY(species_list) if(DEADCHAT_ARRIVALRATTLE) if(prefs.toggles & DISABLE_ARRIVALRATTLE) continue + if(DEADCHAT_PDA) + if(prefs.chat_toggles & CHAT_GHOSTPDA) + continue if(isobserver(M)) var/rendered_message = message diff --git a/code/modules/modular_computers/file_system/programs/ntpda_msg.dm b/code/modules/modular_computers/file_system/programs/ntpda_msg.dm index 5dd70dea1827..42141c846bd0 100644 --- a/code/modules/modular_computers/file_system/programs/ntpda_msg.dm +++ b/code/modules/modular_computers/file_system/programs/ntpda_msg.dm @@ -124,7 +124,7 @@ GLOBAL_LIST_EMPTY(NTPDAMessages) return FALSE // Show ghosts (and admins) - deadchat_broadcast(" sent an NTPDA Message ([username] --> [recipient.username]): [span_message(message)]", user, user, speaker_key = user.ckey) + deadchat_broadcast(" sent an NTPDA Message ([username] --> [recipient.username]): [span_message(message)]", user, user, speaker_key = user.ckey, message_type = DEADCHAT_PDA) computer.visible_message(span_notice("Message sent!"), null, null, 1) message_history += list(list(username, message, REF(src), signal)) return TRUE @@ -182,7 +182,7 @@ GLOBAL_LIST_EMPTY(NTPDAMessages) return FALSE // Show ghosts (and admins) - deadchat_broadcast(" sent an NTPDA Message ([username] --> Everyone): [span_message(message)]", user, user, speaker_key = user.ckey) + deadchat_broadcast(" sent an NTPDA Message ([username] --> Everyone): [span_message(message)]", user, user, speaker_key = user.ckey, message_type = DEADCHAT_PDA) computer.visible_message(span_notice("Message sent!"), null, null, 1) message_history += list(list(username, message, REF(src), signal)) return TRUE From f43ae8a37932cf06e665ac307ffe912d3360db27 Mon Sep 17 00:00:00 2001 From: Yogbot-13 Date: Sun, 8 Dec 2024 00:18:31 -0500 Subject: [PATCH 8/9] Automatic changelog generation #22833 [ci skip] --- html/changelogs/AutoChangelog-pr-22833.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangelog-pr-22833.yml diff --git a/html/changelogs/AutoChangelog-pr-22833.yml b/html/changelogs/AutoChangelog-pr-22833.yml new file mode 100644 index 000000000000..3968bd89c5db --- /dev/null +++ b/html/changelogs/AutoChangelog-pr-22833.yml @@ -0,0 +1,4 @@ +author: "ToasterBiome" +delete-after: true +changes: + - bugfix: "Ghost \"Enable PDA notifications\" setting will now function correctly" From d04c9f655da2377a15de13435af2eaf4f87a5408 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Sun, 8 Dec 2024 06:14:42 +0000 Subject: [PATCH 9/9] Automatic changelog compile [ci skip] --- html/changelog.html | 35 ++++++++++------------ html/changelogs/.all_changelog.yml | 9 ++++++ html/changelogs/AutoChangelog-pr-22828.yml | 4 --- html/changelogs/AutoChangelog-pr-22833.yml | 4 --- html/changelogs/AutoChangelog-pr-22836.yml | 5 ---- 5 files changed, 24 insertions(+), 33 deletions(-) delete mode 100644 html/changelogs/AutoChangelog-pr-22828.yml delete mode 100644 html/changelogs/AutoChangelog-pr-22833.yml delete mode 100644 html/changelogs/AutoChangelog-pr-22836.yml diff --git a/html/changelog.html b/html/changelog.html index ad77f5ae498b..0e5c8fedb41e 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -57,6 +57,21 @@ -->
    +

    08 December 2024

    +

    Oblisk234 updated:

    +
      +
    • Fixed an exploit where you could use the cursed stomach to vomitcrawl to Centcomm
      • +
    +

    SapphicOverload updated:

    +
      +
    • Fixed movement canceling certain timed actions when it shouldn't
      • +
    • Fixed containers not picking up and emptying items properly
      • +
    +

    ToasterBiome updated:

    +
      +
    • Ghost "Enable PDA notifications" setting will now function correctly
      • +
    +

    04 December 2024

    SapphicOverload updated:

      @@ -791,26 +806,6 @@

      cowbot92 updated:

    • Adds a new area to enter the backrooms on station
    • This is experimental
    - -

    08 September 2024

    -

    AgentCitrus, kit-katz, PowerfulBacon, ToasterBiome updated:

    -
      -
    • Adds a distortion effect to the supermatter engine
      • -
    • Fixes singularity spawned by delamination to not be a gravitational one
      • -
    -

    M4565, ToasterBiome updated:

    -
      -
    • makes burning surgical mats drop plastic instead of metal
      • -
    -

    SapphicOverload updated:

    -
      -
    • Fixed objectives sometimes not re-rolling properly
      • -
    -

    ToasterBiome updated:

    -
      -
    • Scrubs instances of the word retard/retarded
      • -
    • centcom ban DB check now works again
      • -
    GoonStation 13 Development Team diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 75de7a76f4fa..40de606256df 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -45766,3 +45766,12 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. - rscadd: Adds lactose intolerance quirk - tweak: Lizards are now lactose intolerant instead of not liking vegetables and sugar +2024-12-08: + Oblisk234: + - bugfix: Fixed an exploit where you could use the cursed stomach to vomitcrawl + to Centcomm + SapphicOverload: + - bugfix: Fixed movement canceling certain timed actions when it shouldn't + - bugfix: Fixed containers not picking up and emptying items properly + ToasterBiome: + - bugfix: Ghost "Enable PDA notifications" setting will now function correctly diff --git a/html/changelogs/AutoChangelog-pr-22828.yml b/html/changelogs/AutoChangelog-pr-22828.yml deleted file mode 100644 index 139dda62513f..000000000000 --- a/html/changelogs/AutoChangelog-pr-22828.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Oblisk234" -delete-after: true -changes: - - bugfix: "Fixed an exploit where you could use the cursed stomach to vomitcrawl to Centcomm" diff --git a/html/changelogs/AutoChangelog-pr-22833.yml b/html/changelogs/AutoChangelog-pr-22833.yml deleted file mode 100644 index 3968bd89c5db..000000000000 --- a/html/changelogs/AutoChangelog-pr-22833.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "ToasterBiome" -delete-after: true -changes: - - bugfix: "Ghost \"Enable PDA notifications\" setting will now function correctly" diff --git a/html/changelogs/AutoChangelog-pr-22836.yml b/html/changelogs/AutoChangelog-pr-22836.yml deleted file mode 100644 index 0f13a0d0f312..000000000000 --- a/html/changelogs/AutoChangelog-pr-22836.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "SapphicOverload" -delete-after: true -changes: - - bugfix: "Fixed movement canceling certain timed actions when it shouldn't" - - bugfix: "Fixed containers not picking up and emptying items properly"