diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm
index abcded54f1f..cc8caa6284e 100644
--- a/code/game/jobs/job/security.dm
+++ b/code/game/jobs/job/security.dm
@@ -120,6 +120,7 @@
 /*		var/obj/item/clothing/mask/cigarette/CIG = new /obj/item/clothing/mask/cigarette(H)
 		CIG.light("")
 		H.equip_or_collect(CIG, slot_wear_mask)	*/
+		H.equip_or_collect(new /obj/item/clothing/glasses/sunglasses/noir(H),slot_glasses)
 		H.equip_or_collect(new /obj/item/clothing/gloves/color/black(H), slot_gloves)
 		if(H.mind.role_alt_title && H.mind.role_alt_title == "Forensic Technician")
 			H.equip_or_collect(new /obj/item/clothing/suit/storage/forensics/blue(H), slot_wear_suit)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
index 4da3103f302..66d4e4e17b8 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
@@ -346,8 +346,7 @@
 		new /obj/item/weapon/gun/projectile/revolver/detective(src)
 		new /obj/item/taperoll/police(src)
 		new /obj/item/clothing/accessory/holster/armpit(src)
-		new /obj/item/clothing/glasses/sunglasses/noir(src)
-		new /obj/item/clothing/glasses/sunglasses/noir(src)
+		new /obj/item/clothing/glasses/sunglasses/yeah(src)
 		new /obj/item/device/flashlight/seclite(src)
 		return
 
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index e0da6b13676..c956975f13a 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -141,7 +141,7 @@
 	var/invisa_view = 0
 	var/flash_protect = 0		//Mal: What level of bright light protection item has. 1 = Flashers, Flashes, & Flashbangs | 2 = Welding | -1 = OH GOD WELDING BURNT OUT MY RETINAS
 	var/tint = 0				//Mal: Sets the item's level of visual impairment tint, normally set to the same as flash_protect
-	var/color_view	//overrides client.color while worn
+	var/color_view = null//overrides client.color while worn
 	strip_delay = 20			//	   but seperated to allow items to protect but not impair vision, like space helmets
 	put_on_delay = 25
 	species_restricted = list("exclude","Kidan")
diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm
index a9e5a8e2fe7..a7b2c00c172 100644
--- a/code/modules/clothing/glasses/glasses.dm
+++ b/code/modules/clothing/glasses/glasses.dm
@@ -211,40 +211,40 @@
 /obj/item/clothing/glasses/sunglasses/noir
 	name = "noir sunglasses"
 	desc = "Somehow these seem even more out-of-date than normal sunglasses."
-	color_view = list(0.3,0.3,0.3,0,\
-			 			0.3,0.3,0.3,0,\
- 						0.3,0.3,0.3,0,\
- 						0.0,0.0,0.0,1,) //greyscale
-	var/punused = null
-	action_button_name = "YEAH!"
+	color_view = list(0.3, 0.3, 0.3, 0,\
+						0.3, 0.3, 0.3, 0,\
+ 						0.3, 0.3, 0.3, 0,\
+ 						0.0, 0.0, 0.0, 1,) //greyscale
 
 /obj/item/clothing/glasses/sunglasses/noir/equipped(mob/user, slot)
-	if(slot == slot_glasses)
-		if(color_view && user.client && !user.client.color)
-			if(user.mind && (user.mind.assigned_role == "Detective"))
-				animate(user.client, color = color_view, time = 10)
-				//H.client.color = G.color_view
+	if(color_view && user.client && !user.client.color)
+		animate(user.client, color = color_view, time = 10)
 
 	..(user, slot)
 
 /obj/item/clothing/glasses/sunglasses/noir/dropped(mob/user)
 	if(user.client && user.client.color)
 		animate(user.client, color = null, time = 10)
-		//H.client.color = null
 	..(user)
 
-/obj/item/clothing/glasses/sunglasses/noir/attack_self()
+/obj/item/clothing/glasses/sunglasses/yeah
+	name = "agreeable glasses"
+	desc = "H.C Limited edition."
+	var/punused = null
+	action_button_name = "YEAH!"
+
+/obj/item/clothing/glasses/sunglasses/yeah/attack_self()
 	pun()
 
 
-/obj/item/clothing/glasses/sunglasses/noir/verb/pun()
+/obj/item/clothing/glasses/sunglasses/yeah/verb/pun()
 	set category = "Object"
 	set name = "YEAH!"
 	set src in usr
 	if(usr.mind && (usr.mind.assigned_role == "Detective"))
 		if(!punused)//one per round
 			punused = 1
-			playsound(src.loc, 'sound/misc/yeah.ogg', 50, 1)
+			playsound(src.loc, 'sound/misc/yeah.ogg', 100, 1)
 		else
 			usr << "The moment is gone."
 
diff --git a/sound/misc/yeah.ogg b/sound/misc/yeah.ogg
index 417d86af07a..355d46019e1 100644
Binary files a/sound/misc/yeah.ogg and b/sound/misc/yeah.ogg differ