diff --git a/code/modules/mob/living/carbon/human/species/species_attack.dm b/code/modules/mob/living/carbon/human/species/species_attack.dm
index fe5eac0f07..bb922b905b 100644
--- a/code/modules/mob/living/carbon/human/species/species_attack.dm
+++ b/code/modules/mob/living/carbon/human/species/species_attack.dm
@@ -35,23 +35,29 @@
if("head", "mouth", "eyes")
// ----- HEAD ----- //
switch(attack_damage)
- if(1 to 2) user.visible_message("[user] scratched [target] across \his cheek!")
- if(3 to 4) user.visible_message("[user] [pick(attack_verb)] [target]'s [pick("head", "neck")] [pick("", "", "", "with spread [pick(attack_noun)]")]!")
- if(5) user.visible_message("[pick("[user] [pick(attack_verb)] [target] across \his face!", "[user] rakes \his [pick(attack_noun)] across [target]'s face!")]")
- if("chest", "l_arm", "r_arm", "l_hand", "r_hand", "groin", "l_leg", "r_leg", "l_foot", "r_foot")
+ if(1 to 2)
+ user.visible_message("[user] scratched [target] across \his cheek!")
+ if(3 to 4)
+ user.visible_message("[user] [pick(attack_verb)] [target]'s [pick("head", "neck")]!") //'with spread claws' sounds a little bit odd, just enough that conciseness is better here I think
+ if(5)
+ user.visible_message(pick(
+ "[user] rakes \his [pick(attack_noun)] across [target]'s face!",
+ "[user] tears \his [pick(attack_noun)] into [target]'s face!",
+ ))
+ else
// ----- BODY ----- //
switch(attack_damage)
if(1 to 2) user.visible_message("[user] scratched [target]'s [affecting.display_name]!")
if(3 to 4) user.visible_message("[user] [pick(attack_verb)] [pick("", "", "the side of")] [target]'s [affecting.display_name]!")
- if(5) user.visible_message("[user] tears \his [pick(attack_noun)] deep into [target]'s [affecting.display_name]!")
+ if(5) user.visible_message("[user] tears \his [pick(attack_noun)] [pick("deep into", "into", "across")] [target]'s [affecting.display_name]!")
/datum/unarmed_attack/claws/strong
- attack_verb = list("slash")
+ attack_verb = list("slashed")
damage = 10
shredding = 1
/datum/unarmed_attack/bite/strong
- attack_verb = list("maul")
+ attack_verb = list("mauled")
damage = 15
shredding = 1
diff --git a/code/modules/mob/living/carbon/human/unarmed_attack.dm b/code/modules/mob/living/carbon/human/unarmed_attack.dm
index ba738e81ef..c98e3788c0 100644
--- a/code/modules/mob/living/carbon/human/unarmed_attack.dm
+++ b/code/modules/mob/living/carbon/human/unarmed_attack.dm
@@ -35,17 +35,18 @@
switch(zone) // strong punches can have effects depending on where they hit
if("head", "mouth", "eyes")
// Induce blurriness
- target.visible_message("[target] looks dazed.", "You see stars.")
+ target.visible_message("[target] looks momentarily disoriented.", "You see stars.")
target.apply_effect(attack_damage*2, EYE_BLUR, armour)
if("l_arm", "l_hand")
if (target.l_hand)
// Disarm left hand
- target.visible_message("[src] [pick("dropped", "let go off")] \the [target.l_hand][pick("", " with a scream")]!")
+ //Urist McAssistant dropped the macguffin with a scream just sounds odd. Plus it doesn't work with NO_PAIN
+ target.visible_message("\The [target.l_hand] was knocked right out of [src]'s grasp!")
target.drop_l_hand()
if("r_arm", "r_hand")
if (target.r_hand)
// Disarm right hand
- target.visible_message("[src] [pick("dropped", "let go off")] \the [target.r_hand][pick("", " with a scream")]!")
+ target.visible_message("\The [target.r_hand] was knocked right out of [src]'s grasp!")
target.drop_r_hand()
if("chest")
if(!target.lying)
@@ -113,21 +114,30 @@
if("head", "mouth", "eyes")
// ----- HEAD ----- //
switch(attack_damage)
- if(1 to 2) user.visible_message("[user] slapped [target] across \his cheek!")
- if(3 to 4) user.visible_message("[user] struck [target] in the head[pick("", " with a closed fist")]!")
- if(5) user.visible_message("[user] gave [target] a resounding slap to the face!")
- if("chest", "l_arm", "r_arm", "l_hand", "r_hand", "groin", "l_leg", "r_let", "l_foot", "r_foot")
+ if(1 to 2)
+ user.visible_message("[user] slapped [target] across \his cheek!")
+ if(3 to 4)
+ user.visible_message(pick(
+ 80; "[user] [pick(attack_verb)] [target] in the head!", //striking someone with a 'closed fist' is called punching them.
+ 20; "[user] struck [target] in the head[pick("", " with a closed fist")]!"
+ ))
+ if(5)
+ user.visible_message(pick(
+ 10; "[user] gave [target] a resounding slap to the face!",
+ 90; "[user] smashed \his [pick(attack_noun)] into [target]'s [organ]!"
+ ))
+ else
// ----- BODY ----- //
switch(attack_damage)
if(1 to 2) user.visible_message("[user] slapped [target]'s [organ]!")
if(3 to 4) user.visible_message("[user] [pick(attack_verb)] [target] in \his [organ]!")
- if(5) user.visible_message("[user] slammed \his [pick(attack_noun)] into [target]'s [organ]!")
+ if(5) user.visible_message("[user] smashed \his [pick(attack_noun)] into [target]'s [organ]!")
else
- user.visible_message("[user] [pick("punched", "threw a punch", "struck", "slapped", "rammed their [pick(attack_noun)] into")] [target]'s [organ]!")
+ user.visible_message("[user] [pick("punched", "threw a punch", "struck", "slapped", "slammed their [pick(attack_noun)] into")] [target]'s [organ]!") //why do we have a separate set of verbs for lying targets?
/datum/unarmed_attack/kick
- attack_verb = list("kicked", "kneed")
- attack_noun = list("kick", "knee strike")
+ attack_verb = list("kicked", "kicked", "kicked", "kneed")
+ attack_noun = list("kick", "kick", "kick", "knee strike")
attack_sound = "swing_hit"
damage = 0
@@ -161,7 +171,7 @@
attack_damage = Clamp(attack_damage, 1, 5)
switch(attack_damage)
- if(1 to 2) user.visible_message("[user] gave [target] a light [pick(attack_noun)] to the [organ]!")
+ if(1 to 2) user.visible_message("[user] threw [target] a glancing [pick(attack_noun)] to the [organ]!") //it's not that they're kicking lightly, it's that the kick didn't quite connect
if(3 to 4) user.visible_message("[user] [pick(attack_verb)] [target] in \his [organ]!")
if(5) user.visible_message("[user] landed a strong [pick(attack_noun)] against [target]'s [organ]!")
@@ -204,6 +214,6 @@
attack_damage = Clamp(attack_damage, 1, 5)
switch(attack_damage)
- if(1 to 2) user.visible_message("[user] [pick("clomped on", "treaded on")] [target]'s [organ]!")
- if(3 to 4) user.visible_message("[pick("[user] stomped down on", "[user] slammed \his [shoes ? copytext(shoes.name, 1, -1) : "foot"] down onto")] [target]'s [organ]!")
- if(5) user.visible_message("[pick("[user] landed a devastating stomp on", "[user] stomped down hard on", "[user] slammed \his [shoes ? copytext(shoes.name, 1, -1) : "foot"] down hard onto")] [target]'s [organ]!")
\ No newline at end of file
+ if(1 to 2) user.visible_message("[user] [pick("stepped on", "treaded on")] [target]'s [organ]!") //stepped on conveys the same meaning and is more recognizable as an actual word than "clomped"
+ if(3 to 4) user.visible_message("[pick("[user] stomped on", "[user] slammed \his [shoes ? copytext(shoes.name, 1, -1) : "foot"] down onto")] [target]'s [organ]!")
+ if(5) user.visible_message("[pick("[user] landed a powerful stomp on", "[user] stomped down hard on", "[user] slammed \his [shoes ? copytext(shoes.name, 1, -1) : "foot"] down hard onto")] [target]'s [organ]!") //Devastated lol. No. We want to say that the stomp was powerful or forceful, not that it /wrought devastation/
\ No newline at end of file