Merge pull request #2231 from Citadel-Station-13/upstream-merge-29615

[MIRROR] Action buttons for spells now include their description
2017-08-14 08:56:19 -05:00
parent bc3e5419f2 0ec200f540
commit f1872a8bae
1 changed files with 3 additions and 2 deletions
@@ -169,7 +169,7 @@

 /datum/action/item_action/toggle_firemode
 	name = "Toggle Firemode"
-	
+
 /datum/action/item_action/rcl
 	name = "Change Cable Color"
 	button_icon_state = "rcl_rainbow"
@@ -490,7 +490,8 @@
 	var/obj/effect/proc_holder/spell/S = target
 	S.action = src
 	name = S.name
-	icon_icon = S.action_icon
+	desc = S.desc
+	button_icon = S.action_icon
 	button_icon_state = S.action_icon_state
 	background_icon_state = S.action_background_icon_state
 	button.name = name