cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-19 19:15:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

clothing _vr dmi cleanup: eyewear and masks (#18292)

Browse Source 
* clothing _vr dmi cleanup: boots

* clothing _vr dmi cleanup: boots

* clothing _vr dmi cleanup: eyewear and masks

* cyber mantle tweaks and fixes

---------

Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
Killian
2025-08-26 16:27:42 +01:00
committed by GitHub
parent 6855920e27
commit 0efa9edee4
41 changed files with 61 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/clothing.dm
+16 -5
View File
@@ -574,13 +574,24 @@
heat_protection = FALSE //No heat protection anywhere
cold_protection = FALSE //No heat protection anywhere
slot_flags = SLOT_MASK
body_parts_covered = FACE|EYES
body_parts_covered = HEAD|FACE|EYES
blood_sprite_state = "maskblood"
item_icons = list(
slot_wear_mask_str = 'icons/inventory/face/mob.dmi'
)
sprite_sheets = list(
SPECIES_TESHARI = 'icons/inventory/face/mob_teshari.dmi',
SPECIES_VOX = 'icons/inventory/face/mob_vox.dmi',
SPECIES_TAJARAN = 'icons/inventory/face/mob_tajaran.dmi',
SPECIES_UNATHI = 'icons/inventory/face/mob_unathi.dmi'
SPECIES_TESHARI = 'icons/inventory/face/mob_teshari.dmi',
SPECIES_VOX = 'icons/inventory/face/mob_vox.dmi',
SPECIES_TAJARAN = 'icons/inventory/face/mob_tajaran.dmi',
SPECIES_UNATHI = 'icons/inventory/face/mob_unathi.dmi',
SPECIES_SERGAL = 'icons/inventory/face/mob_sergal.dmi',
SPECIES_NEVREAN = 'icons/inventory/face/mob_nevrean.dmi',
SPECIES_ZORREN_HIGH = 'icons/inventory/face/mob_fox.dmi',
SPECIES_ZORREN_FLAT = 'icons/inventory/face/mob_fennec.dmi',
SPECIES_AKULA = 'icons/inventory/face/mob_akula.dmi',
SPECIES_VULPKANIN = 'icons/inventory/face/mob_vulpkanin.dmi',
SPECIES_XENOCHIMERA = 'icons/inventory/face/mob_tajaran.dmi',
SPECIES_WEREBEAST = 'icons/inventory/face/mob_werebeast.dmi'
)
var/voicechange = 0
code/modules/clothing/clothing_vr.dm
-29
View File
@@ -56,35 +56,6 @@
src.visible_message(span_red("\The [src] moves a little!"))
to_chat(user, span_red("You throw yourself against the inside of \the [src]!"))
//Mask
/obj/item/clothing/mask
name = "mask"
icon = 'icons/inventory/face/item_vr.dmi' // This is intentional because of our custom species.
item_icons = list(
slot_l_hand_str = 'icons/mob/items/lefthand_masks.dmi',
slot_r_hand_str = 'icons/mob/items/righthand_masks.dmi',
)
body_parts_covered = HEAD|FACE|EYES
slot_flags = SLOT_MASK
item_icons = list(
slot_wear_mask_str = 'icons/inventory/face/mob_vr.dmi'
)
sprite_sheets = list(
SPECIES_TESHARI = 'icons/inventory/face/mob_teshari.dmi',
SPECIES_VOX = 'icons/inventory/face/mob_vox.dmi',
SPECIES_TAJARAN = 'icons/inventory/face/mob_tajaran.dmi',
SPECIES_UNATHI = 'icons/inventory/face/mob_unathi.dmi',
SPECIES_SERGAL = 'icons/inventory/face/mob_vr_sergal.dmi',
SPECIES_NEVREAN = 'icons/inventory/face/mob_vr_nevrean.dmi',
SPECIES_ZORREN_HIGH = 'icons/inventory/face/mob_vr_fox.dmi',
SPECIES_ZORREN_FLAT = 'icons/inventory/face/mob_vr_fox.dmi',
SPECIES_AKULA = 'icons/inventory/face/mob_vr_akula.dmi',
SPECIES_VULPKANIN = 'icons/inventory/face/mob_vr_vulpkanin.dmi',
SPECIES_XENOCHIMERA = 'icons/inventory/face/mob_vr_tajaran.dmi',
SPECIES_WEREBEAST = 'icons/inventory/face/mob_vr_werebeast.dmi'
)
//"Spider" = 'icons/inventory/mask/mob_spider.dmi' Add this later when they have custom mask sprites and everything.
/obj/item/clothing/under
sensor_mode = 3
var/sensorpref = 5
code/modules/clothing/glasses/glasses.dm
+13 -3
View File
@@ -12,7 +12,7 @@ BLIND // can't see anything
///////////////////////////////////////////////////////////////////////
/obj/item/clothing/glasses
name = "glasses"
name = DEVELOPER_WARNING_NAME
icon = 'icons/inventory/eyes/item.dmi'
w_class = ITEMSIZE_SMALL
slot_flags = SLOT_EYES
@@ -31,8 +31,18 @@ BLIND // can't see anything
pickup_sound = 'sound/items/pickup/accessory.ogg'
sprite_sheets = list(
SPECIES_TESHARI = 'icons/inventory/eyes/mob_teshari.dmi',
SPECIES_VOX = 'icons/inventory/eyes/mob_vox.dmi'
SPECIES_TESHARI = 'icons/inventory/eyes/mob_teshari.dmi',
SPECIES_VOX = 'icons/inventory/eyes/mob_vox.dmi',
SPECIES_WEREBEAST = 'icons/inventory/eyes/mob_werebeast.dmi',
SPECIES_TAJARAN = 'icons/inventory/eyes/mob_tajaran.dmi',
SPECIES_UNATHI = 'icons/inventory/eyes/mob_unathi.dmi',
SPECIES_SERGAL = 'icons/inventory/eyes/mob_sergal.dmi',
SPECIES_NEVREAN = 'icons/inventory/eyes/mob_nevrean.dmi',
SPECIES_ZORREN_HIGH = 'icons/inventory/eyes/mob_fox.dmi',
SPECIES_ZORREN_FLAT = 'icons/inventory/eyes/mob_fennec.dmi',
SPECIES_AKULA = 'icons/inventory/eyes/mob_akula.dmi',
SPECIES_VULPKANIN = 'icons/inventory/eyes/mob_vulpkanin.dmi',
SPECIES_XENOCHIMERA = 'icons/inventory/eyes/mob_tajaran.dmi'
)
var/glasses_layer_above = FALSE
code/modules/clothing/glasses/glasses_vr.dm
-36
View File
@@ -64,8 +64,6 @@
/obj/item/clothing/glasses/graviton/medgravpatch
name = "medical graviton eyepatch"
desc = "A graviton eyepatch with a medical overlay."
icon = 'icons/inventory/eyes/item_vr.dmi'
icon_override = 'icons/inventory/eyes/mob_vr.dmi'
icon_state = "medgravpatch"
item_state_slots = list(slot_r_hand_str = "blindfold", slot_l_hand_str = "blindfold")
actions_types = list(/datum/action/item_action/toggle_eyepatch)
@@ -76,8 +74,6 @@
name = "tactical AR visor"
desc = "Special AR visor designed for security teams, protects your eyes and provides useful data. The red lights provide extra style and intimidation."
icon_state = "tacsecvis1"
icon = 'icons/inventory/eyes/item_vr.dmi'
icon_override = 'icons/inventory/eyes/mob_vr.dmi'
enables_planes = list(VIS_CH_ID,VIS_CH_WANTED,VIS_CH_IMPTRACK,VIS_CH_IMPLOYAL,VIS_CH_IMPCHEM)
flash_protection = FLASH_PROTECTION_MODERATE
item_flags = AIRTIGHT
@@ -115,70 +111,38 @@
/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/inventory/eyes/item_vr.dmi'
icon_override = 'icons/inventory/eyes/mob_vr.dmi'
icon_state = "tajblind"
item_state = "tajblind"
prescription = TRUE
body_parts_covered = EYES
sprite_sheets = list(SPECIES_VOX = 'icons/inventory/eyes/mob_vox.dmi')
/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/inventory/eyes/item_vr.dmi'
icon_override = 'icons/inventory/eyes/mob_vr.dmi'
icon_state = "tajblind_med"
item_state = "tajblind_med"
body_parts_covered = EYES
sprite_sheets = list(SPECIES_VOX = 'icons/inventory/eyes/mob_vox.dmi')
/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/inventory/eyes/item_vr.dmi'
icon_override = 'icons/inventory/eyes/mob_vr.dmi'
icon_state = "tajblind_sec"
item_state = "tajblind_sec"
prescription = TRUE
body_parts_covered = EYES
sprite_sheets = list(SPECIES_VOX = 'icons/inventory/eyes/mob_vox.dmi')
/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/inventory/eyes/item_vr.dmi'
icon_override = 'icons/inventory/eyes/mob_vr.dmi'
icon_state = "tajblind_meson"
item_state = "tajblind_meson"
off_state = "tajblind"
body_parts_covered = EYES
sprite_sheets = list(SPECIES_VOX = 'icons/inventory/eyes/mob_vox.dmi')
/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/inventory/eyes/item_vr.dmi'
icon_override = 'icons/inventory/eyes/mob_vr.dmi'
icon_state = "tajblind_meson"
item_state = "tajblind_meson"
off_state = "tajblind"
body_parts_covered = EYES
sprite_sheets = list(SPECIES_VOX = 'icons/inventory/eyes/mob_vox.dmi')
/obj/item/clothing/glasses
name = DEVELOPER_WARNING_NAME
sprite_sheets = list(
SPECIES_TESHARI = 'icons/inventory/eyes/mob_teshari.dmi',
SPECIES_VOX = 'icons/inventory/eyes/mob_vox.dmi',
SPECIES_WEREBEAST = 'icons/inventory/eyes/mob_werebeast.dmi',
SPECIES_TAJARAN = 'icons/inventory/eyes/mob_tajaran.dmi',
SPECIES_UNATHI = 'icons/inventory/eyes/mob_unathi.dmi',
SPECIES_SERGAL = 'icons/inventory/eyes/mob_sergal.dmi',
SPECIES_NEVREAN = 'icons/inventory/eyes/mob_nevrean.dmi',
SPECIES_ZORREN_HIGH = 'icons/inventory/eyes/mob_fox.dmi',
SPECIES_ZORREN_FLAT = 'icons/inventory/eyes/mob_fennec.dmi',
SPECIES_AKULA = 'icons/inventory/eyes/mob_akula.dmi',
SPECIES_VULPKANIN = 'icons/inventory/eyes/mob_vulpkanin.dmi',
SPECIES_XENOCHIMERA = 'icons/inventory/eyes/mob_tajaran.dmi'
)
code/modules/clothing/glasses/hud.dm
+27 -5
View File
@@ -214,8 +214,6 @@
/obj/item/clothing/glasses/omnihud/visor
name = "AR visor"
desc = "The VZR-AR are a product based upon the classic AR Glasses, just more fashionable."
icon_override = 'icons/inventory/eyes/mob_vr.dmi'
icon = 'icons/inventory/eyes/mob_vr.dmi'
icon_state = "visor_CIV"
item_state = "visor_CIV"
@@ -354,8 +352,6 @@
/obj/item/clothing/glasses/hud/security/eyepatch2
name = "Security Hudpatch MKII"
desc = "An eyepatch with built in scanners, that analyzes those in view and provides accurate data about their ID status and security records. This updated model offers better ergonomics and updated sensors."
icon = 'icons/inventory/eyes/item_vr.dmi'
icon_override = 'icons/inventory/eyes/mob_vr.dmi'
icon_state = "sec_eyepatch"
item_state_slots = list(slot_r_hand_str = "blindfold", slot_l_hand_str = "blindfold")
body_parts_covered = 0
@@ -448,9 +444,15 @@
desc = "A full-face, partially-obscuring visor favoured by certain subcultures and those with sensitive eyes. Covers the face and eyes, but it's not enough to actually hide your identity. The interior has a simple augmented-reality display that aids with daily tasks. It can be toggled in and out of corrective vision mode via integrated subroutine."
icon_state = "mantle_HUD"
item_state = "mantle_HUD"
body_parts_covered = FACE|EYES
body_parts_covered = EYES
flags_inv = HIDEFACE
can_shade = FALSE
/obj/item/clothing/glasses/omnihud/mantle/ar_interact(var/mob/living/carbon/human/user)
if(tgarscreen)
tgarscreen.tgui_interact(user)
return 1
/obj/item/clothing/glasses/omnihud/mantle/verb/switcheye()
set name = "Toggle Autocorrective Vision"
set category = "Object"
@@ -473,6 +475,11 @@
tgarscreen_path = /datum/tgui_module/alarm_monitor/security/glasses
enables_planes = list(VIS_CH_ID,VIS_CH_HEALTH_VR,VIS_CH_WANTED,VIS_AUGMENTED)
/obj/item/clothing/glasses/omnihud/mantle/sec/ar_interact(var/mob/living/carbon/human/user)
if(tgarscreen)
tgarscreen.tgui_interact(user)
return 1
/obj/item/clothing/glasses/omnihud/mantle/med
name = "medical AR mantle"
desc = "A full-face, partially-obscuring visor favoured by certain subcultures and those with sensitive eyes. Covers the face and eyes, but it's not enough to actually hide your identity. The interior has a simple augmented-reality display that aids with daily tasks. It can be toggled in and out of corrective vision mode via integrated subroutine. This version includes extra medical-related functions."
@@ -481,6 +488,11 @@
tgarscreen_path = /datum/tgui_module/crew_monitor/glasses
enables_planes = list(VIS_CH_ID,VIS_CH_HEALTH_VR,VIS_CH_STATUS_R,VIS_CH_BACKUP,VIS_AUGMENTED)
/obj/item/clothing/glasses/omnihud/mantle/med/ar_interact(var/mob/living/carbon/human/user)
if(tgarscreen)
tgarscreen.tgui_interact(user)
return 1
/obj/item/clothing/glasses/omnihud/mantle/eng
name = "engineering AR mantle"
desc = "A full-face, partially-obscuring visor favoured by certain subcultures and those with sensitive eyes. Covers the face and eyes, but it's not enough to actually hide your identity. The interior has a simple augmented-reality display that aids with daily tasks. It can be toggled in and out of corrective vision mode via integrated subroutine. This version includes extra engineering-related functions."
@@ -489,6 +501,11 @@
actions_types = list(/datum/action/item_action/ar_console_station_alerts)
tgarscreen_path = /datum/tgui_module/alarm_monitor/engineering/glasses
/obj/item/clothing/glasses/omnihud/mantle/med/ar_interact(var/mob/living/carbon/human/user)
if(tgarscreen)
tgarscreen.tgui_interact(user)
return 1
/obj/item/clothing/glasses/omnihud/mantle/cmd
name = "command AR mantle"
desc = "A full-face, partially-obscuring visor favoured by certain subcultures and those with sensitive eyes. Covers the face and eyes, but it's not enough to actually hide your identity. The interior has a simple augmented-reality display that aids with daily tasks. It can be toggled in and out of corrective vision mode via integrated subroutine. This version includes extra command-related functions."
@@ -497,3 +514,8 @@
enables_planes = list(VIS_CH_ID,VIS_CH_HEALTH_VR,VIS_CH_STATUS_R,VIS_CH_BACKUP,VIS_CH_WANTED,VIS_AUGMENTED)
actions_types = list(/datum/action/item_action/ar_console_all_alerts)
tgarscreen_path = /datum/tgui_module/alarm_monitor/all/glasses
/obj/item/clothing/glasses/omnihud/mantle/cmd/ar_interact(var/mob/living/carbon/human/user)
if(tgarscreen)
tgarscreen.tgui_interact(user)
return 1
code/modules/clothing/masks/breath_vr.dm
-2
View File
@@ -7,8 +7,6 @@
name = "Spacer Tuned Mask"
desc = "A mask designed for long-term use in areas where breathing comes at a premium."
icon_state = "altevian-mask"
icon = 'icons/inventory/face/item_vr.dmi'
icon_override = 'icons/inventory/face/mob_vr.dmi'
sprite_sheets = null
item_state_slots = list(slot_r_hand_str = "breath", slot_l_hand_str = "breath")
item_flags = AIRTIGHT|FLEXIBLEMATERIAL
code/modules/clothing/masks/gasmask.dm
+1 -3
View File
@@ -69,9 +69,7 @@
body_parts_covered = HEAD|FACE|EYES
heat_protection = HEAD
cold_protection = HEAD
sprite_sheets = list(
SPECIES_TESHARI = 'icons/inventory/face/mob_vr_teshari.dmi'
)
/obj/item/clothing/mask/gas/plaguedoctor/gold
name = "gold plague doctor mask"
desc = "A modernised version of the classic design, this mask will not only filter out phoron but it can also be connected to an air supply. This one is gold."
code/modules/clothing/masks/gasmask_vr.dm
-2
View File
@@ -14,7 +14,5 @@
name = "imperial soldier facemask"
desc = "A close-fitting tactical mask that can be connected to an air supply."
icon_state = "ge_visor"
icon = 'icons/inventory/face/item_vr.dmi'
icon_override = 'icons/inventory/face/mob_vr.dmi'
body_parts_covered = FACE|EYES
flags_inv = HIDEEARS|HIDEEYES|HIDEFACE
code/modules/clothing/masks/miscellaneous_vr.dm
+3 -3
View File
@@ -1,13 +1,13 @@
/obj/item/clothing/mask/emotions
sprite_sheets = list(
SPECIES_TESHARI = 'icons/inventory/face/mob_vr_teshari.dmi'
SPECIES_TESHARI = 'icons/inventory/face/mob_teshari.dmi'
)
/obj/item/clothing/mask/lacemask
name = "lace mask"
desc = "A sheer lace mask that rests above the nose and trails down below the chin."
icon = 'icons/inventory/face/item_vr.dmi'
icon = 'icons/inventory/face/item.dmi'
icon_state = "lace_mask"
icon_override = 'icons/inventory/face/mob_vr.dmi'
icon_override = 'icons/inventory/face/mob.dmi'
item_flags = FLEXIBLEMATERIAL
w_class = ITEMSIZE_SMALL
code/modules/vore/fluffstuff/custom_clothes_vr.dm
-2
View File
@@ -2551,8 +2551,6 @@ Departamental Swimsuits, for general use
/obj/item/clothing/glasses/big_round
name = "big round blue glasses"
desc = "A set of glasses! They are big, round, and very reflective, catching the light and obscuring the eyes!"
icon = 'icons/inventory/eyes/item_vr.dmi'
icon_override = 'icons/inventory/eyes/mob_vr.dmi'
icon_state = "bigroundglasses"
slot_flags = SLOT_EYES | SLOT_EARS
glasses_layer_above = TRUE