Merge branch 'SPLURT-Station:master' into master

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 ..()
 

html/changelogs/archive/2024-11.yml

@@ -0,0 +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

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"))

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"