cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-20 04:17:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into development

Browse Source
This commit is contained in:
skull132
2017-08-06 22:09:41 +03:00
parent cb5e227320 1ae15cd900
commit 81bb348a42
28 changed files with 204 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/assembly/mousetrap.dm
+2 -1
View File
@@ -44,7 +44,8 @@
if(!H.gloves)
H.apply_effect(250/(target.mob_size*(target.mob_size*0.25)), AGONY)
if (!(types & TYPE_SYNTHETIC))
target.apply_damage(rand(6,14), BRUTE, def_zone = zone, used_weapon = src)
target.apply_damage(rand(6,14), AGONY, def_zone = zone, used_weapon = src)
target.apply_damage(rand(1,3), BRUTE, def_zone = zone, used_weapon = src)
playsound(target.loc, 'sound/effects/snap.ogg', 50, 1)
layer = MOB_LAYER - 0.2