Emote Refractoring

code/__HELPERS/global_lists.dm

@@ -78,11 +78,6 @@
 	for(var/path in subtypesof(/datum/surgery))
 		GLOB.surgeries_list += new path()
 
-	//Emotes
-	for(var/path in subtypesof(/datum/emote))
-		var/datum/emote/E = new path()
-		E.emote_list[E.key] = E
-
 	for(var/path in subtypesof(/datum/bark))
 		var/datum/bark/B = new path()
 		GLOB.bark_list[B.id] = path
@@ -96,7 +91,7 @@
 
 	// Keybindings
 	init_keybindings()
-
+	GLOB.emote_list = init_emote_list()
 	init_subtypes(/datum/crafting_recipe, GLOB.crafting_recipes)
 
 	INVOKE_ASYNC(GLOBAL_PROC, GLOBAL_PROC_REF(init_ref_coin_values)) //so the current procedure doesn't sleep because of UNTIL()

code/_globalvars/lists/mobs.dm

@@ -39,6 +39,8 @@ GLOBAL_LIST_EMPTY(sentient_disease_instances)
 
 GLOBAL_LIST_EMPTY(latejoin_ai_cores)
 
+GLOBAL_LIST_EMPTY(emote_list)
+
 GLOBAL_LIST_EMPTY(mob_config_movespeed_type_lookup)
 GLOBAL_LIST_EMPTY(mob_config_movespeed_type_lookup_floating)
 
@@ -99,6 +101,24 @@ GLOBAL_LIST_EMPTY(pre_setup_antags) //minds that have been picked as antag by th
 		var/mob/M = i
 		M.update_config_movespeed()
 
