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
@@ -12,7 +12,7 @@ Doesn't work on other aliens/AI.*/
 	var/plasma_cost = 0
 	var/check_turf = FALSE
 	has_action = TRUE
-	datum/action/spell_action/alien/action
+	base_action = /datum/action/spell_action/alien
 	action_icon = 'icons/mob/actions/actions_xeno.dmi'
 	action_icon_state = "spell_default"
 	action_background_icon_state = "bg_alien"