From 13f1b8e0198a64685b3ac9c6a41764c2fb204acd Mon Sep 17 00:00:00 2001 From: S34N <12197162+S34NW@users.noreply.github.com> Date: Sun, 21 Apr 2024 21:34:32 +0100 Subject: [PATCH 1/2] Fixes unsorted emotes, announcements, votes, surgery, prayers, ahelp responses --- code/datums/emote.dm | 10 +- code/defines/procs/announcer_datum.dm | 4 +- .../miniantags/pulsedemon/pulsedemon.dm | 4 +- code/game/verbs/ooc.dm | 2 +- code/modules/admin/misc_admin_procs.dm | 2 +- code/modules/admin/verbs/adminpm.dm | 4 +- code/modules/admin/verbs/pray.dm | 2 +- .../mob/dead/observer/observer_base.dm | 2 +- .../modules/mob/living/silicon/silicon_say.dm | 2 +- .../simple_animal/hostile/megafauna/drake.dm | 2 +- code/modules/mob/mob.dm | 40 +++--- code/modules/mob/mob_holder.dm | 4 +- code/modules/surgery/bio_chip_removal.dm | 15 ++- code/modules/surgery/bones.dm | 36 ++++-- code/modules/surgery/cavity_implant.dm | 32 +++-- code/modules/surgery/core_removal.dm | 13 +- code/modules/surgery/dental_implant.dm | 7 +- code/modules/surgery/encased.dm | 33 +++-- code/modules/surgery/generic.dm | 51 +++++--- code/modules/surgery/limb_augmentation.dm | 6 +- code/modules/surgery/limb_reattach.dm | 27 +++-- code/modules/surgery/organs_internal.dm | 92 ++++++++------ code/modules/surgery/other.dm | 40 ++++-- code/modules/surgery/plastic_surgery.dm | 21 +++- .../modules/surgery/remove_embedded_object.dm | 6 +- code/modules/surgery/robotics.dm | 114 ++++++++++++------ code/modules/vote/vote_datum.dm | 2 +- code/modules/world_topic/adminmsg.dm | 4 +- 28 files changed, 368 insertions(+), 209 deletions(-) diff --git a/code/datums/emote.dm b/code/datums/emote.dm index e549d8b1314b..fb1dbb66722e 100644 --- a/code/datums/emote.dm +++ b/code/datums/emote.dm @@ -209,11 +209,11 @@ if(!ghost.client) continue if((ghost.client.prefs.toggles & PREFTOGGLE_CHAT_GHOSTSIGHT) && !(ghost in viewers(user_turf, null))) - ghost.show_message("[user] ([ghost_follow_link(user, ghost)]) [msg]") + ghost.show_message("[user] ([ghost_follow_link(user, ghost)]) [msg]", chat_message_type = MESSAGE_TYPE_LOCALCHAT) if(isobserver(user)) for(var/mob/dead/observer/ghost in viewers(user)) - ghost.show_message("[displayed_msg]", EMOTE_VISIBLE) + ghost.show_message("[displayed_msg]", EMOTE_VISIBLE, chat_message_type = MESSAGE_TYPE_LOCALCHAT) else if((emote_type & EMOTE_AUDIBLE) && !user.mind?.miming) user.audible_message(displayed_msg, deaf_message = "You see how [user] [msg]") @@ -283,10 +283,10 @@ for(var/mob/O as anything in can_see) if(O.status_flags & PASSEMOTES) for(var/obj/item/holder/H in O.contents) - H.show_message(text, EMOTE_VISIBLE) + H.show_message(text, EMOTE_VISIBLE, chat_message_type = MESSAGE_TYPE_LOCALCHAT) for(var/mob/living/M in O.contents) - M.show_message(text, EMOTE_VISIBLE) + M.show_message(text, EMOTE_VISIBLE, chat_message_type = MESSAGE_TYPE_LOCALCHAT) if(O.client?.prefs.toggles2 & PREFTOGGLE_2_RUNECHAT) O.create_chat_message(user, runechat_text, symbol = RUNECHAT_SYMBOL_EMOTE) @@ -636,7 +636,7 @@ if(!ghost.client) continue if(ghost.client.prefs.toggles & PREFTOGGLE_CHAT_GHOSTSIGHT && !(ghost in viewers(origin_turf, null))) - ghost.show_message("[ghost_follow_link(src, ghost)] [ghost_text]") + ghost.show_message("[ghost_follow_link(src, ghost)] [ghost_text]", chat_message_type = MESSAGE_TYPE_LOCALCHAT) visible_message(text) diff --git a/code/defines/procs/announcer_datum.dm b/code/defines/procs/announcer_datum.dm index 35caf3367f3b..055430b27369 100644 --- a/code/defines/procs/announcer_datum.dm +++ b/code/defines/procs/announcer_datum.dm @@ -101,9 +101,9 @@ GLOBAL_DATUM_INIT(major_announcement, /datum/announcer, new(config_type = /datum /datum/announcer/proc/Message(message, garbled_message, receivers, garbled_receivers) for(var/mob/M in receivers) - to_chat(M, message) + to_chat(M, message, MESSAGE_TYPE_WARNING) for(var/mob/M in garbled_receivers) - to_chat(M, garbled_message) + to_chat(M, garbled_message, MESSAGE_TYPE_WARNING) /datum/announcer/proc/Format(message, title, subtitle = null) var/formatted_message diff --git a/code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm b/code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm index fd11e7048cf8..71af7f47793e 100644 --- a/code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm +++ b/code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm @@ -585,7 +585,7 @@ else return ..() -/mob/living/simple_animal/demon/pulse_demon/visible_message(message, self_message, blind_message) +/mob/living/simple_animal/demon/pulse_demon/visible_message(message, self_message, blind_message, chat_message_type) // overriden because pulse demon is quite often in non-turf locs, and /mob/visible_message acts differently there for(var/mob/M as anything in get_mobs_in_view(7, src)) if(M.see_invisible < invisibility) @@ -593,7 +593,7 @@ var/msg = message if(self_message && M == src) msg = self_message - M.show_message(msg, EMOTE_VISIBLE, blind_message, EMOTE_AUDIBLE) + M.show_message(msg, EMOTE_VISIBLE, blind_message, EMOTE_AUDIBLE, chat_message_type = MESSAGE_TYPE_LOCALCHAT) /mob/living/simple_animal/demon/pulse_demon/has_internal_radio_channel_access(mob/user, list/req_one_accesses) return has_access(list(), req_one_accesses, get_all_accesses()) diff --git a/code/game/verbs/ooc.dm b/code/game/verbs/ooc.dm index 043e2d7b6904..7de156056f40 100644 --- a/code/game/verbs/ooc.dm +++ b/code/game/verbs/ooc.dm @@ -247,7 +247,7 @@ GLOBAL_VAR_INIT(admin_ooc_colour, "#b82e00") prefix = "(R)" if(send) - to_chat(target, "LOOC[prefix]: [display_name][admin_stuff]: [msg]") + to_chat(target, "LOOC[prefix]: [display_name][admin_stuff]: [msg]", MESSAGE_TYPE_OOC) // Ported from /tg/, full credit to SpaceManiac and Timberpoes. diff --git a/code/modules/admin/misc_admin_procs.dm b/code/modules/admin/misc_admin_procs.dm index 40729ea7e0f6..24e1bee04748 100644 --- a/code/modules/admin/misc_admin_procs.dm +++ b/code/modules/admin/misc_admin_procs.dm @@ -27,7 +27,7 @@ GLOBAL_VAR_INIT(nologevent, 0) for(var/client/C in GLOB.admins) if(R_ADMIN & C.holder.rights) if(important || (C.prefs && !(C.prefs.toggles & PREFTOGGLE_CHAT_NO_TICKETLOGS))) - to_chat(C, msg, MESSAGE_TYPE_ADMINPM, confidential = TRUE) + to_chat(C, msg, MESSAGE_TYPE_ADMINCHAT, confidential = TRUE) if(important) if(C.prefs?.sound & SOUND_ADMINHELP) SEND_SOUND(C, sound('sound/effects/adminhelp.ogg')) diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm index 6d8ad1481780..0de68cd247be 100644 --- a/code/modules/admin/verbs/adminpm.dm +++ b/code/modules/admin/verbs/adminpm.dm @@ -222,10 +222,10 @@ if(X.key != key && X.key != C.key) if(message_type == MESSAGE_TYPE_MENTORPM) if(check_rights(R_ADMIN|R_MOD|R_MENTOR, 0, X.mob)) - to_chat(X, third_party_message) + to_chat(X, third_party_message, MESSAGE_TYPE_ADMINPM) else if(check_rights(R_ADMIN|R_MOD, 0, X.mob)) - to_chat(X, third_party_message) + to_chat(X, third_party_message, MESSAGE_TYPE_ADMINPM) //Check if the mob being PM'd has any open tickets. var/list/tickets = tickets_system.checkForTicket(C, ticket_id) diff --git a/code/modules/admin/verbs/pray.dm b/code/modules/admin/verbs/pray.dm index f791d97fa99f..1c1cb0965b67 100644 --- a/code/modules/admin/verbs/pray.dm +++ b/code/modules/admin/verbs/pray.dm @@ -34,7 +34,7 @@ for(var/client/X in GLOB.admins) if(check_rights(R_EVENT,0,X.mob)) - to_chat(X, msg) + to_chat(X, msg, MESSAGE_TYPE_ADMINPM) if(X.prefs.sound & SOUND_PRAYERNOTIFY) SEND_SOUND(X, sound('sound/items/PDA/ambicha4-short.ogg')) to_chat(usr, "Your prayers have been received by the gods.") diff --git a/code/modules/mob/dead/observer/observer_base.dm b/code/modules/mob/dead/observer/observer_base.dm index 8b158b8f18e6..529065d80a79 100644 --- a/code/modules/mob/dead/observer/observer_base.dm +++ b/code/modules/mob/dead/observer/observer_base.dm @@ -217,7 +217,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp var/obj/machinery/cryopod/P = istype(loc, /obj/machinery/cryopod) && loc if(frozen) - to_chat(src, "You cannot do this while admin frozen.") + to_chat(src, "You cannot do this while admin frozen.", MESSAGE_TYPE_WARNING) message_admins("[key_name_admin(src)] tried to ghost while admin frozen") return diff --git a/code/modules/mob/living/silicon/silicon_say.dm b/code/modules/mob/living/silicon/silicon_say.dm index 0420cccf33f9..b1963c0b96ec 100644 --- a/code/modules/mob/living/silicon/silicon_say.dm +++ b/code/modules/mob/living/silicon/silicon_say.dm @@ -99,7 +99,7 @@ to_chat(src, "Holopad action relayed, [real_name] [message]") for(var/mob/M in viewers(T.loc)) - M.show_message(rendered, EMOTE_VISIBLE) + M.show_message(rendered, EMOTE_VISIBLE, chat_message_type = MESSAGE_TYPE_LOCALCHAT) log_emote("(HPAD) [message]", src) else //This shouldn't occur, but better safe then sorry. diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm index 69ea8e7a312d..9036a7298c6e 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm @@ -399,7 +399,7 @@ Difficulty: Medium return FALSE return ..() -/mob/living/simple_animal/hostile/megafauna/dragon/visible_message(message, self_message, blind_message) +/mob/living/simple_animal/hostile/megafauna/dragon/visible_message(message, self_message, blind_message, chat_message_type) if(swooping & SWOOP_INVULNERABLE) //to suppress attack messages without overriding every single proc that could send a message saying we got hit return return ..() diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index cd74386bdd7f..4d17c80d8d8b 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -106,31 +106,31 @@ usr.show_message(t, EMOTE_VISIBLE) -/mob/proc/show_message(msg, type, alt, alt_type)//Message, type of message (1 or 2), alternative message, alt message type (1 or 2) - - if(!client) return +/mob/proc/show_message(msg, type, alt, alt_type, chat_message_type) // Message, type of message (1 or 2), alternative message, alt message type (1 or 2) + if(!client) + return if(type) - if(type & EMOTE_VISIBLE && !has_vision(information_only=TRUE))//Vision related + if(type & EMOTE_VISIBLE && !has_vision(information_only = TRUE)) // Vision related if(!alt) return - else - msg = alt - type = alt_type - if(type & EMOTE_AUDIBLE && !can_hear())//Hearing related + msg = alt + type = alt_type + + if(type & EMOTE_AUDIBLE && !can_hear()) // Hearing related if(!alt) return - else - msg = alt - type = alt_type - if(type & EMOTE_VISIBLE && !has_vision(information_only=TRUE)) - return + msg = alt + type = alt_type + if(type & EMOTE_VISIBLE && !has_vision(information_only = TRUE)) + return + // Added voice muffling for Issue 41. if(stat == UNCONSCIOUS) - to_chat(src, "... You can almost hear someone talking ...") - else - to_chat(src, msg) - return + to_chat(src, "... You can almost hear someone talking ...", MESSAGE_TYPE_LOCALCHAT) + return + + to_chat(src, msg, chat_message_type) // Show a message to all mobs in sight of this one // This would be for visible actions by the src mob @@ -138,7 +138,7 @@ // self_message (optional) is what the src mob sees e.g. "You do something!" // blind_message (optional) is what blind people will hear e.g. "You hear something!" -/mob/visible_message(message, self_message, blind_message) +/mob/visible_message(message, self_message, blind_message, chat_message_type) if(!isturf(loc)) // mobs inside objects (such as lockers) shouldn't have their actions visible to those outside the object for(var/mob/M as anything in get_mobs_in_view(3, src)) if(M.see_invisible < invisibility) @@ -150,7 +150,7 @@ if(!blind_message) // for some reason VISIBLE action has blind_message param so if we are not in the same object but next to it, lets show it continue msg = blind_message - M.show_message(msg, EMOTE_VISIBLE, blind_message, EMOTE_AUDIBLE) + M.show_message(msg, EMOTE_VISIBLE, blind_message, EMOTE_AUDIBLE, chat_message_type) return for(var/mob/M as anything in get_mobs_in_view(7, src)) if(M.see_invisible < invisibility) @@ -158,7 +158,7 @@ var/msg = message if(self_message && M == src) msg = self_message - M.show_message(msg, EMOTE_VISIBLE, blind_message, EMOTE_AUDIBLE) + M.show_message(msg, EMOTE_VISIBLE, blind_message, EMOTE_AUDIBLE, chat_message_type) // Show a message to all mobs in sight of this atom // Use for objects performing visible actions diff --git a/code/modules/mob/mob_holder.dm b/code/modules/mob/mob_holder.dm index 47366ef8b49c..36ce7a9ed343 100644 --- a/code/modules/mob/mob_holder.dm +++ b/code/modules/mob/mob_holder.dm @@ -29,9 +29,9 @@ for(var/mob/M in src.contents) M.attackby(W,user, params) -/obj/item/holder/proc/show_message(message, m_type) +/obj/item/holder/proc/show_message(message, m_type, chat_message_type) for(var/mob/living/M in contents) - M.show_message(message,m_type) + M.show_message(message, m_type, chat_message_type) /obj/item/holder/emp_act(intensity) for(var/mob/living/M in contents) diff --git a/code/modules/surgery/bio_chip_removal.dm b/code/modules/surgery/bio_chip_removal.dm index 039e1c81c765..e0099c14c382 100644 --- a/code/modules/surgery/bio_chip_removal.dm +++ b/code/modules/surgery/bio_chip_removal.dm @@ -41,14 +41,16 @@ if(times_repeated >= max_times_to_check) user.visible_message( "[user] seems to have had enough and stops checking inside [target].", - "There doesn't seem to be anything inside, you've checked enough times." + "There doesn't seem to be anything inside, you've checked enough times.", + chat_message_type = MESSAGE_TYPE_COMBAT ) return SURGERY_BEGINSTEP_SKIP I = locate(/obj/item/bio_chip) in target user.visible_message( "[user] starts poking around inside [target]'s [affected.name] with \the [tool].", - "You start poking around inside [target]'s [affected.name] with \the [tool]." + "You start poking around inside [target]'s [affected.name] with \the [tool].", + chat_message_type = MESSAGE_TYPE_COMBAT ) affected.custom_pain("The pain in your [affected.name] is living hell!") return ..() @@ -59,7 +61,8 @@ var/obj/item/organ/external/affected = target.get_organ(target_zone) user.visible_message( "[user] grips onto [target]'s [affected.name] by mistake, tearing it!", - "You think you've found something, but you've grabbed onto [target]'s [affected.name] instead, damaging it!" + "You think you've found something, but you've grabbed onto [target]'s [affected.name] instead, damaging it!", + chat_message_type = MESSAGE_TYPE_COMBAT ) affected.receive_damage(10) return SURGERY_STEP_RETRY @@ -70,7 +73,8 @@ if(I && prob(80)) //implant removal only works on the chest. user.visible_message( "[user] takes something out of [target]'s [affected.name] with \the [tool].", - "You take \an [I] out of [target]'s [affected.name]s with \the [tool]." + "You take \an [I] out of [target]'s [affected.name]s with \the [tool].", + chat_message_type = MESSAGE_TYPE_COMBAT ) I.removed(target) @@ -94,7 +98,8 @@ else user.visible_message( " [user] could not find anything inside [target]'s [affected.name], and pulls \the [tool] out.", - "You could not find anything inside [target]'s [affected.name]." + "You could not find anything inside [target]'s [affected.name].", + chat_message_type = MESSAGE_TYPE_COMBAT ) return SURGERY_STEP_CONTINUE diff --git a/code/modules/surgery/bones.dm b/code/modules/surgery/bones.dm index ddbfd0c74ff6..f9c096ab3c1b 100644 --- a/code/modules/surgery/bones.dm +++ b/code/modules/surgery/bones.dm @@ -60,7 +60,8 @@ var/obj/item/organ/external/affected = target.get_organ(target_zone) user.visible_message( "[user] starts applying medication to the damaged bones in [target]'s [affected.name] with \the [tool].", - "You start applying medication to the damaged bones in [target]'s [affected.name] with \the [tool]." + "You start applying medication to the damaged bones in [target]'s [affected.name] with \the [tool].", + chat_message_type = MESSAGE_TYPE_COMBAT ) affected.custom_pain("Something in your [affected.name] is causing you a lot of pain!") return ..() @@ -69,7 +70,8 @@ var/obj/item/organ/external/affected = target.get_organ(target_zone) user.visible_message( " [user] applies some [tool] to [target]'s bone in [affected.name].", - " You apply some [tool] to [target]'s bone in [affected.name] with \the [tool]." + " You apply some [tool] to [target]'s bone in [affected.name] with \the [tool].", + chat_message_type = MESSAGE_TYPE_COMBAT ) return SURGERY_STEP_CONTINUE @@ -78,7 +80,8 @@ var/obj/item/organ/external/affected = target.get_organ(target_zone) user.visible_message( " [user]'s hand slips, smearing [tool] in the incision in [target]'s [affected.name]!", - " Your hand slips, smearing [tool] in the incision in [target]'s [affected.name]!" + " Your hand slips, smearing [tool] in the incision in [target]'s [affected.name]!", + chat_message_type = MESSAGE_TYPE_COMBAT ) return SURGERY_STEP_RETRY @@ -96,7 +99,8 @@ var/obj/item/organ/external/affected = target.get_organ(target_zone) user.visible_message( "[user] is beginning to set the bone in [target]'s [affected.name] in place with \the [tool].", - "You are beginning to set the bone in [target]'s [affected.name] in place with \the [tool]." + "You are beginning to set the bone in [target]'s [affected.name] in place with \the [tool].", + chat_message_type = MESSAGE_TYPE_COMBAT ) affected.custom_pain("The pain in your [affected.name] is going to make you pass out!") return ..() @@ -105,7 +109,8 @@ var/obj/item/organ/external/affected = target.get_organ(target_zone) user.visible_message( " [user] sets the bone in [target]'s [affected.name] in place with \the [tool].", - " You set the bone in [target]'s [affected.name] in place with \the [tool]." + " You set the bone in [target]'s [affected.name] in place with \the [tool].", + chat_message_type = MESSAGE_TYPE_COMBAT ) return SURGERY_STEP_CONTINUE @@ -113,7 +118,8 @@ var/obj/item/organ/external/affected = target.get_organ(target_zone) user.visible_message( " [user]'s hand slips, damaging the bone in [target]'s [affected.name] with \the [tool]!", - " Your hand slips, damaging the bone in [target]'s [affected.name] with \the [tool]!" + " Your hand slips, damaging the bone in [target]'s [affected.name] with \the [tool]!", + chat_message_type = MESSAGE_TYPE_COMBAT ) affected.receive_damage(5) return SURGERY_STEP_RETRY @@ -124,7 +130,8 @@ /datum/surgery_step/set_bone/mend_skull/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) user.visible_message( "[user] is beginning piece together [target]'s skull with \the [tool].", - "You are beginning piece together [target]'s skull with \the [tool]." + "You are beginning piece together [target]'s skull with \the [tool].", + chat_message_type = MESSAGE_TYPE_COMBAT ) return ..() @@ -132,7 +139,8 @@ var/obj/item/organ/external/affected = target.get_organ(target_zone) user.visible_message( " [user] sets [target]'s [affected.encased] with \the [tool].", - " You set [target]'s [affected.encased] with \the [tool]." + " You set [target]'s [affected.encased] with \the [tool].", + chat_message_type = MESSAGE_TYPE_COMBAT ) return SURGERY_STEP_CONTINUE @@ -141,7 +149,8 @@ var/obj/item/organ/external/affected = target.get_organ(target_zone) user.visible_message( "[user]'s hand slips, damaging [target]'s face with \the [tool]!", - "Your hand slips, damaging [target]'s face with \the [tool]!" + "Your hand slips, damaging [target]'s face with \the [tool]!", + chat_message_type = MESSAGE_TYPE_COMBAT ) var/obj/item/organ/external/head/H = affected H.receive_damage(10) @@ -164,7 +173,8 @@ var/obj/item/organ/external/affected = target.get_organ(target_zone) user.visible_message( "[user] starts to finish mending the damaged bones in [target]'s [affected.name] with \the [tool].", - "You start to finish mending the damaged bones in [target]'s [affected.name] with \the [tool]." + "You start to finish mending the damaged bones in [target]'s [affected.name] with \the [tool].", + chat_message_type = MESSAGE_TYPE_COMBAT ) return ..() @@ -172,7 +182,8 @@ var/obj/item/organ/external/affected = target.get_organ(target_zone) user.visible_message( " [user] has mended the damaged bones in [target]'s [affected.name] with \the [tool].", - " You have mended the damaged bones in [target]'s [affected.name] with \the [tool]." + " You have mended the damaged bones in [target]'s [affected.name] with \the [tool].", + chat_message_type = MESSAGE_TYPE_COMBAT ) affected.mend_fracture() return SURGERY_STEP_CONTINUE @@ -181,6 +192,7 @@ var/obj/item/organ/external/affected = target.get_organ(target_zone) user.visible_message( " [user]'s hand slips, smearing [tool] in the incision in [target]'s [affected.name]!", - " Your hand slips, smearing [tool] in the incision in [target]'s [affected.name]!" + " Your hand slips, smearing [tool] in the incision in [target]'s [affected.name]!", + chat_message_type = MESSAGE_TYPE_COMBAT ) return SURGERY_STEP_RETRY diff --git a/code/modules/surgery/cavity_implant.dm b/code/modules/surgery/cavity_implant.dm index e15fa61ca7e4..22936b1b981b 100644 --- a/code/modules/surgery/cavity_implant.dm +++ b/code/modules/surgery/cavity_implant.dm @@ -136,7 +136,8 @@ var/obj/item/organ/external/chest/affected = target.get_organ(target_zone) user.visible_message( " [user]'s hand slips, scraping around inside [target]'s [affected.name] with \the [tool]!", - " Your hand slips, scraping around inside [target]'s [affected.name] with \the [tool]!" + " Your hand slips, scraping around inside [target]'s [affected.name] with \the [tool]!", + chat_message_type = MESSAGE_TYPE_COMBAT ) affected.receive_damage(20) return SURGERY_STEP_RETRY @@ -156,7 +157,8 @@ var/obj/item/organ/external/affected = target.get_organ(target_zone) user.visible_message( "[user] starts making some space inside [target]'s [get_cavity(affected)] cavity with \the [tool].", - "You start making some space inside [target]'s [get_cavity(affected)] cavity with \the [tool]." + "You start making some space inside [target]'s [get_cavity(affected)] cavity with \the [tool].", + chat_message_type = MESSAGE_TYPE_COMBAT ) affected.custom_pain("The pain in your chest is living hell!") return ..() @@ -165,7 +167,8 @@ var/obj/item/organ/external/chest/affected = target.get_organ(target_zone) user.visible_message( " [user] makes some space inside [target]'s [get_cavity(affected)] cavity with \the [tool].", - " You make some space inside [target]'s [get_cavity(affected)] cavity with \the [tool]." + " You make some space inside [target]'s [get_cavity(affected)] cavity with \the [tool].", + chat_message_type = MESSAGE_TYPE_COMBAT ) return SURGERY_STEP_CONTINUE @@ -186,7 +189,8 @@ var/obj/item/organ/external/affected = target.get_organ(target_zone) user.visible_message( "[user] starts mending [target]'s [get_cavity(affected)] cavity wall with \the [tool].", - "You start mending [target]'s [get_cavity(affected)] cavity wall with \the [tool]." + "You start mending [target]'s [get_cavity(affected)] cavity wall with \the [tool].", + chat_message_type = MESSAGE_TYPE_COMBAT ) affected.custom_pain("The pain in your chest is living hell!") return ..() @@ -195,7 +199,8 @@ var/obj/item/organ/external/chest/affected = target.get_organ(target_zone) user.visible_message( " [user] mends [target]'s [get_cavity(affected)] cavity walls with \the [tool].", - " You mend [target]'s [get_cavity(affected)] cavity walls with \the [tool]." + " You mend [target]'s [get_cavity(affected)] cavity walls with \the [tool].", + chat_message_type = MESSAGE_TYPE_COMBAT ) return SURGERY_STEP_CONTINUE @@ -218,7 +223,8 @@ // Check even if there isn't anything inside user.visible_message( "[user] checks for items in [target]'s [target_zone].", - "You check for items in [target]'s [target_zone]..." + "You check for items in [target]'s [target_zone]...", + chat_message_type = MESSAGE_TYPE_COMBAT ) return ..() @@ -239,7 +245,8 @@ return SURGERY_STEP_CONTINUE user.visible_message( "[user] pulls [extracting] out of [target]'s [target_zone]!", - "You pull [extracting] out of [target]'s [target_zone]." + "You pull [extracting] out of [target]'s [target_zone].", + chat_message_type = MESSAGE_TYPE_COMBAT ) user.put_in_hands(extracting) affected.hidden = null @@ -249,7 +256,8 @@ var/obj/item/organ/external/affected = target.get_organ(target_zone) user.visible_message( "[user] grabs onto something else by mistake, damaging it!.", - "You grab onto something else inside [target]'s [get_cavity(affected)] cavity by mistake, damaging it!" + "You grab onto something else inside [target]'s [get_cavity(affected)] cavity by mistake, damaging it!", + chat_message_type = MESSAGE_TYPE_COMBAT ) affected.damage += rand(3, 5) @@ -298,7 +306,8 @@ user.visible_message( "[user] starts putting \the [tool] inside [target]'s [get_cavity(affected)] cavity.", - "You start putting \the [tool] inside [target]'s [get_cavity(affected)] cavity." + "You start putting \the [tool] inside [target]'s [get_cavity(affected)] cavity.", + chat_message_type = MESSAGE_TYPE_COMBAT ) affected.custom_pain("The pain in your [target_zone] is living hell!") return ..() @@ -311,13 +320,14 @@ user.visible_message( "[user] puts \the [tool] inside [target]'s [get_cavity(affected)] cavity.", - "You put \the [tool] inside [target]'s [get_cavity(affected)] cavity." + "You put \the [tool] inside [target]'s [get_cavity(affected)] cavity.", + chat_message_type = MESSAGE_TYPE_COMBAT ) if((tool.w_class > get_max_wclass(affected) / 2 && prob(50) && !affected.is_robotic())) user.visible_message( "[user] tears some blood vessels trying to fit the object in the cavity!", "You tear some blood vessels trying to fit the object into the cavity!", - "You hear some gentle tearing.") + "You hear some gentle tearing.", MESSAGE_TYPE_COMBAT) affected.cause_internal_bleeding() user.drop_item() affected.hidden = tool diff --git a/code/modules/surgery/core_removal.dm b/code/modules/surgery/core_removal.dm index a31217a5586f..e89d1491243b 100644 --- a/code/modules/surgery/core_removal.dm +++ b/code/modules/surgery/core_removal.dm @@ -22,17 +22,17 @@ time = 1.6 SECONDS /datum/surgery_step/slime/cut_flesh/begin_step(mob/user, mob/living/simple_animal/slime/target, target_zone, obj/item/tool) - user.visible_message("[user] starts cutting through [target]'s flesh with \the [tool].", "You start cutting through [target]'s flesh with \the [tool].") + user.visible_message("[user] starts cutting through [target]'s flesh with \the [tool].", "You start cutting through [target]'s flesh with \the [tool].", chat_message_type = MESSAGE_TYPE_COMBAT) return ..() /datum/surgery_step/slime/cut_flesh/end_step(mob/living/user, mob/living/simple_animal/slime/target, target_zone, obj/item/tool) user.visible_message(" [user] cuts through [target]'s flesh with \the [tool].", - " You cut through [target]'s flesh with \the [tool], revealing its silky innards.") + " You cut through [target]'s flesh with \the [tool], revealing its silky innards.", chat_message_type = MESSAGE_TYPE_COMBAT) return SURGERY_STEP_CONTINUE /datum/surgery_step/slime/cut_flesh/fail_step(mob/living/user, mob/living/simple_animal/slime/target, target_zone, obj/item/tool) user.visible_message(" [user]'s hand slips, tearing [target]'s flesh with \the [tool]!", \ - " Your hand slips, tearing [target]'s flesh with \the [tool]!") + " Your hand slips, tearing [target]'s flesh with \the [tool]!", chat_message_type = MESSAGE_TYPE_COMBAT) return SURGERY_STEP_RETRY /datum/surgery_step/slime/extract_core @@ -43,7 +43,8 @@ /datum/surgery_step/slime/extract_core/begin_step(mob/user, mob/living/simple_animal/slime/target, target_zone, obj/item/tool) user.visible_message( "[user] begins to extract a core from [target].", - "You begin to extract a core from [target]..." + "You begin to extract a core from [target]...", + chat_message_type = MESSAGE_TYPE_COMBAT ) return ..() @@ -52,7 +53,7 @@ if(slime.cores > 0) slime.cores-- user.visible_message("[user] successfully extracts a core from [slime]!", - "You successfully extract a core from [slime]. [slime.cores] core\s remaining.") + "You successfully extract a core from [slime]. [slime.cores] core\s remaining.", chat_message_type = MESSAGE_TYPE_COMBAT) new slime.coretype(slime.loc) @@ -67,5 +68,5 @@ /datum/surgery_step/slime/extract_core/fail_step(mob/living/user, mob/living/simple_animal/slime/target, target_zone, obj/item/tool) user.visible_message(" [user]'s hand slips, tearing [target]'s flesh with \the [tool]!", \ - " Your hand slips, tearing [target]'s flesh with \the [tool]!") + " Your hand slips, tearing [target]'s flesh with \the [tool]!", chat_message_type = MESSAGE_TYPE_COMBAT) return SURGERY_STEP_RETRY diff --git a/code/modules/surgery/dental_implant.dm b/code/modules/surgery/dental_implant.dm index 8a1bed115b7d..841b13d39c7d 100644 --- a/code/modules/surgery/dental_implant.dm +++ b/code/modules/surgery/dental_implant.dm @@ -18,7 +18,8 @@ /datum/surgery_step/insert_pill/begin_step(mob/living/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) user.visible_message( "[user] begins to wedge \the [tool] in [target]'s [parse_zone(target_zone)].", - "You begin to wedge [tool] in [target]'s [parse_zone(target_zone)]..." + "You begin to wedge [tool] in [target]'s [parse_zone(target_zone)]...", + chat_message_type = MESSAGE_TYPE_COMBAT ) return ..() @@ -30,7 +31,7 @@ for(var/obj/item/reagent_containers/pill in target.contents) // Can't give them more than 4 dental implants. dental_implants++ if(dental_implants >= 4) - user.visible_message("[user] pulls \the [tool] back out of [target]'s [parse_zone(target_zone)]!", "You pull \the [tool] back out of [target]'s [parse_zone(target_zone)], there wans't enough room...") + user.visible_message("[user] pulls \the [tool] back out of [target]'s [parse_zone(target_zone)]!", "You pull \the [tool] back out of [target]'s [parse_zone(target_zone)], there wans't enough room...", chat_message_type = MESSAGE_TYPE_COMBAT) return SURGERY_STEP_INCOMPLETE user.drop_item() @@ -40,7 +41,7 @@ P.name = "Activate Pill ([tool.name])" P.Grant(target) - user.visible_message("[user] wedges \the [tool] into [target]'s [parse_zone(target_zone)]!", "You wedge [tool] into [target]'s [parse_zone(target_zone)].") + user.visible_message("[user] wedges \the [tool] into [target]'s [parse_zone(target_zone)]!", "You wedge [tool] into [target]'s [parse_zone(target_zone)].", chat_message_type = MESSAGE_TYPE_COMBAT) return SURGERY_STEP_CONTINUE /datum/action/item_action/hands_free/activate_pill diff --git a/code/modules/surgery/encased.dm b/code/modules/surgery/encased.dm index 86388407fbf9..5b76c2135377 100644 --- a/code/modules/surgery/encased.dm +++ b/code/modules/surgery/encased.dm @@ -20,7 +20,8 @@ user.visible_message( "[user] begins to cut through [target]'s [affected.encased] with \the [tool].", - "You begin to cut through [target]'s [affected.encased] with \the [tool]." + "You begin to cut through [target]'s [affected.encased] with \the [tool].", + chat_message_type = MESSAGE_TYPE_COMBAT ) affected.custom_pain("Something hurts horribly in your [affected.name]!") return ..() @@ -30,7 +31,8 @@ user.visible_message( " [user] has cut [target]'s [affected.encased] open with \the [tool].", - " You have cut [target]'s [affected.encased] open with \the [tool]." + " You have cut [target]'s [affected.encased] open with \the [tool].", + chat_message_type = MESSAGE_TYPE_COMBAT ) affected.open = ORGAN_ORGANIC_ENCASED_OPEN affected.fracture(silent = TRUE) @@ -41,7 +43,8 @@ user.visible_message( " [user]'s hand slips, cracking [target]'s [affected.encased] with \the [tool]!" , - " Your hand slips, cracking [target]'s [affected.encased] with \the [tool]!" + " Your hand slips, cracking [target]'s [affected.encased] with \the [tool]!", + chat_message_type = MESSAGE_TYPE_COMBAT ) affected.receive_damage(20) @@ -65,7 +68,8 @@ user.visible_message( "[user] starts to force open the [affected.encased] in [target]'s [affected.name] with \the [tool].", - "You start to force open the [affected.encased] in [target]'s [affected.name] with \the [tool]." + "You start to force open the [affected.encased] in [target]'s [affected.name] with \the [tool].", + chat_message_type = MESSAGE_TYPE_COMBAT ) affected.custom_pain("Something hurts horribly in your [affected.name]!") return ..() @@ -76,7 +80,8 @@ user.visible_message( " [user] forces open [target]'s [affected.encased] with \the [tool].", - " You force open [target]'s [affected.encased] with \the [tool]." + " You force open [target]'s [affected.encased] with \the [tool].", + chat_message_type = MESSAGE_TYPE_COMBAT ) affected.open = ORGAN_ORGANIC_ENCASED_OPEN @@ -88,7 +93,8 @@ user.visible_message( " [user]'s hand slips, cracking [target]'s [affected.encased]!", - " Your hand slips, cracking [target]'s [affected.encased]!" + " Your hand slips, cracking [target]'s [affected.encased]!", + chat_message_type = MESSAGE_TYPE_COMBAT ) affected.receive_damage(20) @@ -111,7 +117,8 @@ user.visible_message( "[user] starts bending [target]'s [affected.encased] back into place with \the [tool].", - "You start bending [target]'s [affected.encased] back into place with \the [tool]." + "You start bending [target]'s [affected.encased] back into place with \the [tool].", + chat_message_type = MESSAGE_TYPE_COMBAT ) affected.custom_pain("Something hurts horribly in your [affected.name]!") return ..() @@ -121,7 +128,8 @@ user.visible_message( "[user] bends [target]'s [affected.encased] back into place with \the [tool].", - "You bend [target]'s [affected.encased] back into place with \the [tool]." + "You bend [target]'s [affected.encased] back into place with \the [tool].", + chat_message_type = MESSAGE_TYPE_COMBAT ) return SURGERY_STEP_CONTINUE @@ -131,7 +139,8 @@ user.visible_message( "[user]'s hand slips, bending [target]'s [affected.encased] the wrong way!", - "Your hand slips, bending [target]'s [affected.encased] the wrong way!" + "Your hand slips, bending [target]'s [affected.encased] the wrong way!", + chat_message_type = MESSAGE_TYPE_COMBAT ) affected.receive_damage(20) @@ -153,7 +162,8 @@ user.visible_message( "[user] starts applying \the [tool] to [target]'s [affected.encased].", - "You start applying \the [tool] to [target]'s [affected.encased]." + "You start applying \the [tool] to [target]'s [affected.encased].", + chat_message_type = MESSAGE_TYPE_COMBAT ) affected.custom_pain("Something hurts horribly in your [affected.name]!") return ..() @@ -163,7 +173,8 @@ user.visible_message( " [user] applied \the [tool] to [target]'s [affected.encased].", - " You applied \the [tool] to [target]'s [affected.encased]." + " You applied \the [tool] to [target]'s [affected.encased].", + chat_message_type = MESSAGE_TYPE_COMBAT ) affected.open = ORGAN_ORGANIC_OPEN diff --git a/code/modules/surgery/generic.dm b/code/modules/surgery/generic.dm index 8c8a29066807..0f6ca6f673a5 100644 --- a/code/modules/surgery/generic.dm +++ b/code/modules/surgery/generic.dm @@ -27,7 +27,8 @@ var/obj/item/organ/external/affected = target.get_organ(target_zone) user.visible_message( "[user] starts the incision on [target]'s [affected.name] with \the [tool].", - "You start the incision on [target]'s [affected.name] with \the [tool]." + "You start the incision on [target]'s [affected.name] with \the [tool].", + chat_message_type = MESSAGE_TYPE_COMBAT ) affected.custom_pain("You feel a horrible pain as if from a sharp knife in your [affected.name]!") return ..() @@ -36,7 +37,8 @@ var/obj/item/organ/external/affected = target.get_organ(target_zone) user.visible_message( " [user] has made an incision on [target]'s [affected.name] with \the [tool].", - " You have made an incision on [target]'s [affected.name] with \the [tool]." + " You have made an incision on [target]'s [affected.name] with \the [tool].", + chat_message_type = MESSAGE_TYPE_COMBAT ) affected.open = ORGAN_ORGANIC_OPEN target.resume_bleeding() @@ -46,7 +48,8 @@ var/obj/item/organ/external/affected = target.get_organ(target_zone) user.visible_message( " [user]'s hand slips, slicing open [target]'s [affected.name] in a wrong spot with \the [tool]!", - " Your hand slips, slicing open [target]'s [affected.name] in a wrong spot with \the [tool]!" + " Your hand slips, slicing open [target]'s [affected.name] in a wrong spot with \the [tool]!", + chat_message_type = MESSAGE_TYPE_COMBAT ) affected.receive_damage(10) return SURGERY_STEP_RETRY @@ -68,7 +71,8 @@ var/obj/item/organ/external/affected = target.get_organ(target_zone) user.visible_message( "[user] starts clamping bleeders in [target]'s [affected.name] with \the [tool].", - "You start clamping bleeders in [target]'s [affected.name] with \the [tool]." + "You start clamping bleeders in [target]'s [affected.name] with \the [tool].", + chat_message_type = MESSAGE_TYPE_COMBAT ) affected.custom_pain("The pain in your [affected.name] is maddening!") return ..() @@ -77,7 +81,8 @@ var/obj/item/organ/external/affected = target.get_organ(target_zone) user.visible_message( " [user] clamps bleeders in [target]'s [affected.name] with \the [tool].", - " You clamp bleeders in [target]'s [affected.name] with \the [tool]." + " You clamp bleeders in [target]'s [affected.name] with \the [tool].", + chat_message_type = MESSAGE_TYPE_COMBAT ) spread_germs_to_organ(affected, user, tool) return SURGERY_STEP_CONTINUE @@ -86,7 +91,8 @@ var/obj/item/organ/external/affected = target.get_organ(target_zone) user.visible_message( " [user]'s hand slips, tearing blood vessels and causing massive bleeding in [target]'s [affected.name] with \the [tool]!", - " Your hand slips, tearing blood vessels and causing massive bleeding in [target]'s [affected.name] with \the [tool]!" + " Your hand slips, tearing blood vessels and causing massive bleeding in [target]'s [affected.name] with \the [tool]!", + chat_message_type = MESSAGE_TYPE_COMBAT ) affected.receive_damage(10) return SURGERY_STEP_RETRY @@ -114,7 +120,7 @@ if(target_zone == BODY_ZONE_PRECISE_GROIN) msg = "[user] starts to pry open the incision and rearrange the organs in [target]'s lower abdomen with \the [tool]." self_msg = "You start to pry open the incision and rearrange the organs in [target]'s lower abdomen with \the [tool]." - user.visible_message(msg, self_msg) + user.visible_message(msg, self_msg, chat_message_type = MESSAGE_TYPE_COMBAT) affected.custom_pain("It feels like the skin on your [affected.name] is on fire!") return ..() @@ -128,7 +134,7 @@ if(target_zone == BODY_ZONE_PRECISE_GROIN) msg = " [user] keeps the incision open on [target]'s lower abdomen with \the [tool]." self_msg = " You keep the incision open on [target]'s lower abdomen with \the [tool]." - user.visible_message(msg, self_msg) + user.visible_message(msg, self_msg, chat_message_type = MESSAGE_TYPE_COMBAT) affected.open = ORGAN_ORGANIC_ENCASED_OPEN return SURGERY_STEP_CONTINUE @@ -142,7 +148,7 @@ if(target_zone == BODY_ZONE_PRECISE_GROIN) msg = "[user]'s hand slips, damaging several organs [target]'s lower abdomen with \the [tool]" self_msg = " Your hand slips, damaging several organs [target]'s lower abdomen with \the [tool]!" - user.visible_message(msg, self_msg) + user.visible_message(msg, self_msg, chat_message_type = MESSAGE_TYPE_COMBAT) target.apply_damage(12, BRUTE, affected, sharp = TRUE) return SURGERY_STEP_RETRY @@ -164,7 +170,8 @@ var/obj/item/organ/external/affected = target.get_organ(target_zone) user.visible_message( "[user] is beginning to cauterize the incision on [target]'s [affected.name] with \the [tool].", - "You are beginning to cauterize the incision on [target]'s [affected.name] with \the [tool]." + "You are beginning to cauterize the incision on [target]'s [affected.name] with \the [tool].", + chat_message_type = MESSAGE_TYPE_COMBAT ) affected.custom_pain("Your [affected.name] is being burned!") return ..() @@ -173,7 +180,8 @@ var/obj/item/organ/external/affected = target.get_organ(target_zone) user.visible_message( "[user] cauterizes the incision on [target]'s [affected.name] with \the [tool].", - "You cauterize the incision on [target]'s [affected.name] with \the [tool]." + "You cauterize the incision on [target]'s [affected.name] with \the [tool].", + chat_message_type = MESSAGE_TYPE_COMBAT ) affected.open = ORGAN_CLOSED affected.germ_level = 0 @@ -183,7 +191,8 @@ var/obj/item/organ/external/affected = target.get_organ(target_zone) user.visible_message( "[user]'s hand slips, leaving a small burn on [target]'s [affected.name] with \the [tool]!", - "Your hand slips, leaving a small burn on [target]'s [affected.name] with \the [tool]!" + "Your hand slips, leaving a small burn on [target]'s [affected.name] with \the [tool]!", + chat_message_type = MESSAGE_TYPE_COMBAT ) target.apply_damage(3, BURN, affected) return SURGERY_STEP_RETRY @@ -196,7 +205,8 @@ user.visible_message( "[user] is beginning to cauterize the incision on [target]'s [affected.name] with \the [tool].", // give a little heads up to the surgeon that they're stopping the surgery prematurely in case that wasn't the intention. - "You are interrupting the current surgery, beginning to cauterize the incision on [target]'s [affected.name] with \the [tool]." + "You are interrupting the current surgery, beginning to cauterize the incision on [target]'s [affected.name] with \the [tool].", + chat_message_type = MESSAGE_TYPE_COMBAT ) affected.custom_pain("Your [affected.name] is being burned!") return ..() @@ -217,7 +227,8 @@ /datum/surgery_step/generic/drill/begin_step(mob/living/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) user.visible_message( "[user] begins to drill into the bone in [target]'s [parse_zone(target_zone)].", - "You begin to drill into the bone in [target]'s [parse_zone(target_zone)]..." + "You begin to drill into the bone in [target]'s [parse_zone(target_zone)]...", + chat_message_type = MESSAGE_TYPE_COMBAT ) return ..() @@ -229,7 +240,8 @@ var/obj/item/organ/external/affected = target.get_organ(target_zone) user.visible_message( "[user]'s [tool] doesn't get a firm grip and tears at the bone in [target]'s [parse_zone(target_zone)]!", - "Your [tool] doesn't get a firm grip and tears at the bone in [target]'s [parse_zone(target_zone)]!" + "Your [tool] doesn't get a firm grip and tears at the bone in [target]'s [parse_zone(target_zone)]!", + chat_message_type = MESSAGE_TYPE_COMBAT ) affected.receive_damage(15) @@ -251,7 +263,8 @@ var/obj/item/organ/external/affected = target.get_organ(target_zone) user.visible_message( "[user] is beginning to amputate [target]'s [affected.name] with \the [tool].", - "You are beginning to cut through [target]'s [affected.amputation_point] with \the [tool]." + "You are beginning to cut through [target]'s [affected.amputation_point] with \the [tool].", + chat_message_type = MESSAGE_TYPE_COMBAT ) affected.custom_pain("Your [affected.amputation_point] is being ripped apart!") return ..() @@ -260,7 +273,8 @@ var/obj/item/organ/external/affected = target.get_organ(target_zone) user.visible_message( " [user] amputates [target]'s [affected.name] at the [affected.amputation_point] with \the [tool].", - " You amputate [target]'s [affected.name] with \the [tool]." + " You amputate [target]'s [affected.name] with \the [tool].", + chat_message_type = MESSAGE_TYPE_COMBAT ) add_attack_logs(user, target, "Surgically removed [affected.name]. INTENT: [uppertext(user.a_intent)]")//log it @@ -279,7 +293,8 @@ var/obj/item/organ/external/affected = target.get_organ(target_zone) user.visible_message( " [user]'s hand slips, sawing through the bone in [target]'s [affected.name] with \the [tool]!", - " Your hand slips, sawing through the bone in [target]'s [affected.name] with \the [tool]!" + " Your hand slips, sawing through the bone in [target]'s [affected.name] with \the [tool]!", + chat_message_type = MESSAGE_TYPE_COMBAT ) affected.receive_damage(30) affected.fracture() diff --git a/code/modules/surgery/limb_augmentation.dm b/code/modules/surgery/limb_augmentation.dm index c3086fb4fb52..b8331903d58a 100644 --- a/code/modules/surgery/limb_augmentation.dm +++ b/code/modules/surgery/limb_augmentation.dm @@ -32,7 +32,8 @@ var/obj/item/organ/external/affected = target.get_organ(target_zone) user.visible_message( "[user] starts augmenting [affected] with [tool].", - "You start augmenting [affected] with [tool]." + "You start augmenting [affected] with [tool].", + chat_message_type = MESSAGE_TYPE_COMBAT ) return ..() to_chat(user, "[tool] cannot be used to augment this limb!") @@ -45,7 +46,8 @@ var/obj/item/organ/external/affected = target.get_organ(target_zone) user.visible_message( "[user] has finished augmenting [affected] with [tool].", - "You augment [affected] with [tool]." + "You augment [affected] with [tool].", + chat_message_type = MESSAGE_TYPE_COMBAT ) if(L.part) diff --git a/code/modules/surgery/limb_reattach.dm b/code/modules/surgery/limb_reattach.dm index 43d2d314cc85..f1557b69be09 100644 --- a/code/modules/surgery/limb_reattach.dm +++ b/code/modules/surgery/limb_reattach.dm @@ -117,7 +117,8 @@ user.visible_message( "[user] starts attaching [E.name] to [target]'s [E.amputation_point].", - "You start attaching [E.name] to [target]'s [E.amputation_point]." + "You start attaching [E.name] to [target]'s [E.amputation_point].", + chat_message_type = MESSAGE_TYPE_COMBAT ) return ..() @@ -125,7 +126,8 @@ var/obj/item/organ/external/E = tool user.visible_message( "[user] has attached [target]'s [E.name] to the [E.amputation_point].", - "You have attached [target]'s [E.name] to the [E.amputation_point]." + "You have attached [target]'s [E.name] to the [E.amputation_point].", + chat_message_type = MESSAGE_TYPE_COMBAT ) attach_limb(user, target, E) return SURGERY_STEP_CONTINUE @@ -134,7 +136,8 @@ var/obj/item/organ/external/E = tool user.visible_message( "[user]'s hand slips, damaging [target]'s [E.amputation_point]!", - "Your hand slips, damaging [target]'s [E.amputation_point]!" + "Your hand slips, damaging [target]'s [E.amputation_point]!", + chat_message_type = MESSAGE_TYPE_COMBAT ) target.apply_damage(10, BRUTE, null, sharp = TRUE) return SURGERY_STEP_RETRY @@ -194,7 +197,8 @@ var/obj/item/organ/external/E = target.get_organ(target_zone) user.visible_message( "[user] starts connecting tendons and muscles in [target]'s [E.amputation_point] with [tool].", - "You start connecting tendons and muscle in [target]'s [E.amputation_point]." + "You start connecting tendons and muscle in [target]'s [E.amputation_point].", + chat_message_type = MESSAGE_TYPE_COMBAT ) return ..() @@ -202,7 +206,8 @@ var/obj/item/organ/external/E = target.get_organ(target_zone) user.visible_message( "[user] has connected tendons and muscles in [target]'s [E.amputation_point] with [tool].", - "You have connected tendons and muscles in [target]'s [E.amputation_point] with [tool]." + "You have connected tendons and muscles in [target]'s [E.amputation_point] with [tool].", + chat_message_type = MESSAGE_TYPE_COMBAT ) E.properly_attached = TRUE target.update_body() @@ -214,7 +219,8 @@ var/obj/item/organ/external/E = target.get_organ(target_zone) user.visible_message( "[user]'s hand slips, damaging [target]'s [E.amputation_point]!", - "Your hand slips, damaging [target]'s [E.amputation_point]!" + "Your hand slips, damaging [target]'s [E.amputation_point]!", + chat_message_type = MESSAGE_TYPE_COMBAT ) target.apply_damage(10, BRUTE, null, sharp = TRUE) return SURGERY_STEP_RETRY @@ -235,7 +241,8 @@ user.visible_message( "[user] starts attaching \the [tool] to [target].", - "You start attaching \the [tool] to [target]." + "You start attaching \the [tool] to [target].", + chat_message_type = MESSAGE_TYPE_COMBAT ) return ..() @@ -243,7 +250,8 @@ var/obj/item/robot_parts/L = tool user.visible_message( "[user] has attached \the [tool] to [target].", - "You have attached \the [tool] to [target]." + "You have attached \the [tool] to [target].", + chat_message_type = MESSAGE_TYPE_COMBAT ) if(L.part) @@ -273,7 +281,8 @@ /datum/surgery_step/limb/mechanize/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) user.visible_message( "[user]'s hand slips, damaging [target]'s flesh!", - "Your hand slips, damaging [target]'s flesh!" + "Your hand slips, damaging [target]'s flesh!", + chat_message_type = MESSAGE_TYPE_COMBAT ) target.apply_damage(10, BRUTE, null, sharp = TRUE) return SURGERY_STEP_RETRY diff --git a/code/modules/surgery/organs_internal.dm b/code/modules/surgery/organs_internal.dm index 6921c16efceb..7f85de5b4e13 100644 --- a/code/modules/surgery/organs_internal.dm +++ b/code/modules/surgery/organs_internal.dm @@ -244,13 +244,15 @@ if(!I.is_robotic() && !istype(tool, /obj/item/stack/nanopaste)) user.visible_message( " [user] treats damage to [target]'s [I.name] with [tool_name].", - " You treat damage to [target]'s [I.name] with [tool_name]." + " You treat damage to [target]'s [I.name] with [tool_name].", + chat_message_type = MESSAGE_TYPE_COMBAT ) I.damage = 0 else if(I.is_robotic() && istype (tool, /obj/item/stack/nanopaste)) user.visible_message( " [user] treats damage to [target]'s [I.name] with [tool_name].", - " You treat damage to [target]'s [I.name] with [tool_name]." + " You treat damage to [target]'s [I.name] with [tool_name].", + chat_message_type = MESSAGE_TYPE_COMBAT ) I.damage = 0 return SURGERY_STEP_CONTINUE @@ -263,7 +265,8 @@ user.visible_message( " [user]'s hand slips, getting messy and tearing the inside of [target]'s [parse_zone(target_zone)] with [tool]!", - " Your hand slips, getting messy and tearing the inside of [target]'s [parse_zone(target_zone)] with [tool]!" + " Your hand slips, getting messy and tearing the inside of [target]'s [parse_zone(target_zone)] with [tool]!", + chat_message_type = MESSAGE_TYPE_COMBAT ) var/dam_amt = 2 @@ -314,7 +317,8 @@ return SURGERY_BEGINSTEP_SKIP user.visible_message( "[user] starts to separate [target]'s [I] with [tool].", - "You start to separate [target]'s [I] with [tool] for removal." + "You start to separate [target]'s [I] with [tool] for removal.", + chat_message_type = MESSAGE_TYPE_COMBAT ) var/mob/living/carbon/human/H = target var/obj/item/organ/affected = H.get_organ(user.zone_selected) @@ -329,13 +333,15 @@ if(!extracting || extracting.owner != target) user.visible_message( "[user] can't seem to extract anything from [target]'s [parse_zone(target_zone)]!", - "You can't extract anything from [target]'s [parse_zone(target_zone)]!" + "You can't extract anything from [target]'s [parse_zone(target_zone)]!", + chat_message_type = MESSAGE_TYPE_COMBAT ) return SURGERY_STEP_CONTINUE user.visible_message( " [user] has separated and extracts [target]'s [extracting] with [tool].", - " You have separated and extracted [target]'s [extracting] with [tool]." + " You have separated and extracted [target]'s [extracting] with [tool].", + chat_message_type = MESSAGE_TYPE_COMBAT ) add_attack_logs(user, target, "Surgically removed [extracting.name]. INTENT: [uppertext(user.a_intent)]") @@ -357,19 +363,22 @@ if(affected) user.visible_message( " [user]'s hand slips, damaging [target]'s [affected.name] with [tool]!", - " Your hand slips, damaging [target]'s [affected.name] with [tool]!" + " Your hand slips, damaging [target]'s [affected.name] with [tool]!", + chat_message_type = MESSAGE_TYPE_COMBAT ) affected.receive_damage(20) else user.visible_message( " [user]'s hand slips, damaging [target]'s [parse_zone(target_zone)] with [tool]!", - " Your hand slips, damaging [target]'s [parse_zone(target_zone)] with [tool]!" + " Your hand slips, damaging [target]'s [parse_zone(target_zone)] with [tool]!", + chat_message_type = MESSAGE_TYPE_COMBAT ) return SURGERY_STEP_RETRY else user.visible_message( "[user] can't seem to extract anything from [target]'s [parse_zone(target_zone)]!", - "You can't extract anything from [target]'s [parse_zone(target_zone)]!" + "You can't extract anything from [target]'s [parse_zone(target_zone)]!", + chat_message_type = MESSAGE_TYPE_COMBAT ) return SURGERY_STEP_CONTINUE @@ -415,13 +424,15 @@ if(affected) user.visible_message( "[user] starts transplanting [tool] into [target]'s [affected.name].", - "You start transplanting [tool] into [target]'s [affected.name]." + "You start transplanting [tool] into [target]'s [affected.name].", + chat_message_type = MESSAGE_TYPE_COMBAT ) affected.custom_pain("Someone's rooting around in your [affected.name]!") else user.visible_message( "[user] starts transplanting [tool] into [target]'s [parse_zone(target_zone)].", - "You start transplanting [tool] into [target]'s [parse_zone(target_zone)]." + "You start transplanting [tool] into [target]'s [parse_zone(target_zone)].", + chat_message_type = MESSAGE_TYPE_COMBAT ) return ..() @@ -444,17 +455,20 @@ if(affected) user.visible_message(" [user] has transplanted [tool] into [target]'s [affected.name].", - " You have transplanted [tool] into [target]'s [affected.name].") + " You have transplanted [tool] into [target]'s [affected.name].", + chat_message_type = MESSAGE_TYPE_COMBAT) else user.visible_message(" [user] has transplanted [tool] into [target]'s [parse_zone(target_zone)].", - " You have transplanted [tool] into [target]'s [parse_zone(target_zone)].") + " You have transplanted [tool] into [target]'s [parse_zone(target_zone)].", + chat_message_type = MESSAGE_TYPE_COMBAT) return SURGERY_STEP_CONTINUE /datum/surgery_step/internal/manipulate_organs/implant/fail_step(mob/living/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) user.visible_message( "[user]'s hand slips, damaging [tool]!", - "Your hand slips, damaging [tool]!" + "Your hand slips, damaging [tool]!", + chat_message_type = MESSAGE_TYPE_COMBAT ) var/obj/item/organ/internal/I = tool if(istype(I) && !I.tough) @@ -565,12 +579,14 @@ if(istype(C, /obj/item/reagent_containers/syringe)) user.visible_message( " [user] has injected [tool] into [target]'s [I.name].", - " You have injected [tool] into [target]'s [I.name]." + " You have injected [tool] into [target]'s [I.name].", + chat_message_type = MESSAGE_TYPE_COMBAT ) else user.visible_message( " [user] has poured some of [tool] over [target]'s [I.name].", - " You have poured some of [tool] over [target]'s [I.name]." + " You have poured some of [tool] over [target]'s [I.name].", + chat_message_type = MESSAGE_TYPE_COMBAT ) R.reaction(target, REAGENT_INGEST, R.total_volume / C.amount_per_transfer_from_this) @@ -611,7 +627,8 @@ user.visible_message( " [user]'s hand slips, splashing the contents of [tool] all over [target][affected ? "'s [affected.name]" : ""] incision!", - " Your hand slips, splashing the contents of [tool] all over [target][affected ? "'s [affected.name]" : ""] incision!" + " Your hand slips, splashing the contents of [tool] all over [target][affected ? "'s [affected.name]" : ""] incision!", + chat_message_type = MESSAGE_TYPE_COMBAT ) // continue here since we want to keep moving in the surgery return SURGERY_STEP_CONTINUE @@ -628,14 +645,15 @@ /datum/surgery_step/internal/manipulate_organs/finish/begin_step(mob/living/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) var/mob/living/carbon/human/H = target var/obj/item/organ/external/affected = target.get_organ(target_zone) + var/msg + var/self_msg if(affected && affected.encased) - var/msg = "[user] starts bending [target]'s [affected.encased] back into place with [tool]." - var/self_msg = "You start bending [target]'s [affected.encased] back into place with [tool]." - user.visible_message(msg, self_msg) + msg = "[user] starts bending [target]'s [affected.encased] back into place with [tool]." + self_msg = "You start bending [target]'s [affected.encased] back into place with [tool]." else - var/msg = "[user] starts pulling [target]'s skin back into place with [tool]." - var/self_msg = "You start pulling [target]'s skin back into place with [tool]." - user.visible_message(msg, self_msg) + msg = "[user] starts pulling [target]'s skin back into place with [tool]." + self_msg = "You start pulling [target]'s skin back into place with [tool]." + user.visible_message(msg, self_msg, chat_message_type = MESSAGE_TYPE_COMBAT) if(H && affected) affected.custom_pain("Something hurts horribly in your [affected.name]!") @@ -654,7 +672,7 @@ msg = "[user] pulls [target]'s flesh back into place with [tool]." self_msg = "You pull [target]'s flesh back into place with [tool]." - user.visible_message(msg, self_msg) + user.visible_message(msg, self_msg, chat_message_type = MESSAGE_TYPE_COMBAT) return SURGERY_STEP_CONTINUE /datum/surgery_step/internal/manipulate_organs/finish/fail_step(mob/living/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) @@ -670,7 +688,7 @@ self_msg = " Your hand slips, tearing skin!" if(affected) affected.receive_damage(20) - user.visible_message(msg, self_msg) + user.visible_message(msg, self_msg, chat_message_type = MESSAGE_TYPE_COMBAT) return SURGERY_STEP_RETRY ////////////////////////////////////////////////////////////////// @@ -730,14 +748,16 @@ /datum/surgery_step/cut_carapace/begin_step(mob/living/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) user.visible_message("[user] starts the incision on [target]'s [target_zone] with [tool].", \ - "You start the incision on [target]'s [target_zone] with [tool].") + "You start the incision on [target]'s [target_zone] with [tool].", + chat_message_type = MESSAGE_TYPE_COMBAT) return ..() /datum/surgery_step/cut_carapace/end_step(mob/living/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) user.visible_message( " [user] has made an incision on [target]'s [target_zone] with [tool].", - " You have made an incision on [target]'s [target_zone] with [tool]." + " You have made an incision on [target]'s [target_zone] with [tool].", + chat_message_type = MESSAGE_TYPE_COMBAT ) return SURGERY_STEP_CONTINUE @@ -745,7 +765,8 @@ user.visible_message( "[user]'s hand slips, slicing open [target]'s [target_zone] in a wrong spot with [tool]!", - "Your hand slips, slicing open [target]'s [target_zone] in a wrong spot with [tool]!" + "Your hand slips, slicing open [target]'s [target_zone] in a wrong spot with [tool]!", + chat_message_type = MESSAGE_TYPE_COMBAT ) return SURGERY_STEP_RETRY @@ -770,7 +791,7 @@ if(target_zone == BODY_ZONE_PRECISE_GROIN) msg = "[user] starts to pry open the incision and rearrange the organs in [target]'s lower abdomen with [tool]." self_msg = "You start to pry open the incision and rearrange the organs in [target]'s lower abdomen with [tool]." - user.visible_message(msg, self_msg) + user.visible_message(msg, self_msg, chat_message_type = MESSAGE_TYPE_COMBAT) return ..() /datum/surgery_step/retract_carapace/end_step(mob/living/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) @@ -782,7 +803,7 @@ if(target_zone == BODY_ZONE_PRECISE_GROIN) msg = " [user] keeps the incision open on [target]'s lower abdomen with [tool]." self_msg = " You keep the incision open on [target]'s lower abdomen with [tool]." - user.visible_message(msg, self_msg) + user.visible_message(msg, self_msg, chat_message_type = MESSAGE_TYPE_COMBAT) return SURGERY_STEP_CONTINUE /datum/surgery_step/generic/retract_carapace/fail_step(mob/living/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) @@ -794,7 +815,7 @@ if(target_zone == BODY_ZONE_PRECISE_GROIN) msg = " [user]'s hand slips, damaging several organs in [target]'s lower abdomen with [tool]" self_msg = " Your hand slips, damaging several organs in [target]'s lower abdomen with [tool]!" - user.visible_message(msg, self_msg) + user.visible_message(msg, self_msg, chat_message_type = MESSAGE_TYPE_COMBAT) return SURGERY_STEP_RETRY // redefine cauterize for every step because of course it relies on get_organ() @@ -825,7 +846,8 @@ var/zone = zone_name(target_zone) user.visible_message( "[user] is beginning to cauterize the incision on [target]'s [zone] with \the [tool].", - "You are beginning to cauterize the incision on [target]'s [zone] with \the [tool]." + "You are beginning to cauterize the incision on [target]'s [zone] with \the [tool].", + chat_message_type = MESSAGE_TYPE_COMBAT ) to_chat(user, "Your [zone] is being burned!") // No custom pain because xenos are special return ..() @@ -834,7 +856,8 @@ var/zone = zone_name(target_zone) user.visible_message( "[user] cauterizes the incision on [target]'s [zone] with \the [tool].", - "You cauterize the incision on [target]'s [zone] with \the [tool]." + "You cauterize the incision on [target]'s [zone] with \the [tool].", + chat_message_type = MESSAGE_TYPE_COMBAT ) return SURGERY_STEP_CONTINUE @@ -842,7 +865,8 @@ var/zone = zone_name(target_zone) user.visible_message( "[user]'s hand slips, leaving a small burn on [target]'s [zone] with \the [tool]!", - "Your hand slips, leaving a small burn on [target]'s [zone] with \the [tool]!" + "Your hand slips, leaving a small burn on [target]'s [zone] with \the [tool]!", + chat_message_type = MESSAGE_TYPE_COMBAT ) target.apply_damage(3, BURN, target_zone) return SURGERY_STEP_RETRY diff --git a/code/modules/surgery/other.dm b/code/modules/surgery/other.dm index cc4f1ccea022..7c88cbc5d30c 100644 --- a/code/modules/surgery/other.dm +++ b/code/modules/surgery/other.dm @@ -90,7 +90,8 @@ user.visible_message( "[user] starts patching the damaged vein in [target]'s [affected.name] with \the [tool].", - "You start patching the damaged vein in [target]'s [affected.name] with \the [tool]." + "You start patching the damaged vein in [target]'s [affected.name] with \the [tool].", + chat_message_type = MESSAGE_TYPE_COMBAT ) affected.custom_pain("The pain in your [affected.name] is unbearable!") return ..() @@ -100,7 +101,8 @@ var/obj/item/organ/external/affected = target.get_organ(target_zone) user.visible_message( " [user] has patched the damaged vein in [target]'s [affected.name] with \the [tool].", - " You have patched the damaged vein in [target]'s [affected.name] with \the [tool]." + " You have patched the damaged vein in [target]'s [affected.name] with \the [tool].", + chat_message_type = MESSAGE_TYPE_COMBAT ) affected.fix_internal_bleeding() @@ -114,7 +116,8 @@ var/obj/item/organ/external/affected = target.get_organ(target_zone) user.visible_message( "[user]'s hand slips, smearing [tool] in the incision in [target]'s [affected.name]!", - "Your hand slips, smearing [tool] in the incision in [target]'s [affected.name]!" + "Your hand slips, smearing [tool] in the incision in [target]'s [affected.name]!", + chat_message_type = MESSAGE_TYPE_COMBAT ) affected.receive_damage(5, 0) @@ -139,7 +142,8 @@ user.visible_message( "[user] starts to treat the scorched tissue in [target]'s [affected.name] with [tool].", - "You start to treat the scorched tissue in [target]'s [affected.name] with [tool]." + "You start to treat the scorched tissue in [target]'s [affected.name] with [tool].", + chat_message_type = MESSAGE_TYPE_COMBAT ) affected.custom_pain("Your [affected.name] flares with agony as its burn is touched!") @@ -156,7 +160,8 @@ user.visible_message( "[user] finishes treating affected tissue in [target]'s [affected.name].", - "You finish treating affected tissue in [target]'s [affected.name] with [tool]." + "You finish treating affected tissue in [target]'s [affected.name] with [tool].", + chat_message_type = MESSAGE_TYPE_COMBAT ) return SURGERY_STEP_CONTINUE @@ -169,7 +174,8 @@ user.visible_message( "[user]'s hand slips, applying [tool] in the wrong place on [target]'s [affected.name]!", - "Your hand slips, applying [tool] in the wrong place on [target]'s [affected.name]!" + "Your hand slips, applying [tool] in the wrong place on [target]'s [affected.name]!", + chat_message_type = MESSAGE_TYPE_COMBAT ) return SURGERY_STEP_RETRY @@ -191,7 +197,8 @@ var/obj/item/organ/external/affected = target.get_organ(target_zone) user.visible_message( "[user] starts cutting away necrotic tissue in [target]'s [affected.name] with \the [tool].", - "You start cutting away necrotic tissue in [target]'s [affected.name] with \the [tool]." + "You start cutting away necrotic tissue in [target]'s [affected.name] with \the [tool].", + chat_message_type = MESSAGE_TYPE_COMBAT ) affected.custom_pain("The pain in [affected.name] is unbearable!") return ..() @@ -200,7 +207,8 @@ var/obj/item/organ/external/affected = target.get_organ(target_zone) user.visible_message( " [user] has cut away necrotic tissue in [target]'s [affected.name] with \the [tool].", - " You have cut away necrotic tissue in [target]'s [affected.name] with \the [tool]." + " You have cut away necrotic tissue in [target]'s [affected.name] with \the [tool].", + chat_message_type = MESSAGE_TYPE_COMBAT ) affected.open = ORGAN_ORGANIC_OPEN @@ -210,7 +218,8 @@ var/obj/item/organ/external/affected = target.get_organ(target_zone) user.visible_message( "[user]'s hand slips, slicing an artery inside [target]'s [affected.name] with [tool]!", - "Your hand slips, slicing an artery inside [target]'s [affected.name] with [tool]!" + "Your hand slips, slicing an artery inside [target]'s [affected.name] with [tool]!", + chat_message_type = MESSAGE_TYPE_COMBAT ) affected.receive_damage(20) @@ -240,7 +249,9 @@ if(!container.reagents.has_reagent("mitocholide")) user.visible_message( "[user] looks at \the [tool] and ponders.", - "You are not sure if \the [tool] contains the mitocholide necessary to treat the necrosis.") + "You are not sure if \the [tool] contains the mitocholide necessary to treat the necrosis.", + chat_message_type = MESSAGE_TYPE_COMBAT + ) return FALSE /datum/surgery_step/treat_necrosis/begin_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery) @@ -253,7 +264,8 @@ user.visible_message( "[user] starts applying medication to the affected tissue in [target]'s [affected.name] with \the [tool].", - "You start applying medication to the affected tissue in [target]'s [affected.name] with \the [tool]." + "You start applying medication to the affected tissue in [target]'s [affected.name] with \the [tool].", + chat_message_type = MESSAGE_TYPE_COMBAT ) affected.custom_pain("Something in your [affected.name] is causing you a lot of pain!") return ..() @@ -279,7 +291,8 @@ user.visible_message( " [user] applies [trans] units of the solution to affected tissue in [target]'s [affected.name]", - " You apply [trans] units of the solution to affected tissue in [target]'s [affected.name] with \the [tool]." + " You apply [trans] units of the solution to affected tissue in [target]'s [affected.name] with \the [tool].", + chat_message_type = MESSAGE_TYPE_COMBAT ) return SURGERY_STEP_CONTINUE @@ -297,7 +310,8 @@ user.visible_message( "[user]'s hand slips, applying [trans] units of the solution to the wrong place in [target]'s [affected.name] with the [tool]!", - "Your hand slips, applying [trans] units of the solution to the wrong place in [target]'s [affected.name] with the [tool]!" + "Your hand slips, applying [trans] units of the solution to the wrong place in [target]'s [affected.name] with the [tool]!", + chat_message_type = MESSAGE_TYPE_COMBAT ) //no damage or anything, just wastes medicine diff --git a/code/modules/surgery/plastic_surgery.dm b/code/modules/surgery/plastic_surgery.dm index 1aaa027b0221..43fa6078ed6f 100644 --- a/code/modules/surgery/plastic_surgery.dm +++ b/code/modules/surgery/plastic_surgery.dm @@ -16,7 +16,11 @@ time = 6.4 SECONDS /datum/surgery_step/reshape_face/begin_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery) - user.visible_message("[user] begins to alter [target]'s appearance.", "You begin to alter [target]'s appearance...") + user.visible_message( + "[user] begins to alter [target]'s appearance.", + "You begin to alter [target]'s appearance...", + chat_message_type = MESSAGE_TYPE_COMBAT + ) return ..() /datum/surgery_step/reshape_face/end_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery) @@ -24,7 +28,11 @@ var/species_names = target.dna.species.name if(head.status & ORGAN_DISFIGURED) head.status &= ~ORGAN_DISFIGURED - user.visible_message("[user] successfully restores [target]'s appearance!", "You successfully restore [target]'s appearance.") + user.visible_message( + "[user] successfully restores [target]'s appearance!", + "You successfully restore [target]'s appearance.", + chat_message_type = MESSAGE_TYPE_COMBAT + ) else var/list/names = list() var/list_size = 10 @@ -74,7 +82,11 @@ var/oldname = target.real_name target.real_name = chosen_name var/newname = target.real_name //something about how the code handles names required that I use this instead of target.real_name - user.visible_message("[user] alters [oldname]'s appearance completely, [target.p_they()] [target.p_are()] now [newname]!", "You alter [oldname]'s appearance completely, [target.p_they()] [target.p_are()] now [newname].") + user.visible_message( + "[user] alters [oldname]'s appearance completely, [target.p_they()] [target.p_are()] now [newname]!", + "You alter [oldname]'s appearance completely, [target.p_they()] [target.p_are()] now [newname].", + chat_message_type = MESSAGE_TYPE_COMBAT + ) target.sec_hud_set_ID() return SURGERY_STEP_CONTINUE @@ -83,7 +95,8 @@ var/obj/item/organ/external/head/head = target.get_organ(target_zone) user.visible_message( " [user]'s hand slips, tearing skin on [target]'s face with [tool]!", - " Your hand slips, tearing skin on [target]'s face with [tool]!" + " Your hand slips, tearing skin on [target]'s face with [tool]!", + chat_message_type = MESSAGE_TYPE_COMBAT ) target.apply_damage(10, BRUTE, head, sharp = TRUE) return SURGERY_STEP_RETRY diff --git a/code/modules/surgery/remove_embedded_object.dm b/code/modules/surgery/remove_embedded_object.dm index 513fcd1f022c..2770e260f724 100644 --- a/code/modules/surgery/remove_embedded_object.dm +++ b/code/modules/surgery/remove_embedded_object.dm @@ -69,7 +69,11 @@ H.clear_alert("embeddedobject") if(objects > 0) - user.visible_message("[user] successfully removes [objects] object\s from [H]'s [parse_zone(user.zone_selected)]!", "You successfully remove [objects] object\s from [H]'s [L.name].") + user.visible_message( + "[user] successfully removes [objects] object\s from [H]'s [parse_zone(user.zone_selected)]!", + "You successfully remove [objects] object\s from [H]'s [L.name].", + chat_message_type = MESSAGE_TYPE_COMBAT + ) else to_chat(user, "You find no objects embedded in [H]'s [parse_zone(user.zone_selected)]!") diff --git a/code/modules/surgery/robotics.dm b/code/modules/surgery/robotics.dm index bbd8a70b96d1..4818d47873ec 100644 --- a/code/modules/surgery/robotics.dm +++ b/code/modules/surgery/robotics.dm @@ -122,7 +122,8 @@ var/obj/item/organ/external/affected = target.get_organ(target_zone) user.visible_message( "[user] starts to unscrew the maintenance hatch on [target]'s [affected.name] with \the [tool].", - "You start to unscrew the maintenance hatch on [target]'s [affected.name] with \the [tool]." + "You start to unscrew the maintenance hatch on [target]'s [affected.name] with \the [tool].", + chat_message_type = MESSAGE_TYPE_COMBAT ) return ..() @@ -130,7 +131,8 @@ var/obj/item/organ/external/affected = target.get_organ(target_zone) user.visible_message( " [user] has opened the maintenance hatch on [target]'s [affected.name] with \the [tool].", - " You have opened the maintenance hatch on [target]'s [affected.name] with \the [tool]." + " You have opened the maintenance hatch on [target]'s [affected.name] with \the [tool].", + chat_message_type = MESSAGE_TYPE_COMBAT ) affected.open = ORGAN_SYNTHETIC_LOOSENED return SURGERY_STEP_CONTINUE @@ -139,7 +141,8 @@ var/obj/item/organ/external/affected = target.get_organ(target_zone) user.visible_message( " [user]'s [tool.name] slips, failing to unscrew [target]'s [affected.name].", - " Your [tool] slips, failing to unscrew [target]'s [affected.name]." + " Your [tool] slips, failing to unscrew [target]'s [affected.name].", + chat_message_type = MESSAGE_TYPE_COMBAT ) return SURGERY_STEP_RETRY @@ -157,7 +160,8 @@ var/obj/item/organ/external/affected = target.get_organ(target_zone) user.visible_message( "[user] starts to pry open the maintenance hatch on [target]'s [affected.name] with \the [tool].", - "You start to pry open the maintenance hatch on [target]'s [affected.name] with \the [tool]." + "You start to pry open the maintenance hatch on [target]'s [affected.name] with \the [tool].", + chat_message_type = MESSAGE_TYPE_COMBAT ) return ..() @@ -165,7 +169,8 @@ var/obj/item/organ/external/affected = target.get_organ(target_zone) user.visible_message( " [user] opens the maintenance hatch on [target]'s [affected.name] with \the [tool].", - " You open the maintenance hatch on [target]'s [affected.name] with \the [tool]." + " You open the maintenance hatch on [target]'s [affected.name] with \the [tool].", + chat_message_type = MESSAGE_TYPE_COMBAT ) affected.open = ORGAN_SYNTHETIC_OPEN return SURGERY_STEP_CONTINUE @@ -174,7 +179,8 @@ var/obj/item/organ/external/affected = target.get_organ(target_zone) user.visible_message( " [user]'s [tool.name] slips, failing to open the hatch on [target]'s [affected.name].", - " Your [tool] slips, failing to open the hatch on [target]'s [affected.name]." + " Your [tool] slips, failing to open the hatch on [target]'s [affected.name].", + chat_message_type = MESSAGE_TYPE_COMBAT ) return SURGERY_STEP_RETRY @@ -192,7 +198,8 @@ var/obj/item/organ/external/affected = target.get_organ(target_zone) user.visible_message( "[user] begins to close and secure the hatch on [target]'s [affected.name] with \the [tool].", - "You begin to close and secure the hatch on [target]'s [affected.name] with \the [tool]." + "You begin to close and secure the hatch on [target]'s [affected.name] with \the [tool].", + chat_message_type = MESSAGE_TYPE_COMBAT ) return ..() @@ -200,7 +207,8 @@ var/obj/item/organ/external/affected = target.get_organ(target_zone) user.visible_message( " [user] closes and secures the hatch on [target]'s [affected.name] with \the [tool].", - " You close and secure the hatch on [target]'s [affected.name] with \the [tool]." + " You close and secure the hatch on [target]'s [affected.name] with \the [tool].", + chat_message_type = MESSAGE_TYPE_COMBAT ) tool.play_tool_sound(target) affected.open = ORGAN_CLOSED @@ -208,8 +216,10 @@ /datum/surgery_step/robotics/external/close_hatch/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message(" [user]'s [tool.name] slips, failing to close the hatch on [target]'s [affected.name].", - " Your [tool.name] slips, failing to close the hatch on [target]'s [affected.name].") + user.visible_message( + " [user]'s [tool.name] slips, failing to close the hatch on [target]'s [affected.name].", + " Your [tool.name] slips, failing to close the hatch on [target]'s [affected.name].", + chat_message_type = MESSAGE_TYPE_COMBAT) return SURGERY_STEP_RETRY /datum/surgery_step/robotics/external/close_hatch/premature @@ -219,7 +229,8 @@ var/obj/item/organ/external/affected = target.get_organ(target_zone) user.visible_message( "[user] begins to close and secure the hatch on [target]'s [affected.name] with \the [tool].", - "You are interrupting the current surgery, beginning to close and secure the hatch on [target]'s [affected.name] with \the [tool]." + "You are interrupting the current surgery, beginning to close and secure the hatch on [target]'s [affected.name] with \the [tool].", + chat_message_type = MESSAGE_TYPE_COMBAT ) return ..() @@ -248,7 +259,8 @@ C.use(3) user.visible_message( "[user] begins to splice new cabling into [target]'s [affected.name].", - "You begin to splice new cabling into [target]'s [affected.name]." + "You begin to splice new cabling into [target]'s [affected.name].", + chat_message_type = MESSAGE_TYPE_COMBAT ) return ..() @@ -258,7 +270,8 @@ var/obj/item/organ/external/affected = target.get_organ(target_zone) user.visible_message( " [user] finishes splicing cable into [target]'s [affected.name].", - " You finishes splicing new cable into [target]'s [affected.name]." + " You finishes splicing new cable into [target]'s [affected.name].", + chat_message_type = MESSAGE_TYPE_COMBAT ) affected.heal_damage(0, rand(30, 50), 1, 1) if(affected.burn_dam) @@ -270,7 +283,8 @@ var/obj/item/organ/external/affected = target.get_organ(target_zone) user.visible_message( " [user] causes a short circuit in [target]'s [affected.name]!", - " You cause a short circuit in [target]'s [affected.name]!" + " You cause a short circuit in [target]'s [affected.name]!", + chat_message_type = MESSAGE_TYPE_COMBAT ) target.apply_damage(rand(5, 10), BURN, affected) return SURGERY_STEP_RETRY @@ -292,7 +306,8 @@ return SURGERY_BEGINSTEP_SKIP user.visible_message( "[user] begins to patch damage to [target]'s [affected.name]'s support structure with \the [tool].", - "You begin to patch damage to [target]'s [affected.name]'s support structure with \the [tool]." + "You begin to patch damage to [target]'s [affected.name]'s support structure with \the [tool].", + chat_message_type = MESSAGE_TYPE_COMBAT ) return ..() @@ -301,7 +316,8 @@ var/obj/item/organ/external/affected = target.get_organ(target_zone) user.visible_message( " [user] finishes patching damage to [target]'s [affected.name] with \the [tool].", - " You finish patching damage to [target]'s [affected.name] with \the [tool]." + " You finish patching damage to [target]'s [affected.name] with \the [tool].", + chat_message_type = MESSAGE_TYPE_COMBAT ) affected.heal_damage(rand(30, 50), 0, 1, 1) affected.status &= ~ORGAN_DISFIGURED @@ -315,7 +331,8 @@ var/obj/item/organ/external/affected = target.get_organ(target_zone) user.visible_message( "[user]'s [tool.name] slips, damaging the internal structure of [target]'s [affected.name].", - "Your [tool.name] slips, damaging the internal structure of [target]'s [affected.name]." + "Your [tool.name] slips, damaging the internal structure of [target]'s [affected.name].", + chat_message_type = MESSAGE_TYPE_COMBAT ) target.apply_damage(rand(5, 10), BURN, affected) return SURGERY_STEP_RETRY @@ -355,7 +372,8 @@ if(I && I.damage && I.is_robotic()) user.visible_message( "[user] starts mending the damage to [target]'s [I.name]'s mechanisms.", - "You start mending the damage to [target]'s [I.name]'s mechanisms." + "You start mending the damage to [target]'s [I.name]'s mechanisms.", + chat_message_type = MESSAGE_TYPE_COMBAT ) found_damaged_organ = TRUE @@ -376,7 +394,8 @@ if(I.is_robotic()) user.visible_message( " [user] repairs [target]'s [I.name] with [tool].", - " You repair [target]'s [I.name] with [tool]." + " You repair [target]'s [I.name] with [tool].", + chat_message_type = MESSAGE_TYPE_COMBAT ) I.damage = 0 I.surgeryize() @@ -385,8 +404,10 @@ /datum/surgery_step/robotics/manipulate_robotic_organs/mend/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message(" [user]'s hand slips, gumming up the mechanisms inside of [target]'s [affected.name] with \the [tool]!", \ - " Your hand slips, gumming up the mechanisms inside of [target]'s [affected.name] with \the [tool]!") + user.visible_message( + " [user]'s hand slips, gumming up the mechanisms inside of [target]'s [affected.name] with \the [tool]!", + " Your hand slips, gumming up the mechanisms inside of [target]'s [affected.name] with \the [tool]!", + chat_message_type = MESSAGE_TYPE_COMBAT) target.adjustToxLoss(5) affected.receive_damage(5) @@ -441,14 +462,16 @@ I.insert(target) user.visible_message( " [user] has reattached [target]'s [I].", - " You have reattached [target]'s [I]." + " You have reattached [target]'s [I].", + chat_message_type = MESSAGE_TYPE_COMBAT ) return ..() /datum/surgery_step/robotics/manipulate_robotic_organs/implant/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery) user.visible_message( " [user]'s hand slips, disconnecting \the [tool].", - " Your hand slips, disconnecting \the [tool]." + " Your hand slips, disconnecting \the [tool].", + chat_message_type = MESSAGE_TYPE_COMBAT ) return SURGERY_STEP_RETRY @@ -479,7 +502,8 @@ return SURGERY_BEGINSTEP_SKIP user.visible_message( "[user] starts to decouple [target]'s [I] with \the [tool].", - "You start to decouple [target]'s [I] with \the [tool]." + "You start to decouple [target]'s [I] with \the [tool].", + chat_message_type = MESSAGE_TYPE_COMBAT ) affected.custom_pain("The pain in your [affected.name] is living hell!") @@ -492,13 +516,15 @@ if(!I || I.owner != target) user.visible_message( "[user] can't seem to extract anything from [target]'s [parse_zone(target_zone)]!", - "You can't extract anything from [target]'s [parse_zone(target_zone)]!" + "You can't extract anything from [target]'s [parse_zone(target_zone)]!", + chat_message_type = MESSAGE_TYPE_COMBAT ) return SURGERY_STEP_CONTINUE user.visible_message( " [user] has decoupled [target]'s [I] with \the [tool].", - " You have decoupled [target]'s [I] with \the [tool]." + " You have decoupled [target]'s [I] with \the [tool].", + chat_message_type = MESSAGE_TYPE_COMBAT ) add_attack_logs(user, target, "Surgically removed [I.name]. INTENT: [uppertext(user.a_intent)]") @@ -515,7 +541,8 @@ /datum/surgery_step/robotics/manipulate_robotic_organs/extract/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery) user.visible_message( " [user]'s hand slips, disconnecting \the [tool].", - " Your hand slips, disconnecting \the [tool]." + " Your hand slips, disconnecting \the [tool].", + chat_message_type = MESSAGE_TYPE_COMBAT ) return SURGERY_STEP_RETRY @@ -571,7 +598,8 @@ var/obj/item/organ/external/affected = target.get_organ(target_zone) user.visible_message( " [user] has installed \the [tool] into [target]'s [affected.name].", - " You have installed \the [tool] into [target]'s [affected.name]." + " You have installed \the [tool] into [target]'s [affected.name].", + chat_message_type = MESSAGE_TYPE_COMBAT ) var/obj/item/mmi/M = tool @@ -583,7 +611,8 @@ /datum/surgery_step/robotics/manipulate_robotic_organs/install_mmi/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery) user.visible_message( " [user]'s hand slips!", - " Your hand slips!" + " Your hand slips!", + chat_message_type = MESSAGE_TYPE_COMBAT ) return SURGERY_STEP_RETRY @@ -600,7 +629,8 @@ var/obj/item/organ/external/affected = target.get_organ(target_zone) user.visible_message( "[user] starts to decouple [target]'s [affected.name] with \the [tool].", - "You start to decouple [target]'s [affected.name] with \the [tool]." + "You start to decouple [target]'s [affected.name] with \the [tool].", + chat_message_type = MESSAGE_TYPE_COMBAT ) affected.custom_pain("Your [affected.amputation_point] is being ripped apart!") @@ -610,7 +640,8 @@ var/obj/item/organ/external/affected = target.get_organ(target_zone) user.visible_message( " [user] has decoupled [target]'s [affected.name] with \the [tool].", - " You have decoupled [target]'s [affected.name] with \the [tool]." + " You have decoupled [target]'s [affected.name] with \the [tool].", + chat_message_type = MESSAGE_TYPE_COMBAT ) @@ -626,7 +657,8 @@ user.visible_message( " [user]'s hand slips!", - " Your hand slips!" + " Your hand slips!", + chat_message_type = MESSAGE_TYPE_COMBAT ) return SURGERY_STEP_RETRY @@ -639,7 +671,8 @@ var/obj/item/organ/external/affected = target.get_organ(target_zone) user.visible_message( "[user] begins to reprogram the appearance of [target]'s [affected.name] with [tool].", - "You begin to reprogram the appearance of [target]'s [affected.name] with [tool]." + "You begin to reprogram the appearance of [target]'s [affected.name] with [tool].", + chat_message_type = MESSAGE_TYPE_COMBAT ) return ..() @@ -658,15 +691,18 @@ target.UpdateDamageIcon() user.visible_message( " [user] reprograms the appearance of [target]'s [affected.name] with [tool].", - " You reprogram the appearance of [target]'s [affected.name] with [tool]." + " You reprogram the appearance of [target]'s [affected.name] with [tool].", + chat_message_type = MESSAGE_TYPE_COMBAT ) affected.open = ORGAN_CLOSED return SURGERY_STEP_CONTINUE /datum/surgery_step/robotics/external/customize_appearance/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message(" [user]'s [tool.name] slips, failing to reprogram [target]'s [affected.name].", - " Your [tool.name] slips, failing to reprogram [target]'s [affected.name].") + user.visible_message( + " [user]'s [tool.name] slips, failing to reprogram [target]'s [affected.name].", + " Your [tool.name] slips, failing to reprogram [target]'s [affected.name].", + chat_message_type = MESSAGE_TYPE_COMBAT) return SURGERY_STEP_RETRY /datum/surgery/robotics/reconfigure_id @@ -687,7 +723,8 @@ /datum/surgery_step/robotics/edit_serial/begin_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery) user.visible_message( "[user] begins to edit [target]'s identity parameters with [tool].", - "You begin to alter [target]'s identity parameters with [tool]." + "You begin to alter [target]'s identity parameters with [tool].", + chat_message_type = MESSAGE_TYPE_COMBAT ) return ..() @@ -714,6 +751,7 @@ target.gender = new_gender user.visible_message( "[user] edits [old_name]'s identity parameters with [tool]; [target.p_they()] [target.p_are()] now known as [new_name].", - "You alter [old_name]'s identity parameters with [tool]; [target.p_they()] [target.p_are()] now known as [new_name]." + "You alter [old_name]'s identity parameters with [tool]; [target.p_they()] [target.p_are()] now known as [new_name].", + chat_message_type = MESSAGE_TYPE_COMBAT ) return SURGERY_STEP_CONTINUE diff --git a/code/modules/vote/vote_datum.dm b/code/modules/vote/vote_datum.dm index a951bf74abb4..0da5ab185808 100644 --- a/code/modules/vote/vote_datum.dm +++ b/code/modules/vote/vote_datum.dm @@ -119,7 +119,7 @@ to_chat(world, chat_box_purple( "[start_text]

\ Click here or type Vote to place your vote.
\ - You have [GLOB.configuration.vote.vote_time / 10] seconds to vote.")) + You have [GLOB.configuration.vote.vote_time / 10] seconds to vote."), MESSAGE_TYPE_OOC) SEND_SOUND(world, sound('sound/ambience/alarm4.ogg')) diff --git a/code/modules/world_topic/adminmsg.dm b/code/modules/world_topic/adminmsg.dm index 95de4ef356f0..fdbfba8a4d34 100644 --- a/code/modules/world_topic/adminmsg.dm +++ b/code/modules/world_topic/adminmsg.dm @@ -28,12 +28,12 @@ C.last_discord_pm_time = 0 SEND_SOUND(C, sound('sound/effects/adminhelp.ogg')) - to_chat(C, message) + to_chat(C, message, , MESSAGE_TYPE_ADMINPM) for(var/client/A in GLOB.admins) // GLOB.admins includes anyone with a holder datum (mentors too). This makes sure only admins see ahelps if(check_rights(R_ADMIN, FALSE, A.mob)) if(A != C) - to_chat(A, amessage) + to_chat(A, amessage, , MESSAGE_TYPE_ADMINPM) return json_encode(list("success" = "Message Successful")) From ce002022bc1f4722089402437ea8f5d569ee8504 Mon Sep 17 00:00:00 2001 From: S34N <12197162+S34NW@users.noreply.github.com> Date: Tue, 23 Apr 2024 19:20:19 +0100 Subject: [PATCH 2/2] Apply suggestions from code review Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> --- code/game/verbs/ooc.dm | 2 +- code/modules/mob/mob.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/verbs/ooc.dm b/code/game/verbs/ooc.dm index 7de156056f40..8c92209c9ef0 100644 --- a/code/game/verbs/ooc.dm +++ b/code/game/verbs/ooc.dm @@ -247,7 +247,7 @@ GLOBAL_VAR_INIT(admin_ooc_colour, "#b82e00") prefix = "(R)" if(send) - to_chat(target, "LOOC[prefix]: [display_name][admin_stuff]: [msg]", MESSAGE_TYPE_OOC) + to_chat(target, "LOOC[prefix]: [display_name][admin_stuff]: [msg]", MESSAGE_TYPE_OOC) // Ported from /tg/, full credit to SpaceManiac and Timberpoes. diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 4d17c80d8d8b..875f926227e7 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -127,7 +127,7 @@ // Added voice muffling for Issue 41. if(stat == UNCONSCIOUS) - to_chat(src, "... You can almost hear someone talking ...", MESSAGE_TYPE_LOCALCHAT) + to_chat(src, "... You can almost hear someone talking ...", MESSAGE_TYPE_LOCALCHAT) return to_chat(src, msg, chat_message_type)