July 5th TG sync (#1883)

July 5th TG sync
2017-07-05 22:14:19 -05:00
parent 454b9c3d68
commit b1b4826c0c
1264 changed files with 149689 additions and 570309 deletions
@@ -41,11 +41,10 @@

 /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()
-
+	change_position_cooldown = config.id_console_jobslot_delay

 /datum/computer_file/program/card_mod/event_idremoved(background, slot)
 	if(!slot || slot == 2)// slot being false means both are removed