From ed93aa8020daa25dbd98a4357209a6f966202e1d Mon Sep 17 00:00:00 2001 From: Meghan-Rossi <56671765+Meghan-Rossi@users.noreply.github.com> Date: Fri, 1 Nov 2024 21:49:02 +0000 Subject: [PATCH 1/6] 515.1543 Compatibility Removes some unnecessary compile-time checks that caused compile errors in byond versions 515.1543 and higher. --- .../debug_variable_appearance.dm | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/code/modules/admin/view_variables/debug_variable_appearance.dm b/code/modules/admin/view_variables/debug_variable_appearance.dm index 3ceaf2a50b5b..8bc9979a7d10 100644 --- a/code/modules/admin/view_variables/debug_variable_appearance.dm +++ b/code/modules/admin/view_variables/debug_variable_appearance.dm @@ -59,25 +59,23 @@ GLOBAL_DATUM_INIT(pluto, /atom/movable, new /atom/movable(null)) if(beloved.vars.Find(var_name)) // If datums have it, get out return FALSE // If it is one of the two args on /image, yeet (I am sorry) - if(var_name == NAMEOF(src, realized_overlays)) + if(var_name == "realized_overlays") return FALSE - if(var_name == NAMEOF(src, realized_underlays)) + if(var_name == "realized_underlays") return FALSE // Filtering out the stuff I know we don't care about - if(var_name == NAMEOF(src, x)) + if(var_name == "x") return FALSE - if(var_name == NAMEOF(src, y)) + if(var_name == "y") return FALSE - if(var_name == NAMEOF(src, z)) + if(var_name == "z") return FALSE // Could make an argument for these but I think they will just confuse people, so yeeet -#ifndef SPACEMAN_DMM // Spaceman doesn't believe in contents on appearances, sorry lads - if(var_name == NAMEOF(src, contents)) + if(var_name == "contents") return FALSE -#endif - if(var_name == NAMEOF(src, loc)) + if(var_name == "loc") return FALSE - if(var_name == NAMEOF(src, vis_contents)) + if(var_name == "vis_contents") return FALSE return ..() From 6f5b7144875cf4197b755d6420f44ffb21cb53c2 Mon Sep 17 00:00:00 2001 From: Mosley <93835010+MosleyTheMalO@users.noreply.github.com> Date: Sun, 3 Nov 2024 12:40:03 -0500 Subject: [PATCH 2/6] fein fein fein fein fein I better get a dommy mommy for this --- modular_splurt/code/datums/traits/good.dm | 7 +++---- modular_splurt/code/modules/mob/emote.dm | 3 --- tgstation.dme | 1 - 3 files changed, 3 insertions(+), 8 deletions(-) delete mode 100644 modular_splurt/code/modules/mob/emote.dm diff --git a/modular_splurt/code/datums/traits/good.dm b/modular_splurt/code/datums/traits/good.dm index e2025ae166c9..a001ab354718 100644 --- a/modular_splurt/code/datums/traits/good.dm +++ b/modular_splurt/code/datums/traits/good.dm @@ -92,12 +92,11 @@ sub.dir = turn(get_dir(sub, quirk_holder), pick(-90, 90)) sub.emote("blush") -/datum/quirk/dominant_aura/proc/handle_snap(datum/source, list/emote_args) +/datum/quirk/dominant_aura/proc/handle_snap(datum/source, datum/emote/emote) SIGNAL_HANDLER . = FALSE - var/key = GLOB.emote_list[lowertext(emote_args[EMOTE_ACT])] - if(TIMER_COOLDOWN_CHECK(quirk_holder, COOLDOWN_DOMINANT_SNAP) || !findtext(key, "snap")) + if(TIMER_COOLDOWN_CHECK(quirk_holder, COOLDOWN_DOMINANT_SNAP) || !findtext(emote.key, "snap")) return for(var/mob/living/carbon/human/sub in hearers(DOMINANT_DETECT_RANGE, quirk_holder)) if(!sub.has_quirk(/datum/quirk/well_trained) || (sub == quirk_holder)) @@ -108,7 +107,7 @@ good_x = "boy" if(FEMALE) good_x = "girl" - switch(key) + switch(emote.key) if("snap") sub.dir = get_dir(sub, quirk_holder) sub.emote(pick("blush", "pant")) diff --git a/modular_splurt/code/modules/mob/emote.dm b/modular_splurt/code/modules/mob/emote.dm deleted file mode 100644 index a8caa144f984..000000000000 --- a/modular_splurt/code/modules/mob/emote.dm +++ /dev/null @@ -1,3 +0,0 @@ -/mob/emote(act, m_type, message, intentional) - . = ..() - SEND_SIGNAL(src, COMSIG_MOB_EMOTE, args) diff --git a/tgstation.dme b/tgstation.dme index 105d49fb44bf..7c0826cab877 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -4922,7 +4922,6 @@ #include "modular_splurt\code\modules\mining\equipment\kinetic_crusher.dm" #include "modular_splurt\code\modules\mining\equipment\machine_vending.dm" #include "modular_splurt\code\modules\mining\lavaland\necropolis_chests.dm" -#include "modular_splurt\code\modules\mob\emote.dm" #include "modular_splurt\code\modules\mob\femclaw.dm" #include "modular_splurt\code\modules\mob\inventory.dm" #include "modular_splurt\code\modules\mob\mob.dm" From 1a2d0104e5c39220a83bda00a6d8037ca91e009f Mon Sep 17 00:00:00 2001 From: SPLURT Bot <97993072+SPLURT-Station-Bot@users.noreply.github.com> Date: Sun, 3 Nov 2024 17:57:18 +0000 Subject: [PATCH 3/6] Automatic changelog generation for PR #1217 [ci skip] --- html/changelogs/AutoChangeLog-pr-1217.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-1217.yml diff --git a/html/changelogs/AutoChangeLog-pr-1217.yml b/html/changelogs/AutoChangeLog-pr-1217.yml new file mode 100644 index 000000000000..80629c17451c --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-1217.yml @@ -0,0 +1,4 @@ +author: Meghan-Rossi +delete-after: true +changes: + - server: Server can now be compiled on byond 515.1543 From 3f465142506a265f1c76a5680b851a9124893f95 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Sun, 3 Nov 2024 17:58:47 +0000 Subject: [PATCH 4/6] Automatic changelog compile [ci skip] --- .../{AutoChangeLog-pr-1217.yml => archive/2024-11.yml} | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) rename html/changelogs/{AutoChangeLog-pr-1217.yml => archive/2024-11.yml} (53%) diff --git a/html/changelogs/AutoChangeLog-pr-1217.yml b/html/changelogs/archive/2024-11.yml similarity index 53% rename from html/changelogs/AutoChangeLog-pr-1217.yml rename to html/changelogs/archive/2024-11.yml index 80629c17451c..d6f8b1d2c04b 100644 --- a/html/changelogs/AutoChangeLog-pr-1217.yml +++ b/html/changelogs/archive/2024-11.yml @@ -1,4 +1,3 @@ -author: Meghan-Rossi -delete-after: true -changes: +2024-11-03: + Meghan-Rossi: - server: Server can now be compiled on byond 515.1543 From 19a5faba73d86c9aabb0abf5c185ef376f235649 Mon Sep 17 00:00:00 2001 From: SPLURT Bot <97993072+SPLURT-Station-Bot@users.noreply.github.com> Date: Sun, 3 Nov 2024 18:00:30 +0000 Subject: [PATCH 5/6] Automatic changelog generation for PR #1218 [ci skip] --- html/changelogs/AutoChangeLog-pr-1218.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-1218.yml diff --git a/html/changelogs/AutoChangeLog-pr-1218.yml b/html/changelogs/AutoChangeLog-pr-1218.yml new file mode 100644 index 000000000000..871952fcd0b7 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-1218.yml @@ -0,0 +1,4 @@ +author: MosleyTheMalO +delete-after: true +changes: + - bugfix: Fixes the snap on dominant aura From 0d8acbb6c605afc22899d32051fbd7a0a075cd52 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Sun, 3 Nov 2024 18:01:48 +0000 Subject: [PATCH 6/6] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-1218.yml | 4 ---- html/changelogs/archive/2024-11.yml | 2 ++ 2 files changed, 2 insertions(+), 4 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-1218.yml diff --git a/html/changelogs/AutoChangeLog-pr-1218.yml b/html/changelogs/AutoChangeLog-pr-1218.yml deleted file mode 100644 index 871952fcd0b7..000000000000 --- a/html/changelogs/AutoChangeLog-pr-1218.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: MosleyTheMalO -delete-after: true -changes: - - bugfix: Fixes the snap on dominant aura diff --git a/html/changelogs/archive/2024-11.yml b/html/changelogs/archive/2024-11.yml index d6f8b1d2c04b..da1590628128 100644 --- a/html/changelogs/archive/2024-11.yml +++ b/html/changelogs/archive/2024-11.yml @@ -1,3 +1,5 @@ 2024-11-03: Meghan-Rossi: - server: Server can now be compiled on byond 515.1543 + MosleyTheMalO: + - bugfix: Fixes the snap on dominant aura