cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-26 06:29:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Requesting a re-merge of another change that has mysteriously disappeared, https://github.com/tgstation/-tg-station/pull/485

Browse Source 
Originally merged by @Giacomand
This commit is contained in:
Ikarrus
2013-05-23 20:19:04 -06:00
parent 7d0c5f1054
commit 6932c4e32d
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/grille.dm
+1
View File
@@ -159,6 +159,7 @@
//window placing end
else if(istype(W, /obj/item/weapon/shard))
playsound(loc, 'sound/effects/grillehit.ogg', 80, 1)
health -= W.force * 0.1
else if(!shock(user, 70))
playsound(loc, 'sound/effects/grillehit.ogg', 80, 1)