[MIRROR] Blindfolds properly apply blindness (#5782)

* Blindfolds properly apply blindness (#36101)

* blindfolds properly apply blindness

* covering your eyes now applies blindness

* Blindfolds properly apply blindness
This commit is contained in:
CitadelStationBot
2018-03-04 05:26:37 -06:00
committed by Poojawa
parent 8e5e94cdfa
commit 7cdeebab69
5 changed files with 16 additions and 3 deletions

View File

@@ -17,7 +17,7 @@
var/list/icon/current = list() //the current hud icons
var/vision_correction = 0 //does wearing these glasses correct some of our vision defects?
var/glass_colour_type //colors your vision when worn
/obj/item/clothing/glasses/suicide_act(mob/living/carbon/user)
user.visible_message("<span class='suicide'>[user] is stabbing \the [src] into their eyes! It looks like [user.p_theyre()] trying to commit suicide!</span>")
return BRUTELOSS
@@ -262,6 +262,14 @@
flash_protect = 2
tint = 3 // to make them blind
/obj/item/clothing/glasses/sunglasses/blindfold/equipped(mob/living/carbon/human/user, slot)
..()
user.become_blind("blindfold")
/obj/item/clothing/glasses/sunglasses/blindfold/dropped(mob/living/carbon/human/user)
..()
user.cure_blind("blindfold")
/obj/item/clothing/glasses/sunglasses/big
desc = "Strangely ancient technology used to help provide rudimentary eye cover. Larger than average enhanced shielding blocks flashes."
icon_state = "bigsunglasses"

View File

@@ -568,10 +568,12 @@
return
tinttotal = get_total_tint()
if(tinttotal >= TINT_BLIND)
overlay_fullscreen("tint", /obj/screen/fullscreen/blind)
become_blind(EYES_COVERED)
else if(tinttotal >= TINT_DARKENED)
cure_blind(EYES_COVERED)
overlay_fullscreen("tint", /obj/screen/fullscreen/impaired, 2)
else
cure_blind(EYES_COVERED)
clear_fullscreen("tint", 0)
/mob/living/carbon/proc/get_total_tint()

View File

@@ -54,7 +54,7 @@
/mob/living/carbon/human/handle_traits()
if(eye_blind) //blindness, heals slowly over time
if(tinttotal >= TINT_BLIND) //covering your eyes heals blurry eyes faster
if(has_trait(TRAIT_BLIND, EYES_COVERED)) //covering your eyes heals blurry eyes faster
adjust_blindness(-3)
else
adjust_blindness(-1)

View File

@@ -130,12 +130,14 @@
eye.on = TRUE
eye.forceMove(M)
eye.update_brightness(M)
M.become_blind("flashlight_eyes")
/obj/item/organ/eyes/robotic/flashlight/Remove(var/mob/living/carbon/M, var/special = 0)
eye.on = FALSE
eye.update_brightness(M)
eye.forceMove(src)
M.cure_blind("flashlight_eyes")
..()
// Welding shield implant