From 944babf62290e68e07196b35c4d5c2c24c541d1a Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 20 Mar 2019 16:57:07 -0400 Subject: [PATCH 1/2] Ports veils from Baystation Thought about kicking this to Polaris, but, pretty sure the Taj species maintainer would not be interested in them. Might make some additional changes later, as I saw some problems with the code while making this. --- .../loadout/loadout_xeno_vr.dm | 25 +++++++++++ code/modules/clothing/glasses/glasses_vr.dm | 41 ++++++++++++++++++ icons/mob/eyes_vr.dmi | Bin 0 -> 481 bytes icons/obj/clothing/glasses_vr.dmi | Bin 0 -> 480 bytes 4 files changed, 66 insertions(+) create mode 100644 icons/mob/eyes_vr.dmi create mode 100644 icons/obj/clothing/glasses_vr.dmi diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno_vr.dm b/code/modules/client/preference_setup/loadout/loadout_xeno_vr.dm index a38b489827..05a0c58461 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno_vr.dm @@ -37,4 +37,29 @@ /datum/gear/uniform/loincloth display_name = "loincloth" path = /obj/item/clothing/suit/storage/fluff/loincloth + sort_category = "Xenowear" + +// Taj clothing +/datum/gear/eyes/tajblind + display_name = "embroidered veil" + path = /obj/item/clothing/glasses/tajblind + //whitelisted = SPECIES_TAJ + sort_category = "Xenowear" + +/datum/gear/eyes/medical/tajblind + display_name = "medical veil (Tajara) (Medical)" + path = /obj/item/clothing/glasses/hud/health/tajblind + //whitelisted = SPECIES_TAJ + sort_category = "Xenowear" + +/datum/gear/eyes/meson/tajblind + display_name = "industrial veil (Tajara) (Engineering, Science)" + path = /obj/item/clothing/glasses/meson/prescription/tajblind + //whitelisted = SPECIES_TAJ + sort_category = "Xenowear" + +/datum/gear/eyes/security/tajblind + display_name = "sleek veil (Tajara) (Security)" + path = /obj/item/clothing/glasses/sunglasses/sechud/tajblind + //whitelisted = SPECIES_TAJ sort_category = "Xenowear" \ No newline at end of file diff --git a/code/modules/clothing/glasses/glasses_vr.dm b/code/modules/clothing/glasses/glasses_vr.dm index e85b40633a..615f94fdec 100644 --- a/code/modules/clothing/glasses/glasses_vr.dm +++ b/code/modules/clothing/glasses/glasses_vr.dm @@ -60,3 +60,44 @@ /obj/item/clothing/glasses/sunglasses/sechud/tactical item_flags = AIRTIGHT body_parts_covered = EYES + +/*---Tajaran-specific Eyewear---*/ + +/obj/item/clothing/glasses/tajblind + name = "embroidered veil" + desc = "An Tajaran made veil that allows the user to see while obscuring their eyes." + icon = 'icons/obj/clothing/glasses_vr.dmi' + icon_override = 'icons/mob/eyes_vr.dmi' + icon_state = "tajblind" + item_state = "tajblind" + prescription = 1 + body_parts_covered = EYES + +/obj/item/clothing/glasses/hud/health/tajblind + name = "lightweight veil" + desc = "An Tajaran made veil that allows the user to see while obscuring their eyes. This one has an installed medical HUD." + icon = 'icons/obj/clothing/glasses_vr.dmi' + icon_override = 'icons/mob/eyes_vr.dmi' + icon_state = "tajblind_med" + item_state = "tajblind_med" + body_parts_covered = EYES + +/obj/item/clothing/glasses/sunglasses/sechud/tajblind + name = "sleek veil" + desc = "An Tajaran made veil that allows the user to see while obscuring their eyes. This one has an in-built security HUD." + icon = 'icons/obj/clothing/glasses_vr.dmi' + icon_override = 'icons/mob/eyes_vr.dmi' + icon_state = "tajblind_sec" + item_state = "tajblind_sec" + prescription = 1 + body_parts_covered = EYES + +/obj/item/clothing/glasses/meson/prescription/tajblind + name = "industrial veil" + desc = "An Tajaran made veil that allows the user to see while obscuring their eyes. This one has installed mesons." + icon = 'icons/obj/clothing/glasses_vr.dmi' + icon_override = 'icons/mob/eyes_vr.dmi' + icon_state = "tajblind_meson" + item_state = "tajblind_meson" + off_state = "tajblind_meson" + body_parts_covered = EYES diff --git a/icons/mob/eyes_vr.dmi b/icons/mob/eyes_vr.dmi new file mode 100644 index 0000000000000000000000000000000000000000..15a473ebbe078340d57d26b79cffb7be86adbb02 GIT binary patch literal 481 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H3?#oinD`S&83g!*xE?rgAT2G;+1WWbIGB&O z-O9?!(9n>9;Xebz%z6ffGYkwS3tlkH{LgUaKVzMb@l4~46Hy#My^JM6e!&b5&u*jv zIrUW`5hX6E#mPmP1tppJc?=8{bArPPib}tK2`>2f^@*0ZuGYCT=Yuzd8eBAf@JQ#p zkLF2+qMqIz7REuwmyNv?<~*8oWKxJi@Jba!ZB2D!eb>%zW7W+oB$o7d8?V(cG#5Q$ zb|ge1e$FhPJ&*2$2>Gy`dh+~X(7H7bUOi{}ro^Bz!{y*S)rwG{Q?7WrIEGZrd3$@K zP_u%7Yv3l262TAu|C>e6;Jd;jG`o7v#!Bn1vVD%v8}9FMi;MZAqBMDWn4ZwRgXbQH zDb#&Ce%-!;Inlg*sojQ%E!pc1?0)t+{zI&z_I&?5exT_L2Sl5HGfvg`m0~Y&weMb? zgYz1Gm+o`F7)x*6=g-g%|HTMa#Cz-;bM~hG|6A;K)hm2|FYlpvoqdyQ`d^2#o%`iI z*4kVIo5hf4Q1RbkWB>n8PyRJNGLJrT@kDFgf|j**8zR3<|Ih8Et^WlSSqxfst5R57 TPRzPH9mMl=^>bP0l+XkK(l*8U literal 0 HcmV?d00001 diff --git a/icons/obj/clothing/glasses_vr.dmi b/icons/obj/clothing/glasses_vr.dmi new file mode 100644 index 0000000000000000000000000000000000000000..bff9c7b3a80cd76175baf0b3f9c992d847b12d7f GIT binary patch literal 480 zcmV<60U!Q}P)V=-0C=2JR&a84 z_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+(=$pSoZ^zil2jm5sU$Hg zDJL^8MTv_uC9|j)C}haRnO2mTn+joLD2y*oO(tG(ZYl{T17-5_a4A<-aP@Nmdl3L6 zJVdoeYV8I9006{EL_t(oh3%F}4udcZMGbLrObB7R|5=+ss%XIsRi$qH7LMX)Mas$_ zKvCYQ>T=fAU2lv@9`KPts9wzsB5r+YuAVS}4OwPO4VL=~Oyk&+V|LVHxqlE_WU1?7 z*|FJsM}1Gu@A^Cv*jf&Pj^1+!>?NN@$T^aA^xhwN*!|lbuPBP5C_m);d~mk^FXV%= z|A(^whwc6^ex#8(7C9eGG|#a}`G6cPODu9en9}~A Date: Wed, 20 Mar 2019 18:20:45 -0400 Subject: [PATCH 2/2] Adds a mining veil for Mining. --- .../preference_setup/loadout/loadout_xeno_vr.dm | 8 +++++++- code/modules/clothing/glasses/glasses_vr.dm | 12 +++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno_vr.dm b/code/modules/client/preference_setup/loadout/loadout_xeno_vr.dm index 05a0c58461..8733c16023 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno_vr.dm @@ -58,8 +58,14 @@ //whitelisted = SPECIES_TAJ sort_category = "Xenowear" +/datum/gear/eyes/material/tajblind + display_name = "mining veil (Tajara) (Mining)" + path = /obj/item/clothing/glasses/material/prescription/tajblind + //whitelisted = SPECIES_TAJ + sort_category = "Xenowear" + /datum/gear/eyes/security/tajblind display_name = "sleek veil (Tajara) (Security)" path = /obj/item/clothing/glasses/sunglasses/sechud/tajblind //whitelisted = SPECIES_TAJ - sort_category = "Xenowear" \ No newline at end of file + sort_category = "Xenowear" diff --git a/code/modules/clothing/glasses/glasses_vr.dm b/code/modules/clothing/glasses/glasses_vr.dm index 615f94fdec..1d7cb0087f 100644 --- a/code/modules/clothing/glasses/glasses_vr.dm +++ b/code/modules/clothing/glasses/glasses_vr.dm @@ -99,5 +99,15 @@ icon_override = 'icons/mob/eyes_vr.dmi' icon_state = "tajblind_meson" item_state = "tajblind_meson" - off_state = "tajblind_meson" + off_state = "tajblind" + body_parts_covered = EYES + +/obj/item/clothing/glasses/material/prescription/tajblind + name = "mining veil" + desc = "An Tajaran made veil that allows the user to see while obscuring their eyes. This one has an installed material scanner." + icon = 'icons/obj/clothing/glasses_vr.dmi' + icon_override = 'icons/mob/eyes_vr.dmi' + icon_state = "tajblind_meson" + item_state = "tajblind_meson" + off_state = "tajblind" body_parts_covered = EYES