Merge pull request #9606 from VOREStation/upstream-merge-7834

[MIRROR] fixes some sprites, adds a thin blindfold
This commit is contained in:
Novacat
2021-01-24 22:08:31 -05:00
committed by Chompstation Bot
parent d3f6cba62c
commit 3954bedb9d
7 changed files with 17 additions and 0 deletions

View File

@@ -27,6 +27,14 @@
..() ..()
gear_tweaks += gear_tweak_free_color_choice gear_tweaks += gear_tweak_free_color_choice
/datum/gear/eyes/thinblindfold
display_name = "blindfold, thin white (recolorable)"
path = /obj/item/clothing/glasses/sunglasses/thinblindfold
/datum/gear/eyes/thinblindfold/New()
..()
gear_tweaks += gear_tweak_free_color_choice
/datum/gear/eyes/glasses /datum/gear/eyes/glasses
display_name = "Glasses, prescription" display_name = "Glasses, prescription"
path = /obj/item/clothing/glasses/regular path = /obj/item/clothing/glasses/regular

View File

@@ -399,6 +399,13 @@ BLIND // can't see anything
desc = "A white blindfold that covers the eyes, preventing sight." desc = "A white blindfold that covers the eyes, preventing sight."
icon_state = "blindfoldwhite" icon_state = "blindfoldwhite"
/obj/item/clothing/glasses/sunglasses/thinblindfold
name = "thin white blindfold"
desc = "A thin blindfold to help protect sensitive eyes while still allowing some sight"
icon_state = "blindfoldwhite"
flash_protection = FLASH_PROTECTION_MODERATE //not as thick, only offers some protection
tint = TINT_HEAVY
/obj/item/clothing/glasses/sunglasses/blindfold/tape /obj/item/clothing/glasses/sunglasses/blindfold/tape
name = "length of tape" name = "length of tape"
desc = "It's a robust DIY blindfold!" desc = "It's a robust DIY blindfold!"

View File

@@ -1338,6 +1338,8 @@
if(!O.up) if(!O.up)
found_welder = 1 found_welder = 1
if(!found_welder && nif && nif.flag_check(NIF_V_UVFILTER,NIF_FLAGS_VISION)) found_welder = 1 //VOREStation Add - NIF if(!found_welder && nif && nif.flag_check(NIF_V_UVFILTER,NIF_FLAGS_VISION)) found_welder = 1 //VOREStation Add - NIF
if(istype(glasses, /obj/item/clothing/glasses/sunglasses/thinblindfold))
found_welder = 1
if(!found_welder && istype(head, /obj/item/clothing/head/welding)) if(!found_welder && istype(head, /obj/item/clothing/head/welding))
var/obj/item/clothing/head/welding/O = head var/obj/item/clothing/head/welding/O = head
if(!O.up) if(!O.up)

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.5 KiB

After

Width:  |  Height:  |  Size: 8.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 98 KiB

After

Width:  |  Height:  |  Size: 101 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 22 KiB