From 9decfc49f65fb2d426064f6a85bd289455017f89 Mon Sep 17 00:00:00 2001 From: Gandalf Date: Sat, 17 Apr 2021 19:45:43 +0100 Subject: [PATCH] Revert "toggleable eyepatch side (#4949)" (#4986) This reverts commit 774824da1820d8654fc667bca7db3a086bc1fa94. --- .../items/stacks/sheets/sheet_types.dm | 1 - .../customization/icons/mob/clothing/eyes.dmi | Bin 3969 -> 3453 bytes .../customization/icons/obj/clothing/eyes.dmi | Bin 4205 -> 3536 bytes .../modules/client/loadout/glasses.dm | 57 +++++++++--- .../modules/clothing/glasses/glasses.dm | 84 ++++-------------- .../modules/clothing/glasses/hud.dm | 79 ++++++++++++---- 6 files changed, 126 insertions(+), 95 deletions(-) diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index e55e0c777e6..dfa35cd07c9 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -333,7 +333,6 @@ GLOBAL_LIST_INIT(cloth_recipes, list ( \ new/datum/stack_recipe("white beanie", /obj/item/clothing/head/beanie, 2), \ null, \ new/datum/stack_recipe("blindfold", /obj/item/clothing/glasses/blindfold, 2), \ - new/datum/stack_recipe("eyepatch wrap", /obj/item/clothing/glasses/eyepatch/wrap, 2), /*SKYRAT EDIT ADDITION*/ \ null, \ new/datum/stack_recipe("19x19 canvas", /obj/item/canvas/nineteen_nineteen, 3), \ new/datum/stack_recipe("23x19 canvas", /obj/item/canvas/twentythree_nineteen, 4), \ diff --git a/modular_skyrat/modules/customization/icons/mob/clothing/eyes.dmi b/modular_skyrat/modules/customization/icons/mob/clothing/eyes.dmi index 3b6bee96d13a552d85868d5be2dafef16e1ef024..26b4e167578a994d441f24e2aa5138b545d9e3fe 100644 GIT binary patch literal 3453 zcmcInX;>228U~kK#;qwc%ha;POw);Jals`uw{n?C%}P^qNi)j@6$Qz4atYJS$uXD7 z$}Sq23o0s8hG?m%xrbt+fEz@LAP8J$>Y01*^W2~H<2>g%-}C)B@B4o5d(LflR|jRq z9f|+|K-tOB?iT<6s4H0j`Aw3_7GrdyWP1yPc*ocUMF&P*y%BRY@;U$zUs6b_RY@^X z+cf>ak{}D!dpkj}R+4U&I(TF7ROlIub5f$*p6s8rsQdgxVv)>YLPPa#j5GVBTj%+_ zyj^$p6ra)g+3`e~UFCq1nW3Dly4v119aX>P6_@Ac+7In?)7`ygpck#6u(uNLo$LR8 zAw=w6@&4LaiL-TFR zbx3>Usrs}x+63O^haAd&_aW2Sa|bP*APXGbljVm20Hy0rb~cdslI2O8P_5BjL^gg$ ztwwiqEW3DLv*C};tNF+Z87SjmUQ54wgJWh|iiJx3J;x6&;bUgD56|vRFAW&)x3zIm z>?SBwYJ|wxTy}&p_Eq=q>z+CKw&LgeRfps;a&bd!SYdof+*G8eKzMP+u#2^v7>Nhv z%YxL2wLs)+?$8#1Nwd5fKvPP_Is*XQ?z}zYu##=jT=-K5uqL2j_w7C!jRqOP2Tq%p zr>Dze>*}Z}Fu19ZlAfM^TDIqiNEbstC@&?cuk^!a!NIWVhYxpY$lMy`w!L^U4ecxQ zvrJrDN;TbJkqX+y=5$ix2k{j{g2=&R))%oJG&&ZB>+S7*=06h{e2ie#5wb<*RyH-h zilC!TiB?$P%pGS^usT!ia6Ms&A63JKRV>HhN42&s2PwmdpWDQ_HI0IpmHga*(^4|i zwe}vf#l5ty00$(X>l5ZO;L3k4mbcsbTOS|H+u(JTY_ZMFrY}QmQIAZNF7d^1jKdMc zz?%PHUj|=mwXcK7do)EoP0A>%PrX0FYD14aa@<{95AsNhE}sy4w3BYJkUiS1AE)>S zFsfFMS=%xyet-C&HnqbR?TLoQ#9R>w1knAVV-tf(&!ek6(Wut@)tRi+yqv#)!&tV4 zHTd)v_dY2?Pdi0-UkF4mGYR3Ihl^?;2Irr?ubnmIStJWP7vhecGRoS6#bQJJE{ezj z9-kc6*GVyQ_uMaWJiR>0{LW5xQ+9SXlbn7CYV2DurCc?lCojdl7H`Dmtvza5C{x%0 zrPI{I8+?e=wbI)bL@&y`>~c$;%h_$j+8FIe-q{sW_fGFwubWYXq)B^h_1J1kiL z5LK2)`z3BPWq^OMm2-UTXeCCf&@Z>RtQyjq!Lg{*H%K7nl9jo%r`yu)Wf9C zSC%wKqK0~`*sPU`|uA84b%&TmkH3}V_Bu}&!z6&~3 z=sYqXV`%!rd0O7QN@#2lp(gU0mTF^D6Qjk8IVNdZ4Vzw6+r-JJd*)_zCvY8$$l@?@ z;<&zX@Rz}`-WHgTczTm=A%noqKB);uh9^?FwDlh1m~*bWby|1 zP|-V2gTm_f^J7arIlHv9VQtdqmc_>@Nz~E=nkE`z(1^n=f&uevgTgGAWLN9r*f6 zm|Pt*9~^R1>s_Q!-AgoFsE%!~y=lRmnfU`Z*mgBM+GQ{@GpWV_4t;k9j5W;{9Ym_aP?sx$-MkZwUYpPV@TkJL@Gh7#AXqH#lUyAo7HkZldGiH%mYG;D3BOMH<}5& zrA|NDrn=qti37+jDvjS3Hw@bvqyu3ed~3;D9YNocNDtLIwG3Tuz*1`yS<)2X18~#e zsxLf$G_!0l?uU;4-oBo(S05|Rq0gC{nY|PW;o*_8jqn%u7PbC0yr75KxA;-;=_&W4 zNGSL!eKWba_NVmz$R0#u!6+{{crI$(`Eh=%*)Es9z|!!$Z|Hj1@0p8CBO#=5pyh{FuiRhJ- zUSq=Gha1B%nOCW)17Qt{n^WE&3&xu+F_}KBVs7a>i%Pvu6Cc!a5v zTjoUU(XI;sN>l5C@A|L{bdhPb?3av-u!7IY;$pdFYjZfAaTew|9RZk<^zd_|2Nx6i z^wy(cV1y871-l?NrU)6l*fJLQZqoFJSJgQFkjq!%Em4R#v-X+yD#4QzUzQBl$c0*v*>Gj`xEKp#iF@~IJ1LaV>n-5Dg{H_5Xri2^)`Uv?%M zhs!IdA$u}}rrRaa-eJ`t{VlUYlhPLRs7)F2z={+)OQFs<{b1yU0)Cu9990Qju{q~Uh~{Wo~)V4CDV1#q%= LwR?W@a>~B}Kqoj< literal 3969 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 F`X|=j9uNQk diff --git a/modular_skyrat/modules/customization/icons/obj/clothing/eyes.dmi b/modular_skyrat/modules/customization/icons/obj/clothing/eyes.dmi index 28a2c685644ad38f047e69a33bc300b73588012f..c5b8f5757543eb17c03ec3643f1c4dbc607c19aa 100644 GIT binary patch literal 3536 zcma)9cTm$y*Zw6GDM66l1TG!Sm4FD+5=2C$84*wr>0Jm#IuSz=q}+fsFG2{20Rg3m zNReJdK>-adf+3@)8f1I2Ql_JXbCo zTOA?h_uybZn!DjH14qyoWqmWm*yFBSuuou!PXG!4A_{Uo*B*~Egs{)#MW?Wb$^Gni zg(ZR}reFL{4`_P37@;VeYi{%mGx zNR9G4_2kYVaAd99L#I`E!qU{lIIVSii`#&rWLG<603XuXVNBn}R&VHgvL8Ek{x1=W zT0KLR)7C)31vbNTe+0i$uCTYb$Ha_ova?3(jS8$}e(+b@FKP;cZp;S>c1yN3FpT-h zhRNj?lAmSE3YF@TIbHee@A4fx325a{i|^aYC^Hq)UFax+7JYZwtnG3hsHY-l(yoq_ z_TUtlWZ$sdfYv6nI)$#sp7V zxu1!-6VLYP4K7d@$HBVq?K{N|oD1JZ+s>)UXPRO7bKW#GZ0O=pHhD6MN6bFIQ{0e?%ubh6eD&W`_whk44SEij(>y zK@2}3rR=~xME9goamK9Ha+sc4Sl7pokRzt&G;=V3X0e5g+nhq(NWRw;`jST&k`C#l z)IVL+PT$?h6)JsZS0Pv(BhxKqc)SZDBizMgqGuzO1x;H9Jq46syo9fArT|deK*=P- z;dECgm)}QHyuemqNl^uj=<`3X5dpHR59Q?K&|Y3%vs?HB0XBfOoh}E7cCyHhW})?L zq%3`_A^E*pc4rF8h}056@>OWUpvcdZi^C(0Jl<{W(;e%Ax9+<0J1|)jFC_-AHgX*W z>%b0?qwf&zTigw6oNC|?4JI);u_8x2X#z8`ql4j}&P1>ebX`Ho;go~hc!!C^?gXRa zgzi`&%FgB{%yir-==M>P3iP52gPH=0eFm{lnthLG7cUK}ZIALo12&IB4ND?G*g53& z8@RxOraDTUc>BLj`)6hCR(N`D=tu)vHpf6vy~(AmF3&pkt_!Au7%npmriLuQ7r@LM z57Citr;JdmY?dF#ZS=kvZTEYpwm4K5E#Tj7y~QSHQ;3EDaK^mA!5XP%fWBPJQ9Xa9MK=SE=;#M-M;`4NYm)&U6XZ7p z9uB2XF67y=tKA2CtGCgd6|Npy=?cO!j(8&YZ8g1$NX`K>H*g3>qiT{p(*c5 zZ`-9l&0uiK?*MkaW%ysWldmF(N_z0yr?mr`#V_?u{X^y$N|X!o??7;ul!I*~DzDkq ziTNhW<(51;##Uu9D7$2r)rMdD|0ibqS> z3|y7Tla{HZZ$6_l#88S$T3L+7_VnquJ39ZG3ptBA$GAvk382#c`3^KJ`_y>o!alCk zSIp79lsjU4rH7$QX~RoA4^50jCH4h(R)%IjloetkOSJu~*V($mkP{h=N+ zksa=uvV0tvWAWaaae)z>{+F=iE3cdSM}I&6$sbwI-(Z1gb#-!jf>| zM9mA~=xzPf*n@PGw9f7TyTUTJ86jd>WRM`5RSb?TLQo8HRHa#Tux82l#}fF$Da{iNq zA#Ki~dC}4q)Q^xTzv(s>eO`SIxN(zZlD8&T?x-w(a<+$?nJVIZQW?v)+?5{lBHNg_ zg6loMrC2AlITdk`G#3~=kl#TW(#P}T3;nHMCc3~3?(wFk@?LYgmV6V+mGv3msqF10 zC^)po@X#V4_J60odZnT1w*b@HwW#Vgjdj5!zLcDrb9-nk`>^-vuy^iWkxM;HjAw>% zZnHV`-&RBtl^Q(^Bi$~rVsHjRo(J9Nc7Kl9tGQLr7i!~)ahN5Z>Fi^?@9F|W*bNjF zQ6;r5r#>$J(-=(ULc^t>l41S*o6oDN`j}JqSfy*sTW$6Y3|qIv6zLd`MaoJ^bF-9( zN0f253mpx2XbNHT+%VD9^6TyC@fU?eL7`Ag`o@HDcVBo*rz@TeDNUZZ{_Drjw$Ssb5)bacdeLysrAbi9H(xE@61Adk^`0NquKYI)655$s4_$(Eh z4%tuDwiP{*YQne)6&_#eS850*O$S|%52Do52*`YYxc)H#NCQj zR6t0sA-BU&n1c3mfFp?u6Zn6iO#Z%lg1r5$TdBVI!T+aCJQ7a1Q(7=Qjha21xsHf^ zfW4}ObDieOEdX(e;j6O4b?qYodhC8fBbuSHy*!yzeX^YeX!&k%`9Wz$niD(cV7T>m zXVfTIx|GJio-e35*;h`y-BQ4(a5heowJ#Nip6Q6Sxli~x-#-~p)icvh+Z(C%)OGy% z>>G=GU)il{dl;iZ4gi+a*pb(@v!Ca$TDB2C_YVYBATOcz&0F?8MGiN#WA2Fni6-su zCIiA~u1a3I2j`9it0;p;4PG0sb|8m_4xBf1tQM&b=hd+CFxq$EE6~&24So7?cQ$=B ztZiN6aAi+gBM(cNiUmK?f*C_GJ^ZkmmJ@)j;iQ+yL$iqLup)fi$gHNxOEXCQ}{hg zfM4hf!}Xa~6k~!3DzEF%-ruh*XdeqI-^YxsBY%m>%<*Te(l@Oxp+`+E$X0y|y3)!n zAmEFvj0M0bodDn5fE%tWf%_ZM)3oD$j2#O#~7R)A(`6Z7jE4-$(N3vKFsK)7*n)E=J+P_VI;@3Bi!>A_MyHk2Z-M> zw4zwPhQ8FotlR_)Z_8Y4&0>Wp$DZU~8Kx>{6K*I>$eBz4nLQl!6f6o%>sD}?3djto zIf$z)4R#6Yw?!AS5%w7*7rd+UR4^+v%#*Ce*v1Ex0KjlpU+1&|J3h@9gW zeOnu9s9H@_`~1{3+0#F6#OH}3=SL3?C6rquc97N7i|D zk9Jx{g4;4_!aNfz}G003?sFadn*-R`&1HevHJf(2~KMqb8v9b+jrdE-K~X! z;73j?GhlDt6pApYJEY4Y!$V{HUvtC!=ToGEgyH_aEnLAm1sj#qc59RQq_76T-W2*PWz3p>tZE`lO1f3y= zN{dv1Sm58pCe}ZQ{Z!b-yxJVT>c{}(t-AxTJeV5Vj-+V8vqVj=zc=e>u%d4^rbuuPTB=pp)@?HbK_Pvu3Blcrs!+|V6o@vv zg~Q*xmnO7iCk-C92m_pHP6*wwJwJhEW>}GoIHjJb2*7Ed9XBh3!DxwUEibL(YGzhr zhFxgP+noid!zQQ89T%w@eui`+tq}a;GZO(w2^SB`Z8?MXAlNz$0-VocU3M(cC`R(w zHJjOJxy3puKIbpqL(AUbXBzYV%hmP=c&|86FLTw!(j`#otVKdDWz|3~^<8gAYnzub zbM|+`s4f2u#Ht7q+RxC}<9m9QQjxoAAdS?g-^`%>x1ji`dxs@;i~Fg_HN01OSkVbO za9YPVkfCe)Sg@g?c>zqhq^53PM)ZAlgH$zW|Kf_0nwrEacPq&~cV<~VS|5A1b9NrB z$12_C#!k)%GMSxE^PT*6?&!_lmahdm<`VPs8%LJaOIwhFcy^EBJzfrkcqXa0S9Sa^ zX{h%PVUDA`mE0h*NUDO(`x7=)9Dy9OXyGTLis3Fo6Su1E{L()hmN54e(nYBPKmq(( ziiR6uZ7;s2QL^8jdv39y2hYoLb!)PzGUkr1VS^$2)yCm@bxFksJD>@yI&d|;1kZrGB8Wx5>tQ;V)?5+*YC1a(N zh4RS^HThM?-~K0mQzdU?9&g-;bJ^BW3Z^Mgx?+;0rxdJvtl}b`B;;xqoc;R8*xpU{)L_le&rs~kEjWT{gRk}@StdE`Y2?oP+$sqUwLH9BF zrjyfRz|!TRQgft=c-}uI(-#G}RU>C`YR4|2|I}>8f2TxTgd917WKGz*N7~l^Ot7E4 zN%Np{FZP$>LYn^uQU(SLE#@*Zd_4}E0-S_x<>XQ@*6P(57Y$}v4UL?A@1G0ZQHtuY z0?!nNs$q_=14@WJK1f{}F(Q+?S2+HD`d-M5Ykl+_F*>o((q^f`)pNqhNz=^eXmZH* zE<8djFqJ8eHE!R2fDV$`zu?_8!Sl@q_!KY~UK>jonsJr|#>O!KczYdJ`IDI3d^|VTGu^Hh}+|jl7&S@H06^^>FKO+wVW)q z0}C_BmuN*NE`QpUzic`{7jNhW_GrA#W3nxXVbfpr*@pj<&Gn9V({22A2)q>PXue%M z8>%QJ`MY~`lsj;pq+vvrl$pudUFHkIaSx|U^i>^*NVxp!7t8VSxt^V!O-D^x>yx~n z57tq~9WsJmFAWXZ2y(G*lTW2MWXCPT`X^4R7+aBzDSeIslCE0YcC|M^HbV=pLNc#l zFbYmlBlm58L(MHM1yg?Vy)}FUVb>JMKv7W^d(vW=cd4gUbLyW;2y1LdvrY7DL_eXp z^F09&Q9N2h(TN@;wG{(De*AD0raWAFR*y-Gp?GspMy?WpzRB!cW`kZg<9nrAchuH5 zIQi&0`_5S+R$ex#A1Z$w+U_)2j^J}2=+6E!yyRmWIkntaTugt{QquINlBZEfSdhKs z!kQQI(pI)-uPkF+)uQ4%y`>JNU$(UhHPgA?np~Z0JFY-ym{OQ<9O1g+#U$JE)Q$3~ zDJwwJ+8SF-UuieVi8K0g)A1Ahy3;uFoz(fWqeKQ?J-+!nVrhEyb)eeIV-pyD*0|e| zVdi2nI#0OoBnJHHTfSPT&Azz0>seVVFri5JdPk=b7`FQd-=0c{(wJUbL*nL(|;@^VvXqR$-n@G_Dw(TC9qys^WcjaDGDk z1C4a;GLd_-8I?Xtn|F&$OZ}U74yQS66cpflKTEtt)S~cr8P|M4vSGd|G$rT<>0)r_ zExD;RUw#$dm%q2dfKJbV&Nbi1HBAhP!ooW{8&Q)c)^R$)+~hO;d|F$ciW&u=60JCh`U0jCW{U?9L&Bu9~q1u z+nqhe?(H$q~#7K>1UjidNnS(zqOq>w}+Q z2LEC(w9z^O@MVl3{AlFGUkz;(y?Wy5sqOm?)kY$|YB$h%Fd+{d&emyFCwM|0 zCrpb+y zIL;LD7)v`{KR*T2wae7E!@3tb4{)UHIW)nS7uV0qSpOYzu zTH_>Sx()kxR0QY)GsQ~q{K3h< z+V#3DqOYEVj4ZSak4(97Vi?VXR2=`Wps*4QaSf@qA^KVb&-M{IT;0pVUboKdEx0oO zT2`kc3j%VnQ<+wjkWFQft~l2Nq0-3WLX4lJML0MxkOkDxFX(wg4zAh-@9NHQ5$^z< znN$u~=*)+Aj|81vNmCkM`hys8+BkNWI}|`o$R1UmbqCT0MO2+um1%XO&e;$sfOSS0 z#V@2De*_bKUr%qu*N{E7v61t;UglqoT7*Ylc^d3FOD~A(eh+4x>Uiieu(yQ`nQ}Nv zK~85Gpw4?nuI0Uz!~9Q!m^_#NaSQrzpvqM5bZoC=--hk#>BJvShftF2hlj$KkKLXI zw|Q6*bMATuCx3?d3W4m19PB_R-^Cvde@Sz6e|!vQzg z`AtE_Pp)NfUlAF4JdlVKB5nTdxE70>P=)^T`ie*rx=5}ROD8|@?Hg1t%qib+2TLNG z$rql-6CDA~RXBTz><@|Ek~&KL`9&{TeJGIK930uT$Ui2Wu#0Ig3?>=FW2;tL)s-+H^>i&Sk9ykj*oeD>{Y*Kk_4z zKl}^s~x=4pUNMpBcJYDCNx7A{HdUmWQxb4h2<=UHlD2S%97n>v_K>DqjA|@=yBw dAEc3JW8)+CK0}@xk^dh6`nph^YOO~v{{v%r8p;3w diff --git a/modular_skyrat/modules/customization/modules/client/loadout/glasses.dm b/modular_skyrat/modules/customization/modules/client/loadout/glasses.dm index 818d4f00b45..edb1c4b688b 100644 --- a/modular_skyrat/modules/customization/modules/client/loadout/glasses.dm +++ b/modular_skyrat/modules/customization/modules/client/loadout/glasses.dm @@ -18,6 +18,10 @@ name = "Eyepatch" path = /obj/item/clothing/glasses/eyepatch +/datum/loadout_item/glasses/eyepatchright + name = "Right Eyepatch" + path = /obj/item/clothing/glasses/eyepatch/right + /datum/loadout_item/glasses/heat name = "Heat goggles" path = /obj/item/clothing/glasses/heat @@ -54,38 +58,67 @@ name = "Modern Glasses" path = /obj/item/clothing/glasses/betterunshit -/datum/loadout_item/glasses/eyewrap - name = "Eyepatch Wrap" - path = /obj/item/clothing/glasses/eyepatch/wrap - /datum/loadout_item/glasses/whiteeyepatch name = "White Eyepatch" path = /obj/item/clothing/glasses/eyepatch/white -/datum/loadout_item/glasses/medicpatch +/datum/loadout_item/glasses/whiteeyepatchright + name = "White Eyepatch" + path = /obj/item/clothing/glasses/eyepatch/whiteright + + +/datum/loadout_item/glasses/medic name = "Medical Eyepatch" - path = /obj/item/clothing/glasses/hud/eyepatch/med + path = /obj/item/clothing/glasses/hud/med/eyepatchsr restricted_roles = list("Medical Doctor", "Chief Medical Officer", "Geneticist", "Chemist", "Virologist", "Paramedic") restricted_desc = "Medical" -/datum/loadout_item/glasses/robopatch +/datum/loadout_item/glasses/medicright + name = "Right Medical Eyepatch" + path = /obj/item/clothing/glasses/hud/med/righteyepatchsr + restricted_roles = list("Medical Doctor", "Chief Medical Officer", "Geneticist", "Chemist", "Virologist", "Paramedic") + restricted_desc = "lacideM" + +/datum/loadout_item/glasses/robo name = "Diagnostic Eyepatch" - path = /obj/item/clothing/glasses/hud/eyepatch/diagnostic + path = /obj/item/clothing/glasses/hud/diagnostic/eyepatchsr restricted_roles = list("Scientist", "Roboticist", "Geneticist", "Research Director") restricted_desc = "Science" -/datum/loadout_item/glasses/scipatch +/datum/loadout_item/glasses/roboright + name = "Right Diagnostic Eyepatch" + path = /obj/item/clothing/glasses/hud/diagnostic/righteyepatchsr + restricted_roles = list("Scientist", "Roboticist", "Geneticist", "Research Director") + restricted_desc = "ecneicS" + +/datum/loadout_item/glasses/sci name = "Science Eyepatch" - path = /obj/item/clothing/glasses/hud/eyepatch/sci + path = /obj/item/clothing/glasses/hud/sci/eyepatchsr restricted_roles = list("Scientist", "Roboticist", "Geneticist", "Research Director", "Chemist") restricted_desc = "Science" +/datum/loadout_item/glasses/sciright + name = "Right Science Eyepatch" + path = /obj/item/clothing/glasses/hud/sci/righteyepatchsr + restricted_roles = list("Scientist", "Roboticist", "Geneticist", "Research Director", "Chemist") + restricted_desc = "ecneicS" + /datum/loadout_item/glasses/sechud name = "Security Hud" path = /obj/item/clothing/glasses/hud/security restricted_roles = list("Security Officer", "Security Sergeant", "Warden", "Head of Security") -/datum/loadout_item/glasses/secpatch +/datum/loadout_item/glasses/sechud/eyepatch name = "Security Eyepatch Hud" - path = /obj/item/clothing/glasses/hud/eyepatch/sec + path = /obj/item/clothing/glasses/hud/sec/eyepatchsr restricted_roles = list("Security Officer", "Security Sergeant", "Warden", "Head of Security") + +/datum/loadout_item/glasses/sechud/righteyepatch + name = "Right Security Eyepatch Hud" + path = /obj/item/clothing/glasses/hud/sec/righteyepatchsr + restricted_roles = list("Security Officer", "Security Sergeant", "Warden", "Head of Security") + restricted_desc = "ytiruceS" + + + + diff --git a/modular_skyrat/modules/customization/modules/clothing/glasses/glasses.dm b/modular_skyrat/modules/customization/modules/clothing/glasses/glasses.dm index 37875739443..3c92f415333 100644 --- a/modular_skyrat/modules/customization/modules/clothing/glasses/glasses.dm +++ b/modular_skyrat/modules/customization/modules/clothing/glasses/glasses.dm @@ -1,75 +1,10 @@ -/obj/item/clothing/glasses //Code to let you switch the side your eyepatch is on! Woo! Just an explanation, this is added to the base glasses so it works on eyepatch-huds too - var/can_switch_eye = FALSE //Having this default to false means that its easy to make sure this doesnt apply to any pre-existing items - var/current_eye = "_R" //Added to the end of the icon_state to make this easy code-wise, L and R being the wearer's Left and Right - -/obj/item/clothing/glasses/CtrlClick(mob/user) - . = ..() - if(.) - return - if(!user.canUseTopic(src, BE_CLOSE, NO_DEXTERITY, FALSE, !iscyborg(user))) - return - else - switcheye() - -/obj/item/clothing/glasses/examine(mob/user) - . = ..() - if(can_switch_eye) - if(current_eye == "_L") - . += "Ctrl-click on [src] to wear it over your right eye." - else - . += "Ctrl-click on [src] to wear it over your left eye." - -/obj/item/clothing/glasses/verb/eyepatch_switcheye() - set name = "Switch Eyepatch Side" - set category = null - set src in usr - switcheye() - -/obj/item/clothing/glasses/proc/switcheye() - if(!can_use(usr)) - return - if(!can_switch_eye) - to_chat(usr, "You cannot wear this any differently!") - return - eyepatch_do_switch() - if(current_eye == "_L") - to_chat(usr, "You adjust the eyepatch to wear it over your left eye.") - else if(current_eye == "_R") - to_chat(usr, "You adjust the eyepatch to wear it over your right eye.") - usr.update_inv_glasses() - usr.update_overlays() - -/obj/item/clothing/glasses/proc/eyepatch_do_switch() - if(current_eye == "_L") - current_eye = "_R" - else if(current_eye == "_R") - current_eye = "_L" - src.icon_state = "[initial(icon_state)]"+ current_eye - -/obj/item/clothing/glasses/Initialize() - . = ..() - icon_state += current_eye //Makes sure it spawns in with a sprite - -/* ---------- Items Below ----------*/ - -/obj/item/clothing/glasses/eyepatch //Re-defined here for ease with the left/right switch - icon = 'modular_skyrat/modules/customization/icons/obj/clothing/eyes.dmi' - worn_icon = 'modular_skyrat/modules/customization/icons/mob/clothing/eyes.dmi' - can_switch_eye = TRUE - -/obj/item/clothing/glasses/eyepatch/wrap - name = "eye wrap" - desc = "A glorified bandage. At least this one's actually made for your head..." - icon = 'modular_skyrat/modules/customization/icons/obj/clothing/eyes.dmi' - worn_icon = 'modular_skyrat/modules/customization/icons/mob/clothing/eyes.dmi' - icon_state = "eyewrap" - /obj/item/clothing/glasses/eyepatch/white name = "white eyepatch" desc = "This is what happens when a pirate gets a PhD." icon = 'modular_skyrat/modules/customization/icons/obj/clothing/eyes.dmi' worn_icon = 'modular_skyrat/modules/customization/icons/mob/clothing/eyes.dmi' icon_state = "eyepatch_white" + inhand_icon_state = "eyepatch" /obj/item/clothing/glasses/thin name = "thin glasses" @@ -97,3 +32,20 @@ icon_state = "binoclard_lenses" inhand_icon_state = "glasses_rimless" vision_correction = TRUE + +/obj/item/clothing/glasses/eyepatch/right //if someone has more brain that I do, make these a...on click flip thing, please i dunno what i'm doing + name = "right sided eyepatch" + desc = ".rraY" + icon = 'modular_skyrat/modules/customization/icons/obj/clothing/eyes.dmi' + worn_icon = 'modular_skyrat/modules/customization/icons/mob/clothing/eyes.dmi' + icon_state = "eyepatch_1" + inhand_icon_state = "eyepatch" + +/obj/item/clothing/glasses/eyepatch/whiteright + name = "right white eyepatch" + desc = ".DhP a steg etarip a nehw sneppah tahw si sihT" + icon = 'modular_skyrat/modules/customization/icons/obj/clothing/eyes.dmi' + worn_icon = 'modular_skyrat/modules/customization/icons/mob/clothing/eyes.dmi' + icon_state = "eyepatch_white_1" + inhand_icon_state = "eyepatch" + diff --git a/modular_skyrat/modules/customization/modules/clothing/glasses/hud.dm b/modular_skyrat/modules/customization/modules/clothing/glasses/hud.dm index a1b37f7e4a9..8a78b7f517a 100644 --- a/modular_skyrat/modules/customization/modules/clothing/glasses/hud.dm +++ b/modular_skyrat/modules/customization/modules/clothing/glasses/hud.dm @@ -1,38 +1,85 @@ -/obj/item/clothing/glasses/hud/eyepatch - name = "eyepatch HUD" - desc = "A simple HUD designed to interface with optical nerves of a lost eye. This one seems busted." +/obj/item/clothing/glasses/hud/sec/eyepatchsr + name = "Security Eyepatch Hud" + desc = "Lost your eye beating an innocent clown? Thankfully your corporate overlords have made something to make up for this. May not do well against flashes." icon = 'modular_skyrat/modules/customization/icons/obj/clothing/eyes.dmi' worn_icon = 'modular_skyrat/modules/customization/icons/mob/clothing/eyes.dmi' icon_state = "hudpatch" inhand_icon_state = "eyepatch" - can_switch_eye = TRUE //See modular_skyrat\modules\customization\modules\clothing\glasses\glasses.dm - -/obj/item/clothing/glasses/hud/eyepatch/sec - name = "security eyepatch HUD" - desc = "Lost your eye beating an innocent clown? Thankfully your corporate overlords have made something to make up for this. May not do well against flashes." - icon_state = "hudpatch" hud_type = DATA_HUD_SECURITY_ADVANCED hud_trait = TRAIT_SECURITY_HUD glass_colour_type = /datum/client_colour/glass_colour/blue -/obj/item/clothing/glasses/hud/eyepatch/med - name = "medical eyepatch HUD" +/obj/item/clothing/glasses/hud/med/eyepatchsr + name = "Medical Eyepatch Hud" desc = "Do no harm, maybe harm has befell to you, or your poor eyeball, thankfully there's a way to continue your oath, thankfully it didn't mention sleepdarts or monkey men." + icon = 'modular_skyrat/modules/customization/icons/obj/clothing/eyes.dmi' + worn_icon = 'modular_skyrat/modules/customization/icons/mob/clothing/eyes.dmi' icon_state = "medpatch" + inhand_icon_state = "eyepatch" hud_type = DATA_HUD_MEDICAL_ADVANCED hud_trait = TRAIT_MEDICAL_HUD glass_colour_type = /datum/client_colour/glass_colour/lightblue -/obj/item/clothing/glasses/hud/eyepatch/diagnostic - name = "diagnostic eyepatch HUD" + +/obj/item/clothing/glasses/hud/diagnostic/eyepatchsr + name = "Diagnostic Eyepatch Hud" desc = "Lost your eyeball to a rogue borg? Dare to tell a Dogborg to do it's job? Got bored? Whatever the reason, this bit of tech will help you still repair borgs, they'll never need it since they usually do it themselves, but its the thought that counts." + icon = 'modular_skyrat/modules/customization/icons/obj/clothing/eyes.dmi' + worn_icon = 'modular_skyrat/modules/customization/icons/mob/clothing/eyes.dmi' icon_state = "robopatch" + inhand_icon_state = "eyepatch" hud_type = DATA_HUD_DIAGNOSTIC_BASIC hud_trait = TRAIT_DIAGNOSTIC_HUD glass_colour_type = /datum/client_colour/glass_colour/lightorange -/obj/item/clothing/glasses/hud/eyepatch/sci - name = "science eyepatch HUD" - desc = "Every few years, the aspiring mad scientist says to themselves 'I've got the castle, the evil laugh and equipment, but what I need is a look', thankfully, Dr. Galox has already covered that for you dear friend - while it doesn't do much beyond scan chemicals, what it lacks in use it makes up for in style." +/obj/item/clothing/glasses/hud/sci/eyepatchsr + name = "Science Eyepatch Hud" + desc = "Every few years, the aspiring mad scientist says to themselves 'I've got the castle, the evil laugh and equipment, but what I need is a look', thankfully, Dr. Galox has already covered that for you dear friend, while it doesn't do much beyond scan chemicals, what it lacks in use it makes up for in style." + icon = 'modular_skyrat/modules/customization/icons/obj/clothing/eyes.dmi' + worn_icon = 'modular_skyrat/modules/customization/icons/mob/clothing/eyes.dmi' icon_state = "scipatch" + inhand_icon_state = "eyepatch" + clothing_flags = SCAN_REAGENTS + +/obj/item/clothing/glasses/hud/sec/righteyepatchsr + name = "Right Security Eyepatch Hud" + desc = ".sehsalf tsniaga llew od ton yaM .siht rof pu ekam ot gnihtemos edam evah sdrolrevo etaroproc ruoy yllufknahT ?nwolc tneconni na gnitaeb eye ruoy tsoL" + icon = 'modular_skyrat/modules/customization/icons/obj/clothing/eyes.dmi' + worn_icon = 'modular_skyrat/modules/customization/icons/mob/clothing/eyes.dmi' + icon_state = "hudpatch_1" + inhand_icon_state = "eyepatch" + hud_type = DATA_HUD_SECURITY_ADVANCED + hud_trait = TRAIT_SECURITY_HUD + glass_colour_type = /datum/client_colour/glass_colour/blue + +/obj/item/clothing/glasses/hud/med/righteyepatchsr + name = "Right Medical Eyepatch Hud" + desc = ".nem yeknom ro stradpeels noitnem t'ndid ti yllufknaht ,htao ruoy eunitnoc ot yaw a s'ereht yllufknaht ,llabeye roop ruoy ro ,uoy ot llefeb sah mrah ebyam ,mrah on oD" + icon = 'modular_skyrat/modules/customization/icons/obj/clothing/eyes.dmi' + worn_icon = 'modular_skyrat/modules/customization/icons/mob/clothing/eyes.dmi' + icon_state = "medpatch_1" + inhand_icon_state = "eyepatch" + hud_type = DATA_HUD_MEDICAL_ADVANCED + hud_trait = TRAIT_MEDICAL_HUD + glass_colour_type = /datum/client_colour/glass_colour/lightblue + + +/obj/item/clothing/glasses/hud/diagnostic/righteyepatchsr + name = "Right Diagnostic Eyepatch Hud" + desc = ".stnuoc taht thguoht eht sti tub ,sevlesmeht ti od yllausu yeht ecnis ti deen reven ll'yeht ,sgrob riaper llits uoy pleh lliw hcet fo tib siht ,nosaer eht revetahW ?derob toG ?boj s'ti od ot grobgoD a llet ot eraD ?grob eugor a ot llabeye ruoy tsoL" + icon = 'modular_skyrat/modules/customization/icons/obj/clothing/eyes.dmi' + worn_icon = 'modular_skyrat/modules/customization/icons/mob/clothing/eyes.dmi' + icon_state = "robopatch_1" + inhand_icon_state = "eyepatch" + hud_type = DATA_HUD_DIAGNOSTIC_BASIC + hud_trait = TRAIT_DIAGNOSTIC_HUD + glass_colour_type = /datum/client_colour/glass_colour/lightorange + +/obj/item/clothing/glasses/hud/sci/righteyepatchsr + name = "Right Science Eyepatch Hud" + desc = ".elyts ni rof pu sekam ti esu ni skcal ti tahw ,slacimehc nacs dnoyeb hcum od t'nseod ti elihw ,dneirf raed uoy rof taht derevoc ydaerla sah xolaG .rD ,yllufknaht ,'kool a si deen I tahw tub ,tnempiuqe dna hgual live eht ,eltsac eht tog ev'I' sevlesmeht ot syas tsitneics dam gniripsa eht ,sraey wef yrevE" + icon = 'modular_skyrat/modules/customization/icons/obj/clothing/eyes.dmi' + worn_icon = 'modular_skyrat/modules/customization/icons/mob/clothing/eyes.dmi' + icon_state = "scipatch_1" + inhand_icon_state = "eyepatch" clothing_flags = SCAN_REAGENTS