Makes actionbuttons remember positions where you locked them.

2017-12-08 12:29:42 +03:00
parent e6fb6a5910
commit c55b914f06
3 changed files with 39 additions and 1 deletions
@@ -178,8 +178,12 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 	var/list/exp
 	var/list/menuoptions

+<<<<<<< HEAD
 	//citadel code
 	var/arousable = TRUE //Allows players to disable arousal from the character creation menu
+=======
+	var/action_buttons_screen_locs = list()
+>>>>>>> f07421a... Makes actionbuttons remember positions where you locked them. (#33150)

 /datum/preferences/New(client/C)
 	parent = C