From 4531bc233787d3825dda85cfe78c9531ca00ec76 Mon Sep 17 00:00:00 2001 From: Fox McCloud Date: Sun, 3 Jun 2018 19:26:48 -0400 Subject: [PATCH] tweaks --- code/game/atoms.dm | 2 +- code/game/mecha/mecha.dm | 4 ++-- code/game/objects/effects/effect_system/effects_foam.dm | 6 +++--- code/game/objects/items/weapons/twohanded.dm | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 9d6114bd0e6..136c8950028 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -146,7 +146,7 @@ /atom/proc/attack_hulk(mob/living/carbon/human/user, does_attack_animation = FALSE) if(does_attack_animation) user.changeNext_move(CLICK_CD_MELEE) - add_attack_logs(user, src, "punched with hulk powers") + add_attack_logs(user, src, "Punched with hulk powers") user.do_attack_animation(src, ATTACK_EFFECT_SMASH) /atom/proc/CheckParts(list/parts_list) diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 9ac98e2c5d3..ca43f87ae46 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -472,7 +472,7 @@ log_message("Attack by hand/paw. Attacker - [user].",1) 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","You hit [name] with no visible effect.") + user.visible_message("[user] hits [name]. Nothing happens", "You hit [name] with no visible effect.") log_append_to_last("Armor saved.") @@ -525,7 +525,7 @@ if(.) check_for_internal_damage(list(MECHA_INT_TEMP_CONTROL, MECHA_INT_TANK_BREACH, MECHA_INT_CONTROL_LOST)) log_message("Attack by hulk. Attacker - [user].", 1) - add_attack_logs(user, src, "punched with hulk powers") + add_attack_logs(user, src, "Punched with hulk powers") /obj/mecha/hitby(atom/movable/A) //wrapper ..() diff --git a/code/game/objects/effects/effect_system/effects_foam.dm b/code/game/objects/effects/effect_system/effects_foam.dm index b8f7d798d3c..e765e59442d 100644 --- a/code/game/objects/effects/effect_system/effects_foam.dm +++ b/code/game/objects/effects/effect_system/effects_foam.dm @@ -187,7 +187,7 @@ move_update_air(T) /obj/structure/foamedmetal/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0) - playsound(src.loc, 'sound/weapons/tap.ogg', 100, 1) + playsound(loc, 'sound/weapons/tap.ogg', 100, 1) /obj/structure/foamedmetal/proc/updateicon() if(metal == MFOAM_ALUMINUM) @@ -203,11 +203,11 @@ user.changeNext_move(CLICK_CD_MELEE) user.do_attack_animation(src, ATTACK_EFFECT_PUNCH) if(prob(75 - metal * 25)) - user.visible_message("[user] smashes through [src].", "You smash through [src].") + user.visible_message("[user] smashes through [src].", "You smash through [src].") qdel(src) else to_chat(user, "You hit the metal foam but bounce off it.") - playsound(src.loc, 'sound/weapons/tap.ogg', 100, 1) + playsound(loc, 'sound/weapons/tap.ogg', 100, 1) /obj/structure/foamedmetal/CanPass(atom/movable/mover, turf/target) return !density diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm index 225271088f4..953536f1149 100644 --- a/code/game/objects/items/weapons/twohanded.dm +++ b/code/game/objects/items/weapons/twohanded.dm @@ -249,7 +249,7 @@ /obj/item/twohanded/dualsaber/attack_hulk(mob/living/carbon/human/user, does_attack_animation = FALSE) //In case thats just so happens that it is still activated on the groud, prevents hulk from picking it up if(wielded) - to_chat(user, "You can't pick up such dangerous item with your meaty hands without losing fingers, better not to!") + to_chat(user, "You can't pick up such a dangerous item with your meaty hands without losing fingers, better not to!") return TRUE /obj/item/twohanded/dualsaber/green