+/proc/init_emote_list()
+	. = list()
+	for(var/path in subtypesof(/datum/emote))
+		var/datum/emote/E = new path()
+		if(E.key)
+			if(!.[E.key])
+				.[E.key] = list(E)
+			else
+				.[E.key] += E
+		else if(E.message) //Assuming all non-base emotes have this
+			stack_trace("Keyless emote: [E.type]")
+
+		if(E.key_third_person) //This one is optional
+			if(!.[E.key_third_person])
+				.[E.key_third_person] = list(E)
+			else
+				.[E.key_third_person] |= E
+
 	//blood types
 GLOBAL_LIST_INIT(regular_bloods,list(
 		"O-",

code/datums/emotes.dm

@@ -1,6 +1,7 @@
 /datum/emote
 	var/key = "" //What calls the emote
 	var/key_third_person = "" //This will also call the emote
+	var/name = "" // Needed for more user-friendly emote names, so emotes with keys like "aflap" will show as "flap angry". Defaulted to key.
 	var/message = "" //Message displayed when emote is used
 	var/message_mime = "" //Message displayed if the user is a mime
 	var/message_alien = "" //Message displayed if the user is a grown alien
@@ -11,21 +12,19 @@
 	var/message_simple = "" //Message to display if the user is a simple_animal
 	var/message_param = "" //Message to display if a param was given
 	var/emote_type = EMOTE_VISIBLE //Whether the emote is visible or audible
+	var/sound
 	var/restraint_check = FALSE //Checks if the mob is restrained before performing the emote
 	var/muzzle_ignore = FALSE //Will only work if the emote is EMOTE_AUDIBLE
 	var/list/mob_type_allowed_typecache = /mob //Types that are allowed to use that emote
 	var/list/mob_type_blacklist_typecache //Types that are NOT allowed to use that emote
 	var/list/mob_type_ignore_stat_typecache
 	var/stat_allowed = CONSCIOUS
-	var/static/list/emote_list = list()
 	var/static/regex/stop_bad_mime = regex(@"says|exclaims|yells|asks")
 
 	var/chat_popup = TRUE //Skyrat edit
 	var/image_popup
 
 /datum/emote/New()
-	if(key_third_person)
-		emote_list[key_third_person] = src
 	if (ispath(mob_type_allowed_typecache))
 		switch (mob_type_allowed_typecache)
 			if (/mob)
@@ -39,6 +38,9 @@
 	mob_type_blacklist_typecache = typecacheof(mob_type_blacklist_typecache)
 	mob_type_ignore_stat_typecache = typecacheof(mob_type_ignore_stat_typecache)
 
+	if(!name)
+		name = key
+
 /datum/emote/proc/run_emote(mob/user, params, type_override, intentional = FALSE)
 	. = TRUE
 	if(!can_run_emote(user, TRUE, intentional))
@@ -81,6 +83,9 @@
 		flick_emote_popup_on_mob(user, image_popup, 40)
 	//End of skyrat changes
 
+/datum/emote/proc/get_sound(mob/living/user)
+	return sound //by default just return this var.
+
 /datum/emote/proc/replace_pronoun(mob/user, message)
 	if(findtext(message, "their"))
 		message = replacetext(message, "their", user.p_their())
@@ -149,12 +154,61 @@
 			return FALSE
 
 /datum/emote/sound
-	var/sound //Sound to play when emote is called
 	var/vary = FALSE	//used for the honk borg emote
 	var/volume = 50
+	// Default time before using another audio emote
+	var/emote_cooldown = 1 SECONDS
+
+	// Default volume of the emote
+	var/emote_volume = 50
+
+	// Default range modifier
+	var/emote_range = -1
+	var/emote_distance_multiplier = SOUND_DEFAULT_DISTANCE_MULTIPLIER
+	var/emote_distance_multiplier_min_range = SOUND_DEFAULT_MULTIPLIER_EFFECT_RANGE
+
+	// Default pitch variance
+	var/emote_pitch_variance = 1
+
+	// Default audio falloff settings
+	var/emote_falloff_exponent = SOUND_FALLOFF_EXPONENT
+	var/emote_falloff_distance = SOUND_DEFAULT_FALLOFF_DISTANCE
+
+	// Default frequency
+	var/emote_frequency = null
+
+	// Default channel
+	var/emote_channel = 0
+
+	// Should the emote consider atmospheric pressure?
+	var/emote_check_pressure = TRUE
+
+	// Should the emote ignore walls?
+	var/emote_ignore_walls = FALSE
+
+	// Default wet and dry settings (???)
+	var/emote_wetness = -10000
+	var/emote_dryness = 0
 	mob_type_allowed_typecache = list(/mob/living/brain, /mob/living/silicon, /mob/camera/aiEye)
 
+/datum/emote/sound/can_run_emote(mob/living/user, status_check, intentional = FALSE)
+	. = ..()
+
+	// Check parent return
+	if(!.)
+		return FALSE
+
+	// Check cooldown
+	if(user?.nextsoundemote >= world.time)
+		return FALSE
+
+	// Allow use
+	return TRUE
+
 /datum/emote/sound/run_emote(mob/user, params)
 	. = ..()
 	if(.)
-		playsound(user.loc, sound, volume, vary)
+		playsound(user.loc, sound, emote_volume, emote_pitch_variance, emote_range, emote_falloff_exponent, emote_frequency, emote_channel, emote_check_pressure, emote_ignore_walls, emote_falloff_distance, emote_wetness, emote_dryness, emote_distance_multiplier, emote_distance_multiplier_min_range)
+
+		//Cooldown.
+		user.nextsoundemote = world.time + emote_cooldown

code/game/machinery/doors/airlock.dm

@@ -1229,9 +1229,9 @@
 			if(obj_integrity < max_integrity)
 				if(!W.tool_start_check(user, amount=0))
 					return
-				user.visible_message("[user] чинит шлюз сваркой.", \
-								"<span class='notice'>Вы начинаете чинить шлюз...</span>", \
-								"<span class='italics'>Вы слышите звук сварки.</span>")
+				user.visible_message("[user] is welding the airlock.", \
+								"<span class='notice'>You begin repairing the airlock...</span>", \
+								"<span class='italics'>You hear welding.</span>")
 				if(W.use_tool(src, user, 40, volume=50, extra_checks = CALLBACK(src, PROC_REF(weld_checks), W, user)))
 					obj_integrity = max_integrity
 					machine_stat &= ~BROKEN

code/modules/emote_panel/emote_panel.dm

@@ -0,0 +1,64 @@
+/datum/emote_panel
+	var/list/blacklisted_emotes = list("me", "help")
+
+/datum/emote_panel/ui_static_data(mob/user)
+	var/list/data = list()
+
+	var/list/emotes = list()
+	var/list/keys = list()
+
+	for(var/key in GLOB.emote_list)
+		for(var/datum/emote/emote in GLOB.emote_list[key])
+			if(emote.key in keys)
+				continue
+			if(emote.key in blacklisted_emotes)
+				continue
+			if(emote.can_run_emote(user, status_check = FALSE))
+				keys += emote.key
+				emotes += list(list(
+					"key" = emote.key,
+					"name" = emote.name,
+					"hands" = emote.restraint_check,
+					"visible" = emote.emote_type & (EMOTE_VISIBLE || EMOTE_BOTH || EMOTE_OMNI),
+					"audible" = emote.emote_type & (EMOTE_AUDIBLE || EMOTE_BOTH || EMOTE_OMNI),
+					"sound" = !isnull(emote.get_sound(user)),
+					"use_params" = emote.message_param,
+				))
+
+	data["emotes"] = emotes
+
+	return data
+
+/datum/emote_panel/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
+	. = ..()
+	if(.)
+		return
+	switch(action)
+		if("play_emote")
+			var/emote_key = params["emote_key"]
+			if(isnull(emote_key) || !GLOB.emote_list[emote_key])
+				return
+			var/use_params = params["use_params"]
+			var/datum/emote/emote = GLOB.emote_list[emote_key][1]
+			var/emote_param
+			if(emote.message_param && use_params)
+				emote_param = tgui_input_text(ui.user, "Add params to the emote...", emote.message_param)
+			ui.user.emote(emote_key, message = emote_param, intentional = TRUE)
+
+/datum/emote_panel/ui_interact(mob/user, datum/tgui/ui)
+	ui = SStgui.try_update_ui(user, src, ui)
+	if(!ui)
+		ui = new(user, src, "EmotePanel")
+		ui.open()
+
+/datum/emote_panel/ui_state(mob/user)
+	return GLOB.always_state
+
+/mob/living/verb/emote_panel()
+	set name = "Emote Panel"
+	set category = "IC"
+
+	var/static/datum/emote_panel/emote_panel
+	if(isnull(emote_panel))
+		emote_panel = new
+	emote_panel.ui_interact(src)

code/modules/mob/emote.dm

@@ -7,12 +7,14 @@
 		param = copytext(act, custom_param + length(act[custom_param]))
 		act = copytext(act, 1, custom_param)
 
-	var/datum/emote/E
-	E = E.emote_list[act]
-	if(!E)
-		to_chat(src, "<span class='notice'>Unusable emote '[act]'. Say *help for a list.</span>")
+	var/list/key_emotes = GLOB.emote_list[act]
+	for(var/datum/emote/emote in key_emotes)
+		if(!emote.can_run_emote(src, TRUE, intentional, param))
+			continue
+		emote.run_emote(src, param, m_type, intentional)
+	if(!key_emotes)
+		to_chat(src, span_notice("Unusable emote '[act]'. Say *help for a list."))
 		return
-	E.run_emote(src, param, m_type, intentional)
 
 /datum/emote/flip
 	key = "flip"

code/modules/mob/living/carbon/emote.dm

@@ -10,28 +10,20 @@
 
 /datum/emote/living/carbon/blink_r
 	key = "blink_r"
+	name = "blink rapidly"
 	message = "blinks rapidly."
 
-/datum/emote/living/carbon/clap
+/datum/emote/sound/human/clap
 	key = "clap"
 	key_third_person = "claps"
 	message = "claps."
 	muzzle_ignore = TRUE
 	restraint_check = TRUE
 	emote_type = EMOTE_AUDIBLE
 
-/datum/emote/living/carbon/clap/run_emote(mob/living/user, params)
+/datum/emote/sound/human/clap/run_emote(mob/user, params)
+	sound = pick('sound/misc/clap1.ogg', 'sound/misc/clap2.ogg', 'sound/misc/clap3.ogg', 'sound/misc/clap4.ogg')
 	. = ..()
-	if (.)
-		if (ishuman(user))
-			// Need hands to clap
-			if (!user.get_bodypart(BODY_ZONE_L_ARM) || !user.get_bodypart(BODY_ZONE_R_ARM))
-				return
-			var/clap = pick('sound/misc/clap1.ogg',
-							'sound/misc/clap2.ogg',
-							'sound/misc/clap3.ogg',
-							'sound/misc/clap4.ogg')
-			playsound(user, clap, 50, 1, -1)
 
 /datum/emote/living/carbon/gnarl
 	key = "gnarl"

code/modules/mob/living/carbon/human/emote.dm

@@ -99,7 +99,7 @@
 	else
 		H.dna.species.stop_wagging_tail(H)
 
-/datum/emote/living/carbon/human/wag/can_run_emote(mob/user, status_check = TRUE)
+/datum/emote/living/carbon/human/wag/can_run_emote(mob/user, status_check = TRUE, intentional = FALSE)
 	if(!..() || !ishuman(user))
 		return FALSE
 	var/mob/living/carbon/human/H = user
@@ -135,7 +135,7 @@
 	else
 		. = "closes " + message
 
-/datum/emote/living/carbon/human/wing/can_run_emote(mob/user, status_check = TRUE)
+/datum/emote/living/carbon/human/wing/can_run_emote(mob/user, status_check = TRUE, intentional = FALSE)
 	if(!..() || !ishuman(user))
 		return FALSE
 	var/mob/living/carbon/human/H = user
@@ -162,7 +162,7 @@
 		T.Entered(src)
 
 /datum/emote/sound/human
-	mob_type_allowed_typecache = list(/mob/living/carbon/human)
+	mob_type_allowed_typecache = list(/mob/living/) // /sound/human/ became the global emote type, so this is now the only valid typecache
 	emote_type = EMOTE_AUDIBLE
 
 /datum/emote/sound/human/buzz
@@ -247,6 +247,7 @@
 
 //the actual emotes
 /datum/emote/living/carbon/human/rockpaperscissors
+	key = "rps" // Give rockpaperscissors a key so it STOPS RUNTIMING
 	message = "is attempting to play rock paper scissors!"
 
 /datum/emote/living/carbon/human/rockpaperscissors/rock

code/modules/mob/living/emote.dm

@@ -222,7 +222,7 @@
 /datum/emote/living/audio_emote
 	emote_type = EMOTE_AUDIBLE
 
-/datum/emote/living/audio_emote/can_run_emote(mob/living/user, status_check = TRUE)
+/datum/emote/living/audio_emote/can_run_emote(mob/living/user, status_check = TRUE, intentional = FALSE)
 	. = ..()
 	if(. && iscarbon(user))
 		var/mob/living/carbon/C = user
@@ -508,14 +508,12 @@
 	var/list/keys = list()
 	var/list/message = list("Available emotes, you can use them with say \"*emote\": ")
 
-	var/datum/emote/E
-	var/list/emote_list = E.emote_list
-	for(var/e in emote_list)
-		if(e in keys)
-			continue
-		E = emote_list[e]
-		if(E.can_run_emote(user, status_check = FALSE))
-			keys += E.key
+	for(var/key in GLOB.emote_list)
+		for(var/datum/emote/emote_action in GLOB.emote_list[key])
+			if(emote_action.key in keys)
+				continue
+			if(emote_action.can_run_emote(user, status_check = FALSE , intentional = TRUE))
+				keys += emote_action.key
 
 	keys = sort_list(keys)
 

html/changelogs/archive/2024-09.yml

@@ -32,3 +32,12 @@
   - rscadd: New space ruins
   - tweak: several edits to simplemobs such as seeing their health
   - imageadd: TG sprites for doors, floors and other items
+  ariaworld:
+  - rscadd: Added some safeguards to RD console & design datums.
+  - rscadd: Added Beach, Forest, Jungle, Prison, and Winter apartments to infinidorm.
+2024-09-26:
+  Just-Sim:
+  - bugfix: Fixed cluttercode.
+2024-09-28:
+  Just-Sim:
+  - code_imp: Changed a lot of emotes.

html/changelogs/archive/2024-10.yml

@@ -1,3 +1,11 @@
+2024-10-01:
+  Just-Sim:
+  - rscadd: Added Emote Panel
+  - rscdel: Remove herobrine.
+  - refactor: refactored emote code.
+2024-10-05:
+  Just-Sim:
+  - bugfix: fixes bugs brought about by the emote panel
 2024-10-07:
   SaraSayomi:
   - bugfix: Crop top