Pref Window Alignment + cycled backgrounds from Virgo

This commit is contained in:
Poojawa
2019-04-11 14:05:40 -05:00
parent dff9bcee70
commit 8520c91a98
6 changed files with 28 additions and 16 deletions
+9
View File
@@ -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 += "<b>Species:</b><a style='display:block;width:100px' href='?_src_=prefs;preference=species;task=input'>[pref_species.id]</a><BR>"
dat += "<a style='display:block;width:100px' href='?_src_=prefs;preference=all;task=random'>Random Body</A><BR>"
dat += "<b>Always Random Body:</b><a href='?_src_=prefs;preference=all'>[be_random_body ? "Yes" : "No"]</A><BR>"
dat += "<br><b>Cycle background:</b><a style='display:block;width:100px' href='?_src_=prefs;preference=cycle_bg;task=input'>[bgstate]</a><BR>"
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)
@@ -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.
@@ -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)
+7 -7
View File
@@ -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"
Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

+9 -8
View File
@@ -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"
saved-params = "zoom;letterbox;zoom-mode"