upstream-merge-27951

This commit is contained in:
LetterJay
2017-06-11 02:11:34 -05:00
parent a8b71089ae
commit c760c52817
7 changed files with 27 additions and 16 deletions
@@ -42,6 +42,9 @@
/datum/computer_file/program/card_mod/New()
..()
change_position_cooldown = config.id_console_jobslot_delay
addtimer(CALLBACK(src, .proc/SetConfigCooldown), 0)
/datum/computer_file/program/card_mod/proc/SetConfigCooldown()
/datum/computer_file/program/card_mod/event_idremoved(background, slot)