From c68fb0861fdfb9072455acde1d4e4c9db8dd5c46 Mon Sep 17 00:00:00 2001 From: Anewbe Date: Fri, 27 Oct 2017 23:00:34 -0500 Subject: [PATCH] Ports the background icons for char setup --- .../client/preference_setup/general/03_body.dm | 12 ++++++++++++ code/modules/mob/new_player/preferences_setup.dm | 2 +- icons/effects/128x48.dmi | Bin 0 -> 1913 bytes 3 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 icons/effects/128x48.dmi diff --git a/code/modules/client/preference_setup/general/03_body.dm b/code/modules/client/preference_setup/general/03_body.dm index c6500143f0..73d91129e7 100644 --- a/code/modules/client/preference_setup/general/03_body.dm +++ b/code/modules/client/preference_setup/general/03_body.dm @@ -3,6 +3,9 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O /datum/preferences var/equip_preview_mob = EQUIP_PREVIEW_ALL + var/icon/bgstate = "000" + var/list/bgstate_options = list("000", "fff", "steel", "white") + /datum/category_item/player_setup_item/general/body name = "Body" sort_order = 3 @@ -34,6 +37,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O S["synth_green"] >> pref.g_synth S["synth_blue"] >> pref.b_synth pref.preview_icon = null + S["bgstate"] >> pref.bgstate /datum/category_item/player_setup_item/general/body/save_character(var/savefile/S) S["species"] << pref.species @@ -61,6 +65,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O S["synth_red"] << pref.r_synth S["synth_green"] << pref.g_synth S["synth_blue"] << pref.b_synth + S["bgstate"] << pref.bgstate /datum/category_item/player_setup_item/general/body/sanitize_character(var/savefile/S) if(!pref.species || !(pref.species in playable_species)) @@ -87,6 +92,8 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O if(!pref.rlimb_data) pref.rlimb_data = list() if(!pref.body_markings) pref.body_markings = list() else pref.body_markings &= body_marking_styles_list + if(!pref.bgstate || !(pref.bgstate in pref.bgstate_options)) + pref.bgstate = "000" // Moved from /datum/preferences/proc/copy_to() /datum/category_item/player_setup_item/general/body/copy_to_mob(var/mob/living/carbon/human/character) @@ -268,6 +275,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O . += "Preview
" . += "
" + . += "
Cycle background" . += "
[pref.equip_preview_mob & EQUIP_PREVIEW_LOADOUT ? "Hide loadout" : "Show loadout"]" . += "
[pref.equip_preview_mob & EQUIP_PREVIEW_JOB ? "Hide job gear" : "Show job gear"]" . += "" @@ -694,6 +702,10 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O pref.b_synth = hex2num(copytext(new_color, 6, 8)) return TOPIC_REFRESH_UPDATE_PREVIEW + else if(href_list["cycle_bg"]) + pref.bgstate = next_in_list(pref.bgstate, pref.bgstate_options) + return TOPIC_REFRESH_UPDATE_PREVIEW + return ..() /datum/category_item/player_setup_item/general/body/proc/reset_limbs() diff --git a/code/modules/mob/new_player/preferences_setup.dm b/code/modules/mob/new_player/preferences_setup.dm index 5fa306b7b9..a96524f1f1 100644 --- a/code/modules/mob/new_player/preferences_setup.dm +++ b/code/modules/mob/new_player/preferences_setup.dm @@ -258,7 +258,7 @@ mannequin.delete_inventory(TRUE) dress_preview_mob(mannequin) - preview_icon = icon('icons/effects/effects.dmi', "nothing") + preview_icon = icon('icons/effects/128x48.dmi', bgstate) preview_icon.Scale(48+32, 16+32) mannequin.dir = NORTH diff --git a/icons/effects/128x48.dmi b/icons/effects/128x48.dmi new file mode 100644 index 0000000000000000000000000000000000000000..71038ffdbf893598f9f9ae3f68481f33e5513905 GIT binary patch literal 1913 zcmbu8c{JOJ7RP^iDW}#nth^<3x2}(yhv_(0#@`esU z8-qjBT4IW}l$My*sL^U9v~(EJs-^Yfo%#R$@$MgYJNJ)!&-Z>xJW0-S(pu600LT$t z9K8VmBu)YDH(;?}#JE$$q1W>qg&>YG(NWa6SXu%Vi9{+Zt9epS}9iL!nSD zEiH9*bwfi#1OlO?q@Cc>si~~2tgo-HqN1Xqp`oa#*xc6D*wEnR_iEG$qc6dH{-Fff3_;pXP%^78U#W@fUovL+@bM@L8EZ7-&$A>kv>#Th8wn?wfi z!ue=%QJF>YPj`$;i%gA6PLHD{0YGLw**7`$;_ePP`LB;FC^s|I^wVeLE+5Mo%$v8S z&(0yA0I9O2ruS?x-WVRn74NMUJZ4y8$in~ZokEO{FH=&FagFvm<)W`16X+F@gt{c> z=X1Tnzr3cJdfXo22@84R=6w!FkrEjm&U7p7F6d~Ku?Yv3f<5K4 z^OrvXfCP`|=s?M={}7m%ynGnTfdby&%!HVK94m>_JcKC)T5eBsPoyc2N0Pd}cv@e=sSgZK_}EJl?~R zP*}^&qj}mg;jd-E@ck{eolNB>u5+qM_w_g6ebXxpdj6|r5jb``0WV>()xsxb%pWKg zZv*#p*55r0D1soiM){;&h0mb$y%#+5g;rh2cLmErT1&m4Px@=pq&F{7S_|WrsiXhtl@ygC;Ck@NBz0|Ro_`1N`ezr^_ z@e+N%)vBPM-3~e;ShbEwVZ-Nht9lh}+D^7ao~xl<0u^F)@fDCH=Els+6Y}xd{x@iq zpqVo6+88)?YsyM5iw`Or#p)^VIH0r=rsMYE`|XCE6WAuTc?7DyHW!}XIIyH%@}ttQ zpIlx71Lr@e(`cOkabsY(qVqt?Q?R=Uev5s-*DPvC8pO2*v_o=FHBUrJoY9v|P#|o^#4Nv zTzgTv$sYIuT7%42#jio|3@&jWJZ)ij)Hk+zRWwPy#(w*`-PTp9!k=1y>X1J>SCgRa zahG3W4O;|aI(wc}t{A@H%mq}}R;o@5$FE;Vw7UngCMMicF`&j4yO?@FPNrY&fbQF~ ze1(Njt~4>SM$`9kg=3F!HbRqEFQET4)dNx;;8v6owLMCMemQM$FjsRXWQxuc!b5M; z8W^0mt)dgRG81UqIO709%~?qc?`o1UqE>i$6fL?V(pd~$`tvK_yUyc6l@e90=%#>Z z|E~L9U)~3!g`D+N_2Dqx@tM8gw-_Drr}ZCFoK0dF&&vd3)J|(yo`io*$>ROgq0ncW zFV{bQ$r@RHVua0;>DV5LWZJjKqM}9hN6B5&6|AT~IHSlAyF(<`Se3wfaM`*1k=NBI za~X8q%fQ4T5FLOyS(|N^_Jrz9`44q*I%k9HAV~mn;@#?cW0gl7HFI$L5smECIU$AR zHu^L>2Q;0eu2@Z6ooftR$N|gh>8t$v&b1dxy@G?e)vkq{Wbl=!8>)<4Wv}rhvij0M zM`yT+SkE8W#wo%3Eso`wg>Ia?5!5!=-fr}GTDE#4I%-3Bz5Fnwy&63cP{R`xLh)%1 z%XD0Kf&0^++ArR4`~7|I-Wy39POFPA>yKg+4(IWox`L%&<3uAEhic-@q-dw^D#xnU zv>xgZhlpvNl445)-`GaXz;722%Hl$6WcdEsPCYG8H+>2ZeyjUxGv&?l-Eftr47EL- zji{acAn`gBB|6vz_0#4=&Z{94L6t>QPLbnlcLxp*ydwHBES|8C4Xo$nMwABivnXMV zYsM8m6W9!#vr`>J7kpSGC($;84Qqlr|Nd&uIhn7NX!jZUhBrHEKD=7qq4DrlpLW`h zKfiMmUqJ^prw@xq#|FF%Q~0~qXvU=jw6?q50El$D@>Dh2&XQ+5c{;GgsoW+?{EOp% z$%pi%5j~^ACMG*lIk^?A$;()LymH1Ewraq>fstK(KMqCp5evr6{MP(RD#;4Pb|JaT zwz6B2e9D{z{>M@tb0j9{#4#p+W5xUm>`47h&VO6w