Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-35475

2018-03-09 14:18:47 -05:00
parent a80ab73951 e62f090dad
commit 936c6a33f2
179 changed files with 3274 additions and 1999 deletions
@@ -15,4 +15,4 @@
 			continue
 		empulse(target.loc, emp_heavy, emp_light)

-	return
+	return
@@ -49,4 +49,4 @@
 		target.blur_eyes(amt_eye_blurry)
 		//summoning
 		if(summon_type)
-			new summon_type(target.loc, target)
+			new summon_type(target.loc, target)