cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'tgstation/master'

Browse Source 
Not sure if this worked. Used a wonky special snowflake strat to merge.
This commit is contained in:
AsV9
2018-03-24 08:57:13 +01:00
parent 389f4ccac0
commit d338cac150
921 changed files with 8789 additions and 5779 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/game/objects/effects/effect_system/effects_foam.dm
View File

@@ -286,12 +286,15 @@
move_update_air(T)
/obj/structure/foamedmetal/attack_paw(mob/user)
attack_hand(user)
return attack_hand(user)
/obj/structure/foamedmetal/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
playsound(src.loc, 'sound/weapons/tap.ogg', 100, 1)
/obj/structure/foamedmetal/attack_hand(mob/user)
. = ..()
if(.)
return
user.changeNext_move(CLICK_CD_MELEE)
user.do_attack_animation(src, ATTACK_EFFECT_PUNCH)
to_chat(user, "<span class='warning'>You hit [src] but bounce off it!</span>")