From da414387d645c0d8a1c3646b57af1daa5b69c837 Mon Sep 17 00:00:00 2001
From: JohnWildkins <john.wildkins@gmail.com>
Date: Sat, 2 Nov 2019 19:52:01 -0400
Subject: [PATCH] Fix goggles and cadet vests not working (#7320)

Title, fixes cadet vest not being zippable and goggles not being adjustable, fixes #7319
---
 code/game/jobs/job/security.dm                |  2 +-
 .../crates_lockers/closets/secure/security.dm |  2 +-
 code/modules/clothing/glasses/glasses.dm      | 35 ++++++++++---------
 code/modules/clothing/suits/armor.dm          |  6 +++-
 html/changelogs/johnwildkins-utility2.yml     |  7 ++++
 5 files changed, 32 insertions(+), 20 deletions(-)
 create mode 100644 html/changelogs/johnwildkins-utility2.yml

diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm
index a896e8c4c99..b41fb60fa4d 100644
--- a/code/game/jobs/job/security.dm
+++ b/code/game/jobs/job/security.dm
@@ -265,7 +265,7 @@
 	jobtype = /datum/job/intern_sec
 
 	uniform = /obj/item/clothing/under/rank/cadet
-	suit = /obj/item/clothing/suit/storage/vest/cadet
+	suit = /obj/item/clothing/suit/storage/hazardvest/cadet
 	head = /obj/item/clothing/head/beret/sec/cadet
 	shoes = /obj/item/clothing/shoes/jackboots
 	l_ear = /obj/item/device/radio/headset/headset_sec
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 cf1bf9c467e..a5350893ecb 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
@@ -262,7 +262,7 @@
 		else
 			new /obj/item/weapon/storage/backpack/satchel_sec(src)
 		new /obj/item/clothing/head/beret/sec/cadet(src)
-		new /obj/item/clothing/suit/storage/vest/cadet(src)
+		new /obj/item/clothing/suit/storage/hazardvest/cadet(src)
 		new /obj/item/clothing/under/rank/cadet(src)
 		//Tools
 		new /obj/item/device/radio/headset/headset_sec(src)
diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm
index b83a3da66c7..77b489105bb 100644
--- a/code/modules/clothing/glasses/glasses.dm
+++ b/code/modules/clothing/glasses/glasses.dm
@@ -199,23 +199,24 @@ BLIND     // can't see anything
 	set src in usr
 
 	if(use_check_and_message(usr))
-		if(src.up)
-			src.up = !src.up
-			flags_inv |= HIDEEYES
-			body_parts_covered |= EYES
-			item_state = initial(item_state)
-			icon_state = initial(item_state)
-			to_chat(usr, span("notice", "You flip \the [src] down to protect your eyes."))
-		else
-			src.up = !src.up
-			flags_inv &= ~HIDEEYES
-			body_parts_covered &= ~EYES
-			item_state = "[initial(item_state)]_up"
-			icon_state = "[initial(icon_state)]_up"
-			to_chat(usr, span("notice", "You push \the [src] up out of your face."))
-		update_clothing_icon()
-		update_icon()
-		usr.update_action_buttons()
+		return
+	if(src.up)
+		src.up = !src.up
+		flags_inv |= HIDEEYES
+		body_parts_covered |= EYES
+		item_state = initial(item_state)
+		icon_state = initial(item_state)
+		to_chat(usr, span("notice", "You flip \the [src] down to protect your eyes."))
+	else
+		src.up = !src.up
+		flags_inv &= ~HIDEEYES
+		body_parts_covered &= ~EYES
+		item_state = "[initial(item_state)]_up"
+		icon_state = "[initial(icon_state)]_up"
+		to_chat(usr, span("notice", "You push \the [src] up out of your face."))
+	update_clothing_icon()
+	update_icon()
+	usr.update_action_buttons()
 
 /obj/item/clothing/glasses/eyepatch
 	name = "eyepatch"
diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm
index d23f254f2de..b8800237c7a 100644
--- a/code/modules/clothing/suits/armor.dm
+++ b/code/modules/clothing/suits/armor.dm
@@ -402,12 +402,16 @@
 	icon_badge = "csivest_badge"
 	icon_nobadge = "csivest_nobadge"
 
-/obj/item/clothing/suit/storage/vest/cadet
+/obj/item/clothing/suit/storage/hazardvest/cadet
 	name = "cadet hazard vest"
 	desc = "A sturdy high-visibility vest intended for in training security personnel."
 	icon_state = "hazard_cadet"
 	item_state = "hazard_cadet"
+	icon_open = "hazard_cadet_open"
+	icon_closed = "hazard_cadet"
+	allowed = list(/obj/item/weapon/gun,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/device/flashlight)
 	armor = list(melee = 10, bullet = 0, laser = 10, energy = 10, bomb = 10, bio = 0, rad = 0)
+	siemens_coefficient = 0.5
 
 /obj/item/clothing/suit/storage/vest/heavy
 	name = "heavy armor vest"
diff --git a/html/changelogs/johnwildkins-utility2.yml b/html/changelogs/johnwildkins-utility2.yml
new file mode 100644
index 00000000000..a632d686a0b
--- /dev/null
+++ b/html/changelogs/johnwildkins-utility2.yml
@@ -0,0 +1,7 @@
+author: JohnWildkins
+
+delete-after: True
+
+changes: 
+  - bugfix: "Sec. cadet hazard vests can now be properly zipped/unzipped."
+  - bugfix: "Safety goggles can now be properly adjusted."