From 71f5206c10fe32afc5135c1dd699dd6be1a7d1e3 Mon Sep 17 00:00:00 2001 From: doshMobile <66050649+doshMobile@users.noreply.github.com> Date: Sat, 18 May 2024 17:31:08 -0500 Subject: [PATCH 1/2] add lini hair and clothing hoourgh --- maplestation.dme | 1 + .../loadout_items/loadout_datum_shoes.dm | 4 ++++ .../loadout_items/loadout_datum_under.dm | 4 ++++ .../mob/dead/new_player/sprite_accessories.dm | 5 +++++ maplestation_modules/icons/mob/human_face.dmi | Bin 11527 -> 12757 bytes .../lini_equipment/code/liniclothing.dm | 16 ++++++++++++++++ .../lini_equipment/icons/liniuniform_item.dmi | Bin 0 -> 746 bytes .../lini_equipment/icons/liniuniform_worn.dmi | Bin 0 -> 922 bytes 8 files changed, 30 insertions(+) create mode 100644 maplestation_modules/story_content/lini_equipment/code/liniclothing.dm create mode 100644 maplestation_modules/story_content/lini_equipment/icons/liniuniform_item.dmi create mode 100644 maplestation_modules/story_content/lini_equipment/icons/liniuniform_worn.dmi diff --git a/maplestation.dme b/maplestation.dme index da33d403e6fc..285bdf723a62 100644 --- a/maplestation.dme +++ b/maplestation.dme @@ -6498,6 +6498,7 @@ #include "maplestation_modules\story_content\grey_equipment\code\greyclothing.dm" #include "maplestation_modules\story_content\kimono\code\kimonoclothing.dm" #include "maplestation_modules\story_content\laurence_equipment\code\laurence_clothing.dm" +#include "maplestation_modules\story_content\lini_equipment\code\liniclothing.dm" #include "maplestation_modules\story_content\noble_equipment\code\beacon.dm" #include "maplestation_modules\story_content\noble_equipment\code\nobleclothing.dm" #include "maplestation_modules\story_content\noname_equipment\code\nonameclothing.dm" diff --git a/maplestation_modules/code/modules/loadouts/loadout_items/loadout_datum_shoes.dm b/maplestation_modules/code/modules/loadouts/loadout_items/loadout_datum_shoes.dm index ea16bdf2c9a0..b05bba011ae3 100644 --- a/maplestation_modules/code/modules/loadouts/loadout_items/loadout_datum_shoes.dm +++ b/maplestation_modules/code/modules/loadouts/loadout_items/loadout_datum_shoes.dm @@ -110,3 +110,7 @@ /datum/loadout_item/shoes/grey name = "Designer Boots" item_path = /obj/item/clothing/shoes/greyboots + +/datum/loadout_item/shoes/lini + name = "Berbier Boots" + item_path = /obj/item/clothing/shoes/liniboots diff --git a/maplestation_modules/code/modules/loadouts/loadout_items/loadout_datum_under.dm b/maplestation_modules/code/modules/loadouts/loadout_items/loadout_datum_under.dm index 34ff29261444..ec04b27c75c4 100644 --- a/maplestation_modules/code/modules/loadouts/loadout_items/loadout_datum_under.dm +++ b/maplestation_modules/code/modules/loadouts/loadout_items/loadout_datum_under.dm @@ -370,3 +370,7 @@ /datum/loadout_item/under/formal/grey name = "Designer Outfit" item_path = /obj/item/clothing/under/jumpsuit/greyshirt + +/datum/loadout_item/under/jumpsuit/pilot + name = "Berbier Uniform" + item_path = /obj/item/clothing/under/jumpsuit/lini diff --git a/maplestation_modules/code/modules/mob/dead/new_player/sprite_accessories.dm b/maplestation_modules/code/modules/mob/dead/new_player/sprite_accessories.dm index b7c471787c00..6bfa9ce687fe 100644 --- a/maplestation_modules/code/modules/mob/dead/new_player/sprite_accessories.dm +++ b/maplestation_modules/code/modules/mob/dead/new_player/sprite_accessories.dm @@ -79,6 +79,11 @@ icon = 'maplestation_modules/icons/mob/human_face.dmi' icon_state = "hair_fresh" +/datum/sprite_accessory/hair/fresh + name = "Ex-Pilot" + icon = 'maplestation_modules/icons/mob/human_face.dmi' + icon_state = "hair_expilot" + /// -- Undershirts -- /datum/sprite_accessory/undershirt/ratvarsoul name = "Ratvar's Soul" diff --git a/maplestation_modules/icons/mob/human_face.dmi b/maplestation_modules/icons/mob/human_face.dmi index 83eee0524d7946f678f0fe10436f594add658edb..c0b2638db4d89fae858d33c8ff3d12b8eaf2a6b7 100644 GIT binary patch literal 12757 zcmbWeWmMEr_clC~A|WX$455^C3phiAGzbDBASsP>4Fl34B@%+Plt_0YAtepcpdiiA zG4yk|@ArAXJnw(4cRe3q)*OCw&Y6AA-ut?)y$RP)Qy|2n!Gk~`gwGXawIC1-2Ji#H zy#q$bc#3Mk%Z|6Uo~x{dif$F zAc&6Ltd1Xyk8*n^+8QxV@rJEAt);}t73K!ovg`|ddUcMDXG4^xFB41*B~M$jW(&jSlhbSn1i}D$ zE-R(&`305cWJjxuTx(@so%8;Sp&CcC`6*ak@t4KpTE+QB`?fk_b#>%Apo^RZOcDcoGrI+4`c#^`>vns4BX#aUiYP5N)eqM;qp)H|mOUN~^ zZ&-i*gZz_d*^#DuoRU$3r=gd$@aPco&@ZPUpZuVb3{M|6FFMk%`L3NJcLyX;2P^$= zlHGgE`Q5pb#>B2#7EzJz5XsYY`!t-#aT8T zgbE5Jnu|8>xm)gF{;;*D+^pN~JZC5^G1rY0V`9rqJVA+(J|^c?arSF&W|}CD7mH=6 zMqjoBCB;XieV4oh9nsy(5QZ!ChWX&y;b09JtJ?O|(AEV*Nsp-+6D_OS7fDz~_rU>w zNN8x25X*#tnDVU?ZoA_HlJ3hwusuQ`AAhu3>JQZMYV?;eplH3*Ei<>lwo zo@AlU5cEbD{|>$K8%e`u5oeEQDD73%)tOTVgr~A6?S!|Q@~_0JcZ2mP8&Q+R#SVRW z-b6De+uPr3T3U8+@0W4GL>w1fYure2&PX%$I74iz@eC(1APpsEwzkSS_8}&U5B$BG z9Sjn23@7=-#3Hl`u?;7)w!|nXDM=!`%v0_{zG|`O-`6VqWM(|+rk5D3&GER)fs>+R zX({`~DLy{_%=$W;tD)l_E3UAJh)`xTHx5c!!<^~5)hELNMMOj-F8yi1l21ZnTVE~z zMDCT4Wki#|yi{WF>>atlfmlXau)WSKnb5NG@~n{y+sTrr@578|NEsTkSxN78E<15@ zbBmQi-lXJN>Qi) zyX@QfKRTy*);5rbjVsR7+BZ^$*z5n?)?5zGB%JHN)YR7(YRV8Vz95&rq12}Q(3hH? z?(Ph4tD)lJ;n^*l{r<2uEH2Z)t|t@$+Z~q@F|DP|Cgg$oH_o?bDqzRZiCZoTDS5vHgED4N4vqCSMn-e0bU8G|jKOk!`l4;&S?cD7CzV7RbcqSU<5YsdCd~Bf@`R}Q zANqj&5~AiLc5K0Ox%S%X>f90GZ;`-T`YD(y81azJMzv<;$;>~c3~?`o^DLRZ_Q4>r z8aO7yGY@3xaFUjhTN+ua))ulU6qa>B#R%*<*G{LS5(=QJooone9)#8cD>IQJfB zHZ#F>x)-7iNjDg{?;vT)Chsj4LtIlk?s425-*GCad+^nemY=ztVMEa$*uRTx?n)m= zkY{x?S6RstDq_25^6NNwY1Ml^Oxr^ZExJ7twyIz`% zW4Y`~6|IDz?hapJ;ndPw%4HMKKMdoNnWzdU5m>G9H$>*?#p!N0m|24(;S*X? z_+)o6##Jl|M5}BKHa2nOt5_2^w+E22hK306tt`~r9$g#-4SPx~BwW?tSh>5uB%^&; zHV-i?*XsypJ5&-C7cWXsdaSTFcU=%f!&v6a|IwH~CIkBfe5pa2J+PK8i?nu&=L)5- zh7$%cj@}0e+iIHMlasl>-+MYS&ThEUliZA)aADc$sG8df%Rfi3{^0Eh9j%1r2eI%n*d64=((*3{J0u(^U1`IViWoz)I5 zLzgD5zyq#ggr$nfm+`8F+S0`@UAQ4f7h`Yr!&V~QkRS$jn(`Ia z5O$QYva-f0KH?P+$k8d%`8sBuoL9)j&5aq`N+rdS5Kyuu3X(EJl?h)k3 zj&mBH6{J7CM4bK#UNJGeHwFkR+OxI0V0DkG(d6I`? zfMtU0YjAEBazWH3K}axE(2+iUUFX#W%)X@yMTx zLDOn;Jc!!t;Qi2M{}H`?C+dTnxJb7uh}W|lMw%icF;^|GX|IheZEX6u6O{T^C8`es z8;rkoI^GVDj8)D+1eq1C<*3RJ9xJzCUorV?X5#hrgCy}l0ScTvU>(N;+UB zCa0v##2prDbEJG5sdfJh&LiMq_(LkHvgZigTHHFgqrE+jd(qGR29{*!CEH!bN;X_i3hKMJ9J=omAPQY?jFp#Z&<#ydo zM!-tGa`K-H3D5g);9Lg6PTT}II(RoTeOe)Yad)rOYtJ&p;~DHVwL8~H>-SUQno|j* z{i*Uo_kD~h!__oS12vy&ml%9#vb!iB^5_syiCK1o>&0GNun#>O3S(l@L|jg-aZ`01 zi6XlmDegNZDX5!#Rqz|GQA1UN9JP$UKLX9OcGsa;^QQ{AM@YdCVj>-g6K0Y;{0766 zibYWGb~p-T?4GyL*m6AQAdA@|@P`3C;W|vbQR7n;D7)(Q-yA;`$b3QQ#VTQW=W{VReto=44g7imbIvC!At`EH{) zhi*JnD~4hJLA6SYUezF~mzS0OnM_JlQBxCktyCEsU)rxzg+V-^pXO0l?8TnfXKVX= z9YkZjYj%spK2?*NB!u6Ki>VJn*kzmGG(UKzsu^)h^M_G(-^?2Ox01d%bl9tqSj!@WRFkm z_I^DaJz+E9vO{Q}`sK@ZA0PPe=VzPIBV%VeZXG)ot7~ifgW|hEs5=W@Yjls9stf}0 zze(*_8ee`Hu#6k9G}xhh*mH7iVi3j`c%_L-5jVJoM$^kQow*R9KF;Z>7vmw~Te<-+Tk0vE-oxv3>rP z`7|Ypkci04+q+=}DHR7uf5qebHy#F)_V;2%FI5j6`c^8&hS~W^m}7v6xx%J=oPtMTUQe~<>tDMs#H$BO zn}ovoW!d6;r#@NPCR*j8z{SNs$J^GSpFTWLcu6h@?sq5@sRv@`m{p5rG6~5viyu7_ zZK9e8mywYfWQ)=Dz@6HOCLknyPGT{F6fmD|ji38%brfUgI(vmVL(ITexb>KA#A=*` zF(sJOOt?Z%I6NkaZlv3RZ1l6rPl~R5L&czm2LbbaRzjN;LB0X2zYEe)bNBw`d^nRN zzb8nI6AvR;;2gD~_>2>k^ylBRTJWr;5bNlTpG z^w)~>%;hDb8y-E0x{qRDW*t{r|NZ-SgV>;2=3-s~Ltiqf6k(Y@C1+Sz=7UBzFLSpa zx0JP_V(IKcNmV*utFVSLHOZIgC2I|5|0WxwDr+6(0CwT@i5ksYk<(Xk3{@OFRy)6j zG*2$poS$-ixBB(ulu=FPQ}4lnvkYePCD1vr56+s#v0W>7nc~8B=>rs%F|y~>8=1zH z!)$dulxkVML~eNGjgj$1Rd6|zdE%czt(mbaK9$_bc5J7k-|<#%375%~OpD_ZTi{WTqn=&dFY;n}IH!$c*>DXEHU6ILJZY*p3U zY)If{t@cq=r1uH=eN*#-q_u0o9H_4Y<^Bj|YHI3xg3wx~q<-th`8%WRE!YLnbg?NS z*!g>!kBw3z5)7w^Ov?)apS!27kOw0%lbq`eR_v1emV!lj@n*PUS?jeDd>*p9lfQop zIw|?rrP%?Wm~EcFTHrB}u;avS`nc~ym@v<+f0mnvsa-m04=@nT;10{@BANr8NjHE3 zQ3*aB?zS2xaJ(GdbynkDw-h|$c}PQD-PGP(n$gZuSj$Gk&RiwMzo>GPQM;3JQD(iw z0p!;V-&S2K4oO#@B!CBUm6ISx3gogdqXyS|K#17!={>=8VAL8J24`J$y5Lj#mIv19 zv)lZ(a_@+U%S95%6aZO_SZQw^v-Qwj0fIHaOVBt?cj1FEL0C-b0Gp3O?#0zBD`P~+ z=cJ(P@ZX5HuTNNbv7M7ZDYKnJggbbzr;g*kSIrSZ0HL2P)K==N5TEASe>0YbUzXk>{G<--S2s5Ig8mF{jgzDe19-K4}KGUhW zR~n|ivI}*m!}hvt!70$GE6&E;al05$gXzGk#E=i7c(>1qX0MGdu6)=0&EePO4~p+2 zO-(U@=O$JQzW@ROxQx&E`2Je^h};A$eSVuhZK5l?I-_l55eW-x>1{J?t(Y`Bjf_}q z{fsWqqqVE85cjexa>SUKo3m@cj@%BOUN;{C65y!1iV8!86+FAvGb<3Bc;`)!>o&w)ADIQ4z5FTJc;0i!D)%78DHMPWiiUSd3H#s{3GItj<+F6U=5KVycZ~8;4FBmF|>l7iim{1P4~*%vT$k) z-ZWH^?f($amB7%cE2(;2IE_cn0llx@&2ALbyeUIr)ULku+k;8kaFI}*l~E2pZTGSd z>pOE?m?~?7E_43nud~Co+)LtYUx+vpbcUrLw!d9DG~?ppl0|SO97vku5we_nUR6XT+XP}5%qmynnvM!k?_nr-p1KUaKY8tQvL3|4n#8(PA|&~QFlCJ0ecS68m*c+s=S zIV8>6`s*R_^y#b5S~b2)+tZcN@Cp|P6hpfIzf_f!;^Aq#M$QW$nW`JHi>(FVT~x9C zwVlyeZ*5GStYU18$02Qu@Mk-po|_wg`SRuV#)kD8(AuQ?{h6{W-wr9Y9*~&&7L~10 zMg*C=%XH<2&rEY;oz`MNOe;pBL$_8r z1hehmS#ni|qp8Th@!&QOugnm(!rbR@$jDlmnvJBS_@6y1w)@8%-+Lt20rS{-J-an^ zD$WTL-%q7k2RhGpX|SUc#F0!-Izr*7&%DtcM4m>eT!y1SG_evBNcWRk8z<*FvC)Qd z+8;rh){&;f9+Eixm40*e`AsY-Mj=fcE?G)wPC$70y~oTdQcfq^`Wuz)pPQu?VMJ_p zx87P9p>+Gwyw{GeWQX$upQkDF5x@C4l)e984xjlAL5FM1CtSAFfj+iGljLV15P;V8)D=Big(AGI=QW_dUq2oq$b@g+$6iz-F4{U#aF9&V-KVOrv5KYBaZ22yaok? z=g*lleEVo zlTPTpK&8!_^^qL4Gi7CE!bSbWU~~S$Uoghsfs?2FhXjZ!{3vDeC**+Mf{6J^T>w*oPQ)qZ4sJ_;-XtWphpM>|jm!<(djl;ROQDtCYKh z$cy&_WIi$N29Wu8gZ0u`f9&AS|H9DCf**UoKI7+Knxdzso_4z5H`t+Zwo~#ZOQS80 zS)r_|%6trmNwJe#k2?vgj7y>lb1+S@=d`O7#jVG04e=+#z-XI!rBn2>NR9O69FJ9} zbJtFiICg@CG3V@)ZB>@23x_%Mo5Q`ocXQFPDm0=9wA5VP{trujYr)r|vVP|Dems(z z!(b)i$gYAB_Hd-)J5bR$LCwA`qW23wGS zy^;%q2KY!;J+S=+E zt5wPHTmShPMfA$(uOl#mi+!=TF~7AU2}9p$EYXoZZZJG?r2`nR(FqI68vnB!vh(`t zSIBv+{*7!U*=rrlI;}!0P*S;5(-p=9eGniy5@MyCu;*Mo{|v1aX5!x# zIAsCYX2BjwiB=9@G(gMCawmp9OPjcj?_5iK#-`!Y86Nk=L(GnI8gA< zTPBm*6(?*UI$)7kfB*hn)G*&Y1^y&i4pCZraAh}J87H8Os!K;hc~PxkqKoax44IST$YkWD zAabjI@n^ZZ-%ps=Cdo$8C}g(%uuCAL`#qKz>>3T-LziCTK{7Si0308$^##0NU>~D~ zGM8wRFS^*uV%eyswB4O&R(C}v`Q$mm$oEW01&*W%md5C2Wqr5IY5|1X%Rd(`TBvw5 zVt2HWb)j(t0wGSk?FG19o&ILRSPJZ<;AIi|qRRq^h_4rB_S$NCwnM&=@ey2@Kxxb9 ztQ#_3u2tLf%*4ntab=7r4Xw>0?POc0{kGc0Pj;W(GKj`=cKgDSMTW_|0RW1`AKJ(~dBmva% z^6Q7KNhKg_v|pVr#(Zv{i}tnZJpxj4ov+9^ArNn5!J+91C-EiHcLUJ@7f8ao#>iq+ z#SBFzue3cAY53FCv$uyuagaI;JHvM~9ly%J5gE?Yd3Lf9eRBP6k$XJ$w6)bf{ zX`*aKtjIxsf=k`46FxgZQ$hY*U+fZ%yVoC)AxeI4br?Tl$u2wd{{P(~RfOsEyxoJC!v9U2Nnl~Vl@9mWxehvyTdd}cn|9UtN zV{TwKte!=48xWJkq$JvgU>`yo^PQi0{6rIxPkD4;Ug7HHdR6M_-s9Bw8p+skEGu6c zbkI6By;qN3i0NPSr7S$c^4#ds)hH_d3(S}z41+B=P1`^FSUqtG^8#zKa$3kJ85=A2mhlxcC>t7!To@ftj|4jkxN*1lO9y_^RKyC-Tw6x zb;m$!Ti=~$EYJC!JNiC`N#bK<|6HYjI$g^Yp-WNye(F*3b5_ZZW{5H|FEdkXSJT%c#smLVd?zT zs%Nq}{exw)!~O^VIok_Jao63tSrjSlmqnpqs*w6xt7#l8nnt?Dm4MFOjhhBkK=0sI zPj-gyTPmGxF_Mv@*=08YQ}LTgb`!OL?N7*~&nDW-?2>|=Qv|hjRivp1*rF5p_$~=H zkgxNERGBkxRlNEKf?wyhOI*%5??1cimhTRq!}^y8^|hp$@Qe=diW1d)#1ugq^>IYF z)HfwzlKZIjN)+$6I!r)?%2Qs_^_XIJcVCGkvR2OXaq-5Dc=(+Hi3t&jJMU-LkUR4H zA5>BnBBXR3oz!A|)M7*lTc(lovKZQTR}ObK-ozAz%4c-%GYuu;8C?DC z09_{x+>oIDi||35vN(zF{hFqhpEmT(7ZjmSdU|j>7c;dv*eh>xpx0B^ArHtwcLtJYx~h(1^8t-Aw+8Gln$f$V6@h*$eq^M_uxrb*B!nqv~|<@fh|Z=p36K7 zK_*mMOdo5xo6K&mmiTWI3P^Ym(96UNo_i>oxhyhteaFamWp*?t%beeOtKt4_EfExX zKdW$rclN*_-Jx-DB)KOF^71q_8x1AD?(*zoj8FVf_-%h-s}2uWP*?lg6X%3LZLn%` z`@ZorpMR-!W4`t4^O&f!`NNp>FYS}*NYZcH@q1p=tR@G6JQ&^rJ|owwepkM?tJkJq z*nhb?cezcAdyY5rtv{hRBN=ZFDl_(NTe%h*_M&~!@5yhsz1Vof4LTA)cqqx$VmCK# z4FmZK19G`Ky@-o2+_nU0_~|ZJe?X(=H|fb^x+qPSakLx;OJ{*1g^@64zq70c3sk=r z1@>#w^%@8A{d)?!5`N`!+3$DEv$x*MzQME?=Qex&HvgKP{@GI;2o*o+EHb%BX*(WW zhr(*hVa{*znRAz4Uo#dD{_5*DB%riWUl;1mZg= ztC-#lU2{VI^vGDVjti*1xH!&l!Gy3iiQ~WVp|jP02$*omgbm?em>ayrxRraLM6vi~ zpoP9#4zso_#Pq1Ts_I`@>?Zg6EgKsVHY6~Y&(1~@P~RhulzZJM7NdPGW$)mihUK5Z zeWe{@9SUB?t&dEXq5PyuvgeK3dW~QbI@lKR^_eeCV&31ddK8ImyV??*%ggxJO6 zY8u8G^Jix|Z(yaCoIfdIfru{2T#!e0g$(hR!76s-jXjL+k!CR~{LEF5Hdj6}vzX}Q z@ja)kK3()%)YWfcV(72<4`w-Uzxk1Sb7pv(vg&TGFEr8DLkgErN#0v)B|mEZ+e(;3%K{q6ti^XbxdTAG@+x465(-ZdJ< zLLx|T!`qIx$h7=I;a>X|-7yI|WKUK(4t87aLR#WS?D2=;&)i5$Z(>?I z0a)F+>CWg}8jyS4f}nQ1>`L`qDl|@VZ!;DTqS9J#OTJ3N4v_ln~x^Ch=0LpA*omPg}Umnlh`;XXS>Bzj|1Jy+gjxAg{AV$8Dy ze7C3df_&b05#tt>>BNiSy)+}R{9b& z=%x5UFAgOh&PMx_gWGs_VqAk3ymzUWnBIy*M^E0i!7w(fMGZYMO41#Qm zZiwJF!^v+;x_Jp^1yu_ZG&m{jNhtxg13jbwV(l7wQ$l^srDA-gQ_#HPPrZ){iup0- zpVV~7KeWd)qu0_vlV;AN)7Dx{ZgxakOTP0X*XkXo{4N)V#5IW^6wr_jX3Pf+5K-i1 z-7^6JW<%^~DBR)ZFZ7b+dUNR}L}|o~ibWK&m0G7ugA;<-%AG9J;HW_JszAv+0f8bI ztg zTpUN-DSv(cF8t4Pb#+xRA^>^R0iAt2_~j=ERByF86$>EaacRk`|d~$azx}cXFevp-Bw(LMP#tkAD2y5xA^n|_f=pL$jIsXnp=P+l#O;`X> z`Kmx~4QL91#EueXA2j`Lreubk8_8oyc=Cp56^{P_%F-Kfc9EK)+qeY@_Wc#0nXQiY zXO-&WcS65Qw3Cmer94*6p%mz?9ee;dlUu1m~EGl9_u}w=NF}_#Sr}Er*BYX zLw@g862ttHeyI>;n1HUkdUqj-JlhY%SzpL2#kQ(lmtK`%D8HOHvY2KCox*4IPRNfR zdWIr@{HRlvW}C%J}`!!D;M1& literal 11527 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 diff --git a/maplestation_modules/story_content/lini_equipment/code/liniclothing.dm b/maplestation_modules/story_content/lini_equipment/code/liniclothing.dm new file mode 100644 index 000000000000..6d68baaafb9d --- /dev/null +++ b/maplestation_modules/story_content/lini_equipment/code/liniclothing.dm @@ -0,0 +1,16 @@ +/obj/item/clothing/under/jumpsuit/lini + name = "Berbier Uniform" + desc = "An old uniform leftover from Lini's time with her old mercenary company, B.M.M.I. I. Worn more for convenience than anything." + resistance_flags = FIRE_PROOF|ACID_PROOF + icon = 'maplestation_modules/story_content/lini_equipment/icons/liniuniform_item.dmi' + worn_icon = 'maplestation_modules/story_content/lini_equipment/icons/liniuniform_worn.dmi' + icon_state = "liniuniform" + +/obj/item/clothing/shoes/liniboots + name = "Berbier Boots" + desc = "Steel toed boots, durable and lightweight." + icon = 'maplestation_modules/story_content/casual_clothing/icons/casual_icon.dmi' + resistance_flags = FIRE_PROOF|ACID_PROOF + icon = 'maplestation_modules/story_content/lini_equipment/icons/liniuniform_item.dmi' + worn_icon = 'maplestation_modules/story_content/lini_equipment/icons/liniuniform_worn.dmi' + icon_state = "liniboots" diff --git a/maplestation_modules/story_content/lini_equipment/icons/liniuniform_item.dmi b/maplestation_modules/story_content/lini_equipment/icons/liniuniform_item.dmi new file mode 100644 index 0000000000000000000000000000000000000000..2ea18ddaa3c34cf19698a06ace387e290635be5b GIT binary patch literal 746 zcmVxl|s!a~4`mk=tp<+|bQv zJ)T85kbP%zWL2w_ddaYrp`Q6b00001bW%=J06^y0W&i*HczRS=bVOxyV{&P5bZKvH z004NLQ&wkBR=M?~8Dd~5cpbrps0buQi&Cywc zg}tBuH~>yY>I#9|ZF!|FPPRp9A4D%Vk6MAX((bH8SO`^8s~`}1GUSnhmQdektDZHJ zRzSdk#@p9zqyaU-M#Q+rz7Z4v=|0}Re|~S{ojMZ!gC8DGAHSo2J_fHO zSWLJBBn^Oe5CZ#u5~i4t?_QZ;3+Vt@N1=I!h!_%60b1<)$MdWLSBe@P?C z_D~sc1cp;+GjPa==I~fO@IstB6R00030|Nnn*ifK<`&EIVMxl|s!a~4`mk=tp_Xg!`qIh(7p$K246eP?oH zRjZVG$*`5cz`#hNbJ_p^00DGTPE!Ct=GbNc004M;R9JLGWpiV4X>fFDZ*Bkpc$`yK zaB_9`^iy#0_2eo`Eh^5;&r`5fFwryM;w;ZhDainGjE%TBGg33tGfE(w;*!LYR3K9+ zCo?azG%qtPzbIFUi!&v&s2HS`i!-e#F*g;&HbhmMl%HQxj7z1mf~%hk*cku=;wdiD zeyp4T00M$ZL_t(&f$dq#lA|yTv?T>LuQ3?@|68})r1lca)FiMccP21Z4Qfl4L2^Rq z=;-*bh*C}x9bPnw#HivKFl~^977Z#KNyz!8Xg9md=JF%DO)1qqH7>o`<-*hl<>m*eV^TpcCs zi;cs0uPGSf|D$nAQ^Z-`f9kx>9=kB50CS)E4;;u?dEx_t>u!^AWUwNxW-gu}xHeqo~O0mdDehtDgrke5|> zE3?dH@XiyFPO8>D!2MienzSspwf13S=j)Sp8KFj_c#XY--)82ZwVT`8=p!-09j~eu>7@;{Z7J#i@^eZHG zA7Lx>Pr;O!rW(9X{A+Brz1O840C>RY+i43SAw*O-?`f1?CH`6VS%1&1`uhNZyteA^ z0|aK2_-6_TEBrGBn$U=c6dvbp7rMjmB2HyTZ1UD&l)}4Pa(l3;>?c6M*>c3!|DLugFU~%7UAGGuUpJTW5 w-g Date: Sat, 18 May 2024 17:42:27 -0500 Subject: [PATCH 2/2] I KNEW I MESSED UP SOMETHING --- .../code/modules/mob/dead/new_player/sprite_accessories.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maplestation_modules/code/modules/mob/dead/new_player/sprite_accessories.dm b/maplestation_modules/code/modules/mob/dead/new_player/sprite_accessories.dm index 6bfa9ce687fe..2db2272d064b 100644 --- a/maplestation_modules/code/modules/mob/dead/new_player/sprite_accessories.dm +++ b/maplestation_modules/code/modules/mob/dead/new_player/sprite_accessories.dm @@ -79,7 +79,7 @@ icon = 'maplestation_modules/icons/mob/human_face.dmi' icon_state = "hair_fresh" -/datum/sprite_accessory/hair/fresh +/datum/sprite_accessory/hair/pilot name = "Ex-Pilot" icon = 'maplestation_modules/icons/mob/human_face.dmi' icon_state = "hair_expilot"