From 8520c91a98b070ccd15bdf06c068aa2c17ae2e93 Mon Sep 17 00:00:00 2001 From: Poojawa Date: Thu, 11 Apr 2019 14:05:40 -0500 Subject: [PATCH] Pref Window Alignment + cycled backgrounds from Virgo --- code/modules/client/preferences.dm | 9 +++++++++ .../mob/dead/new_player/preferences_setup.dm | 3 ++- code/modules/mob/living/carbon/human/dummy.dm | 1 + interface/skin.dmf | 14 +++++++------- modular_citadel/icons/ui/backgrounds.dmi | Bin 0 -> 2780 bytes modular_citadel/interface/skin.dmf | 17 +++++++++-------- 6 files changed, 28 insertions(+), 16 deletions(-) create mode 100644 modular_citadel/icons/ui/backgrounds.dmi 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 0000000000000000000000000000000000000000..7e061d6ba04433f8cc47b9a9745252d3269d9156 GIT binary patch literal 2780 zcmbtWc~nz(7XGCHf`Uod7n88aP6(B<8Bj=pLR2symPJ7k*<=wB0%CzDU`ObPML;YX zpvWeR>O`F{cs9CpRb^xASWj$D=RA{B_$ytAt@;-BO@a%EiEoC zuBxi4qobp%tE;7@rLL~7r>7?`FR!AaqN%A#BoZ+gjK049fddCfBoZ2pwzjsmu&_Ak zdfMigJ=LCe#L^0aAOqt=QBPA-E}(; z9USUDP+-C=(KLDSB<`XD-WzBAMC1Zi2GJf{h<;{QUYGZX?QS?R;9)K9aS!*M>~vzR zaun}Mz?Z=yw3JJWLe{hJJ?Rq z0+sMLPwzhV5L@EQ*x!*lUxekk_Rjik{h%azb9?Csc|LskmvRKk2K_jP}Jle`;u~ap=8Xz1BQ?A~QM!Hbk-O^W|>IOz6XQQ@rTlaR(uPTW}3p zBhV^{#dTQ)b}Vj9E=SWs&oGi!Fg4S=_`>NA%5SNWxn*z2?`Ln!pi9Efhyh094B9rvF5|e$rBWhir&S+>v!m2Lt)G#s-Uh(KHazS!Qm)S&M?dD!87$tI}1}^ z(!q!E#`hG|(Xj;7+mX3#98<6CT|6B~+)~c8r0T^Hi#??y@iQp(NW&N({Ho6SNF+*Ir72d=KbY$j8-#Z*>&2xf8#N+r zIM;NCyGlAr*Ae=JN3)m4C&sn!&T@!)=#}$X#W4lu{N>bWUOUGcq6;y-F!xG_J_W8; z)9amnm#$(jA&k1>7YAP@gk%>sII8@VTFv&O7@4AQ()il4aiU*kZZmooM1XbK*Lwvz z0I)UOU!Ab`;kDOY_v?`7hAF7qrlDhp9UG^v#9nJl_HN}E29J7Jrd|1oOo zK;P0amP_}_@H(n&{I>ICE=6eWJGg~gH^g@l-EP=j!~*Kz7BU^tuarwb+z30kix`tL zcoUzn*hCvG!-G}SoIYipe3J()zz~`yKyXq1NYQ5&xgwhHDz}l$KuW>Fap;6?MY(79 z?Sv(at9GBRp+6SUErE@WgLnkXIB4w?Y!9wwESvK!lp93PVfrVK3mL+~qe`@Y zT!H>v;nyu;Zbmx>9mgrPYfz=q8YUlVkL=R1dA7=+Q}f$Ql342H z54U#blRR(_uH{*ep}{O}`(O;?X|q9+_miO8D3Wc}kV$Gi3e#HNJ6{mtz|v!;_DKXU z8iYwPO*8kf5ZF-}GF9Y~WRCLF43(NquRfCGWyx)$GfaXxWE!TsTKn$qo*c#YkRN>q zqAvQC=2TVFK|_rr?sumr-~P!Rz1mscH$a^k*(<0@WQg+IqU9)O?cOV%zjV{`b#AY} zIW7eykf3Lb+
|oyv@TzT39((&t0YxyrMf2AsnhpTp~- z`*yxc-T132?nke&z7^X5GcfKR^o?|ypDvXrny_oy6(}lDd9`TQliz1DpkzO^5#srK2w6WLY%Sr2F(t?UJjvqnSrRYKO2AvxqLBbU056WHipvu z*#zypOkNkBN5F=s0)z1vOaSs@-9Z>H@)-{gwgQ0H448xI!Hd8cY{B&4As7F=5LRJ& ze}nW3AS7r#PKMj!$lYk`V6)jLMm9S-FyEMXipzOZwO(w-YVBa(zkkWZWYPPGm0Vj>RX!fDef@>K0ldG!O}GQrkO5GINl3sYi^46U zx+++Htjl#jW#v+ux$GSQjG8bTTXu)zrsxqc*chxqt%#omQsH2aw95bRwiMDrDu0y@ z7xnMp4-zv3>#*peKfFIjJ{*BXQO&&wB3Q@*OK3VPW+{a{}o2)tXRn@ zqwuQ|tZGp(AtdKvDpZcyN zR#8~QDP%E=&>Ca;8|aKrM