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

Merge branch 'master' of github.com:tgstation/-tg-station into assemblyfun

Browse Source 
Conflicts:
	code/game/objects/items/weapons/grenades/chem_grenade.dm
	html/changelog.html
This commit is contained in:
Pete Goodfellow
2013-05-28 17:34:01 +01:00
parent 542599e9b8 88253ce9cb
commit 0345f66d37
152 changed files with 1805 additions and 1805 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/assembly/mousetrap.dm
+2 -2
View File
@@ -54,13 +54,13 @@
H.Stun(3)
if(affecting)
if(affecting.take_damage(1, 0))
H.UpdateDamageIcon(0)
H.update_damage_overlays(0)
H.updatehealth()
else if(ismouse(target))
var/mob/living/simple_animal/mouse/M = target
visible_message("\red <b>SPLAT!</b>")
M.splat()
playsound(target.loc, 'sound/effects/snap.ogg', 50, 1)
playsound(src.loc, 'sound/effects/snap.ogg', 50, 1)
armed = 0
update_icon()
pulse(0)