cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-22 11:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/VOREStation/Polaris into polaris-update

Browse Source 
# Conflicts:
#	code/world.dm
#	config/example/config.txt

Resolved by removing old lines.
This commit is contained in:
Arokha Sieyes
2016-05-15 12:39:30 -04:00
parent 8bec946868 a77e968b25
commit f8fe9994e5
58 changed files with 1029 additions and 259 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/displaycase.dm
+3
View File
@@ -55,6 +55,9 @@
/obj/structure/displaycase/attackby(obj/item/weapon/W as obj, mob/user as mob)
user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
user.do_attack_animation(src)
playsound(loc, 'sound/effects/Glasshit.ogg', 50, 1)
src.health -= W.force
src.healthcheck()
..()