diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm
index af7671a10d6..7a6e820a2f6 100644
--- a/code/_onclick/item_attack.dm
+++ b/code/_onclick/item_attack.dm
@@ -56,7 +56,7 @@
/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] has hit [src] with [I]!", null, null, COMBAT_MESSAGE_RANGE)
//only witnesses close by and the victim see a hit message.
take_damage(I.force, I.damtype, "melee", 1)
@@ -105,6 +105,6 @@
if(user in viewers(src, null))
attack_message = "[user] has [message_verb] [src][message_hit_area] with [I]!"
visible_message("[attack_message]", \
- "[attack_message]", null, COMBAT_MESSAGE_RANGE,user)
+ "[attack_message]", null, COMBAT_MESSAGE_RANGE)
return 1
diff --git a/code/datums/martial.dm b/code/datums/martial.dm
index eb68ce0e064..dca344b774e 100644
--- a/code/datums/martial.dm
+++ b/code/datums/martial.dm
@@ -47,7 +47,7 @@
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, A)
+ "[A] has attempted to [atk_verb] [D]!", null, COMBAT_MESSAGE_RANGE)
add_logs(A, D, "attempted to [atk_verb]")
return 0
@@ -56,7 +56,7 @@
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, A)
+ "[A] has [atk_verb]ed [D]!", null, COMBAT_MESSAGE_RANGE)
D.apply_damage(damage, BRUTE, affecting, armor_block)
@@ -108,7 +108,7 @@
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, A)
+ "[A] has attempted to [atk_verb] [D]!", null, COMBAT_MESSAGE_RANGE)
add_logs(A, D, "attempted to hit", atk_verb)
return 0
@@ -119,7 +119,7 @@
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, A)
+ "[A] has [atk_verb]ed [D]!", null, COMBAT_MESSAGE_RANGE)
D.apply_damage(damage, STAMINA, affecting, armor_block)
add_logs(A, D, "punched (boxing) ")
diff --git a/code/game/gamemodes/devil/true_devil/_true_devil.dm b/code/game/gamemodes/devil/true_devil/_true_devil.dm
index 2e323976414..e8f6c0ff468 100644
--- a/code/game/gamemodes/devil/true_devil/_true_devil.dm
+++ b/code/game/gamemodes/devil/true_devil/_true_devil.dm
@@ -130,7 +130,7 @@
attack_message = "[user] has [message_verb] [src] with [I]!"
if(message_verb)
visible_message("[attack_message]",
- "[attack_message]", null, COMBAT_MESSAGE_RANGE, user)
+ "[attack_message]", null, COMBAT_MESSAGE_RANGE)
return TRUE
/mob/living/carbon/true_devil/Process_Spacemove(movement_dir = 0)
diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm
index 6ff7bd4743a..aaee37ecabf 100644
--- a/code/game/machinery/machinery.dm
+++ b/code/game/machinery/machinery.dm
@@ -247,7 +247,7 @@ Class Procs:
else
user.changeNext_move(CLICK_CD_MELEE)
user.do_attack_animation(src, ATTACK_EFFECT_PUNCH)
- user.visible_message("[user.name] smashes against \the [src.name] with its paws.", null, null, COMBAT_MESSAGE_RANGE, user)
+ user.visible_message("[user.name] smashes against \the [src.name] with its paws.", null, null, COMBAT_MESSAGE_RANGE)
take_damage(4, BRUTE, "melee", 1)
diff --git a/code/game/mecha/mecha_defense.dm b/code/game/mecha/mecha_defense.dm
index d7710b28d24..4a8ee45ce79 100644
--- a/code/game/mecha/mecha_defense.dm
+++ b/code/game/mecha/mecha_defense.dm
@@ -56,7 +56,7 @@
user.changeNext_move(CLICK_CD_MELEE) // Ugh. Ideally we shouldn't be setting cooldowns outside of click code.
user.do_attack_animation(src, ATTACK_EFFECT_PUNCH)
playsound(loc, 'sound/weapons/tap.ogg', 40, 1, -1)
- user.visible_message("[user] hits [name]. Nothing happens", null, null, COMBAT_MESSAGE_RANGE, user)
+ user.visible_message("[user] hits [name]. Nothing happens", null, null, COMBAT_MESSAGE_RANGE)
log_message("Attack by hand/paw. Attacker - [user].",1)
log_append_to_last("Armor saved.")
@@ -94,7 +94,7 @@
log_message("Attack by hulk. Attacker - [user].",1)
user.changeNext_move(CLICK_CD_MELEE)
add_logs(user, src, "punched", "hulk powers")
- user.visible_message("[user] hits [name]. The metal creaks and bends.", null, null, COMBAT_MESSAGE_RANGE, user)
+ user.visible_message("[user] hits [name]. The metal creaks and bends.", null, null, COMBAT_MESSAGE_RANGE)
user.do_attack_animation(src, ATTACK_EFFECT_SMASH)
take_damage(15, BRUTE, "melee", 0, get_dir(src, user))
return 1
diff --git a/code/game/objects/obj_defense.dm b/code/game/objects/obj_defense.dm
index 1e425b7fac8..726fd15e245 100644
--- a/code/game/objects/obj_defense.dm
+++ b/code/game/objects/obj_defense.dm
@@ -70,7 +70,7 @@
/obj/attack_hulk(mob/living/carbon/human/user, does_attack_animation = 0)
if(user.a_intent == "harm")
..(user, 1)
- visible_message("[user] smashes [src]!", null, null, COMBAT_MESSAGE_RANGE, user)
+ visible_message("[user] smashes [src]!", null, null, COMBAT_MESSAGE_RANGE)
if(density)
playsound(src, 'sound/effects/meteorimpact.ogg', 100, 1)
user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
@@ -134,7 +134,7 @@
return 0
else
return 0
- visible_message("[M.name] has hit [src].", null, null, COMBAT_MESSAGE_RANGE, M.occupant)
+ visible_message("[M.name] has hit [src].", null, 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/displaycase.dm b/code/game/objects/structures/displaycase.dm
index f65a36722f5..17474760f0e 100644
--- a/code/game/objects/structures/displaycase.dm
+++ b/code/game/objects/structures/displaycase.dm
@@ -185,7 +185,7 @@
//prevents remote "kicks" with TK
if (!Adjacent(user))
return
- user.visible_message("[user] kicks the display case.", null, null, COMBAT_MESSAGE_RANGE, user)
+ user.visible_message("[user] kicks the display case.", null, null, COMBAT_MESSAGE_RANGE)
user.do_attack_animation(src, ATTACK_EFFECT_KICK)
take_damage(2)
diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm
index 9258d7140a0..cf3f5b9ff44 100644
--- a/code/game/objects/structures/grille.dm
+++ b/code/game/objects/structures/grille.dm
@@ -43,14 +43,14 @@
/obj/structure/grille/attack_hand(mob/living/user)
user.changeNext_move(CLICK_CD_MELEE)
user.do_attack_animation(src, ATTACK_EFFECT_KICK)
- user.visible_message("[user] hits [src].", null, null, COMBAT_MESSAGE_RANGE, user)
+ user.visible_message("[user] hits [src].", null, null, COMBAT_MESSAGE_RANGE)
if(!shock(user, 70))
take_damage(rand(5,10), BRUTE, "melee", 1)
/obj/structure/grille/attack_alien(mob/living/user)
user.do_attack_animation(src)
user.changeNext_move(CLICK_CD_MELEE)
- user.visible_message("[user] mangles [src].", null, null, COMBAT_MESSAGE_RANGE, user)
+ user.visible_message("[user] mangles [src].", null, null, COMBAT_MESSAGE_RANGE)
if(!shock(user, 70))
take_damage(20, BRUTE, "melee", 1)
diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm
index 66423e31913..2c2d89e7d7a 100644
--- a/code/game/objects/structures/tables_racks.dm
+++ b/code/game/objects/structures/tables_racks.dm
@@ -439,7 +439,7 @@
/obj/structure/rack/attack_hand(mob/living/user)
user.changeNext_move(CLICK_CD_MELEE)
user.do_attack_animation(src, ATTACK_EFFECT_KICK)
- user.visible_message("[user] kicks [src].", null, null, COMBAT_MESSAGE_RANGE, user)
+ user.visible_message("[user] kicks [src].", null, null, COMBAT_MESSAGE_RANGE)
take_damage(rand(4,8), BRUTE, "melee", 1)
diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm
index 4337bf630ce..3c786686e92 100644
--- a/code/game/turfs/simulated/walls.dm
+++ b/code/game/turfs/simulated/walls.dm
@@ -87,7 +87,7 @@
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.occupant)
+ visible_message("[M.name] has hit [src]!", null, null, COMBAT_MESSAGE_RANGE)
if(prob(hardness + M.force) && M.force > 20)
dismantle_wall(1)
playsound(src, 'sound/effects/meteorimpact.ogg', 100, 1)
diff --git a/code/modules/mob/living/carbon/alien/alien_defense.dm b/code/modules/mob/living/carbon/alien/alien_defense.dm
index e7ca991e69b..cb73bddef64 100644
--- a/code/modules/mob/living/carbon/alien/alien_defense.dm
+++ b/code/modules/mob/living/carbon/alien/alien_defense.dm
@@ -36,7 +36,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)
+ "[M.name] bites [src]!", null, COMBAT_MESSAGE_RANGE)
adjustBruteLoss(1)
add_logs(M, src, "attacked")
updatehealth()
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 0c35197d59f..bd8a1322460 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/humanoid_defense.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid_defense.dm
@@ -17,7 +17,7 @@
hitverb = "slammed"
playsound(loc, "punch", 25, 1, -1)
visible_message("[user] has [hitverb] [src]!", \
- "[user] has [hitverb] [src]!", null, COMBAT_MESSAGE_RANGE, user)
+ "[user] has [hitverb] [src]!", null, COMBAT_MESSAGE_RANGE)
return 1
/mob/living/carbon/alien/humanoid/attack_hand(mob/living/carbon/human/M)
@@ -28,7 +28,7 @@
if (prob(90))
playsound(loc, "punch", 25, 1, -1)
visible_message("[M] has punched [src]!", \
- "[M] has punched [src]!", null, COMBAT_MESSAGE_RANGE, M)
+ "[M] has punched [src]!", null, COMBAT_MESSAGE_RANGE)
if ((stat != DEAD) && (damage > 9 || prob(5)))//Regular humans have a very small chance of weakening an alien.
Paralyse(2)
visible_message("[M] has weakened [src]!", \
@@ -39,7 +39,7 @@
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, M)
+ "[M] has attempted to punch [src]!", null, COMBAT_MESSAGE_RANGE)
if ("disarm")
if (!lying)
@@ -54,11 +54,11 @@
drop_item()
playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
visible_message("[M] has disarmed [src]!", \
- "[M] has disarmed [src]!", null, COMBAT_MESSAGE_RANGE, M)
+ "[M] has disarmed [src]!", 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, M)
+ "[M] has attempted to disarm [src]!", 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 1a407d945f2..a5b406612ea 100644
--- a/code/modules/mob/living/carbon/alien/larva/larva_defense.dm
+++ b/code/modules/mob/living/carbon/alien/larva/larva_defense.dm
@@ -7,7 +7,7 @@
playsound(loc, "punch", 25, 1, -1)
add_logs(M, src, "attacked")
visible_message("[M] has kicked [src]!", \
- "[M] has kicked [src]!", null, COMBAT_MESSAGE_RANGE, M)
+ "[M] has kicked [src]!", null, COMBAT_MESSAGE_RANGE)
if ((stat != DEAD) && (damage > 4.9))
Paralyse(rand(5,10))
@@ -16,7 +16,7 @@
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, M)
+ "[M] has attempted to kick [src]!", null, COMBAT_MESSAGE_RANGE)
/mob/living/carbon/alien/larva/attack_hulk(mob/living/carbon/human/user, does_attack_animation = 0)
if(user.a_intent == "harm")
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index 1d7f6c92da6..f272b85a967 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -332,7 +332,7 @@
updatehealth()
visible_message("[M.name] has hit [src]!", \
- "[M.name] has hit [src]!", null, COMBAT_MESSAGE_RANGE, M.occupant)
+ "[M.name] has hit [src]!", null, COMBAT_MESSAGE_RANGE)
add_logs(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 5ec7c528b06..407ca039e84 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -971,7 +971,7 @@
if(!damage || !affecting)
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, user)
+ "[user] has attempted to [atk_verb] [target]!", null, COMBAT_MESSAGE_RANGE)
return 0
@@ -980,7 +980,7 @@
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, user)
+ "[user] has [atk_verb]ed [target]!", null, COMBAT_MESSAGE_RANGE)
if(user.limb_destroyer)
target.dismembering_strike(user, affecting.body_zone)
@@ -1008,7 +1008,7 @@
if(randn <= 25)
playsound(target, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
target.visible_message("[user] has pushed [target]!",
- "[user] has pushed [target]!", null, COMBAT_MESSAGE_RANGE, user)
+ "[user] has pushed [target]!", null, COMBAT_MESSAGE_RANGE)
target.apply_effect(2, WEAKEN, target.run_armor_check(affecting, "melee", "Your armor prevents your fall!", "Your armor softens your fall!"))
target.forcesay(hit_appends)
return
@@ -1026,14 +1026,14 @@
if(!talked) //BubbleWrap
if(target.drop_item())
target.visible_message("[user] has disarmed [target]!", \
- "[user] has disarmed [target]!", null, COMBAT_MESSAGE_RANGE, user)
+ "[user] has disarmed [target]!", null, COMBAT_MESSAGE_RANGE)
playsound(target, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
return
playsound(target, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
target.visible_message("[user] attempted to disarm [target]!", \
- "[user] attemped to disarm [target]!", null, COMBAT_MESSAGE_RANGE, user)
+ "[user] attemped to disarm [target]!", null, COMBAT_MESSAGE_RANGE)
/datum/species/proc/spec_attack_hand(mob/living/carbon/human/M, mob/living/carbon/human/H, datum/martial_art/attacker_style = M.martial_art)
diff --git a/code/modules/mob/living/carbon/monkey/monkey_defense.dm b/code/modules/mob/living/carbon/monkey/monkey_defense.dm
index 0af56cda546..b9400a3d30f 100644
--- a/code/modules/mob/living/carbon/monkey/monkey_defense.dm
+++ b/code/modules/mob/living/carbon/monkey/monkey_defense.dm
@@ -52,7 +52,7 @@
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, M)
+ "[M] has punched [name]!", null, COMBAT_MESSAGE_RANGE)
playsound(loc, "punch", 25, 1, -1)
var/damage = rand(5, 10)
@@ -72,7 +72,7 @@
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, M)
+ "[M] has attempted to punch [name]!", null, COMBAT_MESSAGE_RANGE)
if("disarm")
if (!paralysis)
M.do_attack_animation(src, ATTACK_EFFECT_DISARM)
@@ -81,12 +81,12 @@
playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
add_logs(M, src, "pushed")
visible_message("[M] has pushed down [src]!", \
- "[M] has pushed down [src]!", null, COMBAT_MESSAGE_RANGE, M)
+ "[M] has pushed down [src]!", null, COMBAT_MESSAGE_RANGE)
else
if(drop_item())
playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
visible_message("[M] has disarmed [src]!", \
- "[M] has disarmed [src]!", null, COMBAT_MESSAGE_RANGE, M)
+ "[M] has disarmed [src]!", null, COMBAT_MESSAGE_RANGE)
/mob/living/carbon/monkey/attack_alien(mob/living/carbon/alien/humanoid/M)
if(..()) //if harm or disarm intent.
@@ -99,10 +99,10 @@
if (paralysis < 15)
Paralyse(rand(10, 15))
visible_message("[M] has wounded [name]!", \
- "[M] has wounded [name]!", null, COMBAT_MESSAGE_RANGE, M)
+ "[M] has wounded [name]!", null, COMBAT_MESSAGE_RANGE)
else
visible_message("[M] has slashed [name]!", \
- "[M] has slashed [name]!", null, COMBAT_MESSAGE_RANGE, M)
+ "[M] has slashed [name]!", null, COMBAT_MESSAGE_RANGE)
var/obj/item/bodypart/affecting = get_bodypart(ran_zone(M.zone_selected))
add_logs(M, src, "attacked")
@@ -116,18 +116,17 @@
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, M)
-
+ "[M] has attempted to lunge at [name]!", null, COMBAT_MESSAGE_RANGE)
if (M.a_intent == "disarm")
playsound(loc, 'sound/weapons/pierce.ogg', 25, 1, -1)
if(prob(95))
Weaken(10)
visible_message("[M] has tackled down [name]!", \
- "[M] has tackled down [name]!", null, COMBAT_MESSAGE_RANGE, M)
+ "[M] has tackled down [name]!", null, COMBAT_MESSAGE_RANGE)
else
if(drop_item())
visible_message("[M] has disarmed [name]!", \
- "[M] has disarmed [name]!", null, COMBAT_MESSAGE_RANGE, M)
+ "[M] has disarmed [name]!", null, COMBAT_MESSAGE_RANGE)
add_logs(M, src, "disarmed")
updatehealth()
diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index 0b076c59813..d824b58739a 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -110,7 +110,7 @@
return
updatehealth()
visible_message("[M.name] has hit [src]!", \
- "[M.name] has hit [src]!", null, COMBAT_MESSAGE_RANGE, M.occupant)
+ "[M.name] has hit [src]!", null, COMBAT_MESSAGE_RANGE)
add_logs(M.occupant, src, "attacked", M, "(INTENT: [uppertext(M.occupant.a_intent)]) (DAMTYPE: [uppertext(M.damtype)])")
else
step_away(src,M)
@@ -185,7 +185,7 @@
add_logs(M, src, "attacked")
M.do_attack_animation(src)
visible_message("The [M.name] glomps [src]!", \
- "The [M.name] glomps [src]!", null, COMBAT_MESSAGE_RANGE, M)
+ "The [M.name] glomps [src]!", null, COMBAT_MESSAGE_RANGE)
return 1
/mob/living/attack_animal(mob/living/simple_animal/M)
@@ -198,7 +198,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, M)
+ "\The [M] [M.attacktext] [src]!", null, COMBAT_MESSAGE_RANGE)
add_logs(M, src, "attacked")
return 1
@@ -217,11 +217,11 @@
add_logs(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)
+ "[M.name] bites [src]!", null, COMBAT_MESSAGE_RANGE)
return 1
else
visible_message("[M.name] has attempted to bite [src]!", \
- "[M.name] has attempted to bite [src]!", null, COMBAT_MESSAGE_RANGE, M)
+ "[M.name] has attempted to bite [src]!", null, COMBAT_MESSAGE_RANGE)
return 0
/mob/living/attack_larva(mob/living/carbon/alien/larva/L)
@@ -235,12 +235,12 @@
if(prob(90))
add_logs(L, src, "attacked")
visible_message("[L.name] bites [src]!", \
- "[L.name] bites [src]!", null, COMBAT_MESSAGE_RANGE, L)
+ "[L.name] bites [src]!", null, COMBAT_MESSAGE_RANGE)
playsound(loc, 'sound/weapons/bite.ogg', 50, 1, -1)
return 1
else
visible_message("[L.name] has attempted to bite [src]!", \
- "[L.name] has attempted to bite [src]!", null, COMBAT_MESSAGE_RANGE, L)
+ "[L.name] has attempted to bite [src]!", null, COMBAT_MESSAGE_RANGE)
return 0
/mob/living/attack_alien(mob/living/carbon/alien/humanoid/M)
diff --git a/code/modules/mob/living/silicon/robot/robot_defense.dm b/code/modules/mob/living/silicon/robot/robot_defense.dm
index 7778e4a53c0..7e317bf00c3 100644
--- a/code/modules/mob/living/silicon/robot/robot_defense.dm
+++ b/code/modules/mob/living/silicon/robot/robot_defense.dm
@@ -12,14 +12,14 @@
if(get_active_held_item())
uneq_active()
visible_message("[M] disarmed [src]!", \
- "[M] has disabled [src]'s active module!", null, COMBAT_MESSAGE_RANGE, M)
+ "[M] has disabled [src]'s active module!", null, COMBAT_MESSAGE_RANGE)
add_logs(M, src, "disarmed")
else
Stun(2)
step(src,get_dir(M,src))
add_logs(M, src, "pushed")
visible_message("[M] has forced back [src]!", \
- "[M] has forced back [src]!", null, COMBAT_MESSAGE_RANGE, M)
+ "[M] has forced back [src]!", null, COMBAT_MESSAGE_RANGE)
playsound(loc, 'sound/weapons/pierce.ogg', 50, 1, -1)
else
..()
diff --git a/code/modules/mob/living/silicon/silicon_defense.dm b/code/modules/mob/living/silicon/silicon_defense.dm
index f40f4bfeed6..c6f5452632b 100644
--- a/code/modules/mob/living/silicon/silicon_defense.dm
+++ b/code/modules/mob/living/silicon/silicon_defense.dm
@@ -69,7 +69,7 @@
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, M)
+ "[M] punches [src], but doesn't leave a dent.", null, COMBAT_MESSAGE_RANGE)
return 0
/mob/living/silicon/electrocute_act(shock_damage, obj/source, siemens_coeff = 1, safety = 0, tesla_shock = 0, illusion = 0)
diff --git a/code/modules/mob/living/simple_animal/animal_defense.dm b/code/modules/mob/living/simple_animal/animal_defense.dm
index 4830fd63a2e..c58226a79df 100644
--- a/code/modules/mob/living/simple_animal/animal_defense.dm
+++ b/code/modules/mob/living/simple_animal/animal_defense.dm
@@ -15,7 +15,7 @@
if("harm", "disarm")
M.do_attack_animation(src, ATTACK_EFFECT_PUNCH)
visible_message("[M] [response_harm] [src]!",\
- "[M] [response_harm] [src]!", null, COMBAT_MESSAGE_RANGE, M)
+ "[M] [response_harm] [src]!", null, COMBAT_MESSAGE_RANGE)
playsound(loc, attacked_sound, 25, 1, -1)
attack_threshold_check(harm_intent_damage)
add_logs(M, src, "attacked")
@@ -27,7 +27,7 @@
..(user, 1)
playsound(loc, "punch", 25, 1, -1)
visible_message("[user] has punched [src]!", \
- "[user] has punched [src]!", null, COMBAT_MESSAGE_RANGE, user)
+ "[user] has punched [src]!", null, COMBAT_MESSAGE_RANGE)
adjustBruteLoss(15)
return 1
@@ -48,12 +48,12 @@
if(M.a_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)
+ "[M] [response_disarm] [name]!", null, COMBAT_MESSAGE_RANGE)
add_logs(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, M)
+ "[M] has slashed at [src]!", null, COMBAT_MESSAGE_RANGE)
playsound(loc, 'sound/weapons/slice.ogg', 25, 1, -1)
attack_threshold_check(damage)
add_logs(M, src, "attacked")
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index 87a2f251b82..75ccabb1c41 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -115,9 +115,9 @@
playsound(user, fire_sound, 50, 1)
if(message)
if(pointblank)
- user.visible_message("[user] fires [src] point blank at [pbtarget]!", null, null, COMBAT_MESSAGE_RANGE, user)
+ user.visible_message("[user] fires [src] point blank at [pbtarget]!", null, null, COMBAT_MESSAGE_RANGE)
else
- user.visible_message("[user] fires [src]!", null, null, COMBAT_MESSAGE_RANGE, user)
+ user.visible_message("[user] fires [src]!", null, null, COMBAT_MESSAGE_RANGE)
if(weapon_weight >= WEAPON_MEDIUM)
if(user.get_inactive_held_item())