Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor

This commit is contained in:
Aurorablade
2016-02-24 06:27:16 -05:00
122 changed files with 1406 additions and 680 deletions
+2
View File
@@ -61,6 +61,8 @@
// M.lastattacker = null
/////////////////////////
if(istype(M, /mob/living/simple_animal))
return 0 // No sanic-speed double-attacks for you - simple mobs will handle being attacked on their own
var/power = force
if(!istype(M, /mob/living/carbon/human))