cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-18 03:26:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4810 from phil235/Messagetypos

Browse Source 
Fix many messages and sounds
This commit is contained in:
Cheridan
2014-09-16 08:45:31 -05:00
parent 1ac119c2ee 24686b5248
commit cd990bdeda
14 changed files with 202 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/grille.dm
+5 -3
View File
@@ -172,12 +172,14 @@
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)
switch(W.damtype)
if("fire")
if(BURN)
health -= W.force
if("brute")
playsound(loc, 'sound/items/welder.ogg', 80, 1)
if(BRUTE)
health -= W.force * 0.1
playsound(loc, 'sound/effects/grillehit.ogg', 80, 1)
healthcheck()
..()
return