diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index d6bfc49628..4f91cb016f 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -127,6 +127,11 @@ GLOBAL_LIST_EMPTY(preferences_datums)
var/action_buttons_screen_locs = list()
+ //backgrounds
+ var/mutable_appearance/character_background
+ var/icon/bgstate = "steel"
+ var/list/bgstate_options = list("000", "midgrey", "FFF", "white", "steel", "techmaint", "dark", "plating", "reinforced")
+
/datum/preferences/New(client/C)
parent = C
@@ -266,6 +271,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
dat += "Species:[pref_species.id]
"
dat += "Random Body
"
dat += "Always Random Body:[be_random_body ? "Yes" : "No"]
"
+ dat += "
Cycle background:[bgstate]
"
var/use_skintones = pref_species.use_skintones
if(use_skintones)
@@ -1412,6 +1418,9 @@ GLOBAL_LIST_EMPTY(preferences_datums)
if("previous_facehair_style")
facial_hair_style = previous_list_item(facial_hair_style, GLOB.facial_hair_styles_list)
+ if("cycle_bg")
+ bgstate = next_list_item(bgstate, bgstate_options)
+
if("underwear")
var/new_underwear
if(gender == MALE)
diff --git a/code/modules/mob/dead/new_player/preferences_setup.dm b/code/modules/mob/dead/new_player/preferences_setup.dm
index 6b67ada775..fc879ed7a8 100644
--- a/code/modules/mob/dead/new_player/preferences_setup.dm
+++ b/code/modules/mob/dead/new_player/preferences_setup.dm
@@ -25,7 +25,6 @@
// var/wide_icon = FALSE //CITDEL THINGS
// if(features["taur"] != "None")
// wide_icon = TRUE
-
if(job_engsec_high)
switch(job_engsec_high)
if(AI_JF)
@@ -37,6 +36,8 @@
// Set up the dummy for its photoshoot
var/mob/living/carbon/human/dummy/mannequin = generate_or_wait_for_human_dummy(DUMMY_HUMAN_SLOT_PREFERENCES)
+ mannequin.cut_overlays()
+ mannequin.add_overlay(mutable_appearance('modular_citadel/icons/ui/backgrounds.dmi', bgstate, layer = SPACE_LAYER))
copy_to(mannequin)
// Determine what job is marked as 'High' priority, and dress them up as such.
diff --git a/code/modules/mob/living/carbon/human/dummy.dm b/code/modules/mob/living/carbon/human/dummy.dm
index beb183e842..3406d29b3a 100644
--- a/code/modules/mob/living/carbon/human/dummy.dm
+++ b/code/modules/mob/living/carbon/human/dummy.dm
@@ -2,6 +2,7 @@
/mob/living/carbon/human/dummy
real_name = "Test Dummy"
status_flags = GODMODE|CANPUSH
+ mouse_drag_pointer = MOUSE_INACTIVE_POINTER
var/in_use = FALSE
INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy)
diff --git a/interface/skin.dmf b/interface/skin.dmf
index 65f4a22664..5f8e1ad125 100644
--- a/interface/skin.dmf
+++ b/interface/skin.dmf
@@ -272,7 +272,7 @@ window "statwindow"
elem "preferences_window"
type = MAIN
pos = 372,0
- size = 1120x1000
+ size = 1280x1000
anchor1 = none
anchor2 = none
background-color = none
@@ -281,17 +281,17 @@ window "statwindow"
statusbar = false
elem "preferences_browser"
type = BROWSER
- pos = -8,-8
- size = 896x1008
+ pos = 0,0
+ size = 960x1000
anchor1 = 0,0
- anchor2 = 90,100
+ anchor2 = 75,100
background-color = none
saved-params = ""
elem "character_preview_map"
type = MAP
- pos = 887,0
- size = 313x1000
- anchor1 = 90,0
+ pos = 960,0
+ size = 320x1000
+ anchor1 = 75,0
anchor2 = 100,100
right-click = true
saved-params = "zoom;letterbox;zoom-mode"
diff --git a/modular_citadel/icons/ui/backgrounds.dmi b/modular_citadel/icons/ui/backgrounds.dmi
new file mode 100644
index 0000000000..7e061d6ba0
Binary files /dev/null and b/modular_citadel/icons/ui/backgrounds.dmi differ
diff --git a/modular_citadel/interface/skin.dmf b/modular_citadel/interface/skin.dmf
index 39626ef912..e4531a24ea 100644
--- a/modular_citadel/interface/skin.dmf
+++ b/modular_citadel/interface/skin.dmf
@@ -291,7 +291,7 @@ window "preferences_window"
elem "preferences_window"
type = MAIN
pos = 372,0
- size = 1120x1000
+ size = 1280x1000
anchor1 = none
anchor2 = none
background-color = none
@@ -300,17 +300,18 @@ window "preferences_window"
statusbar = false
elem "preferences_browser"
type = BROWSER
- pos = -8,-8
- size = 896x1008
+ pos = 0,0
+ size = 960x1000
anchor1 = 0,0
- anchor2 = 90,100
+ anchor2 = 75,100
background-color = none
saved-params = ""
elem "character_preview_map"
type = MAP
- pos = 887,0
- size = 313x1000
- anchor1 = 90,0
+ pos = 960,0
+ size = 320x1000
+ anchor1 = 75,0
anchor2 = 100,100
right-click = true
- saved-params = "zoom;letterbox;zoom-mode"
\ No newline at end of file
+ saved-params = "zoom;letterbox;zoom-mode"
+