diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm index 0dc37cef2aa..2417a48a123 100644 --- a/code/_onclick/item_attack.dm +++ b/code/_onclick/item_attack.dm @@ -83,7 +83,8 @@ /obj/attacked_by(obj/item/I, mob/living/user) if(I.force) - visible_message("[user] has hit [src] with [I]!", null, null, COMBAT_MESSAGE_RANGE) + user.visible_message("[user] hits [src] with [I]!", \ + "You hit [src] with [I]!", null, COMBAT_MESSAGE_RANGE) //only witnesses close by and the victim see a hit message. log_combat(user, src, "attacked", I) take_damage(I.force, I.damtype, "melee", 1) @@ -130,9 +131,11 @@ var/message_hit_area = "" if(hit_area) message_hit_area = " in the [hit_area]" - var/attack_message = "[src] has been [message_verb][message_hit_area] with [I]." + var/attack_message = "[src] is [message_verb][message_hit_area] with [I]!" + var/attack_message_local = "You're [message_verb][message_hit_area] with [I]!" if(user in viewers(src, null)) - attack_message = "[user] has [message_verb] [src][message_hit_area] with [I]!" + attack_message = "[user] [message_verb] [src][message_hit_area] with [I]!" + attack_message_local = "[src] [message_verb] you[message_hit_area] with [I]!" visible_message("[attack_message]",\ - "[attack_message]", null, COMBAT_MESSAGE_RANGE) + "[attack_message_local]", null, COMBAT_MESSAGE_RANGE) return 1 diff --git a/code/_onclick/other_mobs.dm b/code/_onclick/other_mobs.dm index 62fbb66e05d..1c8e15292cf 100644 --- a/code/_onclick/other_mobs.dm +++ b/code/_onclick/other_mobs.dm @@ -147,14 +147,15 @@ if(prob(75)) ML.apply_damage(rand(1,3), BRUTE, affecting, armor) ML.visible_message("[name] bites [ML]!", \ - "[name] bites [ML]!") + "[name] bites you!", null, COMBAT_MESSAGE_RANGE) if(armor >= 2) return for(var/thing in diseases) var/datum/disease/D = thing ML.ForceContractDisease(D) else - ML.visible_message("[src] has attempted to bite [ML]!") + ML.visible_message("[src]'s bite misses [ML]!", \ + "[src]'s bite misses you!", null, COMBAT_MESSAGE_RANGE) /* Aliens diff --git a/code/datums/components/butchering.dm b/code/datums/components/butchering.dm index e410c620a8c..be610ae0947 100644 --- a/code/datums/components/butchering.dm +++ b/code/datums/components/butchering.dm @@ -60,7 +60,8 @@ new sinew (T) meat.guaranteed_butcher_results.Remove(sinew) if(butcher) - meat.visible_message("[butcher] butchers [meat].") + butcher.visible_message("[butcher] butchers [meat].", \ + "You butcher [meat].") ButcherEffects(meat) meat.harvest(butcher) meat.gib(FALSE, FALSE, TRUE) diff --git a/code/datums/components/riding.dm b/code/datums/components/riding.dm index e50af4db866..7fb6276f8f5 100644 --- a/code/datums/components/riding.dm +++ b/code/datums/components/riding.dm @@ -62,7 +62,8 @@ var/atom/movable/AM = parent var/mob/AMM = AM if((ride_check_rider_restrained && M.restrained(TRUE)) || (ride_check_rider_incapacitated && M.incapacitated(FALSE, TRUE)) || (ride_check_ridden_incapacitated && istype(AMM) && AMM.incapacitated(FALSE, TRUE))) - AM.visible_message("[M] falls off of [AM]!") + M.visible_message("[M] falls off of [AM]!", \ + "You fall off of [AM]!") AM.unbuckle_mob(M) return TRUE @@ -246,7 +247,8 @@ var/atom/movable/AM = parent AM.unbuckle_mob(user) user.Paralyze(60) - user.visible_message("[AM] pushes [user] off of [AM.p_them()]!") + user.visible_message("[AM] pushes [user] off of [AM.p_them()]!", \ + "[AM] pushes you off of [AM.p_them()]!") /datum/component/riding/cyborg del_on_unbuckle_all = TRUE @@ -302,7 +304,8 @@ var/turf/target = get_edge_target_turf(AM, AM.dir) var/turf/targetm = get_step(get_turf(AM), AM.dir) M.Move(targetm) - M.visible_message("[M] is thrown clear of [AM]!") + M.visible_message("[M] is thrown clear of [AM]!", \ + "You're thrown clear of [AM]!") M.throw_at(target, 14, 5, AM) M.Paralyze(60) diff --git a/code/datums/diseases/brainrot.dm b/code/datums/diseases/brainrot.dm index 1028d1fff4c..fc3fb732259 100644 --- a/code/datums/diseases/brainrot.dm +++ b/code/datums/diseases/brainrot.dm @@ -49,7 +49,8 @@ to_chat(affected_mob, "Strange buzzing fills your head, removing all thoughts.") if(prob(3)) to_chat(affected_mob, "You lose consciousness...") - affected_mob.visible_message("[affected_mob] suddenly collapses") + affected_mob.visible_message("[affected_mob] suddenly collapses!", \ + "You suddenly collapse!") affected_mob.Unconscious(rand(100,200)) if(prob(1)) affected_mob.emote("snore") diff --git a/code/datums/diseases/heart_failure.dm b/code/datums/diseases/heart_failure.dm index e2cbb8e5440..c823d0984b6 100644 --- a/code/datums/diseases/heart_failure.dm +++ b/code/datums/diseases/heart_failure.dm @@ -55,7 +55,8 @@ H.stop_sound_channel(CHANNEL_HEARTBEAT) H.playsound_local(H, 'sound/effects/singlebeat.ogg', 100, 0) if(H.stat == CONSCIOUS) - H.visible_message("[H] clutches at [H.p_their()] chest as if [H.p_their()] heart is stopping!") + H.visible_message("[H] clutches at [H.p_their()] chest as if [H.p_their()] heart is stopping!", \ + "You feel a terrible pain in your chest, as if your heart has stopped!") H.adjustStaminaLoss(60) H.set_heartattack(TRUE) H.reagents.add_reagent(/datum/reagent/medicine/corazone, 3) // To give the victim a final chance to shock their heart before losing consciousness diff --git a/code/datums/martial.dm b/code/datums/martial.dm index 4c16d677f81..030513f906e 100644 --- a/code/datums/martial.dm +++ b/code/datums/martial.dm @@ -53,8 +53,8 @@ if(!damage) playsound(D.loc, A.dna.species.miss_sound, 25, 1, -1) - D.visible_message("[A] has attempted to [atk_verb] [D]!", \ - "[A] has attempted to [atk_verb] [D]!", null, COMBAT_MESSAGE_RANGE) + D.visible_message("[A]'s [atk_verb] misses [D]!", \ + "[A]'s [atk_verb] misses you!", null, COMBAT_MESSAGE_RANGE) log_combat(A, D, "attempted to [atk_verb]") return 0 @@ -62,16 +62,16 @@ var/armor_block = D.run_armor_check(affecting, "melee") playsound(D.loc, A.dna.species.attack_sound, 25, 1, -1) - D.visible_message("[A] has [atk_verb]ed [D]!", \ - "[A] has [atk_verb]ed [D]!", null, COMBAT_MESSAGE_RANGE) + D.visible_message("[A] [atk_verb]ed [D]!", \ + "[A] [atk_verb]ed you!", null, COMBAT_MESSAGE_RANGE) D.apply_damage(damage, A.dna.species.attack_type, affecting, armor_block) log_combat(A, D, "punched") if((D.stat != DEAD) && damage >= A.dna.species.punchstunthreshold) - D.visible_message("[A] has knocked [D] down!!", \ - "[A] has knocked [D] down!") + D.visible_message("[A] knocks [D] down!!", \ + "[A] knocks you down!") D.apply_effect(40, EFFECT_KNOCKDOWN, armor_block) D.forcesay(GLOB.hit_appends) else if(!(D.mobility_flags & MOBILITY_STAND)) diff --git a/code/datums/martial/boxing.dm b/code/datums/martial/boxing.dm index 171548c7102..1241587b037 100644 --- a/code/datums/martial/boxing.dm +++ b/code/datums/martial/boxing.dm @@ -19,8 +19,8 @@ var/damage = rand(5, 8) + A.dna.species.punchdamagelow if(!damage) playsound(D.loc, A.dna.species.miss_sound, 25, 1, -1) - D.visible_message("[A] has attempted to [atk_verb] [D]!", \ - "[A] has attempted to [atk_verb] [D]!", null, COMBAT_MESSAGE_RANGE) + D.visible_message("[A]'s [atk_verb] misses [D]!", \ + "[A]'s [atk_verb] misses you!", null, COMBAT_MESSAGE_RANGE) log_combat(A, D, "attempted to hit", atk_verb) return 0 @@ -30,16 +30,16 @@ playsound(D.loc, A.dna.species.attack_sound, 25, 1, -1) - D.visible_message("[A] has [atk_verb]ed [D]!", \ - "[A] has [atk_verb]ed [D]!", null, COMBAT_MESSAGE_RANGE) + D.visible_message("[A] [atk_verb]ed [D]!", \ + "[A] [atk_verb]ed you!", null, COMBAT_MESSAGE_RANGE) D.apply_damage(damage, STAMINA, affecting, armor_block) log_combat(A, D, "punched (boxing) ") if(D.getStaminaLoss() > 50) var/knockout_prob = D.getStaminaLoss() + rand(-15,15) if((D.stat != DEAD) && prob(knockout_prob)) - D.visible_message("[A] has knocked [D] out with a haymaker!", \ - "[A] has knocked [D] out with a haymaker!") + D.visible_message("[A] knocks [D] out with a haymaker!", \ + "[A] knocks you out with a haymaker!") D.apply_effect(200,EFFECT_KNOCKDOWN,armor_block) D.SetSleeping(100) D.forcesay(GLOB.hit_appends) diff --git a/code/datums/martial/cqc.dm b/code/datums/martial/cqc.dm index 8906c9c5b92..361a625d7bb 100644 --- a/code/datums/martial/cqc.dm +++ b/code/datums/martial/cqc.dm @@ -57,7 +57,7 @@ return FALSE if(!D.stat || !D.IsParalyzed()) D.visible_message("[A] kicks [D] back!", \ - "[A] kicks you back!") + "[A] kicks you back!", null, COMBAT_MESSAGE_RANGE) playsound(get_turf(A), 'sound/weapons/cqchit1.ogg', 50, 1, -1) var/atom/throw_target = get_edge_target_turf(D, A.dir) D.throw_at(throw_target, 1, 14, A) @@ -76,7 +76,8 @@ if(!can_use(A)) return FALSE log_combat(A, D, "pressured (CQC)") - D.visible_message("[A] punches [D]'s neck!") + D.visible_message("[A] punches [D]'s neck!", \ + "[A] punches your neck!", null, COMBAT_MESSAGE_RANGE) D.adjustStaminaLoss(60) playsound(get_turf(A), 'sound/weapons/cqchit1.ogg', 50, 1, -1) return TRUE @@ -102,7 +103,7 @@ if(!D.stat) log_combat(A, D, "consecutive CQC'd (CQC)") D.visible_message("[A] strikes [D]'s abdomen, neck and back consecutively", \ - "[A] strikes your abdomen, neck and back consecutively!") + "[A] strikes your abdomen, neck and back consecutively!", null, COMBAT_MESSAGE_RANGE) playsound(get_turf(D), 'sound/weapons/cqchit2.ogg', 50, 1, -1) var/obj/item/I = D.get_active_held_item() if(I && D.temporarilyRemoveItemFromInventory(I)) @@ -123,7 +124,7 @@ A.grab_state = GRAB_AGGRESSIVE //Instant agressive grab if on grab intent log_combat(A, D, "grabbed", addition="aggressively") D.visible_message("[A] violently grabs [D]!", \ - "[A] violently grabs you!") + "[A] violently grabs you!", null, COMBAT_MESSAGE_RANGE) return TRUE else return FALSE @@ -147,7 +148,7 @@ else playsound(get_turf(D), 'sound/weapons/cqchit1.ogg', 50, 1, -1) D.visible_message("[A] [picked_hit_type] [D]!", \ - "[A] [picked_hit_type] you!") + "[A] [picked_hit_type] you!", null, COMBAT_MESSAGE_RANGE) log_combat(A, D, "[picked_hit_type] (CQC)") if(A.resting && !D.stat && !D.IsParalyzed()) D.visible_message("[A] leg sweeps [D]!", \ @@ -169,15 +170,15 @@ if(!D.stat || !D.IsParalyzed() || !restraining) I = D.get_active_held_item() D.visible_message("[A] strikes [D]'s jaw with their hand!", \ - "[A] strikes your jaw, disorienting you!") + "[A] strikes your jaw, disorienting you!", null, COMBAT_MESSAGE_RANGE) playsound(get_turf(D), 'sound/weapons/cqchit1.ogg', 50, 1, -1) if(I && D.temporarilyRemoveItemFromInventory(I)) A.put_in_hands(I) D.Jitter(2) D.apply_damage(5, A.dna.species.attack_type) else - D.visible_message("[A] attempted to disarm [D]!", \ - "[A] attempted to disarm [D]!") + D.visible_message("[A] fails to disarm [D]!", \ + "[A] fails to disarm you!", null, COMBAT_MESSAGE_RANGE) playsound(D, 'sound/weapons/punchmiss.ogg', 25, 1, -1) log_combat(A, D, "disarmed (CQC)", "[I ? " grabbing \the [I]" : ""]") if(restraining && A.pulling == D) diff --git a/code/datums/martial/krav_maga.dm b/code/datums/martial/krav_maga.dm index 5f2b7dec5a3..a722377da59 100644 --- a/code/datums/martial/krav_maga.dm +++ b/code/datums/martial/krav_maga.dm @@ -99,7 +99,7 @@ /datum/martial_art/krav_maga/proc/quick_choke(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D)//is actually lung punch D.visible_message("[A] pounds [D] on the chest!", \ - "[A] slams your chest! You can't breathe!") + "[A] slams your chest! You can't breathe!", null, COMBAT_MESSAGE_RANGE) playsound(get_turf(A), 'sound/effects/hit_punch.ogg', 50, 1, -1) if(D.losebreath <= 10) D.losebreath = CLAMP(D.losebreath + 5, 0, 10) @@ -109,7 +109,7 @@ /datum/martial_art/krav_maga/proc/neck_chop(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) D.visible_message("[A] karate chops [D]'s neck!", \ - "[A] karate chops your neck, rendering you unable to speak!") + "[A] karate chops your neck, rendering you unable to speak!", null, COMBAT_MESSAGE_RANGE) playsound(get_turf(A), 'sound/effects/hit_punch.ogg', 50, 1, -1) D.apply_damage(5, A.dna.species.attack_type) if(D.silent <= 10) @@ -140,7 +140,7 @@ A.do_attack_animation(D, ATTACK_EFFECT_PUNCH) playsound(get_turf(D), 'sound/effects/hit_punch.ogg', 50, 1, -1) D.visible_message("[A] [picked_hit_type] [D]!", \ - "[A] [picked_hit_type] you!") + "[A] [picked_hit_type] you!", null, COMBAT_MESSAGE_RANGE) log_combat(A, D, "[picked_hit_type] with [name]") return 1 @@ -153,12 +153,12 @@ if(I) if(D.temporarilyRemoveItemFromInventory(I)) A.put_in_hands(I) - D.visible_message("[A] has disarmed [D]!", \ - "[A] has disarmed [D]!") + D.visible_message("[A] disarms [D]!", \ + "[A] disarms you!", null, COMBAT_MESSAGE_RANGE) playsound(D, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) else - D.visible_message("[A] attempted to disarm [D]!", \ - "[A] attempted to disarm [D]!") + D.visible_message("[A] fails to disarm [D]!", \ + "[A] fails to disarm you!", null, COMBAT_MESSAGE_RANGE) playsound(D, 'sound/weapons/punchmiss.ogg', 25, 1, -1) log_combat(A, D, "disarmed (Krav Maga)", "[I ? " removing \the [I]" : ""]") return 1 diff --git a/code/datums/martial/mushpunch.dm b/code/datums/martial/mushpunch.dm index aec4ccb968f..4cd51ec8c71 100644 --- a/code/datums/martial/mushpunch.dm +++ b/code/datums/martial/mushpunch.dm @@ -35,4 +35,5 @@ var/datum/martial_art/mushpunch/mush = new(null) mush.teach(user) qdel(src) - visible_message("[user] devours [src].") + visible_message("[user] devours [src].", \ + "You devour [src].") diff --git a/code/datums/martial/plasma_fist.dm b/code/datums/martial/plasma_fist.dm index e38a011db03..45276a50405 100644 --- a/code/datums/martial/plasma_fist.dm +++ b/code/datums/martial/plasma_fist.dm @@ -44,8 +44,8 @@ return /datum/martial_art/plasma_fist/proc/Throwback(mob/living/carbon/human/A, mob/living/carbon/human/D) - D.visible_message("[A] has hit [D] with Plasma Punch!", \ - "[A] has hit [D] with Plasma Punch!") + D.visible_message("[A] hits [D] with Plasma Punch!", \ + "[A] hits you with Plasma Punch!") playsound(D.loc, 'sound/weapons/punch1.ogg', 50, 1, -1) var/atom/throw_target = get_edge_target_turf(D, get_dir(D, get_step_away(D, A))) D.throw_at(throw_target, 200, 4,A) @@ -57,8 +57,8 @@ A.do_attack_animation(D, ATTACK_EFFECT_PUNCH) playsound(D.loc, 'sound/weapons/punch1.ogg', 50, 1, -1) A.say("PLASMA FIST!", forced="plasma fist") - D.visible_message("[A] has hit [D] with THE PLASMA FIST TECHNIQUE!", \ - "[A] has hit [D] with THE PLASMA FIST TECHNIQUE!") + D.visible_message("[A] hits [D] with THE PLASMA FIST TECHNIQUE!", \ + "[A] hits you with THE PLASMA FIST TECHNIQUE!") D.gib() log_combat(A, D, "gibbed (Plasma Fist)") return diff --git a/code/datums/martial/wrestling.dm b/code/datums/martial/wrestling.dm index e7a901805c4..7fbb8a631c6 100644 --- a/code/datums/martial/wrestling.dm +++ b/code/datums/martial/wrestling.dm @@ -135,7 +135,8 @@ D.setDir(get_dir(D, A)) D.Stun(80) - A.visible_message("[A] starts spinning around with [D]!") + D.visible_message("[A] starts spinning around with [D]!", \ + "[A] starts spinning around with you!") A.emote("scream") for (var/i = 0, i < 20, i++) @@ -186,7 +187,8 @@ D.forceMove(A.loc) // Maybe this will help with the wallthrowing bug. - A.visible_message("[A] throws [D]!") + D.visible_message("[A] throws [D]!", \ + "[A] throws you!") playsound(A.loc, "swing_hit", 50, 1) var/turf/T = get_edge_target_turf(A, A.dir) if (T && isturf(T)) @@ -214,7 +216,8 @@ A.setDir(get_dir(A, D)) D.setDir(get_dir(D, A)) - A.visible_message("[A] lifts [D] up!") + D.visible_message("[A] lifts [D] up!", \ + "[A] lifts you up!") FlipAnimation() @@ -284,7 +287,8 @@ if (3) fluff = "atomic [fluff]" - A.visible_message("[A] [fluff] [D]!") + D.visible_message("[A] [fluff] [D]!", \ + "[A] [fluff] you!", null, COMBAT_MESSAGE_RANGE) playsound(A.loc, "swing_hit", 50, 1) if (!D.stat) D.emote("scream") @@ -327,7 +331,8 @@ A.forceMove(D.loc) addtimer(CALLBACK(src, .proc/CheckStrikeTurf, A, T), 4) - A.visible_message("[A] headbutts [D]!") + D.visible_message("[A] headbutts [D]!", \ + "[A] headbutts you!", null, COMBAT_MESSAGE_RANGE) D.adjustBruteLoss(rand(10,20)) playsound(A.loc, "swing_hit", 50, 1) D.Unconscious(20) @@ -340,7 +345,8 @@ A.emote("flip") A.setDir(turn(A.dir, 90)) - A.visible_message("[A] roundhouse-kicks [D]!") + D.visible_message("[A] roundhouse-kicks [D]!", \ + "[A] roundhouse-kicks you!", null, COMBAT_MESSAGE_RANGE) playsound(A.loc, "swing_hit", 50, 1) D.adjustBruteLoss(rand(10,20)) @@ -372,7 +378,8 @@ if (surface && (ST && isturf(ST))) A.forceMove(ST) - A.visible_message("[A] climbs onto [surface]!") + A.visible_message("[A] climbs onto [surface]!", \ + "You climb onto [surface]!") A.pixel_y = 10 falling = 1 sleep(10) @@ -383,7 +390,8 @@ if ((falling == 0 && get_dist(A, D) > 1) || (falling == 1 && get_dist(A, D) > 2)) // We climbed onto stuff. A.pixel_y = 0 if (falling == 1) - A.visible_message("...and dives head-first into the ground, ouch!") + A.visible_message("...and dives head-first into the ground, ouch!", \ + "...and dive head-first into the ground, ouch!") A.adjustBruteLoss(rand(10,20)) A.Paralyze(60) to_chat(A, "[D] is too far away!") @@ -402,7 +410,8 @@ A.forceMove(D.loc) - A.visible_message("[A] leg-drops [D]!") + D.visible_message("[A] leg-drops [D]!", \ + "[A] leg-drops you!") playsound(A.loc, "swing_hit", 50, 1) A.emote("scream") @@ -437,7 +446,7 @@ return 1 A.start_pulling(D) D.visible_message("[A] gets [D] in a cinch!", \ - "[A] gets [D] in a cinch!") + "[A] gets you in a cinch!", null, COMBAT_MESSAGE_RANGE) D.Stun(rand(60,100)) log_combat(A, D, "cinched") return 1 diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index fd8e1dec9b1..8c21cc7de4c 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -148,7 +148,8 @@ var/mob/M = AM log_combat(src, M, "grabbed", addition="passive grab") if(!supress_message) - visible_message("[src] has grabbed [M] passively!") + M.visible_message("[src] grabs [M] passively.", \ + "[src] grabs you passively.") return TRUE /atom/movable/proc/stop_pulling() diff --git a/code/game/mecha/equipment/tools/work_tools.dm b/code/game/mecha/equipment/tools/work_tools.dm index 79b8c2b0ef3..6cbf4656558 100644 --- a/code/game/mecha/equipment/tools/work_tools.dm +++ b/code/game/mecha/equipment/tools/work_tools.dm @@ -82,10 +82,10 @@ return M.adjustOxyLoss(round(dam_force/2)) M.updatehealth() - target.visible_message("[chassis] squeezes [target].", \ - "[chassis] squeezes [target].",\ + target.visible_message("[chassis] squeezes [target]!", \ + "[chassis] squeezes you!",\ "You hear something crack.") - log_combat(chassis.occupant, M, "attacked", "[name]", "(INTENT: [uppertext(chassis.occupant.a_intent)]) (DAMTYE: [uppertext(damtype)])") + log_combat(chassis.occupant, M, "attacked", "[name]", "(INTENT: [uppertext(chassis.occupant.a_intent)]) (DAMTYPE: [uppertext(damtype)])") else step_away(M,chassis) occupant_message("You push [target] out of the way.") @@ -143,12 +143,12 @@ return M.adjustOxyLoss(round(dam_force/2)) M.updatehealth() - target.visible_message("[chassis] destroys [target] in an unholy fury.", \ - "[chassis] destroys [target] in an unholy fury.") - log_combat(chassis.occupant, M, "attacked", "[name]", "(INTENT: [uppertext(chassis.occupant.a_intent)]) (DAMTYE: [uppertext(damtype)])") + target.visible_message("[chassis] destroys [target] in an unholy fury!", \ + "[chassis] destroys you in an unholy fury!") + log_combat(chassis.occupant, M, "attacked", "[name]", "(INTENT: [uppertext(chassis.occupant.a_intent)]) (DAMTYPE: [uppertext(damtype)])") else - target.visible_message("[chassis] destroys [target] in an unholy fury.", \ - "[chassis] destroys [target] in an unholy fury.") + target.visible_message("[chassis] destroys [target] in an unholy fury!", \ + "[chassis] destroys you in an unholy fury!") else if(chassis.occupant.a_intent == INTENT_DISARM) if(real_clamp) var/mob/living/carbon/C = target @@ -166,15 +166,16 @@ limbs_gone = "[limbs_gone], [affected]" if(play_sound) playsound(src, get_dismember_sound(), 80, TRUE) - target.visible_message("[chassis] rips [target]'s arms off.", \ - "[chassis] rips [target]'s arms off.") - log_combat(chassis.occupant, M, "dismembered of[limbs_gone],", "[name]", "(INTENT: [uppertext(chassis.occupant.a_intent)]) (DAMTYE: [uppertext(damtype)])") + target.visible_message("[chassis] rips [target]'s arms off!", \ + "[chassis] rips your arms off!") + log_combat(chassis.occupant, M, "dismembered of[limbs_gone],", "[name]", "(INTENT: [uppertext(chassis.occupant.a_intent)]) (DAMTYPE: [uppertext(damtype)])") else - target.visible_message("[chassis] rips [target]'s arms off.", \ - "[chassis] rips [target]'s arms off.") + target.visible_message("[chassis] rips [target]'s arms off!", \ + "[chassis] rips your arms off!") else step_away(M,chassis) - target.visible_message("[chassis] tosses [target] like a piece of paper.") + target.visible_message("[chassis] tosses [target] like a piece of paper!", \ + "[chassis] tosses you like a piece of paper!") return 1 diff --git a/code/game/objects/items/cardboard_cutouts.dm b/code/game/objects/items/cardboard_cutouts.dm index 768c7ac2137..50cb52ccde2 100644 --- a/code/game/objects/items/cardboard_cutouts.dm +++ b/code/game/objects/items/cardboard_cutouts.dm @@ -60,17 +60,15 @@ user.do_attack_animation(src) if(I.force) - user.visible_message("[user] has hit \ - [src] with [I]!", "You hit [src] \ - with [I]!") - + user.visible_message("[user] hits [src] with [I]!", \ + "You hit [src] with [I]!") if(prob(I.force)) push_over() /obj/item/cardboard_cutout/bullet_act(obj/item/projectile/P) if(istype(P, /obj/item/projectile/bullet/reusable)) P.on_hit(src, 0) - visible_message("[src] has been hit by [P]!") + visible_message("[src] is hit by [P]!") playsound(src, 'sound/weapons/slice.ogg', 50, 1) if(prob(P.damage)) push_over() diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 9fe74be049d..c8c88d7d96e 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -107,15 +107,16 @@ GENE SCANNER // Clumsiness/brain damage check if ((HAS_TRAIT(user, TRAIT_CLUMSY) || HAS_TRAIT(user, TRAIT_DUMB)) && prob(50)) - to_chat(user, "You stupidly try to analyze the floor's vitals!") - user.visible_message("[user] has analyzed the floor's vitals!") + user.visible_message("[user] analyzes the floor's vitals!", \ + "You stupidly try to analyze the floor's vitals!") to_chat(user, "Analyzing results for The floor:\n\tOverall status: Healthy") to_chat(user, "Key: Suffocation/Toxin/Burn/Brute") to_chat(user, "\tDamage specifics: 0-0-0-0") to_chat(user, "Body temperature: ???") return - user.visible_message("[user] has analyzed [M]'s vitals.") + user.visible_message("[user] analyzes [M]'s vitals.", \ + "You analyze [M]'s vitals.") if(scanmode == 0) healthscan(user, M, mode, advanced) @@ -696,7 +697,8 @@ GENE SCANNER materials = list(/datum/material/iron=200) /obj/item/nanite_scanner/attack(mob/living/M, mob/living/carbon/human/user) - user.visible_message("[user] has analyzed [M]'s nanites.") + user.visible_message("[user] analyzes [M]'s nanites.", \ + "You analyze [M]'s nanites.") add_fingerprint(user) @@ -728,7 +730,8 @@ GENE SCANNER /obj/item/sequence_scanner/attack(mob/living/M, mob/living/carbon/human/user) add_fingerprint(user) if (!HAS_TRAIT(M, TRAIT_RADIMMUNE) && !HAS_TRAIT(M, TRAIT_BADDNA)) //no scanning if its a husk or DNA-less Species - user.visible_message("[user] has analyzed [M]'s genetic sequence.") + user.visible_message("[user] analyzes [M]'s genetic sequence.", \ + "You analyze [M]'s genetic sequence.") gene_scan(M, user) else diff --git a/code/game/objects/items/dna_injector.dm b/code/game/objects/items/dna_injector.dm index 9ce3b5ac3da..ee21f198147 100644 --- a/code/game/objects/items/dna_injector.dm +++ b/code/game/objects/items/dna_injector.dm @@ -60,11 +60,12 @@ log_combat(user, target, "attempted to inject", src) if(target != user) - target.visible_message("[user] is trying to inject [target] with [src]!", "[user] is trying to inject [target] with [src]!") + target.visible_message("[user] is trying to inject [target] with [src]!", \ + "[user] is trying to inject you with [src]!") if(!do_mob(user, target) || used) return target.visible_message("[user] injects [target] with the syringe with [src]!", \ - "[user] injects [target] with the syringe with [src]!") + "[user] injects you with the syringe with [src]!") else to_chat(user, "You inject yourself with [src].") @@ -515,4 +516,3 @@ log_attack("[log_msg] [loc_name(user)]") return TRUE return FALSE - diff --git a/code/game/objects/items/handcuffs.dm b/code/game/objects/items/handcuffs.dm index 7489757fef0..ea814b7312b 100644 --- a/code/game/objects/items/handcuffs.dm +++ b/code/game/objects/items/handcuffs.dm @@ -58,7 +58,7 @@ if(!C.handcuffed) if(C.get_num_arms(FALSE) >= 2 || C.get_arm_ignore()) C.visible_message("[user] is trying to put [src.name] on [C]!", \ - "[user] is trying to put [src.name] on [C]!") + "[user] is trying to put [src.name] on you!") playsound(loc, cuffsound, 30, 1, -2) if(do_mob(user, C, 30) && (C.get_num_arms(FALSE) >= 2 || C.get_arm_ignore())) @@ -66,7 +66,8 @@ apply_cuffs(C, user, TRUE) else apply_cuffs(C, user) - to_chat(user, "You handcuff [C].") + C.visible_message("[user] handcuffs [C].", \ + "[user] handcuffs you.") SSblackbox.record_feedback("tally", "handcuffs", 1, type) log_combat(user, C, "handcuffed") diff --git a/code/game/objects/items/melee/misc.dm b/code/game/objects/items/melee/misc.dm index 52c8a35411c..fedf8be5894 100644 --- a/code/game/objects/items/melee/misc.dm +++ b/code/game/objects/items/melee/misc.dm @@ -212,8 +212,8 @@ /obj/item/melee/classic_baton/proc/get_stun_description(mob/living/target, mob/living/user) . = list() - .["visible"] = "[user] has knocked down [target] with [src]!" - .["local"] = "[user] has knocked down [target] with [src]!" + .["visible"] = "[user] knocks [target] down with [src]!" + .["local"] = "[user] knocks you down with [src]!" return . @@ -386,8 +386,8 @@ force = 5 cooldown = 20 - stun_time_carbon = 85 - affect_silicon = TRUE + stun_time_carbon = 85 + affect_silicon = TRUE on_sound = 'sound/weapons/contractorbatonextend.ogg' on_stun_sound = 'sound/effects/contractorbatonhit.ogg' diff --git a/code/game/objects/obj_defense.dm b/code/game/objects/obj_defense.dm index 14fc3f41644..6ce546a5b15 100644 --- a/code/game/objects/obj_defense.dm +++ b/code/game/objects/obj_defense.dm @@ -78,7 +78,7 @@ /obj/attack_hulk(mob/living/carbon/human/user, does_attack_animation = 0) if(user.a_intent == INTENT_HARM) ..(user, 1) - visible_message("[user] smashes [src]!", null, null, COMBAT_MESSAGE_RANGE) + user.visible_message("[user] smashes [src]!", "You smash [src]!", null, COMBAT_MESSAGE_RANGE) if(density) playsound(src, 'sound/effects/meteorimpact.ogg', 100, 1) user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ), forced="hulk") @@ -153,7 +153,7 @@ return 0 else return 0 - visible_message("[M.name] has hit [src].", null, null, COMBAT_MESSAGE_RANGE) + M.visible_message("[M.name] hits [src]!", "You hit [src]!", null, COMBAT_MESSAGE_RANGE) return take_damage(M.force*3, mech_damtype, "melee", play_soundeffect, get_dir(src, M)) // multiplied by 3 so we can hit objs hard but not be overpowered against mobs. /obj/singularity_act() diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 28442f0de54..f2c1e53ceac 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -146,7 +146,8 @@ if(!can_be_reached(user)) return user.changeNext_move(CLICK_CD_MELEE) - user.visible_message("[user] knocks on [src].") + user.visible_message("[user] knocks on [src].", \ + "You knock on [src].") add_fingerprint(user) playsound(src, 'sound/effects/Glassknock.ogg', 50, 1) diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm index 1e26f307311..848dfda29c4 100644 --- a/code/game/turfs/simulated/walls.dm +++ b/code/game/turfs/simulated/walls.dm @@ -110,7 +110,8 @@ switch(M.damtype) if(BRUTE) playsound(src, 'sound/weapons/punch4.ogg', 50, 1) - visible_message("[M.name] has hit [src]!", null, null, COMBAT_MESSAGE_RANGE) + M.visible_message("[M.name] hits [src]!", \ + "You hit [src]!", null, COMBAT_MESSAGE_RANGE) if(prob(hardness + M.force) && M.force > 20) dismantle_wall(1) playsound(src, 'sound/effects/meteorimpact.ogg', 100, 1) @@ -144,7 +145,10 @@ else playsound(src, 'sound/effects/bang.ogg', 50, 1) add_dent(WALL_DENT_HIT) - to_chat(user, text("You punch the wall.")) + user.visible_message("[user] smashes \the [src]!", \ + "You smash \the [src]!", \ + "You hear a booming smash!") + return TRUE /turf/closed/wall/attack_hand(mob/user) @@ -230,7 +234,9 @@ if(user.loc == T) I.play_tool_sound(src) dismantle_wall() - visible_message("[user] smashes through [src] with [I]!", "You hear the grinding of metal.") + user.visible_message("[user] smashes through [src] with [I]!", \ + "You smash through [src] with [I]!", \ + "You hear the grinding of metal.") return TRUE return FALSE diff --git a/code/modules/antagonists/devil/true_devil/_true_devil.dm b/code/modules/antagonists/devil/true_devil/_true_devil.dm index bed0ebe23db..3ead677876a 100644 --- a/code/modules/antagonists/devil/true_devil/_true_devil.dm +++ b/code/modules/antagonists/devil/true_devil/_true_devil.dm @@ -165,8 +165,8 @@ if ("harm") var/damage = rand(1, 5) playsound(loc, "punch", 25, 1, -1) - visible_message("[M] has punched [src]!", \ - "[M] has punched [src]!") + visible_message("[M] punches [src]!", \ + "[M] punches you!") adjustBruteLoss(damage) log_combat(M, src, "attacked") updatehealth() @@ -176,17 +176,18 @@ Unconscious(40) playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) log_combat(M, src, "pushed") - visible_message("[M] has pushed down [src]!", \ - "[M] has pushed down [src]!") + visible_message("[M] pushes [src] down!", \ + "[M] pushes you down!") else if (prob(25)) dropItemToGround(get_active_held_item()) playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) - visible_message("[M] has disarmed [src]!", \ - "[M] has disarmed [src]!") + visible_message("[M] disarms [src]!", \ + "[M] disarms you!") else playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1) - visible_message("[M] has attempted to disarm [src]!") + visible_message("[M] fails to disarm [src]!", \ + "[M] fails to disarm you!") /mob/living/carbon/true_devil/handle_breathing() // devils do not need to breathe diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm index 797d368b968..ae875c69682 100644 --- a/code/modules/food_and_drinks/drinks/drinks.dm +++ b/code/modules/food_and_drinks/drinks/drinks.dm @@ -35,17 +35,20 @@ return 0 if(M == user) - user.visible_message("[user] swallows a gulp of [src].", "You swallow a gulp of [src].") + user.visible_message("[user] swallows a gulp of [src].", \ + "You swallow a gulp of [src].") if(HAS_TRAIT(M, TRAIT_VORACIOUS)) M.changeNext_move(CLICK_CD_MELEE * 0.5) //chug! chug! chug! else - M.visible_message("[user] attempts to feed the contents of [src] to [M].", "[user] attempts to feed the contents of [src] to [M].") + M.visible_message("[user] attempts to feed [M] the contents of [src].", \ + "[user] attempts to feed you the contents of [src].") if(!do_mob(user, M)) return if(!reagents || !reagents.total_volume) return // The drink might be empty after the delay, such as by spam-feeding - M.visible_message("[user] feeds the contents of [src] to [M].", "[user] feeds the contents of [src] to [M].") + M.visible_message("[user] fed [M] the contents of [src].", \ + "[user] fed you the contents of [src].") log_combat(user, M, "fed", reagents.log_list()) var/fraction = min(gulp_size/reagents.total_volume, 1) diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm index 41b46223cd8..97829dda188 100644 --- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm +++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm @@ -100,11 +100,11 @@ //Display an attack message. if(target != user) - target.visible_message("[user] has hit [target][head_attack_message] with a bottle of [src.name]!", \ - "[user] has hit [target][head_attack_message] with a bottle of [src.name]!") + target.visible_message("[user] hits [target][head_attack_message] with a bottle of [src.name]!", \ + "[user] hits you [head_attack_message] with a bottle of [src.name]!") else - user.visible_message("[target] hits [target.p_them()]self with a bottle of [src.name][head_attack_message]!", \ - "[target] hits [target.p_them()]self with a bottle of [src.name][head_attack_message]!") + target.visible_message("[target] hits [target.p_them()]self with a bottle of [src.name][head_attack_message]!", \ + "You hit yourself with a bottle of [src.name][head_attack_message]!") //Attack logs log_combat(user, target, "attacked", src) diff --git a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm b/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm index 176bf61a40e..82fc931b099 100644 --- a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm +++ b/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm @@ -110,7 +110,7 @@ /obj/item/reagent_containers/food/drinks/drinkingglass/attack(obj/target, mob/user) if(user.a_intent == INTENT_HARM && ismob(target) && target.reagents && reagents.total_volume) target.visible_message("[user] splashes the contents of [src] onto [target]!", \ - "[user] splashes the contents of [src] onto [target]!") + "[user] splashes the contents of [src] onto you!") log_combat(user, target, "splashed", src) reagents.reaction(target, TOUCH) reagents.clear_reagents() @@ -128,4 +128,3 @@ reagents.reaction(target, TOUCH) reagents.clear_reagents() return - diff --git a/code/modules/food_and_drinks/food/condiment.dm b/code/modules/food_and_drinks/food/condiment.dm index a2f6e8407c3..6b3addeddb3 100644 --- a/code/modules/food_and_drinks/food/condiment.dm +++ b/code/modules/food_and_drinks/food/condiment.dm @@ -46,14 +46,17 @@ return 0 if(M == user) - user.visible_message("[user] swallows some of the contents of \the [src].", "You swallow some of the contents of \the [src].") + user.visible_message("[user] swallows some of the contents of \the [src].", \ + "You swallow some of the contents of \the [src].") else - user.visible_message("[user] attempts to feed [M] from [src].") + M.visible_message("[user] attempts to feed [M] from [src].", \ + "[user] attempts to feed you from [src].") if(!do_mob(user, M)) return if(!reagents || !reagents.total_volume) return // The condiment might be empty after the delay. - user.visible_message("[user] feeds [M] from [src].") + M.visible_message("[user] fed [M] from [src].", \ + "[user] fed you from [src].") log_combat(user, M, "fed", reagents.log_list()) var/fraction = min(10/reagents.total_volume, 1) diff --git a/code/modules/food_and_drinks/food/snacks.dm b/code/modules/food_and_drinks/food/snacks.dm index a1186d7d6fc..2d4c2dd35c2 100644 --- a/code/modules/food_and_drinks/food/snacks.dm +++ b/code/modules/food_and_drinks/food/snacks.dm @@ -119,17 +119,17 @@ All foods are distributed among various categories. Use common sense. if(!isbrain(M)) //If you're feeding it to someone else. if(fullness <= (600 * (1 + M.overeatduration / 1000))) M.visible_message("[user] attempts to feed [M] [src].", \ - "[user] attempts to feed [M] [src].") + "[user] attempts to feed you [src].") else M.visible_message("[user] cannot force any more of [src] down [M]'s throat!", \ - "[user] cannot force any more of [src] down [M]'s throat!") + "[user] cannot force any more of [src] down your throat!") return FALSE if(!do_mob(user, M)) return log_combat(user, M, "fed", reagents.log_list()) - M.visible_message("[user] forces [M] to eat [src].", \ - "[user] forces [M] to eat [src].") + M.visible_message("[user] forces [M] to eat [src]!", \ + "[user] forces you to eat [src]!") else to_chat(user, "[M] doesn't seem to have a mouth!") diff --git a/code/modules/mob/living/carbon/alien/alien_defense.dm b/code/modules/mob/living/carbon/alien/alien_defense.dm index c9ad587e3ed..cc18e4ce979 100644 --- a/code/modules/mob/living/carbon/alien/alien_defense.dm +++ b/code/modules/mob/living/carbon/alien/alien_defense.dm @@ -38,7 +38,7 @@ In all, this is a lot like the monkey code. /N M.do_attack_animation(src, ATTACK_EFFECT_BITE) playsound(loc, 'sound/weapons/bite.ogg', 50, 1, -1) visible_message("[M.name] bites [src]!", \ - "[M.name] bites [src]!", null, COMBAT_MESSAGE_RANGE) + "[M.name] bites you!", null, COMBAT_MESSAGE_RANGE) adjustBruteLoss(1) log_combat(M, src, "attacked") updatehealth() diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm index 5881f40e405..d2b0dc452f1 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm @@ -54,7 +54,7 @@ //strip panel if(href_list["pouches"] && usr.canUseTopic(src, BE_CLOSE, NO_DEXTERY)) visible_message("[usr] tries to empty [src]'s pouches.", \ - "[usr] tries to empty [src]'s pouches.") + "[usr] tries to empty your pouches.") if(do_mob(usr, src, POCKET_STRIP_DELAY * 0.5)) dropItemToGround(r_store) dropItemToGround(l_store) @@ -68,7 +68,8 @@ /mob/living/carbon/alien/humanoid/resist_grab(moving_resist) if(pulledby.grab_state) - visible_message("[src] has broken free of [pulledby]'s grip!") + visible_message("[src] breaks free of [pulledby]'s grip!", \ + "You break free of [pulledby]'s grip!") pulledby.stop_pulling() . = 0 diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid_defense.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid_defense.dm index 95a1cd8b991..bdf202abfe7 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/humanoid_defense.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid_defense.dm @@ -4,15 +4,15 @@ if(user.a_intent == INTENT_HARM) ..(user, 1) adjustBruteLoss(15) - var/hitverb = "punched" + var/hitverb = "punches" if(mob_size < MOB_SIZE_LARGE) step_away(src,user,15) sleep(1) step_away(src,user,15) - hitverb = "slammed" + hitverb = "slams" playsound(loc, "punch", 25, 1, -1) - visible_message("[user] has [hitverb] [src]!", \ - "[user] has [hitverb] [src]!", null, COMBAT_MESSAGE_RANGE) + visible_message("[user] [hitverb] [src]!", \ + "[user] [hitverb] you!", null, COMBAT_MESSAGE_RANGE) return 1 /mob/living/carbon/alien/humanoid/attack_hand(mob/living/carbon/human/M) @@ -22,19 +22,19 @@ var/damage = rand(1, 9) if (prob(90)) playsound(loc, "punch", 25, 1, -1) - visible_message("[M] has punched [src]!", \ - "[M] has punched [src]!", null, COMBAT_MESSAGE_RANGE) + visible_message("[M] punches [src]!", \ + "[M] punches you!", null, COMBAT_MESSAGE_RANGE) if ((stat != DEAD) && (damage > 9 || prob(5)))//Regular humans have a very small chance of knocking an alien down. Unconscious(40) - visible_message("[M] has knocked [src] down!", \ - "[M] has knocked [src] down!") + visible_message("[M] knocks [src] down!", \ + "[M] knocks you down!") var/obj/item/bodypart/affecting = get_bodypart(ran_zone(M.zone_selected)) apply_damage(damage, BRUTE, affecting) log_combat(M, src, "attacked") else playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1) - visible_message("[M] has attempted to punch [src]!", \ - "[M] has attempted to punch [src]!", null, COMBAT_MESSAGE_RANGE) + visible_message("[M]'s punch misses [src]!", \ + "[M]'s punch misses you!", null, COMBAT_MESSAGE_RANGE) if ("disarm") if (!(mobility_flags & MOBILITY_STAND)) @@ -42,18 +42,18 @@ Unconscious(40) playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) log_combat(M, src, "pushed") - visible_message("[M] has pushed down [src]!", \ - "[M] has pushed down [src]!") + visible_message("[M] pushed [src] down!", \ + "[M] pushed you down!") else if (prob(50)) dropItemToGround(get_active_held_item()) playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) - visible_message("[M] has disarmed [src]!", \ - "[M] has disarmed [src]!", null, COMBAT_MESSAGE_RANGE) + visible_message("[M] disarms [src]!", \ + "[M] disarms you!", null, COMBAT_MESSAGE_RANGE) else playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1) - visible_message("[M] has attempted to disarm [src]!",\ - "[M] has attempted to disarm [src]!", null, COMBAT_MESSAGE_RANGE) + visible_message("[M] fails to disarm [src]!",\ + "[M] fails to disarm you!", null, COMBAT_MESSAGE_RANGE) diff --git a/code/modules/mob/living/carbon/alien/larva/larva_defense.dm b/code/modules/mob/living/carbon/alien/larva/larva_defense.dm index 69c1be707d8..b37d4aa0f10 100644 --- a/code/modules/mob/living/carbon/alien/larva/larva_defense.dm +++ b/code/modules/mob/living/carbon/alien/larva/larva_defense.dm @@ -6,8 +6,8 @@ if (prob(90)) playsound(loc, "punch", 25, 1, -1) log_combat(M, src, "attacked") - visible_message("[M] has kicked [src]!", \ - "[M] has kicked [src]!", null, COMBAT_MESSAGE_RANGE) + visible_message("[M] kicks [src]!", \ + "[M] kicks you!", null, COMBAT_MESSAGE_RANGE) if ((stat != DEAD) && (damage > 4.9)) Unconscious(rand(100,200)) @@ -15,8 +15,8 @@ apply_damage(damage, BRUTE, affecting) else playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1) - visible_message("[M] has attempted to kick [src]!", \ - "[M] has attempted to kick [src]!", null, COMBAT_MESSAGE_RANGE) + visible_message("[M]'s kick misses [src]!", \ + "[M]'s kick misses you!", null, COMBAT_MESSAGE_RANGE) /mob/living/carbon/alien/larva/attack_hulk(mob/living/carbon/human/user, does_attack_animation = 0) if(user.a_intent == INTENT_HARM) diff --git a/code/modules/mob/living/carbon/alien/special/facehugger.dm b/code/modules/mob/living/carbon/alien/special/facehugger.dm index aa9c0aeccb5..1242a0b9a63 100644 --- a/code/modules/mob/living/carbon/alien/special/facehugger.dm +++ b/code/modules/mob/living/carbon/alien/special/facehugger.dm @@ -150,7 +150,7 @@ return FALSE // passed initial checks - time to leap! M.visible_message("[src] leaps at [M]'s face!", \ - "[src] leaps at [M]'s face!") + "[src] leaps at your face!") // probiscis-blocker handling if(iscarbon(M)) @@ -160,7 +160,7 @@ var/mob/living/carbon/human/H = M if(H.is_mouth_covered(head_only = 1)) H.visible_message("[src] smashes against [H]'s [H.head]!", \ - "[src] smashes against [H]'s [H.head]!") + "[src] smashes against your [H.head]!") Die() return FALSE @@ -168,7 +168,7 @@ var/obj/item/clothing/W = target.wear_mask if(target.dropItemToGround(W)) target.visible_message("[src] tears [W] off of [target]'s face!", \ - "[src] tears [W] off of [target]'s face!") + "[src] tears [W] off of your face!") target.equip_to_slot_if_possible(src, SLOT_WEAR_MASK, 0, 1, 1) return TRUE // time for a smoke @@ -203,7 +203,7 @@ if(!sterile) target.visible_message("[src] falls limp after violating [target]'s face!", \ - "[src] falls limp after violating [target]'s face!") + "[src] falls limp after violating your face!") Die() icon_state = "[initial(icon_state)]_impregnated" @@ -216,7 +216,7 @@ else target.visible_message("[src] violates [target]'s face!", \ - "[src] violates [target]'s face!") + "[src] violates your face!") /obj/item/clothing/mask/facehugger/proc/GoActive() if(stat == DEAD || stat == CONSCIOUS) diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 66270d97d8f..c3d6a8769e1 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -154,7 +154,8 @@ return if(thrown_thing) - visible_message("[src] has thrown [thrown_thing].") + visible_message("[src] throws [thrown_thing].", \ + "You throw [thrown_thing].") log_message("has thrown [thrown_thing]", LOG_ATTACK) newtonian_move(get_dir(target, src)) thrown_thing.safe_throw_at(target, thrown_thing.throw_range, thrown_thing.throw_speed, src, null, null, null, move_force) @@ -215,7 +216,7 @@ var/obj/item/ITEM = get_item_by_slot(slot) if(ITEM && istype(ITEM, /obj/item/tank) && wear_mask && (wear_mask.clothing_flags & MASKINTERNALS)) visible_message("[usr] tries to [internal ? "close" : "open"] the valve on [src]'s [ITEM.name].", \ - "[usr] tries to [internal ? "close" : "open"] the valve on [src]'s [ITEM.name].") + "You try to [internal ? "close" : "open"] the valve on [src]'s [ITEM.name].") if(do_mob(usr, src, POCKET_STRIP_DELAY)) if(internal) internal = null @@ -226,7 +227,7 @@ update_internals_hud_icon(1) visible_message("[usr] [internal ? "opens" : "closes"] the valve on [src]'s [ITEM.name].", \ - "[usr] [internal ? "opens" : "closes"] the valve on [src]'s [ITEM.name].") + "You [internal ? "open" : "close"] the valve on [src]'s [ITEM.name].") /mob/living/carbon/fall(forced) loc.handle_fall(src, forced)//it's loc so it doesn't call the mob's handle_fall which does nothing diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm index c166969c202..d1cff17e95e 100644 --- a/code/modules/mob/living/carbon/carbon_defense.dm +++ b/code/modules/mob/living/carbon/carbon_defense.dm @@ -57,7 +57,8 @@ if(isturf(I.loc)) I.attack_hand(src) if(get_active_held_item() == I) //if our attack_hand() picks up the item... - visible_message("[src] catches [I]!") //catch that sucker! + visible_message("[src] catches [I]!", \ + "You catch [I] in mid-air!") throw_mode_off() return 1 ..() @@ -159,7 +160,7 @@ M.powerlevel = 0 visible_message("The [M.name] has shocked [src]!", \ - "The [M.name] has shocked [src]!") + "The [M.name] has shocked you!") do_sparks(5, TRUE, src) var/power = M.powerlevel + rand(0,3) diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index 246a558463b..6352ec2ee20 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -216,19 +216,19 @@ if(I && dropItemToGround(I)) playsound(loc, 'sound/weapons/slash.ogg', 25, 1, -1) visible_message("[M] disarmed [src]!", \ - "[M] disarmed [src]!") + "[M] disarmed you!") else if(!M.client || prob(5)) // only natural monkeys get to stun reliably, (they only do it occasionaly) playsound(loc, 'sound/weapons/pierce.ogg', 25, 1, -1) if (src.IsKnockdown() && !src.IsParalyzed()) Paralyze(40) log_combat(M, src, "pinned") - visible_message("[M] has pinned down [src]!", \ - "[M] has pinned down [src]!") + visible_message("[M] has pinned [src] down!", \ + "[M] has pinned you down!") else Knockdown(30) log_combat(M, src, "tackled") - visible_message("[M] has tackled down [src]!", \ - "[M] has tackled down [src]!") + visible_message("[M] has tackled [src] down!", \ + "[M] has tackled you down!") if(M.limb_destroyer) dismembering_strike(M, affecting.body_zone) @@ -244,7 +244,8 @@ /mob/living/carbon/human/attack_alien(mob/living/carbon/alien/humanoid/M) if(check_shields(M, 0, "the M.name")) - visible_message("[M] attempted to touch [src]!") + visible_message("[M] attempts to touch [src]!", \ + "[M] attempts to touch you!") return 0 if(..()) @@ -254,8 +255,8 @@ var/damage = prob(90) ? 20 : 0 if(!damage) playsound(loc, 'sound/weapons/slashmiss.ogg', 50, 1, -1) - visible_message("[M] has lunged at [src]!", \ - "[M] has lunged at [src]!") + visible_message("[M] lunges at [src]!", \ + "[M] lunges at you!") return 0 var/obj/item/bodypart/affecting = get_bodypart(ran_zone(M.zone_selected)) if(!affecting) @@ -263,8 +264,8 @@ var/armor_block = run_armor_check(affecting, "melee","","",10) playsound(loc, 'sound/weapons/slice.ogg', 25, 1, -1) - visible_message("[M] has slashed at [src]!", \ - "[M] has slashed at [src]!") + visible_message("[M] slashes at [src]!", \ + "[M] slashes at you!") log_combat(M, src, "attacked") if(!dismembering_strike(M, M.zone_selected)) //Dismemberment successful return 1 @@ -274,14 +275,14 @@ var/obj/item/I = get_active_held_item() if(I && dropItemToGround(I)) playsound(loc, 'sound/weapons/slash.ogg', 25, 1, -1) - visible_message("[M] disarmed [src]!", \ - "[M] disarmed [src]!") + visible_message("[M] disarms [src]!", \ + "[M] disarms you!") else playsound(loc, 'sound/weapons/pierce.ogg', 25, 1, -1) Paralyze(100) log_combat(M, src, "tackled") - visible_message("[M] has tackled down [src]!", \ - "[M] has tackled down [src]!") + visible_message("[M] tackles [src] down!", \ + "[M] tackles you down!") /mob/living/carbon/human/attack_larva(mob/living/carbon/alien/larva/L) @@ -361,8 +362,8 @@ update_damage_overlays() updatehealth() - visible_message("[M.name] has hit [src]!", \ - "[M.name] has hit [src]!", null, COMBAT_MESSAGE_RANGE) + visible_message("[M.name] hits [src]!", \ + "[M.name] hits you!", null, COMBAT_MESSAGE_RANGE) log_combat(M.occupant, src, "attacked", M, "(INTENT: [uppertext(M.occupant.a_intent)]) (DAMTYPE: [uppertext(M.damtype)])") else diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index c1d5175d17f..f56b53d4bec 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -1175,7 +1175,8 @@ GLOBAL_LIST_EMPTY(roundstart_races) /datum/species/proc/grab(mob/living/carbon/human/user, mob/living/carbon/human/target, datum/martial_art/attacker_style) if(target.check_block()) - target.visible_message("[target] blocks [user]'s grab attempt!") + target.visible_message("[target] blocks [user]'s grab attempt!", \ + "You block [user]'s grab attempt!") return 0 if(attacker_style && attacker_style.grab_act(user,target)) return 1 @@ -1189,7 +1190,8 @@ GLOBAL_LIST_EMPTY(roundstart_races) to_chat(user, "You don't want to harm [target]!") return FALSE if(target.check_block()) - target.visible_message("[target] blocks [user]'s attack!") + target.visible_message("[target] blocks [user]'s attack!", \ + "You block [user]'s attack!") return FALSE if(attacker_style && attacker_style.harm_act(user,target)) return TRUE @@ -1222,8 +1224,8 @@ GLOBAL_LIST_EMPTY(roundstart_races) if(!damage || !affecting || prob(miss_chance))//future-proofing for species that have 0 damage/weird cases where no zone is targeted playsound(target.loc, user.dna.species.miss_sound, 25, 1, -1) - target.visible_message("[user] has attempted to [atk_verb] [target]!",\ - "[user] has attempted to [atk_verb] [target]!", null, COMBAT_MESSAGE_RANGE) + target.visible_message("[user]'s [atk_verb] misses [target]!",\ + "[user]'s [atk_verb] misses you!", null, COMBAT_MESSAGE_RANGE) log_combat(user, target, "attempted to punch") return FALSE @@ -1231,8 +1233,8 @@ GLOBAL_LIST_EMPTY(roundstart_races) playsound(target.loc, user.dna.species.attack_sound, 25, 1, -1) - target.visible_message("[user] has [atk_verb]ed [target]!", \ - "[user] has [atk_verb]ed [target]!", null, COMBAT_MESSAGE_RANGE) + target.visible_message("[user] [atk_verb]ed [target]!", \ + "[user] [atk_verb]ed you!", null, COMBAT_MESSAGE_RANGE) target.lastattacker = user.real_name target.lastattackerckey = user.ckey @@ -1250,8 +1252,8 @@ GLOBAL_LIST_EMPTY(roundstart_races) log_combat(user, target, "punched") if((target.stat != DEAD) && damage >= user.dna.species.punchstunthreshold) - target.visible_message("[user] has knocked [target] down!", \ - "[user] has knocked [target] down!", null, COMBAT_MESSAGE_RANGE) + target.visible_message("[user] knocked [target] down!", \ + "[user] knocked you down!", null, COMBAT_MESSAGE_RANGE) var/knockdown_duration = 40 + (target.getStaminaLoss() + (target.getBruteLoss()*0.5))*0.8 //50 total damage = 40 base stun + 40 stun modifier = 80 stun duration, which is the old base duration target.apply_effect(knockdown_duration, EFFECT_KNOCKDOWN, armor_block) target.forcesay(GLOB.hit_appends) @@ -1264,7 +1266,8 @@ GLOBAL_LIST_EMPTY(roundstart_races) /datum/species/proc/disarm(mob/living/carbon/human/user, mob/living/carbon/human/target, datum/martial_art/attacker_style) if(target.check_block()) - target.visible_message("[target] blocks [user]'s shoving attempt!") + target.visible_message("[target] blocks [user]'s shoving attempt!", \ + "You block [user]'s shoving attempt!") return FALSE if(attacker_style && attacker_style.disarm_act(user,target)) return TRUE @@ -1385,7 +1388,8 @@ GLOBAL_LIST_EMPTY(roundstart_races) attacker_style = M.mind.martial_art if((M != H) && M.a_intent != INTENT_HELP && H.check_shields(M, 0, M.name, attack_type = UNARMED_ATTACK)) log_combat(M, H, "attempted to touch") - H.visible_message("[M] attempted to touch [H]!") + H.visible_message("[M] attempts to touch [H]!", \ + "[M] attempts to touch you!") return 0 SEND_SIGNAL(M, COMSIG_MOB_ATTACK_HAND, M, H, attacker_style) switch(M.a_intent) @@ -1407,7 +1411,8 @@ GLOBAL_LIST_EMPTY(roundstart_races) if(H.check_shields(I, I.force, "the [I.name]", MELEE_ATTACK, I.armour_penetration)) return 0 if(H.check_block()) - H.visible_message("[H] blocks [I]!") + H.visible_message("[H] blocks [I]!", \ + "You block [I]!") return 0 var/hit_area @@ -1417,7 +1422,7 @@ GLOBAL_LIST_EMPTY(roundstart_races) hit_area = affecting.name var/def_zone = affecting.body_zone - var/armor_block = H.run_armor_check(affecting, "melee", "Your armor has protected your [hit_area].", "Your armor has softened a hit to your [hit_area].",I.armour_penetration) + var/armor_block = H.run_armor_check(affecting, "melee", "Your armor has protected your [hit_area]!", "Your armor has softened a hit to your [hit_area]!",I.armour_penetration) armor_block = min(90,armor_block) //cap damage reduction at 90% var/Iforce = I.force //to avoid runtimes on the forcesay checks at the bottom. Some items might delete themselves if you drop them. (stunning yourself, ninja swords) @@ -1454,8 +1459,8 @@ GLOBAL_LIST_EMPTY(roundstart_races) if(prob(I.force)) H.adjustOrganLoss(ORGAN_SLOT_BRAIN, 20) if(H.stat == CONSCIOUS) - H.visible_message("[H] has been knocked senseless!", \ - "[H] has been knocked senseless!") + H.visible_message("[H] is knocked senseless!", \ + "You're knocked senseless!") H.confused = max(H.confused, 20) H.adjust_blurriness(10) if(prob(10)) @@ -1482,8 +1487,8 @@ GLOBAL_LIST_EMPTY(roundstart_races) if(BODY_ZONE_CHEST) if(H.stat == CONSCIOUS && !I.is_sharp() && armor_block < 50) if(prob(I.force)) - H.visible_message("[H] has been knocked down!", \ - "[H] has been knocked down!") + H.visible_message("[H] is knocked down!", \ + "You're knocked down!") H.apply_effect(60, EFFECT_KNOCKDOWN, armor_block) if(bloody) diff --git a/code/modules/mob/living/carbon/monkey/monkey_defense.dm b/code/modules/mob/living/carbon/monkey/monkey_defense.dm index 5906bcebca3..aebe82143dc 100644 --- a/code/modules/mob/living/carbon/monkey/monkey_defense.dm +++ b/code/modules/mob/living/carbon/monkey/monkey_defense.dm @@ -39,8 +39,8 @@ if("harm") M.do_attack_animation(src, ATTACK_EFFECT_PUNCH) if (prob(75)) - visible_message("[M] has punched [name]!", \ - "[M] has punched [name]!", null, COMBAT_MESSAGE_RANGE) + visible_message("[M] punches [name]!", \ + "[M] punches you!", null, COMBAT_MESSAGE_RANGE) playsound(loc, "punch", 25, 1, -1) var/damage = rand(5, 10) @@ -48,8 +48,8 @@ damage = rand(10, 15) if(AmountUnconscious() < 100 && health > 0) Unconscious(rand(200, 300)) - visible_message("[M] has knocked out [name]!", \ - "[M] has knocked out [name]!", null, 5) + visible_message("[M] knocks [name] out!", \ + "[M] knocks you out!", null, 5) var/obj/item/bodypart/affecting = get_bodypart(ran_zone(M.zone_selected)) if(!affecting) affecting = get_bodypart(BODY_ZONE_CHEST) @@ -58,8 +58,8 @@ else playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1) - visible_message("[M] has attempted to punch [name]!", \ - "[M] has attempted to punch [name]!", null, COMBAT_MESSAGE_RANGE) + visible_message("[M]'s punch misses [name]!", \ + "[M]'s punch misses you!", null, COMBAT_MESSAGE_RANGE) if("disarm") if(!IsUnconscious()) M.do_attack_animation(src, ATTACK_EFFECT_DISARM) @@ -67,11 +67,12 @@ Paralyze(40) playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) log_combat(M, src, "pushed") - visible_message("[M] has pushed down [src]!", \ - "[M] has pushed down [src]!", null, COMBAT_MESSAGE_RANGE) + visible_message("[M] pushes [src] down!", \ + "[M] pushes you down!") else if(dropItemToGround(get_active_held_item())) playsound(src, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) - visible_message("[M] has disarmed [src]!", "[M] has disarmed [src]!", null, COMBAT_MESSAGE_RANGE) + visible_message("[M] disarms [src]!", \ + "[M] disarms you!", null, COMBAT_MESSAGE_RANGE) /mob/living/carbon/monkey/attack_alien(mob/living/carbon/alien/humanoid/M) if(..()) //if harm or disarm intent. @@ -83,11 +84,11 @@ damage = rand(20, 40) if(AmountUnconscious() < 300) Unconscious(rand(200, 300)) - visible_message("[M] has wounded [name]!", \ - "[M] has wounded [name]!", null, COMBAT_MESSAGE_RANGE) + visible_message("[M] wounds [name]!", \ + "[M] wounds you!", null, COMBAT_MESSAGE_RANGE) else - visible_message("[M] has slashed [name]!", \ - "[M] has slashed [name]!", null, COMBAT_MESSAGE_RANGE) + visible_message("[M] slashes [name]!", \ + "[M] slashes you!", null, COMBAT_MESSAGE_RANGE) var/obj/item/bodypart/affecting = get_bodypart(ran_zone(M.zone_selected)) log_combat(M, src, "attacked") @@ -99,20 +100,21 @@ else playsound(loc, 'sound/weapons/slashmiss.ogg', 25, 1, -1) - visible_message("[M] has attempted to lunge at [name]!", \ - "[M] has attempted to lunge at [name]!", null, COMBAT_MESSAGE_RANGE) + visible_message("[M]'s lunge misses [name]!", \ + "[M]'s lunge misses you!", null, COMBAT_MESSAGE_RANGE) if (M.a_intent == INTENT_DISARM) var/obj/item/I = null playsound(loc, 'sound/weapons/pierce.ogg', 25, 1, -1) if(prob(95)) Paralyze(20) - visible_message("[M] has tackled down [name]!", \ - "[M] has tackled down [name]!", null, COMBAT_MESSAGE_RANGE) + visible_message("[M] tackles [name] down!", \ + "[M] tackles you down!", null, COMBAT_MESSAGE_RANGE) else I = get_active_held_item() if(dropItemToGround(I)) - visible_message("[M] has disarmed [name]!", "[M] has disarmed [name]!", null, COMBAT_MESSAGE_RANGE) + visible_message("[M] disarms [name]!", \ + "[M] disarms you!", null, COMBAT_MESSAGE_RANGE) else I = null log_combat(M, src, "disarmed", "[I ? " removing \the [I]" : ""]") diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 8095d126872..3ffbd5cd9ab 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -277,7 +277,8 @@ log_combat(src, M, "grabbed", addition="passive grab") if(!supress_message && !(iscarbon(AM) && HAS_TRAIT(src, TRAIT_STRONG_GRABBER))) - visible_message("[src] has grabbed [M] passively!") + M.visible_message("[src] grabs [M] passively!", \ + "[src] grabs you passively!") if(!iscarbon(src)) M.LAssailant = null else @@ -781,7 +782,7 @@ to_chat(src, "You can't remove \the [what.name], it appears to be stuck!") return who.visible_message("[src] tries to remove [who]'s [what.name].", \ - "[src] tries to remove [who]'s [what.name].") + "[src] tries to remove your [what.name].") what.add_fingerprint(src) if(do_mob(src, who, what.strip_delay)) if(what && Adjacent(who)) @@ -820,7 +821,8 @@ to_chat(src, "\The [what.name] doesn't fit in that place!") return - visible_message("[src] tries to put [what] on [who].") + who.visible_message("[src] tries to put [what] on [who].", \ + "[src] tries to put [what] on you.") if(do_mob(src, who, what.equip_delay_other)) if(what && Adjacent(who) && what.mob_can_equip(who, src, final_where, TRUE, TRUE)) if(temporarilyRemoveItemFromInventory(what)) diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index 5eb80d908cc..711396dbabb 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -11,14 +11,14 @@ to_chat(src, "Your armor was penetrated!") else if(armor >= 100) if(absorb_text) - to_chat(src, "[absorb_text]") + to_chat(src, "[absorb_text]") else - to_chat(src, "Your armor absorbs the blow!") + to_chat(src, "Your armor absorbs the blow!") else if(armor > 0) if(soften_text) - to_chat(src, "[soften_text]") + to_chat(src, "[soften_text]") else - to_chat(src, "Your armor softens the blow!") + to_chat(src, "Your armor softens the blow!") return armor @@ -85,8 +85,8 @@ if(!I.throwforce)// Otherwise, if the item's throwforce is 0... playsound(loc, 'sound/weapons/throwtap.ogg', 1, volume, -1)//...play throwtap.ogg. if(!blocked) - visible_message("[src] has been hit by [I].", \ - "[src] has been hit by [I].") + visible_message("[src] is hit by [I]!", \ + "You're hit by [I]!") var/armor = run_armor_check(zone, "melee", "Your armor has protected your [parse_zone(zone)].", "Your armor has softened hit to your [parse_zone(zone)].",I.armour_penetration) apply_damage(I.throwforce, dtype, zone, armor) if(I.thrownby) @@ -116,13 +116,14 @@ else return updatehealth() - visible_message("[M.name] has hit [src]!", \ - "[M.name] has hit [src]!", null, COMBAT_MESSAGE_RANGE) + visible_message("[M.name] hits [src]!", \ + "[M.name] hits you!", null, COMBAT_MESSAGE_RANGE) log_combat(M.occupant, src, "attacked", M, "(INTENT: [uppertext(M.occupant.a_intent)]) (DAMTYPE: [uppertext(M.damtype)])") else step_away(src,M) log_combat(M.occupant, src, "pushed", M) - visible_message("[M] pushes [src] out of the way.", null, null, 5) + visible_message("[M] pushes [src] out of the way.", \ + "[M] pushes you out of the way.", null, 5) /mob/living/fire_act() adjust_fire_stacks(3) @@ -177,19 +178,19 @@ if(GRAB_AGGRESSIVE) var/add_log = "" if(HAS_TRAIT(user, TRAIT_PACIFISM)) - visible_message("[user] has firmly gripped [src]!", - "[user] has firmly gripped you!") + visible_message("[user] firmly grips [src]!", + "[user] firmly grips you!") add_log = " (pacifist)" else - visible_message("[user] has grabbed [src] aggressively!", \ - "[user] has grabbed you aggressively!") + visible_message("[user] grabs [src] aggressively!", \ + "[user] grabs you aggressively!") drop_all_held_items() stop_pulling() log_combat(user, src, "grabbed", addition="aggressive grab[add_log]") if(GRAB_NECK) log_combat(user, src, "grabbed", addition="neck grab") - visible_message("[user] has grabbed [src] by the neck!",\ - "[user] has grabbed you by the neck!") + visible_message("[user] grabs [src] by the neck!",\ + "[user] grabs you by the neck!") update_mobility() //we fall down if(!buckled && !density) Move(user.loc) @@ -221,14 +222,15 @@ if (stat != DEAD) log_combat(M, src, "attacked") M.do_attack_animation(src) - visible_message("The [M.name] glomps [src]!", \ - "The [M.name] glomps [src]!", null, COMBAT_MESSAGE_RANGE) + visible_message("\The [M.name] glomps [src]!", \ + "\The [M.name] glomps you!", null, COMBAT_MESSAGE_RANGE) return TRUE /mob/living/attack_animal(mob/living/simple_animal/M) M.face_atom(src) if(M.melee_damage_upper == 0) - M.visible_message("\The [M] [M.friendly] [src]!") + M.visible_message("\The [M] [M.friendly] [src]!", \ + "\The [M] [M.friendly] you!") return FALSE else if(HAS_TRAIT(M, TRAIT_PACIFISM)) @@ -239,7 +241,7 @@ playsound(loc, M.attack_sound, 50, 1, 1) M.do_attack_animation(src) visible_message("\The [M] [M.attacktext] [src]!", \ - "\The [M] [M.attacktext] [src]!", null, COMBAT_MESSAGE_RANGE) + "\The [M] [M.attacktext] you!", null, COMBAT_MESSAGE_RANGE) log_combat(M, src, "attacked") return TRUE @@ -262,17 +264,18 @@ log_combat(M, src, "attacked") playsound(loc, 'sound/weapons/bite.ogg', 50, 1, -1) visible_message("[M.name] bites [src]!", \ - "[M.name] bites [src]!", null, COMBAT_MESSAGE_RANGE) + "[M.name] bites you!", null, COMBAT_MESSAGE_RANGE) return TRUE else - visible_message("[M.name] has attempted to bite [src]!", \ - "[M.name] has attempted to bite [src]!", null, COMBAT_MESSAGE_RANGE) + visible_message("[M.name]'s bite misses [src]!", \ + "[M.name]'s bite misses you!", null, COMBAT_MESSAGE_RANGE) return FALSE /mob/living/attack_larva(mob/living/carbon/alien/larva/L) switch(L.a_intent) if("help") - visible_message("[L.name] rubs its head against [src].") + visible_message("[L.name] rubs its head against [src].", \ + "[L.name] rubs its head against you.") return FALSE else @@ -284,18 +287,19 @@ if(prob(90)) log_combat(L, src, "attacked") visible_message("[L.name] bites [src]!", \ - "[L.name] bites [src]!", null, COMBAT_MESSAGE_RANGE) + "[L.name] bites you!", null, COMBAT_MESSAGE_RANGE) playsound(loc, 'sound/weapons/bite.ogg', 50, 1, -1) return TRUE else - visible_message("[L.name] has attempted to bite [src]!", \ - "[L.name] has attempted to bite [src]!", null, COMBAT_MESSAGE_RANGE) + visible_message("[L.name]'s bite misses [src]!", \ + "[L.name]'s bite misses you!", null, COMBAT_MESSAGE_RANGE) return FALSE /mob/living/attack_alien(mob/living/carbon/alien/humanoid/M) switch(M.a_intent) if ("help") - visible_message("[M] caresses [src] with its scythe like arm.") + visible_message("[M] caresses [src] with its scythe-like arm.", \ + "[M] caresses you with its scythe-like arm.") return FALSE if ("grab") grabbedby(M) diff --git a/code/modules/mob/living/silicon/silicon_defense.dm b/code/modules/mob/living/silicon/silicon_defense.dm index 24a2ff61190..6e82ca9bc79 100644 --- a/code/modules/mob/living/silicon/silicon_defense.dm +++ b/code/modules/mob/living/silicon/silicon_defense.dm @@ -11,8 +11,8 @@ if (prob(90)) log_combat(M, src, "attacked") playsound(loc, 'sound/weapons/slash.ogg', 25, 1, -1) - visible_message("[M] has slashed at [src]!", \ - "[M] has slashed at [src]!") + visible_message("[M] slashes at [src]!", \ + "[M] slashes at you!") if(prob(8)) flash_act(affect_silicon = 1) log_combat(M, src, "attacked") @@ -20,8 +20,8 @@ updatehealth() else playsound(loc, 'sound/weapons/slashmiss.ogg', 25, 1, -1) - visible_message("[M] took a swipe at [src]!", \ - "[M] took a swipe at [src]!") + visible_message("[M]'s swipe misses [src]!", \ + "[M]'s swipe misses you!") /mob/living/silicon/attack_animal(mob/living/simple_animal/M) . = ..() @@ -31,7 +31,8 @@ for(var/mob/living/N in buckled_mobs) N.Paralyze(20) unbuckle_mob(N) - N.visible_message("[N] is knocked off of [src] by [M]!") + N.visible_message("[N] is knocked off of [src] by [M]!", \ + "You're knocked off of [src] by [M]!") switch(M.melee_damage_type) if(BRUTE) adjustBruteLoss(damage) @@ -58,8 +59,8 @@ ..(user, 1) adjustBruteLoss(rand(10, 15)) playsound(loc, "punch", 25, 1, -1) - visible_message("[user] has punched [src]!", \ - "[user] has punched [src]!") + visible_message("[user] punches [src]!", \ + "[user] punches you!", null, COMBAT_MESSAGE_RANGE) return 1 return 0 @@ -77,8 +78,8 @@ else M.do_attack_animation(src, ATTACK_EFFECT_PUNCH) playsound(src.loc, 'sound/effects/bang.ogg', 10, 1) - visible_message("[M] punches [src], but doesn't leave a dent.", \ - "[M] punches [src], but doesn't leave a dent.", null, COMBAT_MESSAGE_RANGE) + visible_message("[M] punches [src], but doesn't leave a dent!", \ + "[M] punches you, but doesn't leave a dent!", null, COMBAT_MESSAGE_RANGE) /mob/living/silicon/attack_drone(mob/living/simple_animal/drone/M) if(M.a_intent == INTENT_HARM) diff --git a/code/modules/mob/living/simple_animal/animal_defense.dm b/code/modules/mob/living/simple_animal/animal_defense.dm index ef92aabb720..57cf4e16ffe 100644 --- a/code/modules/mob/living/simple_animal/animal_defense.dm +++ b/code/modules/mob/living/simple_animal/animal_defense.dm @@ -5,7 +5,8 @@ switch(M.a_intent) if("help") if (health > 0) - visible_message("[M] [response_help] [src].") + visible_message("[M] [response_help] [src].", \ + "[M] [response_help] you.") playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) if("grab") @@ -17,7 +18,7 @@ return M.do_attack_animation(src, ATTACK_EFFECT_PUNCH) visible_message("[M] [response_harm] [src]!",\ - "[M] [response_harm] [src]!", null, COMBAT_MESSAGE_RANGE) + "[M] [response_harm] you!", null, COMBAT_MESSAGE_RANGE) playsound(loc, attacked_sound, 25, 1, -1) attack_threshold_check(harm_intent_damage) log_combat(M, src, "attacked") @@ -31,8 +32,8 @@ return FALSE ..(user, 1) playsound(loc, "punch", 25, 1, -1) - visible_message("[user] has punched [src]!", \ - "[user] has punched [src]!", null, COMBAT_MESSAGE_RANGE) + visible_message("[user] punches [src]!", \ + "[user] punches you!", null, COMBAT_MESSAGE_RANGE) adjustBruteLoss(15) return TRUE @@ -44,7 +45,8 @@ return 1 if (M.a_intent == INTENT_HELP) if (health > 0) - visible_message("[M.name] [response_help] [src].") + visible_message("[M.name] [response_help] [src].", \ + "[M.name] [response_help] you.") playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) @@ -53,12 +55,12 @@ if(M.a_intent == INTENT_DISARM) playsound(loc, 'sound/weapons/pierce.ogg', 25, 1, -1) visible_message("[M] [response_disarm] [name]!", \ - "[M] [response_disarm] [name]!", null, COMBAT_MESSAGE_RANGE) + "[M] [response_disarm] you!", null, COMBAT_MESSAGE_RANGE) log_combat(M, src, "disarmed") else var/damage = rand(15, 30) - visible_message("[M] has slashed at [src]!", \ - "[M] has slashed at [src]!", null, COMBAT_MESSAGE_RANGE) + visible_message("[M] slashes at [src]!", \ + "[M] slashes at you!", null, COMBAT_MESSAGE_RANGE) playsound(loc, 'sound/weapons/slice.ogg', 25, 1, -1) attack_threshold_check(damage) log_combat(M, src, "attacked") diff --git a/code/modules/mob/living/simple_animal/slime/slime.dm b/code/modules/mob/living/simple_animal/slime/slime.dm index cd5b9301a9f..a6b0aed1cf4 100644 --- a/code/modules/mob/living/simple_animal/slime/slime.dm +++ b/code/modules/mob/living/simple_animal/slime/slime.dm @@ -287,7 +287,8 @@ return if(buckled) Feedstop(silent = TRUE) - visible_message("[M] pulls [src] off!") + visible_message("[M] pulls [src] off!", \ + "You pull [src] off!") return attacked += 5 if(nutrition >= 100) //steal some nutrition. negval handled in life() @@ -321,22 +322,26 @@ M.do_attack_animation(src, ATTACK_EFFECT_DISARM) if(buckled == M) if(prob(60)) - visible_message("[M] attempts to wrestle \the [name] off!") + M.visible_message("[M] attempts to wrestle \the [name] off!", \ + "You attempt to wrestle \the [name] off!") playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1) else - visible_message("[M] manages to wrestle \the [name] off!") + M.visible_message("[M] manages to wrestle \the [name] off!", \ + "You manage to wrestle \the [name] off!") playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) discipline_slime(M) else if(prob(30)) - visible_message("[M] attempts to wrestle \the [name] off of [buckled]!") + buckled.visible_message("[M] attempts to wrestle \the [name] off of [buckled]!", \ + "[M] attempts to wrestle \the [name] off of you!") playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1) else - visible_message("[M] manages to wrestle \the [name] off of [buckled]!") + buckled.visible_message("[M] manages to wrestle \the [name] off of [buckled]!", \ + "[M] manage to wrestle \the [name] off of you!") playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) discipline_slime(M) diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index 4ae107dbffa..b810070d6bd 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -190,7 +190,7 @@ var/volume = vol_by_damage() playsound(loc, hitsound, volume, 1, -1) L.visible_message("[L] is hit by \a [src][organ_hit_text]!", \ - "[L] is hit by \a [src][organ_hit_text]!", null, COMBAT_MESSAGE_RANGE) + "You're hit by \a [src][organ_hit_text]!", null, COMBAT_MESSAGE_RANGE) L.on_hit(src) var/reagent_note diff --git a/code/modules/reagents/reagent_containers/dropper.dm b/code/modules/reagents/reagent_containers/dropper.dm index 1df14015a97..2feadf7d4ab 100644 --- a/code/modules/reagents/reagent_containers/dropper.dm +++ b/code/modules/reagents/reagent_containers/dropper.dm @@ -40,7 +40,7 @@ trans = reagents.trans_to(safe_thing, amount_per_transfer_from_this, transfered_by = user, method = TOUCH) target.visible_message("[user] tries to squirt something into [target]'s eyes, but fails!", \ - "[user] tries to squirt something into [target]'s eyes, but fails!") + "[user] tries to squirt something into your eyes, but fails!") to_chat(user, "You transfer [trans] unit\s of the solution.") update_icon() @@ -50,7 +50,7 @@ return target.visible_message("[user] squirts something into [target]'s eyes!", \ - "[user] squirts something into [target]'s eyes!") + "[user] squirts something into your eyes!") reagents.reaction(target, TOUCH, fraction) var/mob/M = target diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index 1005ccccf6d..2aad2ad7579 100755 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -24,7 +24,7 @@ if(user.a_intent == INTENT_HARM) var/R M.visible_message("[user] splashes the contents of [src] onto [M]!", \ - "[user] splashes the contents of [src] onto [M]!") + "[user] splashes the contents of [src] onto you!") if(reagents) for(var/datum/reagent/A in reagents.reagent_list) R += "[A] ([num2text(A.volume)])," @@ -37,13 +37,14 @@ reagents.clear_reagents() else if(M != user) - M.visible_message("[user] attempts to feed something to [M].", \ - "[user] attempts to feed something to you.") + M.visible_message("[user] attempts to feed [M] something.", \ + "[user] attempts to feed you something.") if(!do_mob(user, M)) return if(!reagents || !reagents.total_volume) return // The drink might be empty after the delay, such as by spam-feeding - M.visible_message("[user] feeds something to [M].", "[user] feeds something to you.") + M.visible_message("[user] feeds [M] something.", \ + "[user] feeds you something.") log_combat(user, M, "fed", reagents.log_list()) else to_chat(user, "You swallow a gulp of [src].") diff --git a/code/modules/reagents/reagent_containers/medigel.dm b/code/modules/reagents/reagent_containers/medigel.dm index 4a5f45f6006..86e0ad74ce0 100644 --- a/code/modules/reagents/reagent_containers/medigel.dm +++ b/code/modules/reagents/reagent_containers/medigel.dm @@ -49,13 +49,13 @@ else log_combat(user, M, "attempted to apply", src, reagents.log_list()) M.visible_message("[user] attempts to [apply_method] [src] on [M].", \ - "[user] attempts to [apply_method] [src] on [M].") + "[user] attempts to [apply_method] [src] on you.") if(!do_mob(user, M)) return if(!reagents || !reagents.total_volume) return M.visible_message("[user] [apply_method]s [M] down with [src].", \ - "[user] [apply_method]s [M] down with [src].") + "[user] [apply_method]s you down with [src].") if(!reagents || !reagents.total_volume) return diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm index 47be55cf3ee..09f21657ad0 100644 --- a/code/modules/reagents/reagent_containers/pill.dm +++ b/code/modules/reagents/reagent_containers/pill.dm @@ -40,11 +40,11 @@ else M.visible_message("[user] attempts to force [M] to [apply_method] [src].", \ - "[user] attempts to force [M] to [apply_method] [src].") + "[user] attempts to force you to [apply_method] [src].") if(!do_mob(user, M)) return FALSE M.visible_message("[user] forces [M] to [apply_method] [src].", \ - "[user] forces [M] to [apply_method] [src].") + "[user] forces you to [apply_method] [src].") var/makes_me_think = pick(strings(REDPILL_FILE, "redpill_questions")) if(icon_state == "pill4" && prob(5)) //you take the red pill - you stay in Wonderland, and I show you how deep the rabbit hole goes @@ -261,6 +261,3 @@ icon_state = "pill9" list_reagents = list(/datum/reagent/iron = 30) rename_with_volume = TRUE - - - diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index c6eb3373e17..fc571957a0e 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -79,7 +79,7 @@ var/drawn_amount = reagents.maximum_volume - reagents.total_volume if(target != user) target.visible_message("[user] is trying to take a blood sample from [target]!", \ - "[user] is trying to take a blood sample from [target]!") + "[user] is trying to take a blood sample from you!") busy = TRUE if(!do_mob(user, target, extra_checks=CALLBACK(L, /mob/living/proc/can_inject, user, TRUE))) busy = FALSE @@ -130,7 +130,7 @@ return if(L != user) L.visible_message("[user] is trying to inject [L]!", \ - "[user] is trying to inject [L]!") + "[user] is trying to inject you!") if(!do_mob(user, L, extra_checks=CALLBACK(L, /mob/living/proc/can_inject, user, TRUE))) return if(!reagents.total_volume) @@ -138,7 +138,7 @@ if(L.reagents.total_volume >= L.reagents.maximum_volume) return L.visible_message("[user] injects [L] with the syringe!", \ - "[user] injects [L] with the syringe!") + "[user] injects you with the syringe!") if(L != user) log_combat(user, L, "injected", src, addition="which had [contained]") diff --git a/code/modules/recycling/disposal/bin.dm b/code/modules/recycling/disposal/bin.dm index 34514de901f..01f81db8d6a 100644 --- a/code/modules/recycling/disposal/bin.dm +++ b/code/modules/recycling/disposal/bin.dm @@ -137,7 +137,7 @@ if(user == target) user.visible_message("[user] climbs into [src].", "You climb into [src].") else - target.visible_message("[user] has placed [target] in [src].", "[user] has placed [target] in [src].") + target.visible_message("[user] has placed [target] in [src].", "[user] has placed you in [src].") log_combat(user, target, "stuffed", addition="into [src]") target.LAssailant = user update_icon() diff --git a/code/modules/surgery/organs/heart.dm b/code/modules/surgery/organs/heart.dm index ddd3a3d9c58..c322516b2cd 100644 --- a/code/modules/surgery/organs/heart.dm +++ b/code/modules/surgery/organs/heart.dm @@ -86,7 +86,8 @@ if(organ_flags & ORGAN_FAILING) //heart broke, stopped beating, death imminent if(owner.stat == CONSCIOUS) - owner.visible_message("[owner] clutches at [owner.p_their()] chest as if [owner.p_their()] heart is stopping!") + owner.visible_message("[owner] clutches at [owner.p_their()] chest as if [owner.p_their()] heart is stopping!", \ + "You feel a terrible pain in your chest, as if your heart has stopped!") owner.set_heartattack(TRUE) failed = TRUE diff --git a/code/modules/surgery/organs/lungs.dm b/code/modules/surgery/organs/lungs.dm index 816e55e5de2..9bee3b627f3 100644 --- a/code/modules/surgery/organs/lungs.dm +++ b/code/modules/surgery/organs/lungs.dm @@ -392,7 +392,8 @@ ..() if((!failed) && ((organ_flags & ORGAN_FAILING))) if(owner.stat == CONSCIOUS) - owner.visible_message("[owner] grabs [owner.p_their()] throat, struggling for breath!") + owner.visible_message("[owner] grabs [owner.p_their()] throat, struggling for breath!", \ + "You suddenly feel like you can't breathe!") failed = TRUE else if(!(organ_flags & ORGAN_FAILING)) failed = FALSE