cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

rework soulcatcher message handling (#10226)

Browse Source
This commit is contained in:
Kashargul
2025-02-26 20:10:57 +01:00
committed by GitHub
parent 8e91871b3b
commit 71ac90b3a3
3 changed files with 88 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
modular_chomp/code/modules/vore/eating/soulcatcher.dm
View File

@@ -67,40 +67,60 @@
// Sends messages to the owner of the soulcatcher
/obj/soulgem/proc/notify_holder(var/message)
to_chat(owner, span_nif(span_bold("[name]") + " displays, \"" + span_notice("[message]") + "\""))
message = span_nif(span_bold("[name]") + " displays, \"" + span_notice("[message]") + "\"")
to_chat(owner, message)
for(var/mob/living/carbon/brain/caught_soul/CS as anything in brainmobs)
to_chat(CS, span_nif(span_bold("[name]") + " displays, \"" + span_notice("[message]") + "\""))
to_chat(CS, message)
// Forwards the speech of captured souls
/obj/soulgem/proc/use_speech(var/message, var/mob/living/sender, var/mob/eyeobj)
/obj/soulgem/proc/use_speech(var/message, var/mob/living/sender, var/mob/eyeobj, var/whisper)
var/sender_name = eyeobj ? eyeobj.name : sender.name
//AR Projecting
if(eyeobj)
sender.eyeobj.visible_message(span_game(span_say(span_bold("[sender_name]") + " says, \"[message]\"")))
var/speak_verb = "says"
message = span_game(span_say(span_bold("[sender_name]") + " [speak_verb], \"[message]\""))
if(whisper)
speak_verb = "whispers"
sender.eyeobj.visible_message(span_italics(message), range = 1)
else
sender.eyeobj.visible_message(message)
//Not AR Projecting
else
to_chat(owner, span_nif(span_bold("\[SC\] [sender_name]") + " speaks, \"[message]\""))
for(var/mob/living/carbon/brain/caught_soul/CS as anything in brainmobs)
to_chat(CS, span_nif(span_bold("\[SC\] [sender_name]") + " speaks, \"[message]\""))
var/speak_verb = "speaks"
message = span_nif(span_bold("\[SC\] [sender_name]") + " [speak_verb], \"[message]\"")
to_chat(owner, message)
if(whisper)
speak_verb = "whispers"
to_chat(sender, span_italics(message))
else
for(var/mob/living/carbon/brain/caught_soul/CS as anything in brainmobs)
to_chat(CS, message)
log_nsay(message, owner.real_name, sender)
// Forwards the emotes of captured souls
/obj/soulgem/proc/use_emote(var/message, var/mob/living/sender, var/mob/eyeobj)
/obj/soulgem/proc/use_emote(var/message, var/mob/living/sender, var/mob/eyeobj, var/whisper)
var/sender_name = eyeobj ? eyeobj.name : sender.name
//AR Projecting
if(eyeobj)
sender.eyeobj.visible_message(span_emote("[sender_name] [message]"))
message = span_emote("[sender_name] [message]")
if(whisper)
sender.eyeobj.visible_message(span_italics(message), range = 1)
else
sender.eyeobj.visible_message(message)
//Not AR Projecting
else
to_chat(owner, span_nif(span_bold("[sender_name]") + " [message]"))
for(var/mob/living/carbon/brain/caught_soul/CS as anything in brainmobs)
to_chat(CS, span_nif(span_bold("[sender_name]") + " [message]"))
message = span_nif(span_bold("[sender_name]") + " [message]")
to_chat(owner, message)
if(whisper)
to_chat(sender, span_italics(message))
else
for(var/mob/living/carbon/brain/caught_soul/CS as anything in brainmobs)
to_chat(CS, message)
log_nme(message, owner.real_name,sender)

8
modular_chomp/code/modules/vore/eating/soulcatcher_mob.dm
View File

@@ -50,6 +50,14 @@
if(silent) return FALSE
gem.use_emote(message,src,eyeobj)
/mob/living/carbon/brain/caught_soul/vore/me_verb_subtle(message as message)
if(silent) return FALSE
gem.use_emote(message,src,eyeobj,TRUE)
/mob/living/carbon/brain/caught_soul/vore/whisper(message as text)
if(silent) return FALSE
gem.use_speech(message,src,eyeobj,TRUE)
// Resist override, only returning a message that one is stuck for now
/mob/living/carbon/brain/caught_soul/vore/resist()
set name = "Resist"