Merge branch 'master' into upstream-merge-33783

2017-12-29 06:49:47 -06:00
parent c7db4e8310 6d52395643
commit a64a1e4a5c
55 changed files with 2371 additions and 17035 deletions
@@ -477,6 +477,8 @@
 		return FALSE
 	return TRUE

+/datum/action/spell_action/spell
+
 /datum/action/spell_action/spell/IsAvailable()
 	if(!target)
 		return FALSE