Merge pull request #6346 from Citadel-Station-13/upstream-merge-36791

[MIRROR] Cult spell buttons will no longer hold an empty slot in the regular action bar
2018-04-11 21:35:45 +00:00
parent ce946619b3 8c9c6fb9f9
commit 538cb55b68
2 changed files with 8 additions and 4 deletions
@@ -9,6 +9,7 @@
 	..()
 	button.screen_loc = "6:-29,4:-2"
 	button.moved = "6:-29,4:-2"
+	button.ordered = FALSE

 /datum/action/innate/cult/blood_magic/Remove()
 	for(var/X in spells)
@@ -103,6 +104,7 @@
 	all_magic = BM
 	..()
 	button.locked = TRUE
+	button.ordered = FALSE

 /datum/action/innate/cult/blood_spell/Remove()
 	if(all_magic)