From 1bcbcc926de25bee6629dc0f1bc6c5ff6e340ed6 Mon Sep 17 00:00:00 2001 From: Verkister Date: Tue, 20 Feb 2018 09:52:56 +0200 Subject: [PATCH] Preview background fixes and additions. -Fixes flat white background capitalization error. -Re-enables tunnel plating and reinforced floor. -Adds darker plating, ribbed techmaint tiles, and flat middle grey. -Tweaks their cycle order to cycle flats by shade, and then tiles by shade. -Moves our update preview code underneath the polaris original. -Polaris bg list update waiting for merge out there as well, but let me know anyway if I should do a temporary vorestation edit comment until next sync tho. --- .../preference_setup/general/03_body.dm | 2 +- code/modules/client/preferences_vr.dm | 25 ------------------ .../mob/new_player/preferences_setup_vr.dm | 24 +++++++++++++++++ icons/effects/128x72_vr.dmi | Bin 2101 -> 2780 bytes vorestation.dme | 1 + 5 files changed, 26 insertions(+), 26 deletions(-) create mode 100644 code/modules/mob/new_player/preferences_setup_vr.dm diff --git a/code/modules/client/preference_setup/general/03_body.dm b/code/modules/client/preference_setup/general/03_body.dm index 52b41025e4..9594aa3df9 100644 --- a/code/modules/client/preference_setup/general/03_body.dm +++ b/code/modules/client/preference_setup/general/03_body.dm @@ -4,7 +4,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O var/equip_preview_mob = EQUIP_PREVIEW_ALL var/icon/bgstate = "000" - var/list/bgstate_options = list("000", "fff", "steel", "white") + var/list/bgstate_options = list("000", "midgrey", "FFF", "white", "steel", "techmaint", "dark", "plating", "reinforced") /datum/category_item/player_setup_item/general/body name = "Body" diff --git a/code/modules/client/preferences_vr.dm b/code/modules/client/preferences_vr.dm index 1694f3af75..23105324a5 100644 --- a/code/modules/client/preferences_vr.dm +++ b/code/modules/client/preferences_vr.dm @@ -1,26 +1 @@ //File isn't currently being used. -//It is now. -/datum/preferences/update_preview_icon() // Lines up and un-overlaps character edit previews. Also un-splits taurs. - var/mob/living/carbon/human/dummy/mannequin/mannequin = get_mannequin(client_ckey) - mannequin.delete_inventory(TRUE) - dress_preview_mob(mannequin) - - preview_icon = icon('icons/effects/128x72_vr.dmi', bgstate) - preview_icon.Scale(128, 72) - - mannequin.dir = NORTH - var/icon/stamp = getFlatIcon(mannequin) - stamp.Scale(stamp.Width()*size_multiplier,stamp.Height()*size_multiplier) - preview_icon.Blend(stamp, ICON_OVERLAY, 64-stamp.Width()/2, 5) - - mannequin.dir = WEST - stamp = getFlatIcon(mannequin) - stamp.Scale(stamp.Width()*size_multiplier,stamp.Height()*size_multiplier) - preview_icon.Blend(stamp, ICON_OVERLAY, 16-stamp.Width()/2, 5) - - mannequin.dir = SOUTH - stamp = getFlatIcon(mannequin) - stamp.Scale(stamp.Width()*size_multiplier,stamp.Height()*size_multiplier) - preview_icon.Blend(stamp, ICON_OVERLAY, 112-stamp.Width()/2, 5) - - preview_icon.Scale(preview_icon.Width() * 2, preview_icon.Height() * 2) // Scaling here to prevent blurring in the browser. \ No newline at end of file diff --git a/code/modules/mob/new_player/preferences_setup_vr.dm b/code/modules/mob/new_player/preferences_setup_vr.dm new file mode 100644 index 0000000000..a41cf77092 --- /dev/null +++ b/code/modules/mob/new_player/preferences_setup_vr.dm @@ -0,0 +1,24 @@ +/datum/preferences/update_preview_icon() // Lines up and un-overlaps character edit previews. Also un-splits taurs. + var/mob/living/carbon/human/dummy/mannequin/mannequin = get_mannequin(client_ckey) + mannequin.delete_inventory(TRUE) + dress_preview_mob(mannequin) + + preview_icon = icon('icons/effects/128x72_vr.dmi', bgstate) + preview_icon.Scale(128, 72) + + mannequin.dir = NORTH + var/icon/stamp = getFlatIcon(mannequin) + stamp.Scale(stamp.Width()*size_multiplier,stamp.Height()*size_multiplier) + preview_icon.Blend(stamp, ICON_OVERLAY, 64-stamp.Width()/2, 5) + + mannequin.dir = WEST + stamp = getFlatIcon(mannequin) + stamp.Scale(stamp.Width()*size_multiplier,stamp.Height()*size_multiplier) + preview_icon.Blend(stamp, ICON_OVERLAY, 16-stamp.Width()/2, 5) + + mannequin.dir = SOUTH + stamp = getFlatIcon(mannequin) + stamp.Scale(stamp.Width()*size_multiplier,stamp.Height()*size_multiplier) + preview_icon.Blend(stamp, ICON_OVERLAY, 112-stamp.Width()/2, 5) + + preview_icon.Scale(preview_icon.Width() * 2, preview_icon.Height() * 2) // Scaling here to prevent blurring in the browser. \ No newline at end of file diff --git a/icons/effects/128x72_vr.dmi b/icons/effects/128x72_vr.dmi index 0a9dee45d2ee8c7dab971fac322bf30919277e4b..7e061d6ba04433f8cc47b9a9745252d3269d9156 100644 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|aKrMuthT$R7#{IQ!_OaxJKfockX%T{RMA+nE9NUGv_mN=FH4RFAvwvirR_*0Bk1i z+v5WOAQ=QkH_FNM_LkmCnQ8Po;OCN>k{lZooe+1_)YMc}Ro%-kz;>s-rnYuiXvlsy zHzOmXasJFMbnwlC622)m6*3;9&U@&H8W+o;k zhK7a~78aVCnopjxb#--(jg8IC%^?tom6esgzP_cUB^V5rmAtmLb`Sk&gA5gA`30ry ziB3L3jysVOcRUdQGD^?&H!420R(bvnD~8<~H&iERXvFCw<{Z{1lfdyImglpxt8z-B zB$UOHj*x?l1l+WU)1``i3l#>V(l!k3jo6KpOs&VD-3d$fwwJp%P1RjN_o=xk4XWnFP9Wq$2xOKnV%)?vZf$}Chz7PNWQ zBc3OvW8&vhc&kl~>1Fe`*zJW;8;P z-4{Liqr3*y&FX~)46F9Y&*INHKPV9J*)Jzh>$D8B&2--P@s`NwQG5N_iu*n&-?4ZVRgg%&R)5UH#dAtMqqS!57Fv^2M=A|O?`Yyj*ldVVlsR^-3LxgZ!?UJnF`6|SFu z%Bk3_ZR{+n06%)opZtcXm`L~{+6-lPtjm`w@4JQT{97GQ0e;B!qo`79&6&yH&orpn zi0HLzj4~k6}2RRP33LI%} zJ2r#gXr|=qac;(ZYB?|Wz1bA6aiOrXUlzA$b8I`d_VGZdm66Nki^2Ucm*R51u}kY~ zL?~hKc3pZOSM+I)^sa4Qaft|bsBj;P38d2}8scsY_z2Gpa(V;tH|1aYsxsSVc&FN1 zS8SQ>;jnz>BzB3*Skc1Y`=*$;GH1DD>XQH0r!3;7!trG9P&<~qo`dT_&IEZEy;961 z1^Vu)iu+O7(g#R0TDVWn*NMOT%Us9>#&~Hi=x9B z^!gIHJNb93!$uqlztvpO4@#Hz9HPtm2AwGSi%nKHh*cT}8@hgmhzU)0(XxFi3dPhJ zl{*QDS4tRRkhnhbuC`PmOpic(t1)-uTDBY3tuaI3UUKPsEhE!XW&XS4XCT|ZX9q%1 z8Ns_Uh&?~g{SjdMxU7Aqpz1X=eBk@Go~7Gs<>&!`wXXk2EJf*>x8y-Kk-qdAdui z^-gVU_NV6p9d3K{i^vS!b3pK<9(ge zrntG3 zTU!#rRL7SyYhqT8L1F~v@p1#V=3`@RBKRhQ9y8K}uQF)x=?cF#yjopv3{c^>RPFs} zsda9Tm!pH9-RCl}RC2h-OV&cSDXQFAgU7r?d{I+ZB8PVZgusxT7Xk9nu u#{PR4WG;9uj*mJb85xy5wf~Pu*??4z<{Jg~y2#D`MM-q=*mG}pWX?Y?QL*s= diff --git a/vorestation.dme b/vorestation.dme index b5602c1e5a..940e70e2c3 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -2174,6 +2174,7 @@ #include "code\modules\mob\new_player\new_player_vr.dm" #include "code\modules\mob\new_player\poll.dm" #include "code\modules\mob\new_player\preferences_setup.dm" +#include "code\modules\mob\new_player\preferences_setup_vr.dm" #include "code\modules\mob\new_player\skill.dm" #include "code\modules\mob\new_player\sprite_accessories.dm" #include "code\modules\mob\new_player\sprite_accessories_vr.dm"