Skip to content

Emotes give a proper rune chat message #7714

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ta3754859-max wants to merge 5 commits into
base: main
Choose a base branch
from
+28 −15
Open

Emotes give a proper rune chat message #7714

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5722a40
does the thing
ta3754859-max Aug 29, 2026
dd72c17
changes to emotes, adds kissing on the cheek/forehead
ta3754859-max Aug 29, 2026
fc89773
logging
ta3754859-max Aug 29, 2026
bfc2439
logging change two
ta3754859-max Aug 29, 2026
f5e70a0
Merge branch 'main' into emotes-give-a-proper-message
ta3754859-max Aug 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions code/datums/emotes.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,6 @@
var/runechat_msg = null

/datum/emote/New()
if(!runechat_msg)
runechat_msg = strip_punctuation(message)
if (ispath(mob_type_allowed_typecache))
switch (mob_type_allowed_typecache)
if (/mob)
Expand Down Expand Up @@ -86,6 +84,7 @@
if(!msg && nomsg == FALSE)
return

var/msg_for_runechat = msg
if(!nomsg)
user.log_message(msg, LOG_EMOTE)
msg = "<b>[user]</b> " + msg
Expand Down Expand Up @@ -114,7 +113,7 @@
M.show_message(msg)
var/runechat_msg_to_use = null
if(show_runechat && !(emote_type & EMOTE_AUDIBLE))
runechat_msg_to_use = runechat_msg ? runechat_msg : raw_msg
runechat_msg_to_use = runechat_msg ? runechat_msg : msg_for_runechat
if(emote_type & EMOTE_AUDIBLE)
user.audible_message(msg, runechat_message = runechat_msg_to_use)
else
Expand Down
38 changes: 26 additions & 12 deletions code/modules/mob/living/emote.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -756,6 +756,10 @@
var/log_msg
if(E.age == AGE_CHILD)
log_msg = "[key_name(H)][ADMIN_FLW(H)] kissed [key_name(E)] [ADMIN_FLW(E)], a CHILD!"
if(H.zone_selected == BODY_ZONE_PRECISE_SKULL)
log_msg += " On the FOREHEAD."
else if(H.zone_selected == BODY_ZONE_HEAD)
log_msg += " On the CHEEK."
if(H.age == AGE_CHILD)
log_msg += " As a child."
else
Expand All @@ -769,17 +773,23 @@
if(H.pulling == target)
do_change = TRUE
if(do_change)
if(H.zone_selected == BODY_ZONE_PRECISE_MOUTH)
message_param = "kisses %t deeply."
else if(H.zone_selected == BODY_ZONE_PRECISE_EARS)
message_param = "kisses %t on the ear."
if(E.dna.species?.id == "elf")
if(!E.cmode)
to_chat(target, span_love("It tickles..."))
else if(H.zone_selected == BODY_ZONE_PRECISE_R_EYE || H.zone_selected == BODY_ZONE_PRECISE_L_EYE)
message_param = "kisses %t on the brow."
else
message_param = "kisses %t on \the [parse_zone(H.zone_selected)]."
switch(H.zone_selected)
if(BODY_ZONE_PRECISE_MOUTH)
message_param = "kisses %t deeply."
if(BODY_ZONE_PRECISE_EARS)
message_param = "kisses %t on the ear."
if(E.dna?.species.id in RACES_PLAYER_ELF_ALL)
if(!E.cmode)
E.flash_fullscreen("whiteflash")
to_chat(target, span_love("It tickles..."))
if(BODY_ZONE_PRECISE_R_EYE, BODY_ZONE_PRECISE_L_EYE)
message_param = "kisses %t on the brow."
if(BODY_ZONE_PRECISE_SKULL)
message_param = "kisses %t on the forehead."
if(BODY_ZONE_HEAD)
message_param = "kisses %t on the cheek."
else
message_param = "kisses %t on \the [parse_zone(H.zone_selected)]."
playsound(target, pick('sound/vo/kiss (1).ogg','sound/vo/kiss (2).ogg'), 100, FALSE, -1)
if(user.mind)
record_round_statistic(STATS_KISSES_MADE)
Expand Down Expand Up @@ -1102,9 +1112,13 @@
. = ..()
if(!user || !target)
return
var/mob/living/carbon/human/U
if(ishuman(user))
U = user
if(ishuman(target))
var/mob/living/carbon/human/H = target
H.flash_fullscreen("redflash3")
if(!U || U.zone_selected != BODY_ZONE_PRECISE_GROIN)
H.flash_fullscreen("redflash3")
H.AdjustSleeping(-50)
playsound(target, pick('sound/foley/slap (1).ogg','sound/foley/slap (2).ogg'), 50, FALSE, -1)

Expand Down
Loading