From 0749f51a828503cbf6f59779b1a07fded8bd339d Mon Sep 17 00:00:00 2001
From: shmabuu <68139038+shmabuu@users.noreply.github.com>
Date: Sat, 7 Aug 2021 20:38:32 -0700
Subject: [PATCH] update vampire_powers.dm and glasses.dm
---
code/game/gamemodes/vampire/vampire_powers.dm | 12 +++++++-----
code/modules/clothing/glasses/glasses.dm | 4 ----
2 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/code/game/gamemodes/vampire/vampire_powers.dm b/code/game/gamemodes/vampire/vampire_powers.dm
index 61ca91b064c..641f1f4c417 100644
--- a/code/game/gamemodes/vampire/vampire_powers.dm
+++ b/code/game/gamemodes/vampire/vampire_powers.dm
@@ -218,11 +218,13 @@
/obj/effect/proc_holder/spell/vampire/mob_aoe/glare/cast(list/targets, mob/user = usr)
user.visible_message("[user]'s eyes emit a blinding flash!")
- if(istype(user:glasses, /obj/item/clothing/glasses/sunglasses/blindfold))
- var/obj/item/clothing/glasses/sunglasses/blindfold/B = user:glasses
- if(B.tint)
- to_chat(user, "You're blindfolded!")
- return
+ if(ishuman(user))
+ var/mob/living/carbon/human/H = user
+ if(istype(H.glasses, /obj/item/clothing/glasses/sunglasses/blindfold))
+ var/obj/item/clothing/glasses/sunglasses/blindfold/B = H.glasses
+ if(B.tint)
+ to_chat(user, "You're blindfolded!")
+ return
for(var/mob/living/target in targets)
if(!affects(target))
continue
diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm
index 4313333739b..35404110785 100644
--- a/code/modules/clothing/glasses/glasses.dm
+++ b/code/modules/clothing/glasses/glasses.dm
@@ -397,10 +397,6 @@
/obj/item/clothing/glasses/sunglasses/blindfold/fake
name = "tattered blindfold"
- desc = "A see-through blindfold perfect for cheating at games like pin the stunbaton on the clown."
- icon_state = "blindfold"
- item_state = "blindfold"
- prescription_upgradable = FALSE
flash_protect = 0
tint = 0