From 61330ef44af49affd7ddd3549d8e5c1cf7e8dba9 Mon Sep 17 00:00:00 2001
From: shmabuu <68139038+shmabuu@users.noreply.github.com>
Date: Sat, 7 Aug 2021 01:36:50 -0700
Subject: [PATCH 1/3] i do be seeing part 2
---
code/game/gamemodes/vampire/vampire_powers.dm | 6 ++++--
code/game/objects/items/stacks/sheets/sheet_types.dm | 1 +
code/modules/clothing/glasses/glasses.dm | 9 +++++++++
3 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/code/game/gamemodes/vampire/vampire_powers.dm b/code/game/gamemodes/vampire/vampire_powers.dm
index 36a24113dc9..61ca91b064c 100644
--- a/code/game/gamemodes/vampire/vampire_powers.dm
+++ b/code/game/gamemodes/vampire/vampire_powers.dm
@@ -219,8 +219,10 @@
/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))
- to_chat(user, "You're blindfolded!")
- return
+ var/obj/item/clothing/glasses/sunglasses/blindfold/B = user: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/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm
index bc0211e5871..92e2c4115fe 100644
--- a/code/game/objects/items/stacks/sheets/sheet_types.dm
+++ b/code/game/objects/items/stacks/sheets/sheet_types.dm
@@ -241,6 +241,7 @@ GLOBAL_LIST_INIT(cloth_recipes, list ( \
new/datum/stack_recipe("white beanie", /obj/item/clothing/head/beanie, 2), \
null, \
new/datum/stack_recipe("blindfold", /obj/item/clothing/glasses/sunglasses/blindfold, 3), \
+ new/datum/stack_recipe("tattered blindfold", /obj/item/clothing/glasses/sunglasses/blindfold/fake, 2), \
))
/obj/item/stack/sheet/cloth
diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm
index 2f3fcca395f..4313333739b 100644
--- a/code/modules/clothing/glasses/glasses.dm
+++ b/code/modules/clothing/glasses/glasses.dm
@@ -395,6 +395,15 @@
tint = 3 //to make them blind
prescription_upgradable = 0
+/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
+
/obj/item/clothing/glasses/sunglasses/prescription
prescription = 1
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 2/3] 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
From 40fca69f7953e73bddd74851946d9d1b92647df1 Mon Sep 17 00:00:00 2001
From: shmabuu <68139038+shmabuu@users.noreply.github.com>
Date: Tue, 10 Aug 2021 01:33:53 -0700
Subject: [PATCH 3/3] Update code/modules/clothing/glasses/glasses.dm
Not sure how the description got removed, strange.
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
---
code/modules/clothing/glasses/glasses.dm | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm
index 35404110785..af979eb1045 100644
--- a/code/modules/clothing/glasses/glasses.dm
+++ b/code/modules/clothing/glasses/glasses.dm
@@ -396,9 +396,10 @@
prescription_upgradable = 0
/obj/item/clothing/glasses/sunglasses/blindfold/fake
- name = "tattered blindfold"
- flash_protect = 0
- tint = 0
+ name = "tattered blindfold"
+ desc = "A see-through blindfold perfect for cheating at games like pin the stunbaton on the clown."
+ flash_protect = 0
+ tint = 0
/obj/item/clothing/glasses/sunglasses/prescription
prescription = 1