shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Action buttons for spells now include their description

Browse Source
This commit is contained in:
CitadelStationBot
2017-08-02 08:52:47 -05:00
parent dd22c79678
commit 89e29a036c
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/datums/action.dm
View File

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

9
code/datums/action.dm.rej Normal file
View File

@@ -0,0 +1,9 @@
diff a/code/datums/action.dm b/code/datums/action.dm (rejected hunks)
@@ -491,7 +491,6 @@
S.action = src
name = S.name
desc = S.desc
- button_icon = S.action_icon
icon_icon = S.action_icon
button_icon_state = S.action_icon_state
background_icon_state = S.action_background_icon_state