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

[MIRROR] Fixes half covering glassware protecting eyes [MDB IGNORE] (#24972)

Browse Source 
* Fixes half covering glassware protecting eyes (#79592)

## About The Pull Request
Makes glasses that don't cover both eyes protect from dropper chemicals
onto eyes
## Why It's Good For The Game
It's annoying to spray something on someones exposed eye for it to not
transfer

MEDICS HAVE HAD IT GOOD FOR TO LONG resisting MY humanizing toxin with
their dumb one eye covering health huds THE MED MOTHS SHALL BE HUMAN
## Changelog
🆑
fix: fixes half-covering glassware protecting eyes from chemicals
/🆑

---------

Co-authored-by: Ghom <42542238+Ghommie@ users.noreply.github.com>

* Fixes half covering glassware protecting eyes

---------

Co-authored-by: Hoolny <84478872+SethLafuente@users.noreply.github.com>
Co-authored-by: Ghom <42542238+Ghommie@ users.noreply.github.com>
This commit is contained in:
SkyratBot
2023-11-13 15:42:35 +01:00
committed by GitHub
parent 904144babb
commit b2b3fb7aa5
5 changed files with 31 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/antagonists/cult/cult_items.dm
+1
View File
@@ -458,6 +458,7 @@ Striking a noncultist, however, will tear their flesh."}
/obj/item/clothing/glasses/hud/health/night/cultblind
desc = "May Nar'Sie guide you through the darkness and shield you from the light."
flags_cover = GLASSESCOVERSEYES
name = "zealot's blindfold"
icon_state = "blindfold"
inhand_icon_state = "blindfold"
code/modules/bitrunning/objects/clothing.dm
+1
View File
@@ -1,5 +1,6 @@
/obj/item/clothing/glasses/sunglasses/oval
name = "oval sunglasses"
flags_cover = GLASSESCOVERSEYES
desc = "Vintage wrap around sunglasses. Provides a little protection."
icon_state = "jensenshades"
code/modules/clothing/chameleon/generic_chameleon_clothing.dm
+1
View File
@@ -76,6 +76,7 @@ do { \
/obj/item/clothing/glasses/chameleon
name = "Optical Meson Scanner"
flags_cover = GLASSESCOVERSEYES
desc = "Used by engineering and mining staff to see basic structural and terrain layouts through walls, regardless of lighting condition."
icon_state = "meson"
inhand_icon_state = "meson"
code/modules/clothing/glasses/_glasses.dm
+20 -2
View File
@@ -5,7 +5,6 @@
lefthand_file = 'icons/mob/inhands/clothing/glasses_lefthand.dmi'
righthand_file = 'icons/mob/inhands/clothing/glasses_righthand.dmi'
w_class = WEIGHT_CLASS_SMALL
flags_cover = GLASSESCOVERSEYES
slot_flags = ITEM_SLOT_EYES
strip_delay = 20
equip_delay_other = 25
@@ -114,6 +113,7 @@
icon_state = "meson"
inhand_icon_state = "meson"
clothing_traits = list(TRAIT_MADNESS_IMMUNE)
flags_cover = GLASSESCOVERSEYES
vision_flags = SEE_TURFS
// Mesons get to be lightly green
color_cutoffs = list(5, 15, 5)
@@ -153,6 +153,7 @@
icon_state = "purple"
inhand_icon_state = "glasses"
glass_colour_type = /datum/client_colour/glass_colour/purple
flags_cover = GLASSESCOVERSEYES
resistance_flags = ACID_PROOF
armor_type = /datum/armor/glasses_science
clothing_traits = list(TRAIT_REAGENT_SCANNER, TRAIT_RESEARCH_SCANNER)
@@ -183,6 +184,7 @@
desc = "You can totally see in the dark now!"
icon_state = "night"
inhand_icon_state = "glasses"
flags_cover = GLASSESCOVERSEYES
flash_protect = FLASH_PROTECTION_SENSITIVE
// Dark green
color_cutoffs = list(10, 30, 10)
@@ -244,6 +246,7 @@
desc = "Very confusing glasses."
icon_state = "material"
inhand_icon_state = "glasses"
flags_cover = GLASSESCOVERSEYES
vision_flags = SEE_OBJS
glass_colour_type = /datum/client_colour/glass_colour/lightblue
@@ -273,6 +276,7 @@
desc = "Made by Nerd. Co."
icon_state = "glasses_regular"
inhand_icon_state = "glasses"
flags_cover = GLASSESCOVERSEYES
clothing_traits = list(TRAIT_NEARSIGHTED_CORRECTED)
/obj/item/clothing/glasses/regular/Initialize(mapload)
@@ -347,6 +351,7 @@
desc = "Strangely ancient technology used to help provide rudimentary eye cover. Enhanced shielding blocks flashes."
icon_state = "sun"
inhand_icon_state = "sunglasses"
flags_cover = GLASSESCOVERSEYES
flash_protect = FLASH_PROTECTION_FLASH
tint = 1
glass_colour_type = /datum/client_colour/glass_colour/gray
@@ -449,10 +454,10 @@
inhand_icon_state = "welding-g"
actions_types = list(/datum/action/item_action/toggle)
flash_protect = FLASH_PROTECTION_WELDER
flags_cover = GLASSESCOVERSEYES
custom_materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT*2.5)
tint = 2
visor_vars_to_toggle = VISOR_FLASHPROTECT | VISOR_TINT
flags_cover = GLASSESCOVERSEYES
glass_colour_type = /datum/client_colour/glass_colour/gray
alternate_worn_layer = ABOVE_BODY_FRONT_HEAD_LAYER // SKYRAT EDIT - Just so it works until I make the change upstream
@@ -469,6 +474,7 @@
icon_state = "blindfold"
inhand_icon_state = "blindfold"
flash_protect = FLASH_PROTECTION_WELDER
flags_cover = GLASSESCOVERSEYES
tint = INFINITY // You WILL Be blind, no matter what
dog_fashion = /datum/dog_fashion/head
@@ -477,6 +483,7 @@
desc = "A see-through blindfold perfect for cheating at games like pin the stun baton on the clown."
icon_state = "trickblindfold"
inhand_icon_state = "blindfold"
flags_cover = GLASSESCOVERSEYES
/obj/item/clothing/glasses/blindfold/white
name = "blind personnel blindfold"
@@ -522,6 +529,7 @@
// Going for an orange color here
color_cutoffs = list(25, 8, 5)
flash_protect = FLASH_PROTECTION_SENSITIVE
flags_cover = GLASSESCOVERSEYES
glass_colour_type = /datum/client_colour/glass_colour/red
/obj/item/clothing/glasses/thermal/emp_act(severity)
@@ -588,18 +596,21 @@
desc = "A pair of goggles meant for low temperatures."
icon_state = "cold"
inhand_icon_state = null
flags_cover = GLASSESCOVERSEYES
/obj/item/clothing/glasses/heat
name = "heat goggles"
desc = "A pair of goggles meant for high temperatures."
icon_state = "heat"
inhand_icon_state = null
flags_cover = GLASSESCOVERSEYES
/obj/item/clothing/glasses/orange
name = "orange glasses"
desc = "A sweet pair of orange shades."
icon_state = "orangeglasses"
inhand_icon_state = null
flags_cover = GLASSESCOVERSEYES
glass_colour_type = /datum/client_colour/glass_colour/lightorange
/obj/item/clothing/glasses/red
@@ -607,6 +618,7 @@
desc = "Hey, you're looking good, senpai!"
icon_state = "redglasses"
inhand_icon_state = null
flags_cover = GLASSESCOVERSEYES
glass_colour_type = /datum/client_colour/glass_colour/red
/obj/item/clothing/glasses/geist_gazers
@@ -614,12 +626,14 @@
icon_state = "geist_gazers"
worn_icon_state = "geist_gazers"
glass_colour_type = /datum/client_colour/glass_colour/green
flags_cover = GLASSESCOVERSEYES
/obj/item/clothing/glasses/psych
name = "psych glasses"
icon_state = "psych_glasses"
worn_icon_state = "psych_glasses"
glass_colour_type = /datum/client_colour/glass_colour/red
flags_cover = GLASSESCOVERSEYES
/obj/item/clothing/glasses/debug
name = "debug glasses"
@@ -680,6 +694,7 @@
desc = "A pair of glasses with uniquely colored lenses. The frame is inscribed with 'Best Salesman 1997'."
icon_state = "salesman"
inhand_icon_state = "salesman"
flags_cover = GLASSESCOVERSEYES
///Tells us who the current wearer([BIGSHOT]) is.
var/mob/living/carbon/human/bigshot
@@ -716,6 +731,7 @@
glass_colour_type = /datum/client_colour/glass_colour/nightmare
forced_glass_color = TRUE
lighting_cutoff = LIGHTING_CUTOFF_FULLBRIGHT
flags_cover = GLASSESCOVERSEYES
/// Hallucination datum currently being used for seeing mares
var/datum/hallucination/stored_hallucination
@@ -748,9 +764,11 @@
desc = "There's no such thing as good news! Just bad news and... weird news.."
icon_state = "osi_glasses"
inhand_icon_state = null
flags_cover = GLASSESCOVERSEYES
/obj/item/clothing/glasses/phantom
name = "Phantom Thief Mask"
desc = "Lookin' cool."
icon_state = "phantom_glasses"
inhand_icon_state = null
flags_cover = GLASSESCOVERSEYES
code/modules/clothing/glasses/hud.dm
+8
View File
@@ -69,6 +69,7 @@
icon_state = "healthhudnight"
inhand_icon_state = "glasses"
flash_protect = FLASH_PROTECTION_SENSITIVE
flags_cover = GLASSESCOVERSEYES
// Blue green, dark
color_cutoffs = list(5, 15, 30)
glass_colour_type = /datum/client_colour/glass_colour/green
@@ -89,6 +90,7 @@
desc = "Sunglasses with a medical HUD."
icon_state = "sunhudmed"
flash_protect = FLASH_PROTECTION_FLASH
flags_cover = GLASSESCOVERSEYES
tint = 1
glass_colour_type = /datum/client_colour/glass_colour/blue
@@ -115,6 +117,7 @@
icon_state = "diagnostichudnight"
inhand_icon_state = "glasses"
flash_protect = FLASH_PROTECTION_SENSITIVE
flags_cover = GLASSESCOVERSEYES
// Pale yellow
color_cutoffs = list(30, 20, 5)
glass_colour_type = /datum/client_colour/glass_colour/green
@@ -125,6 +128,7 @@
icon_state = "sunhuddiag"
inhand_icon_state = "glasses"
flash_protect = FLASH_PROTECTION_FLASH
flags_cover = GLASSESCOVERSEYES
tint = 1
/obj/item/clothing/glasses/hud/diagnostic/sunglasses/Initialize(mapload)
@@ -167,6 +171,7 @@
desc = "Sunglasses with a security HUD."
icon_state = "sunhudsec"
flash_protect = FLASH_PROTECTION_FLASH
flags_cover = GLASSESCOVERSEYES
tint = 1
glass_colour_type = /datum/client_colour/glass_colour/darkred
@@ -184,6 +189,7 @@
desc = "An advanced heads-up display that provides ID data and vision in complete darkness."
icon_state = "securityhudnight"
flash_protect = FLASH_PROTECTION_SENSITIVE
flags_cover = GLASSESCOVERSEYES
// Red with a tint of green
color_cutoffs = list(35, 5, 5)
glass_colour_type = /datum/client_colour/glass_colour/green
@@ -212,6 +218,7 @@
/obj/item/clothing/glasses/hud/toggle
name = "Toggle HUD"
desc = "A hud with multiple functions."
flags_cover = GLASSESCOVERSEYES
actions_types = list(/datum/action/item_action/switch_hud)
/obj/item/clothing/glasses/hud/toggle/attack_self(mob/user)
@@ -277,6 +284,7 @@
desc = "For thinking you look cool while brutalizing protestors and minorities."
icon_state = "bigsunglasses"
flash_protect = FLASH_PROTECTION_FLASH
flags_cover = GLASSESCOVERSEYES
tint = 1
glass_colour_type = /datum/client_colour/glass_colour/gray