Merge branch 'master' into changelog-memes

2018-09-11 07:52:59 -05:00
parent 284e9d0325 2b7af47717
commit afac3ae0ab
9 changed files with 1128 additions and 1088 deletions
@@ -112,6 +112,11 @@
 	lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
 	glass_colour_type = /datum/client_colour/glass_colour/green

+/obj/item/clothing/glasses/night/prescription
+	name = "prescription night vision goggles"
+	desc = "NVGs but for those with nearsightedness."
+	vision_correction = 1
+
 /obj/item/clothing/glasses/science/suicide_act(mob/living/carbon/user)
 	user.visible_message("<span class='suicide'>[user] is tightening \the [src]'s straps around [user.p_their()] neck! It looks like [user.p_theyre()] trying to commit suicide!</span>")
 	return OXYLOSS