From 778a88fee9bea172da41cc06cec242e5299c036b Mon Sep 17 00:00:00 2001
From: Geeves <ggrobler447@gmail.com>
Date: Mon, 25 Jan 2021 20:51:16 +0200
Subject: [PATCH] Highvis Jackets (#11030)

---
 .../structures/crates_lockers/closets/wardrobe.dm |   3 ++-
 .../preference_setup/loadout/loadout_suit.dm      |   1 +
 code/modules/clothing/suits/miscellaneous.dm      |   9 +++++++++
 html/changelogs/geeves-hivis.yml                  |   6 ++++++
 icons/clothing/suits/highvis.dmi                  | Bin 0 -> 897 bytes
 5 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 html/changelogs/geeves-hivis.yml
 create mode 100644 icons/clothing/suits/highvis.dmi

diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
index 5d33bdeca94..91dac4e85ae 100644
--- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
+++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
@@ -216,7 +216,8 @@
 	new /obj/item/clothing/head/bandana/engineering(src)
 	new /obj/item/clothing/head/bandana/engineering(src)
 	new /obj/item/clothing/head/bandana/engineering(src)
-	return
+	new /obj/item/clothing/suit/storage/toggle/highvis(src)
+	new /obj/item/clothing/suit/storage/toggle/highvis(src)
 
 
 /obj/structure/closet/wardrobe/white
diff --git a/code/modules/client/preference_setup/loadout/loadout_suit.dm b/code/modules/client/preference_setup/loadout/loadout_suit.dm
index 51a5329bd59..80238713c97 100644
--- a/code/modules/client/preference_setup/loadout/loadout_suit.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm
@@ -44,6 +44,7 @@
 	jackets["flannel jacket, grey"] = /obj/item/clothing/suit/storage/toggle/flannel/gray
 	jackets["flannel jacket, purple"] = /obj/item/clothing/suit/storage/toggle/flannel/purple
 	jackets["flannel jacket, yellow"] = /obj/item/clothing/suit/storage/toggle/flannel/yellow
+	jackets["high visibility jacket"] = /obj/item/clothing/suit/storage/toggle/highvis
 	jackets["black vest"] = /obj/item/clothing/suit/storage/toggle/leather_vest
 	jackets["brown vest"] = /obj/item/clothing/suit/storage/toggle/brown_jacket/sleeveless
 	jackets["leather coat"] = /obj/item/clothing/suit/storage/leathercoat
diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm
index e2663fe8625..192b94f74fa 100644
--- a/code/modules/clothing/suits/miscellaneous.dm
+++ b/code/modules/clothing/suits/miscellaneous.dm
@@ -375,6 +375,15 @@
 	. = ..()
 	color = get_random_colour(lower = 150)
 
+/obj/item/clothing/suit/storage/toggle/highvis
+	name = "high visibility jacket"
+	desc = "A loose-fitting, high visibility jacket to help crew be recognizable in high traffic areas with large industrial equipment."
+	icon = 'icons/clothing/suits/highvis.dmi'
+	icon_state = "highvis"
+	item_state = "highvis"
+	body_parts_covered = UPPER_TORSO|ARMS
+	contained_sprite = TRUE
+
 /obj/item/clothing/suit/storage/toggle/track
 	name = "track jacket"
 	desc = "a track jacket, for the athletic."
diff --git a/html/changelogs/geeves-hivis.yml b/html/changelogs/geeves-hivis.yml
new file mode 100644
index 00000000000..0e57597904b
--- /dev/null
+++ b/html/changelogs/geeves-hivis.yml
@@ -0,0 +1,6 @@
+author: Geeves
+
+delete-after: True
+
+changes:
+  - rscadd: "Ported high-vis jackets from Bay. Added two to the engineering wardrobe locker, and added it to the jacket selection in the suit loadout."
\ No newline at end of file
diff --git a/icons/clothing/suits/highvis.dmi b/icons/clothing/suits/highvis.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..faebaef6113bb33c794a1c45be7b5cff86befd75
GIT binary patch
literal 897
zcmV-{1AhF8P)<h;3K|Lk000e1NJLTq004jh003YJ0{{R3;-rdu0000mP)t-sz`($X
zi->u9cz%F=la-Q>k&Y7+5;Zq8Lq$SRQcuaT03#(Nu$TbG$i*)*GQhyVR<X1}00001
zbW%=J06^y0W&i*He|l6{bVOxyV{&P5bZKvH004NLQ&w<tb@%jBaPjrzDoZUY&dkqK
zuvIY8GvMMZ&rB)F0CJ3txHvOXGt)ClAe`co#FA7XQz-)|R+d?;#KoDCSyT)ZG34S*
zD@x2wg|N}p#TS<%l$zjInqQEbN3^*h#dr)?R&e!m0ecVtpfE&Z0#%3J0007XNkl<Z
zXo2mS?QW|u42DArPRIxMf4Rp_pgR(=-2s#O!_QVU^cw7>bgExFXBdX@O-%nCuju|Y
zP1DN@3HWQ9Jkzy)=Aty+Ps=hd%fwfJ*9zr9zzl#f0j}xMzX%`4I!3I1=1WL11RpZK
zLQEI*vc`k8j5DMZJu<E@)wG2eA;z%b-@n#NO|h4-##DzD)LK)@f!QEP6}6Z#L9Xc>
z^MMX=UFjD_x@$X7D^~!-t>k@$xooE(UC#vqzB~AWl7~qk27U)%+wyybdD~72G(Bg4
z(B6UobTZ0;S7MRl0`T$l?-kO?1swuC1Z#kSzQ@d-?lCF=Kf+TfxI-zGLMIpX#OQm>
zGEu;&00N)V3Us)kS4lsDxB_SaS*TFe+ZN!F)AyUOI{^3?;SaF?$aKBK>U#`VfMFPh
zVHk$-B?vwIpZf<CGYxx+e&;{;4=DZYSLR!5^9P*bA4t0DA2^`yJ>qx!k=XnJz!=Ft
z5Om!?XzgpJ7JAgWbbkOSM(_`K{R97?7eFS$XaU_HfF8s82coX|2geQ!`{&&s=m~iL
zK+tvnpcN3Xw;w%3yFbtq@csd>f8ZZb0Wq{D{w(eOKu^H?2coX|2fh7mP5fCp`hTbR
z1DY=R2S2?#)4(@b@dq?r@(+G`cjiMv3vh~mAnJ;L@NV9@2EM6c|F7%j4;Y4F7=~ed
zJIZ|j<Cx3H^Zgbf_y_lq=lf3a5AGw+_nqP&Jb*mkcd~!*1mb-ED1h@1o<N-M9|bV}
z!7~L&^ZmU5&OdkralYRRVEuzfQ0M!CfA9$Ed|&YoZllik760Hi>U>}E4-CUFj7$6j
XoRcQWCt)GX00000NkvXXu0mjfk+z_v

literal 0
HcmV?d00001