shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5656 from Citadel-Station-13/upstream-merge-35876

Browse Source 
[MIRROR] tabling people on brass tables makes a clanging sound
This commit is contained in:
LetterJay
2018-02-22 23:15:28 -06:00
committed by GitHub
parent 7e5057b99e e66a9dbc50
commit 8ff64f6874
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/tables_racks.dm
+4 -1
View File
@@ -338,7 +338,10 @@
/obj/structure/table/reinforced/brass/Destroy() /obj/structure/table/reinforced/brass/Destroy()
change_construction_value(-2) change_construction_value(-2)
return ..() return ..()
/obj/structure/table/reinforced/brass/tablepush(mob/living/user, mob/living/pushed_mob)
.= ..()
playsound(src, 'sound/magic/clockwork/fellowship_armory.ogg', 50, TRUE)
/obj/structure/table/reinforced/brass/narsie_act() /obj/structure/table/reinforced/brass/narsie_act()
take_damage(rand(15, 45), BRUTE) take_damage(rand(15, 45), BRUTE)