Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 2/17/2018_make_AI_great_again

# Conflicts resolved:
#	icons/mob/modifier_effects.dmi
This commit is contained in:
Neerti
2018-06-15 18:28:00 -04:00
613 changed files with 16003 additions and 11384 deletions

View File

@@ -15,7 +15,7 @@
var/sev1_range = 0
var/sev2_range = 1
var/sev3_range = 1
var/sev4_range = 2
var/sev4_range = 1
/obj/item/projectile/ion/on_hit(var/atom/target, var/blocked = 0)
empulse(target, sev1_range, sev2_range, sev3_range, sev4_range)