diff --git a/code/defines/global.dm b/code/defines/global.dm
index 11136ef3449..ad76387627b 100644
--- a/code/defines/global.dm
+++ b/code/defines/global.dm
@@ -71,7 +71,7 @@ var
 	enter_allowed = 1
 	shuttle_frozen = 0
 	shuttle_left = 0
-	tinted_weldhelh = 0 //as soon as the thing is sprited, we'll code in the toggle verb, bot for now, it should stay on by default. -errorage //Until you have the actual functionality for it, don't set this on by default. You're putting the cart before the horse. --DH
+	tinted_weldhelh = 1 //as soon as the thing is sprited, we'll code in the toggle verb, bot for now, it should stay on by default. -errorage //Until you have the actual functionality for it, don't set this on by default. You're putting the cart before the horse. --DH
 
 	captainMax = 1
 	engineerMax = 5
diff --git a/code/defines/obj/clothing/head.dm b/code/defines/obj/clothing/head.dm
index 7607339dea3..62f76ff15bb 100644
--- a/code/defines/obj/clothing/head.dm
+++ b/code/defines/obj/clothing/head.dm
@@ -177,6 +177,7 @@
 	protective_temperature = 1300
 	m_amt = 3000
 	g_amt = 1000
+	var/up = 0
 
 /obj/item/clothing/head/helmet/HoS
 	name = "HoS helmet"
diff --git a/code/game/objects/items/clothing.dm b/code/game/objects/items/clothing.dm
index c873d0f0c1b..af0ed99ef64 100644
--- a/code/game/objects/items/clothing.dm
+++ b/code/game/objects/items/clothing.dm
@@ -227,6 +227,21 @@ THERMAL GLASSES
 			usr << "Its vital tracker and tracking beacon appear to be enabled."
 
 
+/obj/item/clothing/head/helmet/welding/verb/toggle()
+	set name = "Adjust welding mask"
+	if(src.up)
+		src.up = !src.up
+		src.see_face = !src.see_face
+		src.flags |= HEADCOVERSEYES
+		icon_state = "welding"
+		usr << "You flip the mask down to protect your eyes."
+	else
+		src.up = !src.up
+		src.see_face = !src.see_face
+		src.flags &= ~HEADCOVERSEYES
+		icon_state = "weldingup"
+		usr << "You push the mask up out of your face."
+
 /obj/item/clothing/shoes/magboots/verb/toggle()
 	set name = "Toggle Magboots"
 	if(src.magpulse)
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index 58b2509702a..4ca79c37947 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -722,8 +722,12 @@
 					if(!seer)
 						src.see_invisible = 0
 
-			if (istype(src.head, /obj/item/clothing/head/helmet/welding) && tinted_weldhelh)
-				src.see_in_dark = 0
+			if (istype(src.glasses, /obj/item/clothing/glasses/sunglasses))
+				src.see_in_dark = 1
+
+			if (istype(src.head, /obj/item/clothing/head/helmet/welding))
+				if(!src.head:up && tinted_weldhelh)
+					src.see_in_dark = 0
 
 			if (src.sleep) src.sleep.icon_state = text("sleep[]", src.sleeping)
 			if (src.rest) src.rest.icon_state = text("rest[]", src.resting)
@@ -813,8 +817,9 @@
 					if (src.druggy)
 						src.client.screen += src.hud_used.druggy
 
-					if (istype(src.head, /obj/item/clothing/head/helmet/welding) && tinted_weldhelh)
-						src.client.screen += src.hud_used.darkMask
+					if (istype(src.head, /obj/item/clothing/head/helmet/welding))
+						if(!src.head:up && tinted_weldhelh)
+							src.client.screen += src.hud_used.darkMask
 
 			if (src.stat != 2)
 				if (src.machine)
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index 72c0a780af1..12139c7f484 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