From cd108df1522733a943340446f34246c02e3fe09e Mon Sep 17 00:00:00 2001 From: Cameron Lennox Date: Mon, 6 Jul 2026 15:43:20 -0400 Subject: [PATCH] glass fix (#19570) * glass fix * Update glass_wire.dm * Reemoves unused variable --- code/game/objects/traps/glass_wire.dm | 3 ++- code/modules/clothing/clothing.dm | 1 - code/modules/clothing/glasses/glasses.dm | 8 -------- code/modules/clothing/head/helmet_vr.dm | 6 ------ code/modules/clothing/head/misc_special.dm | 3 --- 5 files changed, 2 insertions(+), 19 deletions(-) diff --git a/code/game/objects/traps/glass_wire.dm b/code/game/objects/traps/glass_wire.dm index 2a9a786e328..ba8bab9b665 100644 --- a/code/game/objects/traps/glass_wire.dm +++ b/code/game/objects/traps/glass_wire.dm @@ -92,7 +92,8 @@ if(ishuman(L)) var/mob/living/carbon/human/human_target = L - if(affecting && (affecting.robotic < ORGAN_ROBOT) && (affecting.take_damage(brute = force, sharp = TRUE, edge = TRUE, used_weapon = "Glass strands"))) + if(affecting && (affecting.robotic < ORGAN_ROBOT)) + affecting.take_damage(brute = force, sharp = TRUE, edge = TRUE, used_weapon = "Glass strands") affecting.open = TRUE human_target.UpdateDamageIcon() human_target.updatehealth() diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 7e7d0dbccee..cf47577f85d 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -15,7 +15,6 @@ var/list/clothing_traits var/flash_protection = FLASH_PROTECTION_NONE - var/tint = TINT_NONE var/list/enables_planes //Enables these planes in the wearing mob's plane_holder var/list/plane_slots //But only if it's equipped into this specific slot diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index 6230175ff48..2fa562d98e4 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -72,7 +72,6 @@ BLIND // can't see anything icon_state = off_state user.update_inv_glasses() flash_protection = FLASH_PROTECTION_NONE - tint = TINT_NONE away_planes = enables_planes enables_planes = null @@ -81,7 +80,6 @@ BLIND // can't see anything icon_state = initial(icon_state) user.update_inv_glasses() flash_protection = initial(flash_protection) - tint = initial(tint) enables_planes = away_planes away_planes = null user.update_mob_action_buttons() @@ -391,7 +389,6 @@ BLIND // can't see anything item_flags = AIRTIGHT var/up = 0 flash_protection = FLASH_PROTECTION_MAJOR - tint = TINT_HEAVY specialty_goggles = TRUE /obj/item/clothing/glasses/welding/attack_self(mob/user) @@ -412,7 +409,6 @@ BLIND // can't see anything body_parts_covered |= EYES icon_state = initial(icon_state) flash_protection = initial(flash_protection) - tint = initial(tint) to_chat(usr, "You flip \the [src] down to protect your eyes.") else src.up = !src.up @@ -420,7 +416,6 @@ BLIND // can't see anything body_parts_covered &= ~EYES icon_state = "[initial(icon_state)]up" flash_protection = FLASH_PROTECTION_NONE - tint = TINT_NONE to_chat(usr, "You push \the [src] up out of your face.") update_clothing_icon() usr.update_mob_action_buttons() @@ -429,7 +424,6 @@ BLIND // can't see anything name = "superior welding goggles" desc = "Welding goggles made from more expensive materials, strangely smells like potatoes." icon_state = "rwelding-g" - tint = TINT_MODERATE /obj/item/clothing/glasses/sunglasses/blindfold name = "blindfold" @@ -438,7 +432,6 @@ BLIND // can't see anything item_state_slots = list(slot_r_hand_str = "blindfold", slot_l_hand_str = "blindfold") flash_protection = FLASH_PROTECTION_MAJOR body_parts_covered = EYES - tint = BLIND drop_sound = 'sound/items/drop/gloves.ogg' pickup_sound = 'sound/items/pickup/gloves.ogg' @@ -453,7 +446,6 @@ BLIND // can't see anything icon_state = "blindfoldwhite" flash_protection = FLASH_PROTECTION_MODERATE //not as thick, only offers some protection body_parts_covered = EYES - tint = TINT_HEAVY /obj/item/clothing/glasses/sunglasses/blindfold/tape name = "length of tape" diff --git a/code/modules/clothing/head/helmet_vr.dm b/code/modules/clothing/head/helmet_vr.dm index b7a600b2461..2807101b6f0 100644 --- a/code/modules/clothing/head/helmet_vr.dm +++ b/code/modules/clothing/head/helmet_vr.dm @@ -35,7 +35,6 @@ desc = "ye olde armored helmet" icon_state = "bedevere_helmet" armor = list(melee = 80, bullet = 50, laser = 10, energy = 0, bomb = 0, bio = 0, rad = 0) - tint = TINT_HEAVY siemens_coefficient = 2 var/base_state @@ -62,7 +61,6 @@ body_parts_covered |= (EYES|FACE) flags_inv |= (HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE) icon_state = base_state - tint = initial(tint) to_chat(usr, "You flip the [src] down to protect yourself from the horrors of this universe. Narry a creature shall harm you with its beams of light.") playsound(src, 'sound/machines/hatch_open.ogg', 75, 1) else @@ -70,7 +68,6 @@ body_parts_covered &= ~(EYES|FACE) flags_inv &= ~(HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE) icon_state = "[base_state]_up" - tint = TINT_NONE to_chat(usr, "You push the [src] up out of your face, ineffectively clearing your vision.") playsound(src, 'sound/machines/hatch_open.ogg', 75, 1) update_clothing_icon() //so our mob-overlays @@ -92,7 +89,6 @@ desc = "ye olde armored helmet" icon_state = "bedevere_helmet" armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0) - tint = TINT_HEAVY siemens_coefficient = 1 var/base_state @@ -119,7 +115,6 @@ body_parts_covered |= (EYES|FACE) flags_inv |= (HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE) icon_state = base_state - tint = initial(tint) to_chat(usr, "You flip the [src] down to protect yourself from the horrors of this universe. Narry a creature shall harm you with its beams of light.") playsound(src, 'sound/machines/hatch_open.ogg', 75, 1) else @@ -127,7 +122,6 @@ body_parts_covered &= ~(EYES|FACE) flags_inv &= ~(HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE) icon_state = "[base_state]_up" - tint = TINT_NONE to_chat(usr, "You push the [src] up out of your face, ineffectively clearing your vision.") playsound(src, 'sound/machines/hatch_open.ogg', 75, 1) update_clothing_icon() //so our mob-overlays diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index c31fb8b3ff2..b0bec3ca3e6 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -28,7 +28,6 @@ w_class = ITEMSIZE_NORMAL var/base_state flash_protection = FLASH_PROTECTION_MAJOR - tint = TINT_HEAVY drop_sound = 'sound/items/drop/helm.ogg' pickup_sound = 'sound/items/pickup/helm.ogg' special_handling = TRUE @@ -56,7 +55,6 @@ flags_inv |= (HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE) icon_state = base_state flash_protection = FLASH_PROTECTION_MAJOR - tint = initial(tint) to_chat(usr, "You flip the [src] down to protect your eyes.") else src.up = !src.up @@ -64,7 +62,6 @@ flags_inv &= ~(HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE) icon_state = "[base_state]up" flash_protection = FLASH_PROTECTION_NONE - tint = TINT_NONE to_chat(usr, "You push the [src] up out of your face.") update_clothing_icon() //so our mob-overlays if (ismob(src.loc)) //should allow masks to update when it is opened/closed