Merge pull request #11819 from Ghommie/Ghommie-cit672

Minor action datum refactor and spellcasting fix.
2020-04-12 17:02:36 -07:00
parent 3aad79f6e1 7615f63753
commit 6b6683846b
32 changed files with 127 additions and 131 deletions
@@ -74,7 +74,7 @@
 	..()
 	cords = target

-/datum/action/item_action/organ_action/colossus/IsAvailable()
+/datum/action/item_action/organ_action/colossus/IsAvailable(silent = FALSE)
 	if(world.time < cords.next_command)
 		return FALSE
 	if(!owner)
@@ -632,7 +632,7 @@
 	..()
 	cords = target

-/datum/action/item_action/organ_action/velvet/IsAvailable()
+/datum/action/item_action/organ_action/velvet/IsAvailable(silent = FALSE)
 	return TRUE

 /datum/action/item_action/organ_action/velvet/Trigger()