From d92ed5fec6c6e19ac0cce84eebe2b58427f186d7 Mon Sep 17 00:00:00 2001 From: Zergspower Date: Wed, 18 Jan 2023 07:29:07 -0600 Subject: [PATCH] Adds Prescription Science glasses (#18790) * Done * Viro science loadout --- code/modules/research/techweb/all_nodes.dm | 1 + modular_skyrat/modules/huds/code/designs.dm | 12 ++++++++++++ .../modules/huds/code/glasses/HUD_Glasses.dm | 17 +++++++++++++++++ modular_skyrat/modules/huds/icons/hudeyes.dmi | Bin 814 -> 962 bytes modular_skyrat/modules/huds/icons/huds.dmi | Bin 470 -> 509 bytes .../loadout_items/loadout_datum_glasses.dm | 13 +++++++++---- 6 files changed, 39 insertions(+), 4 deletions(-) diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm index 5f8536c0006..ef0cc6dafd0 100644 --- a/code/modules/research/techweb/all_nodes.dm +++ b/code/modules/research/techweb/all_nodes.dm @@ -1265,6 +1265,7 @@ "health_hud_prescription", "security_hud_prescription", "diagnostic_hud_prescription", + "science_hud_prescription", "health_hud_aviator", "security_hud_aviator", "diagnostic_hud_aviator", diff --git a/modular_skyrat/modules/huds/code/designs.dm b/modular_skyrat/modules/huds/code/designs.dm index 08155cb0b85..efec8821049 100644 --- a/modular_skyrat/modules/huds/code/designs.dm +++ b/modular_skyrat/modules/huds/code/designs.dm @@ -28,6 +28,18 @@ category = list(RND_CATEGORY_EQUIPMENT) departmental_flags = DEPARTMENT_BITFLAG_SCIENCE +/datum/design/science_hud_prescription + name = "Prescription Science HUD" + desc = "These glasses scan the contents of containers and projects their contents to the user in an easy to read format. This one has a prescription lens." + id = "science_hud_prescription" + build_type = PROTOLATHE + materials = list(/datum/material/iron = 500, /datum/material/glass = 500, /datum/material/gold = 350) + build_path = /obj/item/clothing/glasses/hud/science/prescription + category = list( + RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_SCIENCE + ) + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_MEDICAL + /datum/design/mesons_prescription name = "Prescription Optical Meson Scanners" desc = "Used by engineering and mining staff to see basic structural and terrain layouts through walls, regardless of lighting condition. Prescription lens has been added into this design." diff --git a/modular_skyrat/modules/huds/code/glasses/HUD_Glasses.dm b/modular_skyrat/modules/huds/code/glasses/HUD_Glasses.dm index 9f495a13646..9c3574cb807 100644 --- a/modular_skyrat/modules/huds/code/glasses/HUD_Glasses.dm +++ b/modular_skyrat/modules/huds/code/glasses/HUD_Glasses.dm @@ -22,6 +22,23 @@ worn_icon = 'modular_skyrat/modules/huds/icons/hudeyes.dmi' vision_correction = TRUE +/obj/item/clothing/glasses/hud/science/prescription + name = "prescription science glasses" + desc = "These glasses scan the contents of containers and projects their contents to the user in an easy to read format. This one has prescription lenses." + icon = 'modular_skyrat/modules/huds/icons/huds.dmi' + icon_state = "glasses_sciencehud" + worn_icon = 'modular_skyrat/modules/huds/icons/hudeyes.dmi' + vision_correction = TRUE + flash_protect = FLASH_PROTECTION_NONE + glass_colour_type = /datum/client_colour/glass_colour/purple + resistance_flags = ACID_PROOF + armor_type = /datum/armor/prescription_science + clothing_traits = list(TRAIT_REAGENT_SCANNER, TRAIT_RESEARCH_SCANNER) + +/datum/armor/prescription_science + fire = 80 + acid = 100 + /obj/item/clothing/glasses/meson/prescription name = "prescription optical meson scanner" desc = "Used by engineering and mining staff to see basic structural and terrain layouts through walls, regardless of lighting conditions. This one has prescription lens fitted in." diff --git a/modular_skyrat/modules/huds/icons/hudeyes.dmi b/modular_skyrat/modules/huds/icons/hudeyes.dmi index 90ff433026c5ab5b0941d2f3b3abbb389b6e01aa..f5a2ff9ce07983ad3fc45eef7a194c4c1dbb3ec3 100644 GIT binary patch literal 962 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSQ>#KEN?cNllZ!G7N;32F7#J$% zOg+7qtJy$=?Sf@x7yn)F`k2iku0}7kr%bpri#ts5`>jjc-(T1mP+)U-W#QW@`$e*Q zYJ&vh#4SwP7n|z)&3ag189ljk`I`6+HdTv|%Q7w=c{2~KvCLn&Nv%-O!sOZ=?}`Zr z9)7VFYR`;xwR{)pRH(h?eXP2X?!_kN(->qOI)3=B*!JY5_^D(1Ys zv(R5UQKI4F`qM1lVF!;qbV%AJu&Jf&m0kOldLR;s(OJ+Ae|G6^Vd)D{UPX)t2Z#%V#=TX(RH{2OJc^J+yJOC5( z&i`s&r15I^+rY~KCw92~X3W#SoRIo> z$K=$=9eaHeQy)w0mw#}4d(woxFLhJw52S=~c;Dimu>Nh>{R=GlAS{kS7}=gq?J z%ulj+hyMS4)9D+t&-o(z2C2`|@Bl&t6*;WDXAE77R(yWlt#$r$Rn0o}=an%ZR{q>< z0}9T$L92qjO6zI^mri+B*M59+kXLEX$N6byxA_Y;#kX#M?_6KJ+}f`E*KF%Ie;L$& zhyFi2{pcI^8MB_&F_=CxXPCoyK$3DIX7OK!#TLId%P;6z`kOImm3!fq4SyLXM|$7p zH|RN>WxJ;RYSC6}AWOt;ZiL&Hx`srVu;{1Ps1Q=`%)=guS!?P(I{?g-44$rjF6*2U FngFW#pKSmD delta 626 zcmV-&0*(E`2d)N?7k^*~1^@s6)p~kK0001wdQ@0+L}hbha%pgMX>V=-0C=30%e@N1 zFcb#RIeChYb{BuTW|0)h(7u9%=9*lnE#%%RzP*E^AUK}kv^e*dFv1VPKBx+>3mm%L z-kK*TEpRv;ttrI0=m(-v2@Xx3qX@~hP@J`tEj898t^$Y7ntxl3cM>=pzDMGimsOOf zf0od+Ro2&!)1n_e{1EILnxR1%u~iPl00077Nkltg7Owb_F>Mj^MW7Ix)pzNS z<1)k;!*Dq4tm2Z3^PijZx96*rQfj*0ZU`ZS-ya6k*WbVNMx)V6?~rqD9%qFR!fZAR zRaLc~*=h4PFdbjjoi{O@pTz$B+&e#sYkm2fmQre-z8Cm(d{tLp-}cusdtuh%U6#=* z0R2Dw29wbNE0fOw98GJrAK>;fPq%gky%=M-z06^2XMo=i@aso8jqiqQ*$?nID})X0 z2Pn1=>OZeOhw05>e}3*wZw}G>0gCN|dh&C;mi+*Wv)m7$*8B#O(E%%y&jB1-TRMQU zESuu`qArS}nV*}-^C~X*-27#puTn~>$vHPU=cc&6sB_LMzr)j6Ip-#&^iMO}?FTqJ zs>Az_VY0j5pPze^-F^0cfU~1|^6A@p_5&=;azB7t^Ba>-0yq}#0U%z_t^V=nDF6Tf M07*qoM6N<$g0ucFjsO4v diff --git a/modular_skyrat/modules/huds/icons/huds.dmi b/modular_skyrat/modules/huds/icons/huds.dmi index 6d7d026614b85452746fd88ed6e2e4630569091a..0945b75dba724115723979cb085e24e105ab703e 100644 GIT binary patch delta 441 zcmV;q0Y?7T1N{S#BmqK^B`$yeb6l?gul|X2|6D}G0K}01k^fs;fB=B?z%0H10004W zQchCV=-0C=30k2?y(Fc1Z6=@i25Lw;?VU=v)# zR|t!=(JnYLXxA~meMDRa0`6vbOz~=WZEs!gntNy8n1#pWF7CYBTQh%iP%3gdT0_W@ zbQMuhELg<>L{J`tFeuR!Dr*8~DcixCXNDK9{8I#mm_||dTPi_6W!7a=;~A63KS}M{ zzWM(D0Erq=8nVzhZ~y=R$w@>(R9J=Wmdg&qAPfXqC?!b&=K=r!tF=WhReY$bR?5M1 zS%rxm<-|H?7{_mHDEKgXOQ5o1=oY)Eoa(y|oJ^9Gq`Kj*A^R^z#pqWs|p-Y^WqFs{W9`a!K2 zQT2X6gb}3ogOvyQ{$JO+sr_K*LH7GjhuROe+8QKkZCXD#sCO+$5OuvD$UNWPTWfkh jka_k;@750t;~zW$A+QGv**3m600000NkvXXu0mjfzKF#e delta 402 zcmV;D0d4;M1J(nOBmp^*B`$x!z`*}=T>go4|6D}>TU&L!bNB!N00DGTPE!Ct=GbNc z00549R9JLGWpiV4X>fFDZ*Bkpc$`yKaB_9`^iy#0_2eo`Eh^5;&r`5fFwryM;w;Zh zDainGjE%TBGg33tGfE(w;*!LYR3K9+JtwiaIJG!FBQ-InBqO6VMTvilGbOXA7$|4R z#hF%=n41b=W9Uf9Oia(qFD}VUCPi0qYI12&W=SO;J<1BMelB3o005WoK@fCK13v%& z0I^9#K~z|U?Ulg}!ypVpaTulTK%xBq$1V}OOwGj9U3$p7SYYg`Cx_rT&dq@E7F_a) zV#JV#@j{H0FeF(GphbTQAhN`a^LIe21jS$1v>ARtjyXdm#vS3QS0DbCN`XpB#qhNu z>rKu3UPaFhniqd7#q`A*=US`rhd=m^<2a6UFJ}8c%@Z+W2w!OcH3`c8x5kIH|I>nl wdxr{hH}`+qpm|yEqxUcSKg0LmasJ{3h<60A6(PQi00000Nks-uM6N<$g0KR&ng9R* diff --git a/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_glasses.dm b/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_glasses.dm index dcb509cd77a..5d27601e630 100644 --- a/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_glasses.dm +++ b/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_glasses.dm @@ -150,7 +150,7 @@ GLOBAL_LIST_INIT(loadout_glasses, generate_loadout_items(/datum/loadout_item/gla /datum/loadout_item/glasses/scipatch name = "Science Eyepatch" item_path = /obj/item/clothing/glasses/hud/eyepatch/sci - restricted_roles = list(JOB_SCIENTIST, JOB_ROBOTICIST, JOB_GENETICIST, JOB_RESEARCH_DIRECTOR, JOB_CHEMIST, JOB_SCIENCE_GUARD) + restricted_roles = list(JOB_SCIENTIST, JOB_ROBOTICIST, JOB_GENETICIST, JOB_RESEARCH_DIRECTOR, JOB_CHEMIST, JOB_SCIENCE_GUARD, JOB_VIROLOGIST) /datum/loadout_item/glasses/mesonpatch name = "Meson Eyepatch" @@ -182,6 +182,11 @@ GLOBAL_LIST_INIT(loadout_glasses, generate_loadout_items(/datum/loadout_item/gla item_path = /obj/item/clothing/glasses/hud/diagnostic/prescription restricted_roles = list(JOB_RESEARCH_DIRECTOR,JOB_SCIENTIST, JOB_ROBOTICIST) +/datum/loadout_item/glasses/science_glasses + name = "Prescription Science glasses" + item_path = /obj/item/clothing/glasses/hud/science/prescription + restricted_roles = list(JOB_SCIENTIST, JOB_ROBOTICIST, JOB_GENETICIST, JOB_RESEARCH_DIRECTOR, JOB_CHEMIST, JOB_SCIENCE_GUARD, JOB_VIROLOGIST) + /datum/loadout_item/glasses/aviator_security name = "Security HUD Aviators" item_path = /obj/item/clothing/glasses/hud/ar/aviator/security @@ -205,7 +210,7 @@ GLOBAL_LIST_INIT(loadout_glasses, generate_loadout_items(/datum/loadout_item/gla /datum/loadout_item/glasses/aviator_science name = "Science Aviators" item_path = /obj/item/clothing/glasses/hud/ar/aviator/science - restricted_roles = list(JOB_SCIENTIST, JOB_ROBOTICIST, JOB_GENETICIST, JOB_RESEARCH_DIRECTOR, JOB_CHEMIST, JOB_SCIENCE_GUARD) + restricted_roles = list(JOB_SCIENTIST, JOB_ROBOTICIST, JOB_GENETICIST, JOB_RESEARCH_DIRECTOR, JOB_CHEMIST, JOB_SCIENCE_GUARD, JOB_VIROLOGIST) /datum/loadout_item/glasses/prescription_aviator_security @@ -231,7 +236,7 @@ GLOBAL_LIST_INIT(loadout_glasses, generate_loadout_items(/datum/loadout_item/gla /datum/loadout_item/glasses/prescription_aviator_science name = "Prescription Science Aviators" item_path = /obj/item/clothing/glasses/hud/ar/aviator/science/prescription - restricted_roles = list(JOB_SCIENTIST, JOB_ROBOTICIST, JOB_GENETICIST, JOB_RESEARCH_DIRECTOR, JOB_CHEMIST, JOB_SCIENCE_GUARD) + restricted_roles = list(JOB_SCIENTIST, JOB_ROBOTICIST, JOB_GENETICIST, JOB_RESEARCH_DIRECTOR, JOB_CHEMIST, JOB_SCIENCE_GUARD, JOB_VIROLOGIST) /datum/loadout_item/glasses/retinal_projector_security name = "Retinal Projector Security HUD" @@ -256,7 +261,7 @@ GLOBAL_LIST_INIT(loadout_glasses, generate_loadout_items(/datum/loadout_item/gla /datum/loadout_item/glasses/retinal_projector_science name = "Science Retinal Projector" item_path = /obj/item/clothing/glasses/hud/ar/projector/science - restricted_roles = list(JOB_SCIENTIST, JOB_ROBOTICIST, JOB_GENETICIST, JOB_RESEARCH_DIRECTOR, JOB_CHEMIST, JOB_SCIENCE_GUARD) + restricted_roles = list(JOB_SCIENTIST, JOB_ROBOTICIST, JOB_GENETICIST, JOB_RESEARCH_DIRECTOR, JOB_CHEMIST, JOB_SCIENCE_GUARD, JOB_VIROLOGIST) /* * FAMILIES