From 65b03d3a4e2820c59b669cee66de953b70f6849e Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Sun, 1 Mar 2020 00:32:48 -0500 Subject: [PATCH 1/9] Update recipes_clothing.dm --- code/datums/components/crafting/recipes/recipes_clothing.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/datums/components/crafting/recipes/recipes_clothing.dm b/code/datums/components/crafting/recipes/recipes_clothing.dm index 3e036c7b29..3a7942ae2c 100644 --- a/code/datums/components/crafting/recipes/recipes_clothing.dm +++ b/code/datums/components/crafting/recipes/recipes_clothing.dm @@ -38,6 +38,7 @@ result = /obj/item/clothing/glasses/hud/security/sunglasses time = 20 tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER) + blacklist = list(/obj/item/clothing/glasses/hud/security/prescription) reqs = list(/obj/item/clothing/glasses/hud/security = 1, /obj/item/clothing/glasses/sunglasses = 1, /obj/item/stack/cable_coil = 5) @@ -56,6 +57,7 @@ result = /obj/item/clothing/glasses/hud/health/sunglasses time = 20 tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER) + blacklist = list(/obj/item/clothing/glasses/hud/health/prescription) reqs = list(/obj/item/clothing/glasses/hud/health = 1, /obj/item/clothing/glasses/sunglasses = 1, /obj/item/stack/cable_coil = 5) From 51c675603e6609fe5a068e43056c6112e0a1f9ba Mon Sep 17 00:00:00 2001 From: TrilbySpaceClone Date: Sun, 1 Mar 2020 02:48:13 -0500 Subject: [PATCH 2/9] ??? --- .../crafting/recipes/recipes_clothing.dm | 54 ++++++++++++++++++ code/modules/clothing/glasses/hud.dm | 45 ++++++++++++++- icons/obj/clothing/glasses.dmi | Bin 14100 -> 14195 bytes 3 files changed, 98 insertions(+), 1 deletion(-) diff --git a/code/datums/components/crafting/recipes/recipes_clothing.dm b/code/datums/components/crafting/recipes/recipes_clothing.dm index 3a7942ae2c..9bc3165121 100644 --- a/code/datums/components/crafting/recipes/recipes_clothing.dm +++ b/code/datums/components/crafting/recipes/recipes_clothing.dm @@ -33,6 +33,10 @@ /obj/item/organ/ears/cat = 1) category = CAT_CLOTHING +//////// +//Huds// +//////// + /datum/crafting_recipe/hudsunsec name = "Security HUDsunglasses" result = /obj/item/clothing/glasses/hud/security/sunglasses @@ -44,6 +48,16 @@ /obj/item/stack/cable_coil = 5) category = CAT_CLOTHING +/datum/crafting_recipe/hudsunsec_p + name = "Security Prescription HUDsunglasses" + result = /obj/item/clothing/glasses/hud/security/sunglasses/prescription + time = 20 + tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER) + reqs = list(/obj/item/clothing/glasses/hud/security/prescription = 1, + /obj/item/clothing/glasses/sunglasses = 1, + /obj/item/stack/cable_coil = 5) + category = CAT_CLOTHING + /datum/crafting_recipe/hudsunsecremoval name = "Security HUD removal" result = /obj/item/clothing/glasses/sunglasses @@ -63,6 +77,16 @@ /obj/item/stack/cable_coil = 5) category = CAT_CLOTHING +/datum/crafting_recipe/hudsunmed_p + name = "Medical Prescription HUDsunglasses" + result = /obj/item/clothing/glasses/hud/health/sunglasses/prescription + time = 20 + tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER) + reqs = list(/obj/item/clothing/glasses/hud/health/prescription = 1, + /obj/item/clothing/glasses/sunglasses = 1, + /obj/item/stack/cable_coil = 5) + category = CAT_CLOTHING + /datum/crafting_recipe/hudsunmedremoval name = "Medical HUD removal" result = /obj/item/clothing/glasses/sunglasses @@ -88,6 +112,36 @@ tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER) reqs = list(/obj/item/clothing/glasses/sunglasses/reagent = 1) category = CAT_CLOTHING + +/datum/crafting_recipe/diagnostic_sunglasses + name = "Diagnostic HUDsunglasses" + result = /obj/item/clothing/glasses/hud/diagnostic/sunglasses + time = 20 + tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER) + reqs = list(/obj/item/clothing/glasses/hud/diagnostic = 1, + /obj/item/clothing/glasses/sunglasses = 1, + /obj/item/stack/cable_coil = 5) + category = CAT_CLOTHING + +/datum/crafting_recipe/diagnostic_sunglasses_prescription + name = "Diagnostic Prescription HUDsunglasses" + result = /obj/item/clothing/glasses/hud/diagnostic/sunglasses/prescription + time = 20 + tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER) + reqs = list(/obj/item/clothing/glasses/hud/diagnostic/sunglasses/prescription = 1, + /obj/item/clothing/glasses/sunglasses = 1, + /obj/item/stack/cable_coil = 5) + category = CAT_CLOTHING + +/datum/crafting_recipe/diagnostic_singlasses_removal + name = "Diagnostic HUDsunglasses removal" + result = /obj/item/clothing/glasses/sunglasses + time = 20 + tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER) + reqs = list(/obj/item/clothing/glasses/hud/diagnostic/sunglasses = 1) + category = CAT_CLOTHING + + /* //Kevinz doesn't want it as a recipe for now, leaving it in if anything ever changes to let it in /datum/crafting_recipe/stunglasses name = "Stunglasses" diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm index f2f5dd9b7a..fc5156bc45 100644 --- a/code/modules/clothing/glasses/hud.dm +++ b/code/modules/clothing/glasses/hud.dm @@ -32,6 +32,10 @@ desc = "[desc] The display is flickering slightly." return TRUE +//////////// +//Med Huds// +//////////// + /obj/item/clothing/glasses/hud/health name = "health scanner HUD" desc = "A heads-up display that scans the humans in view and provides accurate data about their health status." @@ -65,6 +69,15 @@ tint = 1 glass_colour_type = /datum/client_colour/glass_colour/blue +/obj/item/clothing/glasses/hud/health/sunglasses/prescription + name = "medical prescription HUDSunglasses" + desc = "Sunglasses with a medical HUD and a second layer of normal prescription glasses." + vision_correction = 1 + +/////////////////// +//Diagnostic Huds// +/////////////////// + /obj/item/clothing/glasses/hud/diagnostic name = "diagnostic HUD" desc = "A heads-up display capable of analyzing the integrity and status of robotics and exosuits." @@ -72,6 +85,19 @@ hud_type = DATA_HUD_DIAGNOSTIC_BASIC glass_colour_type = /datum/client_colour/glass_colour/lightorange +/obj/item/clothing/glasses/hud/diagnostic/sunglasses + name = "diagnostic HUDSunglasses" + desc = "Sunglasses with a diagnostic HUD." + icon_state = "sunhuddiagnostic" + darkness_view = 1 + flash_protect = 1 + tint = 1 + +/obj/item/clothing/glasses/hud/diagnostic/sunglasses/prescription + name = "diagnostic HUDSunglasses" + desc = "Sunglasses with a diagnostic HUD and a second layer of normal prescription glasses." + vision_correction = 1 + /obj/item/clothing/glasses/hud/diagnostic/prescription name = "prescription diagnostic HUD" desc = "A heads-up display capable of analyzing the integrity and status of robotics and exosuits. This one has a prescription lens." @@ -80,6 +106,11 @@ vision_correction = 1 glass_colour_type = /datum/client_colour/glass_colour/lightorange +/obj/item/clothing/glasses/hud/diagnostic/sunglasses/prescription + name = "diagnostic prescription HUDSunglasses" + desc = "Sunglasses with a diagnostic HUD and a second layer of normal prescription glasses." + vision_correction = 1 + /obj/item/clothing/glasses/hud/diagnostic/night name = "night vision diagnostic HUD" desc = "A robotics diagnostic HUD fitted with a light amplifier." @@ -89,6 +120,10 @@ lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE glass_colour_type = /datum/client_colour/glass_colour/green +//////////// +//Sec Huds// +//////////// + /obj/item/clothing/glasses/hud/security name = "security HUD" desc = "A heads-up display that scans the humans in view and provides accurate data about their ID status and security records." @@ -127,7 +162,6 @@ return chameleon_action.emp_randomise() - /obj/item/clothing/glasses/hud/security/sunglasses/eyepatch name = "eyepatch HUD" desc = "A heads-up display that connects directly to the optical nerve of the user, replacing the need for that useless eyeball." @@ -142,6 +176,11 @@ tint = 1 glass_colour_type = /datum/client_colour/glass_colour/darkred +/obj/item/clothing/glasses/hud/security/sunglasses/prescription + name = "security HUDSunglasses" + desc = "Sunglasses with a security HUD and a second layer of normal prescription glasses.." + vision_correction = 1 + /obj/item/clothing/glasses/hud/security/night name = "night vision security HUD" desc = "An advanced heads-up display which provides id data and vision in complete darkness." @@ -170,6 +209,8 @@ force = 12 throwforce = 12 +//Hud Toggle + /obj/item/clothing/glasses/hud/toggle name = "Toggle HUD" desc = "A hud with multiple functions." @@ -197,6 +238,8 @@ var/datum/atom_hud/H = GLOB.huds[hud_type] H.add_hud_to(user) +//Thermal Huds + /obj/item/clothing/glasses/hud/toggle/thermal name = "thermal HUD scanner" desc = "Thermal imaging HUD in the shape of glasses." diff --git a/icons/obj/clothing/glasses.dmi b/icons/obj/clothing/glasses.dmi index 75a03a585cf81015705ad20127c4b9d7d45f87e1..66989e79a47684f91bdd2a23ff75d9047e37e4f7 100644 GIT binary patch literal 14195 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 I%NhIsKg=$BivR!s literal 14100 zcma*ObzBtj`!71n(vl)ACEcZTqksY;DjiFQG)UJ<38H{>cZxJfFRcQSA{`3|NH4wQ zp5c4$y}$Fi=iGDdAG0&FJM)?66Z?MN&--~M>cw+aVnRAX004-esy%)Q01)sH0^s9< zJ7f1!8}KB<@3sEh$JQQ}?)I*4?OmJ!z$Y^)sq1-<5K+X)?yJYH){zkD(~yW!k{wEp zs)M^)_AmQLUM*$!;1Z2SYEzaaA+Ek9EbTS;`UM$O3>|v@L73Y-8+*Hca9Zg^V%3*1 zEHmHuN!8snhKY~aPRe5qONbTL@TurmvFOpa8EYC8`ljD4O2ao ze)>19edcPk^-j`X_{p?of5C&}e#M6$A^8)U2=*WBZ;UKrKMU95mBVE}@ui9z9zb!` z$A&Vq`3e>Zq*gO$6gTTFJljVdqy||hl%;+e5f{?BvDzff1n`x9#6ifyVpyQe_za?pOY{n4Vcu-)X*8J2>6(|J z;@iwn=1A>`GFCn$x_;<7BLBlBwYA2cI~bs9=n1vMx|XG%$D{ zP?U4WyU_*ZCr{uK7O0B&Bw=Q<Ehy>58WQTVTOXpccMDD`96yw?t%&A1Bslvm< z0r)FFTUE^ zS{h);52~oxVH-`?C`)oqhQNS>Zq(8ewDvjT6?8f-YiQtkCIHB|9g6_Sp-|So|H+&(vtPY z_0x5=gZj22&}q3m2mnl+XAodkTJVFXdn2Y~YVHB?O_K=pBK_R~xzbFbWVgdvO6TTd z78QhlFP!%c1-v~}cr_aF7E?9zrUO$kLU_q^1Fy#PZ!|0fmjx}0*X<4jlP}=_Xyqql zK(5u`UComslt8;E#lOAHca6%p-UNgf?LMyHQW@+->cCTEh=V$ZSURIQFRb>9_%YyK zNcJJ%xeG0Iel(rr(e?<(9@Y5m8y1b@c~aNNSc@%cY09y|=zD0eEgG5{VppHbIHpSf zBIiDPc?viK>w`~!hB5(4cf;U05AptSQ4h$Qbd%}XbQVg6NE$0iR{o@U2!WkIkm&)J z*VLhyC_H$nU2YzuDwIBMzI^uv+9@ya9f;F%JwjsY*s*^rziT;#u*td6Sa+CwX_f>)dEz%(nm*?;*p6;>rUdFtg#uVc92CfIUe|;v<8I< z)*9{zb30Xkr4J#{xFZ&&48V?ie!F1hBcK7}Sb!P{DJ5aDK;Kv=Zr(>rVyy0l1q`P= z4hM{}v%tg_0u(clLV#z$ZEq6GG7(f?i2Fjc|OkS;nhQo+?#2yt`a&?*U!jKr^T_VB3t zYJ7)6C}U`6DTYus_AI`KoR&7Kx>~5dp`q(d!-ESusD>01 zSc^I5?Uxr(TKB(${b+TsI99!T`|nzOdz7_24gf5pp_NTa4fG?N62LBpWFojm4N=cp zFAcQ-cl6`LF}wN<{rKlEX+Npx^HHtY2F`Mn5daDS1~NR)bMF241{&x_0l-JG^1|0w z&G-%Fg7+|Lqf7)`tr)}QWC+>K6W?nX?S!)Dc`S`28~d(>weyxpK?5 z^&-G&C=Fbg`dtO6gUB7J9g(N(IH zS}&^B%n+ws&Ln0%y`a?LE@Py$qy&)1LLuxuN&QvC=SQk!$M-}??}8ZhQo!%c{UK%* z;X4nsss*37e}ZWSSKgVDCjo?v_s9o>&(_9s9c-*>MmR}_R`(+^gslPamMFyfots4> zi^N*yt%sK_Td%I(TzHr)r9EUkTM}xe0)~yThNqnyF;9-UW%O=Bef1_PtWwr5&bYe_ zg^Iy`2IOJJ8||*w18Ho|kT*}h&x)qNF`G1e`z`alHw!aE-+PHJ^r!J?D;_By{k_*M zs!>yuF5lKo5wB6@|8;4}mvLx_T3ehsEL;RV0^54B-=_;FMp~5oNNZAM`yvYmoyClN zRdw}fWqHBZRs4n#63U5dCdpLY3ano?9h;mPa_>vFu1z-jI!27$O&iZGIyTCDRGGbS zJE0kP&VGJU>RMX1po56`^-Ck=d#*7x=4&#&CYiFLiz+`6M8W09lg!Oz@AIPi#zz*$ z>a6QJY14B*-Wl*dQ{6qUn1#mS@{wMFw^C737U?dqyrj@JYAor+sk8{R#Z%>9tzzih zT$~~TT=zOz`8>xQkB_e?Hb`W;*ZG6rOfcS4a9%ejRvZ_WP*n;{Y^2;-Tns zBcqJ3Ut5X^^STmtYgf>NM89lAMd>~PKy;tT&fIc2VtEzwV@u$8IVwXd`xP%{xAo3? zR{8Fe!}Kn`*9|xvVut<@k`2Ho_xan;6blQ@0IbRFwEXKTgD-0Jx0c(QA+kIBZXPFU zgK9@|;$x?vjag9BR?SgrWMt%J2YMxXLC@5ey;vg+3jj|9nFE)`$3yN=3q%g0FJr!m z^$HquO_r5?>HeBZ6RUMs_>sOQB_CDvFYGT4U*JU0^i_59^Q3v^tIrg%csYF*ifY#E zLf(6>0}lBkl^7T0$LCrzF|l_y!oyW9lwPm_xpkZO<*pA!?1J$fa^+c;J$nwI-XcgDT-@P;^7nZ)MNFUg1NA$Ke(qt;>z0z} z76pWA3~J<@>qF}6A5Kol;Hd#|Kq`-NFLvWVEhRMu$J5i3k+aiN0xvE*d)Uy(s4q81 z!Y$tpyGL_r2Ix$_FrvExT&X&VfM6*}sJF=_$;B`(@;HS*U0=ay+bGq0!Fp~rH3a}# zT9*>r@nWVKXN(>Fb8ZnWKwlcd&tFqo_C@KcJKSJsXlTT@?v}#+8Egyea9e#Ze}6Kj^{Ht@_;ei3@GVvRNPl3z`x3eC=9wfCae22b~HE7 zl$>DevgL{+?gw*ATkC!I#}D9oQM318WtHmZ_YTlfL)2PH2L<1#PM$o$ zhX73e&+j)NH=@RiF4C-V6Rr71jh7hS+|l@&j~D4Z3N7UqsxhL1m=crUg`YE>KxiBT zd`Zo!HLA0p8?pNS8)Z>`{+wj4-af&xDc1&zgo*G=X7wvmtoxNnJT?lrgM;-Th6Fh) zTX)-q<1Au@pDXv?1|N~!G+}t=$tmD?T^cJ*nUI7GM@R-;gIaa+PYLtn-~TWH*+1-)~>Z;$Khj$WD|7(HuhYW{i! zMR|2=5ra;0<_2UFefO3@KOV&a?@|wKliu0B5C4S?2%{xw8ycpi9jG+e*@3XUr-9n! z`7Z4`3FQFG2kDD}zEfB(A1h;&Kko}OLWaA6s%lW_pih1;rl?Z&Jx0vV%VRU9U&$Y} zadx&Izu|AHZ{6R-W=5{mAm4BxN9g@C7w}N0#Y}Z&zkd|`%^bCEXZ4i=%=qR>bK7pJ zh~8{^?&mok6sE8irQ9!SQEukHncU!l&XFIzt|a5LZd6E=}HW#M&kA84ezkI=`cMmQm13_lgdZUMY%mGG-OT(lB5uP z%@o6V=ejHPTuR90oC#w|m%LaTvG7@j;VAjizdW)gLOSI#(}dFXkt2<>%Fxui5eA0A$ZqEvnEA{E?mAkp?vt`@e24HNEc7#D@_hzKEM#(eSe>60z;kuDjF-wSNdP+O9m(FI)ZO}ieb2I3*cZ88;WprF|qz_I+F&^J^2ww}$d; zZ1@|)**#wk^j;0hNBkTZcu*RjuO}P?`~t-NjHvxim`22c)0o6K$2Xmm6{rvnEau1@WT=?|Y&<;WiWpuBcY9zs zQ`MlDZwkx4nA$t?|8q{vCShN_Ej-f0J^=<8sQbyxq zS67$C3y%k^tWWrz$p)n0u^s@}_Z>%5MrXn2-9~fUkb6;;`MS7?t!q+y7GfDQ%RTSM zrl%w8JVs`dG7L2U_&9eF0Jqf`>3q}h!S?{<_s3Gg#dI?0^QC!gfwIg}M0|4c_h;(r zZpcmuprE5exwW;$tT`hWc=1-4|DhHG2v0EoOjgtW+MM|qYFGfdc^9NfIEW;u`X3Ax zy9$e(>#O_i9EhfJ^EI)gPdAi0sAwReb(pI8`Eygh&X4xZn>TGYOl+L&=0mb)xn+Su zq5|R(xxAH~;5-5fx;H7I?_H0lg{vMxeh#|v=)S7O&XUp*s;yac& zgb{VW{0|Qu@zl%7&7Ga&YaTcmQc&sV-~|C(@dw2~45Yd=S^Z#*$vn&9Hh#wZ=FWL= z_j7gkhoT~Nx9PX~x+5t&O)q^=9Vb6jM_mH-9MB*{0!$r^#h1fn`Zw(r zjeL*{hlwyjdwV-5j|82yqH9~|7#JAr_BXMBD!^y6Unc-M_`BlnRANggsVN^;xtlweG;X?$IBZ{ zOcxs1Eb^$P(HXs!s3%Mz>PA-r0g8%W0-d7jIbGx9MX6C~77JAM0AOMBV_+Rp4=!W7 zCg8D2Szo$wk5Qlkyx+5k80Q!y2S?0=KVh;P8yVP;--+O7qpI@%h9esO!u>g4hd{d6pMR@J_i)>^v9p7gb$8)e=IVGHi!qt6Y_OZ>UKm>)=Jge zsM`aTUbxI$HBHCw{~UVc=!e#83TRfK)qX4Sa-J3@gbk0Y_;k$&dfxCL_vZF3I}&N zoLG=ZOJAV$YNxR0>iD(~@Gf0gIWJ_~gZJMD-q)=M%97+m{*XG`5vr7@KNgK)Qm5-4 zj5jS7NbW>x1srGK7G+<}eQP~QQx$W;#(bp01*S6q(xAn3)yI#g169hA8%-X*E?-Ts z5?6+sW;1He)ZP)@-q?v8QW*aC?_WrL(DCu6MBr9E#}baKSX#+s(Ub@}s%E6LiTvl1 zv8+e(??VsU@UTLYECwLg00kX}riWyqD7PRI$g+|~ziUkeSnCb8uFDsA)T#A@O=Wx2&JTE!?=7nviZ+})eDnz7 z%5cT1xMbpF)c#;@&d6lKqluW2R^jyfduw`XIvE4qJVGFY^<9C+vw>dfy~(2pRi?lR=LPS1xA!~O87>I>v*rq; z#*0h}NIb=TS9vma#n)ES2QHrC=%Q`AH_ifB@G^4po-g~u2=#5ysF{kT1t-@*pfJsM zc6QdvdOSDIW^HVoDB=~&9*{u~;gMSO>nI5#f1V#rr+r@jOi)@eM=lSmi-2_Y<}&|E z{fq@P`5ffyFOF$*l#gtyZF{~=%qvk>%RFD)0XT1M<+5}juJ-f^sRp%{&MYTaDFQBH#G&#x=fy8Nr~C(HuWCnhrd~(ooUsd+yv96kgD6PH%QsGM zr$B}53t(WxtOklG<2Awl8&6vOz%Gt0`nsw8I2(uKhUKoK_O9Cim~ z#mdB9UyKLpecStheE$&5ZY|K*wPxM9mClnWe=05fQ@yV4c3i2bBEUte=CdsXMhbTO zZCnB=`S%d3>2=jbo+bd`x@p+`K79bP<1%x z{g~acc~#~SxL#;DaB=bq3W!n!8$Wbpy1jdcK2LwNv*9pV4IbA@wJojVq|$V|z<@?WCG-O_Vhrp2btN z;eSAmilD78U@DOpYSrz8#X^M_1A!@ak){7y+limQ2V{JF#B&OE_SD~F5g0M52FzoD z%4f};Jtr;r_K~xk>dZn42@VymP|nGp2na$0%P+br0UkgCUmY?ANM~;bQ~Ip6S+`W0M00=3Ul*nf#V7WnwR&lo?TN|ck{$+=6$(n3ow81`!UQ(r(d!nBQ^8 zMXN83Jqqx)J&ej@<>rp!)^cyKwtNbs1;xhU0fyyCYX!XurVb6;OQWOUkdEU&8gL>w z3Qwl9s+g%^@iXtg=L*!N3y12s3Pj?2iyS+9{3G{o^IXe?MMc6|E~;MMYPW){ zR0M)VbYj7l6iJWWZyx^4X?fAile$RXLWq<$r>~W4C z5LO&;-b2avHk1H%!HwT>wM_W!ptw2c&)M0Hf4-n7JkNP7AwFJz+)Rr7@{k2QF&(ja zT4gJ3(jo2HHh$yEt$yKJHh5A=Dw0$MZVnY4@e2ls_=U1_zoM(l;;|;)VXu}03 zB6z9ZdpgwYB;?-Aw(AP`d=*$SJ!&*h8MlZ)VlZrWV&3@SqX*ra%6DY@KL>rSpU8dq z&a$XzD^`JO>)t_!$plm+d_w6*Q2O?z&faJ6YR)z>DI$1A zG5tp;9l0YKgWR^;yLVS@NBnB0{G@3Rk-(lBO7wpJeP|%3Iy__jLUS(Xa{m)zfeeo4 z{>sBc8{9riw_{mXiYQEGaIF}q&-*?rV~fjyqB4!zLo_ar3=f+(;?hv}kwMJrTa*y4 z!+JgDGFVvZ8}p?F{2&ri^xWNz)o;D$jAw*C*QIjIU$peaCc2oe&#Y=rmVccay<@r9 z@9&u<48k;?)J`pTFJ10eAbLu$2Hgud71HrE3(K0D@jpW3{&ISU(X;`isLRhT)X*p2 zL|A++`?W8oRSPEkj0S5TI;?dI$&CH0ToMaqsJtuJ_0dRPud*Di9_V+L1`mHT21hy|qr}K@-6|AJ8RKj~`?|$$lH> zh5dOGK4#ZDki;8Ef;G-$7?|P<>9vX+_@0uZD+WceKdE^Yn5PpsTzNtr;$OVGpjUgS zXo=!R_c@_mxs??(SoydpsAmnm=UN{uN>?YbW2LS;pgcan{CBG;<%8X%!~rv*PKX&- zCcgM$Jv8%X2^aF0Z=5Ni>MTfrOYu<4|;Z&X+SR!_LorMCNi z+$JV}pRV<=n^uYE^w^~*eAggF#_GaDJ@}2@V*HH&VD@Zz2t*;p(jONBg3#GD6+El5 zmUnq~f;uM$)>D=QjU;H0F!RVzrs_{i{HYuQ)tXyfVye0LK?*%cJoto8dC&xNTIJfp zr7uN>kW0P{`Yh=&7u8$8@cqef z#TWq8E&%{`)4p%jju!}m04|fUy_y>z+we@~_awB%hcf}< zhXv5R4Gs^yAWs0WQV!|zg`68h+H#t`n~1-aLjzupe6Ogj?1;4tvfbI@(bR{DN!$m* z4gw#ekk~tj@hXU&^fD*0tKMLVR!+>tg`$(mP#K-Blp#g}01*GX z+mT)UU~&vs$e4YS*eMMgNZ(p|O%YSh0Z?PdD(V~7YMS7q%Q=W9vmV|_-&TjtXRT## z`6tq8+$RCN5<(W&InS{B3+MG-JSVi_Alh=ce^u*5R=IYER^REJK>NJ-y)Hp(a8U&; z_Hr2T3bxOeoH%xXu+7iU4}=K>Sy{1lcXy9YPU4pTAv7)K+u*##bc9A^+K`Rcah%Y3 zQYMv62?n%J7*(`pxYfvT*YLEu-b(s9B1^TeGbP!fY{bY5oZ2iz{hyTN*7E&t5Ux;I z`PJXO2N|FB2;BA7(wzt2tEY*K{z)dLtQCtmC?3-*!V|HPE z7TQ6&bx}g&Q>IIn(9{d-u;TOn1@_Go$A~L;^Mx4a3)+Y8SRR4CfVb(|1YY*4q#NY( zD@_<()ipVmw`UBv^2{-p?^SY`zcV|Z01+bc%|_eq?&VcIBW>A3rPK;!!v}VE6#L z!cP1{HkrhzWeI|(!8@C+Cu&07nB%jvy1=qBeG_A%n}H~kcwE58dqxBo5NDDpJ#S=w z8tl0Biq!00t{2Mp4uD^w2)6O7O`2hHQg_IRb)2d7VggEoGhy_y+G+|}&g!H70wD^M zA<%6*iW#ZUR(M9ZhYQSYcM5Hn+;7Kryb?8SXs?`1yP0J@gOCpQ$~#pVZY4lIx+2OR z)--=8d8udkvbv?|u_I35g5q=i0GU}Ho&Y)WwEo`wdxLZ@!QZTWjy3nagfya(`PC&2 zWA8rYl}J9>=QbV0<>=@4-u--8t;%}MLW_l#mcP(1tZAf)*8P;gZ)9S;bBwI=*ldU{?z&*nbyGjjk8OWuvQ3C+#Y$njyFMse)O8?_5ec&o^NFfElRQdCklxXPS90J{!MK>*D3ZM?mm~D$`T8x$%d-A;)Y;JdCu5 zI&l&e676s;abqaY!>>?ZgWYL1rBy*`S6&KlXrSB|F#3*;LViNz)lZB9$OMA zJ3#1#NWevr_e|?<6|3}i9%|7B# zTvZ0ykv3R4mR+VPQ>NxK{l&;5ASUzL*bxYWSJeYa-&7IhL)cJ-KcAJkmeNQS{^3US z{pgvU<;lih+#*d(%!L42ZI9+J*!%SW{*&%1l9Mw&Uq;9R1bo7%F|6)=hzdqF?GNTs zyVa3xd<~KR%Y*7Reyg;8W&=a^)5$C_+TY3DseLMl0}17XsQRI{p-}RLIfurZpD5Ro zsmQ0W;0tFH99Kd4b1iu6(T=f7G;#w%$<)~COb=$-$iM`@N`ZDVdmqfkOe`a9%bdgSD9+|u$wwnquQ_n3}e43duD- zXa=n~I70lp3}NRZ+PnXjeXPBG1v~B#j-{mDi9v99rtRnuy5OMoU&_=N8a>T9elnkq z{TB2cX5j+?AywyNU<`;-iclmvWZ<3suVCco(%_31WFJn4qgTL+2W6f*gO}D~(b3VC zZf1B|8J*eCrt-nBMBNsEIrR5dRvBJ3wSe z`D?i`$MPtJT7<|4;Rpe|4FxU+RARu2mijACbw0hH~eaE zT?7fK1a0=_(^M`jVN3R;ouI5msKId%_^v<9JB44_Km~Wv@(1tT%*``~r!&}hQD{mYG=eTZKy?)1!3gCECJeE>_f%K|12t??@m>(PfVH8;Kg|3tqj672&x4=@}U*DP3&(a;z{BeyJ>Ru<2g9V@1dn$vy zM{;izqHd1&x5~&;wD`(A%H(Zx2se6BtikvFZE& zl|u=}V!y>h7EQ?FZtCBqaU__RB#`}6)mR7*_AMKKFyAkcc>&?(M#4niS#G3EtXVq)duU+oh(3rHTjhb3rrC-G|?EF${J& z(W6eu9glxdzN)#s-w^bafbQkri^Y0GfnEoVrn_%Rg}j0+T>IVe<@}oTQJ;~*AGG{P zK)9@WHZ|x{|0krRL)v3yeZ~UIf6(|N_(d98;&i!q zA!K1GTugV%HSlade6lXm(Fy9;SQBtQ1Enz4i_6QIjXu0I=@H2(!ttrb8@tYYHC#)> zh5;?36*-Wx6h6g8pT(T(k;(eDlr_d75GU79BX`Faaer^b6$jk`OD_3ecAe9wfUu}u z8SoE~CqTb?W?UqDiVL=ekSF+TJO$I9jqy(DTUihN!!;PGy0S&}#k`P`{$ZNkKGoM->T5-XbCKL3_HBb5PhYg9;B~|i zKIdo1)J+H(OcAs_F{;)6BlPsDVk!R9+F(lE$@WzAwn;~jtcUJYTEuV0&i^7Eq3UZ#Qb5 z(FCmda6({f z6E4;IX2RiERM8U4wzoK8!2KLoD*fIuHe*xP**Xh4+;in{*#GDSMoBE6X)p=L`#Rb2 zPfO(8$+c2WoxeP#89W}a^S)&E2j zKvAP4BJti=0b0hu->nQpul^FKyo#ADuu8qbm=xQ8EJ*WbhD!-o45mkv9 zEC*U${B$)Q^%?w!j;S+Q?l?47*EH&DJX#~YPH&9vd#!adDtP0}iskNdoDuYU?nmG2 zS3PC>Twn$YwDv2kBYSt?`ueg>`YY8{5uWscMknpV$W`@VnZ zX!Caw%OI8^E!3q5ZS~rXr!Qg4Enpga^7{2XuiaVeX>hh!cz6iMV%NS*>X@Wpr{JOr z{GAipQ*0h++pyV}mn!H7v`KKY$&$B)AD@)uw4rso9=;BN5xD}EmO<`mS5|02ViX48P`6MNmpJe_35SPA@4P0@HsF&Tubmu`dPp5oS)? z#8x7ZtMn}m*(d`X#FWMig7w!7l3|Bg=PUl%tMe&o=9@yf;|~fm7@r4%M-Zi!jpd0H zVyNMkc6>lz^_Kd3h^Ad{Z+wgS?+sbt4>DK;+YQg6k7CKdrK_G#Uw7&iSY^dKG)%Sl zD@U*`TZ)~ovsTpB6%|1rr)_ixSSd79vo4a5{HLC5C)fNVDu{1tQwQ+gcF#NoPXBM_ zNA;x)#%c z!4^*$K<~ow@Z!mm0V+5(a6O!7Fa@&DAWwO1ews$TLeeX>%kLA-=i`f<3t@uOT>0A$ zg@Bb+Kjxc-=)!fQJ1)B4LGg&dc?rQt-Lcc!ayOQvGWO%fuhvpvmPMbudl$L4+hC+> z<SDSt%=-4J`^ysU&C9Pl6Ouj6U((}p7S5S=-*`Yk8f4md^M=a> zqmxKm=vg?Z!sEP#+o33oVi5vso&Y`1Lf7Ff0UA{%0q?~;$qfe~2QWJshYG_)ICjdaczyG6F z$*|+6IinFQ7^&*R$287ru%(MIj|hJ8+{wnsc)3jqgeadD_TgE|?8Yky zgiyJ>;kaQ4%56zGK2$!FG>$niaGRo%Hl9(TYo$*^1|6^dxW^Ou^tQcAqB+nbk+G8c z@kxM=3H)5v0}I$Y#1*GrfW@u<>oU{-Ay_?wkU4+O$q@`H5EK2`_cI)pu()>IP(B^8tNOYtluM_g_~A#BFio+`Wy9~-i63!z@!GN&SnS; z`1|*-&?5>Yha#?UEen)J5v34RQiu)8D7M!=UJIlUIQ#V}W)%;@L^EHuG&}iyZ~6vd z5(q;d#0EPe6-{2e$Td`*6-CNMTwMj|gfgq(3J{x>9wj6oIw_342{HbRxMV*wMBlli^hobFw*(wE>?2b{a>{t@aI zSaaPuT>Hq$i5-SbLQG8T`g&@P`Q9rAYv=o5)i%Qz$uYy9lcyaB(`-j!57zvGfSix_RC|{uM(W^UOKzt#i|HEG{h}$6oI2owR5-VxL*h>qy*COZanc#@cxx-2i zwA|szhl_8!uO~fiF*(z<;j(dO;*KW1tb6`9%D|yQkjJWKljY^5Qn~Z$*fmqL4(4Kr z$;`9&QVy@6-e1uAcd=$^!&)CN7Z*wbwK)gB>01s2yd?W5x!?OT{Fz@RIZX8rITRi5 zbT6vr7x zoIldK4h{^!i6Gbg-RLg|l;R%UR^80}3Ey{;-qj7PcoB0Hn1;^=MF}3iMw0)$K3fvR zO_hGPV;@*?ur_HX0${+b2b%JB55wcYXZWAgDUhQ6FJC|U&xPy3kmjq@YNqE%1o*Za O@bt;^$CXNEA^#1MejVHZ From 787edfb2a7ba9b45da0f545b0241527a15ad4c20 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Sun, 1 Mar 2020 08:16:39 -0500 Subject: [PATCH 3/9] Update recipes_clothing.dm --- .../crafting/recipes/recipes_clothing.dm | 42 ++----------------- 1 file changed, 3 insertions(+), 39 deletions(-) diff --git a/code/datums/components/crafting/recipes/recipes_clothing.dm b/code/datums/components/crafting/recipes/recipes_clothing.dm index 9bc3165121..7848295ea7 100644 --- a/code/datums/components/crafting/recipes/recipes_clothing.dm +++ b/code/datums/components/crafting/recipes/recipes_clothing.dm @@ -42,22 +42,12 @@ result = /obj/item/clothing/glasses/hud/security/sunglasses time = 20 tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER) - blacklist = list(/obj/item/clothing/glasses/hud/security/prescription) + parts = list(obj/item/clothing/glasses/hud/security = 1) reqs = list(/obj/item/clothing/glasses/hud/security = 1, /obj/item/clothing/glasses/sunglasses = 1, /obj/item/stack/cable_coil = 5) category = CAT_CLOTHING -/datum/crafting_recipe/hudsunsec_p - name = "Security Prescription HUDsunglasses" - result = /obj/item/clothing/glasses/hud/security/sunglasses/prescription - time = 20 - tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER) - reqs = list(/obj/item/clothing/glasses/hud/security/prescription = 1, - /obj/item/clothing/glasses/sunglasses = 1, - /obj/item/stack/cable_coil = 5) - category = CAT_CLOTHING - /datum/crafting_recipe/hudsunsecremoval name = "Security HUD removal" result = /obj/item/clothing/glasses/sunglasses @@ -71,22 +61,12 @@ result = /obj/item/clothing/glasses/hud/health/sunglasses time = 20 tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER) - blacklist = list(/obj/item/clothing/glasses/hud/health/prescription) + parts = list(obj/item/clothing/glasses/hud/health = 1) reqs = list(/obj/item/clothing/glasses/hud/health = 1, /obj/item/clothing/glasses/sunglasses = 1, /obj/item/stack/cable_coil = 5) category = CAT_CLOTHING -/datum/crafting_recipe/hudsunmed_p - name = "Medical Prescription HUDsunglasses" - result = /obj/item/clothing/glasses/hud/health/sunglasses/prescription - time = 20 - tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER) - reqs = list(/obj/item/clothing/glasses/hud/health/prescription = 1, - /obj/item/clothing/glasses/sunglasses = 1, - /obj/item/stack/cable_coil = 5) - category = CAT_CLOTHING - /datum/crafting_recipe/hudsunmedremoval name = "Medical HUD removal" result = /obj/item/clothing/glasses/sunglasses @@ -118,21 +98,12 @@ result = /obj/item/clothing/glasses/hud/diagnostic/sunglasses time = 20 tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER) + parts = list(obj/item/clothing/glasses/hud/diagnostic = 1) reqs = list(/obj/item/clothing/glasses/hud/diagnostic = 1, /obj/item/clothing/glasses/sunglasses = 1, /obj/item/stack/cable_coil = 5) category = CAT_CLOTHING -/datum/crafting_recipe/diagnostic_sunglasses_prescription - name = "Diagnostic Prescription HUDsunglasses" - result = /obj/item/clothing/glasses/hud/diagnostic/sunglasses/prescription - time = 20 - tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER) - reqs = list(/obj/item/clothing/glasses/hud/diagnostic/sunglasses/prescription = 1, - /obj/item/clothing/glasses/sunglasses = 1, - /obj/item/stack/cable_coil = 5) - category = CAT_CLOTHING - /datum/crafting_recipe/diagnostic_singlasses_removal name = "Diagnostic HUDsunglasses removal" result = /obj/item/clothing/glasses/sunglasses @@ -141,7 +112,6 @@ reqs = list(/obj/item/clothing/glasses/hud/diagnostic/sunglasses = 1) category = CAT_CLOTHING - /* //Kevinz doesn't want it as a recipe for now, leaving it in if anything ever changes to let it in /datum/crafting_recipe/stunglasses name = "Stunglasses" @@ -186,7 +156,6 @@ reqs = list(/obj/item/stack/sheet/durathread = 7, /obj/item/stack/sheet/leather = 3) time = 70 - always_availible = TRUE category = CAT_CLOTHING /datum/crafting_recipe/durathread_toolbelt @@ -195,7 +164,6 @@ reqs = list(/obj/item/stack/sheet/durathread = 5, /obj/item/stack/sheet/leather = 2) time = 30 - always_availible = TRUE category = CAT_CLOTHING /datum/crafting_recipe/durathread_bandolier @@ -204,7 +172,6 @@ reqs = list(/obj/item/stack/sheet/durathread = 6, /obj/item/stack/sheet/leather = 2) time = 50 - always_availible = TRUE category = CAT_CLOTHING /datum/crafting_recipe/durathread_helmet @@ -213,7 +180,6 @@ reqs = list(/obj/item/stack/sheet/durathread = 4, /obj/item/stack/sheet/leather = 2) time = 30 - always_availible = TRUE category = CAT_CLOTHING /datum/crafting_recipe/durathread_vest @@ -222,7 +188,6 @@ reqs = list(/obj/item/stack/sheet/durathread = 6, /obj/item/stack/sheet/leather = 3) time = 50 - always_availible = TRUE category = CAT_CLOTHING /datum/crafting_recipe/durathread_wintercoat @@ -239,5 +204,4 @@ reqs = list(/obj/item/clothing/suit/hooded/wintercoat = 1, /obj/item/bedsheet/cosmos = 1) time = 60 - always_availible = TRUE category = CAT_CLOTHING From 684b7714dbe0fec29d5c839a69841b4ce070dd14 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Sun, 1 Mar 2020 08:21:25 -0500 Subject: [PATCH 4/9] Update hud.dm --- code/modules/clothing/glasses/hud.dm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm index fc5156bc45..c7bd4ef0d2 100644 --- a/code/modules/clothing/glasses/hud.dm +++ b/code/modules/clothing/glasses/hud.dm @@ -4,6 +4,16 @@ flags_1 = null //doesn't protect eyes because it's a monocle, duh var/hud_type = null +/obj/item/clothing/glasses/hud/CheckParts(list/parts_list) + . = ..() + if(vision_correction) + return + for(var/obj/item/clothing/glasses/G in parts_list) + if(G.vision_correction) + vision_correction = TRUE + name = "prescription [name]" + return + /obj/item/clothing/glasses/hud/equipped(mob/living/carbon/human/user, slot) ..() if(hud_type && slot == SLOT_GLASSES) From da48f95de7a83be124648aa0348696ba00485201 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Mon, 2 Mar 2020 00:11:54 -0500 Subject: [PATCH 5/9] Update hud.dm --- code/modules/clothing/glasses/hud.dm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm index c7bd4ef0d2..c0505ea61e 100644 --- a/code/modules/clothing/glasses/hud.dm +++ b/code/modules/clothing/glasses/hud.dm @@ -103,11 +103,6 @@ flash_protect = 1 tint = 1 -/obj/item/clothing/glasses/hud/diagnostic/sunglasses/prescription - name = "diagnostic HUDSunglasses" - desc = "Sunglasses with a diagnostic HUD and a second layer of normal prescription glasses." - vision_correction = 1 - /obj/item/clothing/glasses/hud/diagnostic/prescription name = "prescription diagnostic HUD" desc = "A heads-up display capable of analyzing the integrity and status of robotics and exosuits. This one has a prescription lens." From c6be46c6bdb3f344d2f13ad6f795487c8d1a574c Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Mon, 2 Mar 2020 00:22:46 -0500 Subject: [PATCH 6/9] Update recipes_clothing.dm --- .../components/crafting/recipes/recipes_clothing.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/datums/components/crafting/recipes/recipes_clothing.dm b/code/datums/components/crafting/recipes/recipes_clothing.dm index 7848295ea7..89cd27541b 100644 --- a/code/datums/components/crafting/recipes/recipes_clothing.dm +++ b/code/datums/components/crafting/recipes/recipes_clothing.dm @@ -42,7 +42,7 @@ result = /obj/item/clothing/glasses/hud/security/sunglasses time = 20 tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER) - parts = list(obj/item/clothing/glasses/hud/security = 1) + parts = list(/obj/item/clothing/glasses/hud/security = 1) reqs = list(/obj/item/clothing/glasses/hud/security = 1, /obj/item/clothing/glasses/sunglasses = 1, /obj/item/stack/cable_coil = 5) @@ -61,9 +61,9 @@ result = /obj/item/clothing/glasses/hud/health/sunglasses time = 20 tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER) - parts = list(obj/item/clothing/glasses/hud/health = 1) - reqs = list(/obj/item/clothing/glasses/hud/health = 1, + parts = list(/obj/item/clothing/glasses/hud/health = 1) /obj/item/clothing/glasses/sunglasses = 1, + reqs = list(/obj/item/clothing/glasses/hud/health = 1, /obj/item/stack/cable_coil = 5) category = CAT_CLOTHING @@ -98,7 +98,7 @@ result = /obj/item/clothing/glasses/hud/diagnostic/sunglasses time = 20 tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER) - parts = list(obj/item/clothing/glasses/hud/diagnostic = 1) + parts = list(/obj/item/clothing/glasses/hud/diagnostic = 1) reqs = list(/obj/item/clothing/glasses/hud/diagnostic = 1, /obj/item/clothing/glasses/sunglasses = 1, /obj/item/stack/cable_coil = 5) From 9540c47adf6b5b81e3b4827169f8e9207759ea0a Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Mon, 2 Mar 2020 00:24:36 -0500 Subject: [PATCH 7/9] Update recipes_clothing.dm --- code/datums/components/crafting/recipes/recipes_clothing.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/datums/components/crafting/recipes/recipes_clothing.dm b/code/datums/components/crafting/recipes/recipes_clothing.dm index 89cd27541b..85d8dae78b 100644 --- a/code/datums/components/crafting/recipes/recipes_clothing.dm +++ b/code/datums/components/crafting/recipes/recipes_clothing.dm @@ -62,9 +62,9 @@ time = 20 tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER) parts = list(/obj/item/clothing/glasses/hud/health = 1) - /obj/item/clothing/glasses/sunglasses = 1, reqs = list(/obj/item/clothing/glasses/hud/health = 1, - /obj/item/stack/cable_coil = 5) + /obj/item/clothing/glasses/sunglasses = 1, + /obj/item/stack/cable_coil = 5) category = CAT_CLOTHING /datum/crafting_recipe/hudsunmedremoval From 748614b98acea6a2c9fc05b9fdefc867947e1839 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Sat, 7 Mar 2020 08:26:15 -0500 Subject: [PATCH 8/9] Apply suggestions from code review Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com> --- code/modules/clothing/glasses/hud.dm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm index c0505ea61e..c84aec5c15 100644 --- a/code/modules/clothing/glasses/hud.dm +++ b/code/modules/clothing/glasses/hud.dm @@ -80,8 +80,7 @@ glass_colour_type = /datum/client_colour/glass_colour/blue /obj/item/clothing/glasses/hud/health/sunglasses/prescription - name = "medical prescription HUDSunglasses" - desc = "Sunglasses with a medical HUD and a second layer of normal prescription glasses." + name = "prescription medical HUDSunglasses" vision_correction = 1 /////////////////// @@ -112,8 +111,7 @@ glass_colour_type = /datum/client_colour/glass_colour/lightorange /obj/item/clothing/glasses/hud/diagnostic/sunglasses/prescription - name = "diagnostic prescription HUDSunglasses" - desc = "Sunglasses with a diagnostic HUD and a second layer of normal prescription glasses." + name = "prescription diagnostic HUDSunglasses" vision_correction = 1 /obj/item/clothing/glasses/hud/diagnostic/night @@ -182,8 +180,7 @@ glass_colour_type = /datum/client_colour/glass_colour/darkred /obj/item/clothing/glasses/hud/security/sunglasses/prescription - name = "security HUDSunglasses" - desc = "Sunglasses with a security HUD and a second layer of normal prescription glasses.." + name = "prescription security HUDSunglasses" vision_correction = 1 /obj/item/clothing/glasses/hud/security/night From bceed5d002de3a43a2a203180792eda83e74fa53 Mon Sep 17 00:00:00 2001 From: Ghom <42542238+Ghommie@users.noreply.github.com> Date: Sun, 8 Mar 2020 23:46:33 +0100 Subject: [PATCH 9/9] Update recipes_clothing.dm --- .../components/crafting/recipes/recipes_clothing.dm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/code/datums/components/crafting/recipes/recipes_clothing.dm b/code/datums/components/crafting/recipes/recipes_clothing.dm index 85d8dae78b..f21991c754 100644 --- a/code/datums/components/crafting/recipes/recipes_clothing.dm +++ b/code/datums/components/crafting/recipes/recipes_clothing.dm @@ -42,7 +42,8 @@ result = /obj/item/clothing/glasses/hud/security/sunglasses time = 20 tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER) - parts = list(/obj/item/clothing/glasses/hud/security = 1) + parts = list(/obj/item/clothing/glasses/hud/security = 1, + /obj/item/clothing/glasses/sunglasses = 1) reqs = list(/obj/item/clothing/glasses/hud/security = 1, /obj/item/clothing/glasses/sunglasses = 1, /obj/item/stack/cable_coil = 5) @@ -61,7 +62,8 @@ result = /obj/item/clothing/glasses/hud/health/sunglasses time = 20 tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER) - parts = list(/obj/item/clothing/glasses/hud/health = 1) + parts = list(/obj/item/clothing/glasses/hud/health = 1, + /obj/item/clothing/glasses/sunglasses = 1) reqs = list(/obj/item/clothing/glasses/hud/health = 1, /obj/item/clothing/glasses/sunglasses = 1, /obj/item/stack/cable_coil = 5) @@ -98,7 +100,8 @@ result = /obj/item/clothing/glasses/hud/diagnostic/sunglasses time = 20 tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER) - parts = list(/obj/item/clothing/glasses/hud/diagnostic = 1) + parts = list(/obj/item/clothing/glasses/hud/diagnostic = 1, + /obj/item/clothing/glasses/sunglasses = 1) reqs = list(/obj/item/clothing/glasses/hud/diagnostic = 1, /obj/item/clothing/glasses/sunglasses = 1, /obj/item/stack/cable_coil = 5)