Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Big slap hand fix #15627

Merged
JamieD1 merged 4 commits into from
Sep 5, 2022
Merged

Big slap hand fix #15627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
851f17d
oh fbauh8fhwai fuck
warface1234455 Sep 5, 2022
909eda3
aye
warface1234455 Sep 5, 2022
d2e451a
Merge branch 'master' into sprite-fix
warface1234455 Sep 5, 2022
bc3ed2f
aaa
warface1234455 Sep 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion code/game/objects/items/weaponry.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -831,8 +831,9 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
//Uncomment if we ever port table slam signals
//SEND_SIGNAL(user, COMSIG_LIVING_SLAM_TABLE, the_table)
//SEND_SIGNAL(the_table, COMSIG_TABLE_SLAMMED, user)
playsound(get_turf(the_table), 'sound/effects/tableslam.ogg', 110, TRUE)
playsound(get_turf(the_table), 'sound/effects/table-slam-hard.ogg', 110, TRUE)
user.visible_message("<b><span class='danger'>[user] slams [user.p_their()] fist down on [the_table]!</span></b>", "<b><span class='danger'>You slam your fist down on [the_table]!</span></b>")
transform = null
else
user.do_attack_animation(the_table)
playsound(get_turf(the_table), 'sound/effects/tableslam.ogg', 40, TRUE)
Expand Down
Binary file added sound/effects/table-slam-hard.ogg
View file
Open in desktop
Binary file not shown.