Removes and Replaces Generic Security Coats (#14972)

code/game/objects/structures/crates_lockers/closets/secure/security.dm

@@ -111,9 +111,9 @@
 	new /obj/item/clothing/accessory/leg_guard(src)
 	new /obj/item/clothing/accessory/arm_guard(src)
 	new /obj/item/clothing/head/helmet/hos(src)
-	new /obj/item/clothing/suit/storage/security/hos(src)
 	new /obj/item/clothing/accessory/badge/hos(src)
 	new /obj/item/clothing/gloves/black_leather(src)
+	new /obj/item/clothing/suit/storage/security/officer/hos(src)
 	new /obj/item/clothing/mask/gas/alt(src)
 	new /obj/item/clothing/mask/gas/half(src)
 	//Tools
@@ -151,7 +151,6 @@
 	new /obj/item/clothing/accessory/leg_guard(src)
 	new /obj/item/clothing/accessory/arm_guard(src)
 	new /obj/item/clothing/head/helmet/hos(src)
-	new /obj/item/clothing/suit/storage/security/hos(src)
 	//Tools
 	new /obj/item/clothing/glasses/sunglasses/sechud/aviator(src)
 	new /obj/item/device/radio/headset/heads/hos(src)
@@ -182,7 +181,6 @@
 	new /obj/item/clothing/accessory/arm_guard(src)
 	new /obj/item/clothing/accessory/leg_guard(src)
 	new /obj/item/clothing/head/helmet/security(src)
-	new	/obj/item/clothing/suit/storage/security/warden(src)
 	new /obj/item/clothing/accessory/badge/warden(src)
 	new /obj/item/clothing/gloves/black_leather(src)
 	new /obj/item/clothing/mask/gas/alt(src)
@@ -246,7 +244,6 @@
 	new /obj/item/clothing/accessory/arm_guard(src)
 	new /obj/item/clothing/accessory/leg_guard(src)
 	new /obj/item/clothing/head/helmet/security(src)
-	new /obj/item/clothing/suit/storage/security/officer(src)
 	new /obj/item/clothing/accessory/badge/officer(src)
 	new /obj/item/clothing/mask/gas/alt(src)
 	new /obj/item/clothing/mask/gas/half(src)

code/modules/client/preference_setup/loadout/loadout_factions.dm

@@ -92,6 +92,20 @@
 	idris_labcoats["idris windbreaker"] = /obj/item/clothing/suit/storage/toggle/idris
 	gear_tweaks += new /datum/gear_tweak/path(idris_labcoats)
 
+/datum/gear/faction/idris_sec_coat
+	display_name = "idris security coat selection"
+	description = "A selection of Idris security coats."
+	path = /obj/item/clothing/suit/storage/security/officer/idris
+	slot = slot_wear_suit
+	faction = "Idris Incorporated"
+
+/datum/gear/faction/idris_sec_coat/New()
+	..()
+	var/list/idris_sec_coat = list()
+	idris_sec_coat["idris security coat"] = /obj/item/clothing/suit/storage/security/officer/idris
+	idris_sec_coat["idris security coat, alt"] = /obj/item/clothing/suit/storage/security/officer/idris/alt
+	gear_tweaks += new /datum/gear_tweak/path(idris_sec_coat)
+
 /datum/gear/faction/idrissec_patch
 	display_name = "idris security sleeve patch"
 	path = /obj/item/clothing/accessory/sleevepatch/idrissec
@@ -133,7 +147,8 @@
 	gear_tweaks += new /datum/gear_tweak/path(zavod_sec_uniforms)
 
 /datum/gear/faction/zavodskoi_labcoat
-	display_name = "zavodskoi labcoat"
+	display_name = "zavodskoi coat selection"
+	description = "A selection of Zavodskoi coats."
 	path = /obj/item/clothing/suit/storage/toggle/labcoat/zavodskoi
 	slot = slot_wear_suit
 	faction = "Zavodskoi Interstellar"
@@ -148,6 +163,20 @@
 	zavodskoi_labcoats["zavodskoi labcoat, long"] = /obj/item/clothing/suit/storage/toggle/longcoat/zavodskoi
 	gear_tweaks += new /datum/gear_tweak/path(zavodskoi_labcoats)
 
+/datum/gear/faction/zavod_sec_coat
+	display_name = "zavodskoi security coat selection"
+	description = "A selection of Zavodskoi security coats."
+	path = /obj/item/clothing/suit/storage/security/officer/zav
+	slot = slot_wear_suit
+	faction = "Zavodskoi Interstellar"
+
+/datum/gear/faction/zavod_sec_coat/New()
+	..()
+	var/list/zavod_sec_coat = list()
+	zavod_sec_coat["zavodskoi security coat"] = /obj/item/clothing/suit/storage/security/officer/zav
+	zavod_sec_coat["zavodskoi security coat, alt"] = /obj/item/clothing/suit/storage/security/officer/zav/alt
+	zavod_sec_coat += new /datum/gear_tweak/path(zavod_sec_coat)
+
 /datum/gear/faction/zavod_sunglasses
 	display_name = "zavodskoi security HUD selection"
 	description = "A selection of Zavodskoi security HUDs."
@@ -214,6 +243,20 @@
 	pmc_labcoats["EPMC labcoat"] = /obj/item/clothing/suit/storage/toggle/labcoat/epmc
 	gear_tweaks += new /datum/gear_tweak/path(pmc_labcoats)
 
+/datum/gear/faction/pmc_sec_coat
+	display_name = "PMCG security coat selection"
+	description = "A selection of PMCG security coats."
+	path = /obj/item/clothing/suit/storage/security/officer/pmc
+	slot = slot_wear_suit
+	faction = "Private Military Contracting Group"
+
+/datum/gear/faction/pmc_sec_coat/New()
+	..()
+	var/list/pmc_sec_coat = list()
+	pmc_sec_coat["PMCG security coat"] = /obj/item/clothing/suit/storage/security/officer/pmc
+	pmc_sec_coat["PMCG security coat, alt"] = /obj/item/clothing/suit/storage/security/officer/pmc/alt
+	gear_tweaks += new /datum/gear_tweak/path(pmc_sec_coat)
+
 /datum/gear/faction/pmcg_headwear
 	display_name = "PMCG and EPMC headwear selection"
 	description = "A selection of PMCG and EPMC headwear."
@@ -320,7 +363,7 @@
 
 //Zeng-Hu
 /datum/gear/faction/zenghu_beret
-	display_name = "Zeng-Hu beret selection"
+	display_name = "zeng-hu beret selection"
 	description = "A selection of Zeng-Hu berets."
 	path = /obj/item/clothing/head/beret/corporate/zeng
 	slot = slot_head
@@ -372,7 +415,8 @@
 
 //Hephaestus
 /datum/gear/faction/heph_labcoat
-	display_name = "hephaestus labcoat"
+	display_name = "hephaestus coat selection"
+	description = "A selection of Hephaestus coats."
 	path = /obj/item/clothing/suit/storage/toggle/labcoat/heph
 	slot = slot_wear_suit
 	faction = "Hephaestus Industries"

code/modules/client/preference_setup/loadout/loadout_suit.dm

@@ -239,58 +239,6 @@ datum/gear/suit/colorvest
 	path = /obj/item/clothing/suit/storage/toggle/highloft
 	flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
 
-/datum/gear/suit/secjacketofficer
-	display_name = "security jacket selection (Security Officer)"
-	path = /obj/item/clothing/suit/storage/security/officer
-	allowed_roles = list("Security Officer", "Head of Security", "Warden")
-
-/datum/gear/suit/secjacketofficer/New()
-	..()
-	var/list/secjacket = list()
-	secjacket["security jacket"] = /obj/item/clothing/suit/storage/security/officer
-	secjacket["security jacket, blue"] = /obj/item/clothing/suit/storage/security/officer/blue
-	secjacket["security jacket, dark navy"] = /obj/item/clothing/suit/storage/security/officer/dnavy
-	gear_tweaks += new /datum/gear_tweak/path(secjacket)
-
-/datum/gear/suit/secjacketwarden
-	display_name = "security jacket selection (Warden)"
-	path = /obj/item/clothing/suit/storage/security/warden
-	allowed_roles = list("Head of Security", "Warden")
-
-/datum/gear/suit/secjacketwarden/New()
-	..()
-	var/list/secjacket = list()
-	secjacket["security jacket"] = /obj/item/clothing/suit/storage/security/warden
-	secjacket["security jacket, blue"] = /obj/item/clothing/suit/storage/security/warden/blue
-	secjacket["security jacket, dark navy"] = /obj/item/clothing/suit/storage/security/warden/dnavy
-	gear_tweaks += new /datum/gear_tweak/path(secjacket)
-
-/datum/gear/suit/secjackethos
-	display_name = "security jacket selection (Head of Security)"
-	path = /obj/item/clothing/suit/storage/security/hos
-	allowed_roles = list("Head of Security")
-
-/datum/gear/suit/secjackethos/New()
-	..()
-	var/list/secjacket = list()
-	secjacket["security jacket"] = /obj/item/clothing/suit/storage/security/hos
-	secjacket["security jacket, blue"] = /obj/item/clothing/suit/storage/security/hos/blue
-	secjacket["security jacket, dark navy"] = /obj/item/clothing/suit/storage/security/hos/dnavy
-	gear_tweaks += new /datum/gear_tweak/path(secjacket)
-
-/datum/gear/suit/secjacketforensictech
-	display_name = "security jacket selection (Forensic Technician)"
-	path = /obj/item/clothing/suit/storage/toggle/forensics
-	allowed_roles = list("Investigator")
-
-/datum/gear/suit/secjacketforensictech/New()
-	..()
-	var/list/secjacket = list()
-	secjacket["security jacket"] = /obj/item/clothing/suit/storage/toggle/forensics
-	secjacket["security jacket, blue"] = /obj/item/clothing/suit/storage/toggle/forensics/blue
-	secjacket["security jacket, dark navy"] = /obj/item/clothing/suit/storage/toggle/forensics/dnavy
-	gear_tweaks += new /datum/gear_tweak/path(secjacket)
-
 /datum/gear/suit/dominia_cape
 	display_name = "dominian cape"
 	path = /obj/item/clothing/accessory/poncho/dominia_cape

code/modules/clothing/suits/jobs.dm

@@ -104,49 +104,42 @@ obj/item/clothing/suit/apron/overalls/blue
 //Security
 
 /obj/item/clothing/suit/storage/security/officer
-	name = "security officer's jacket"
-	desc = "This jacket is for those special occasions when a security officer actually feels safe."
-	icon_state = "officerjacket"
-	item_state = "officerjacket"
+	name = "corporate security jacket"
+	desc = "This jacket is for those special occasions when corporate security actually feels safe."
+	icon = 'icons/obj/contained_items/department_uniforms/security.dmi'
+	contained_sprite = TRUE
+	blood_overlay_type = "coat"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
 
-/obj/item/clothing/suit/storage/security/officer/blue
-	icon_state = "officerbluejacket"
-	item_state = "officerbluejacket"
+/obj/item/clothing/suit/storage/security/officer/zav
+	icon_state = "zav_jacket"
+	item_state = "zav_jacket"
 
-/obj/item/clothing/suit/storage/security/officer/dnavy
-	icon_state = "officerdnavyjacket"
-	item_state = "officerdnavyjacket"
+/obj/item/clothing/suit/storage/security/officer/zav/alt
+	icon_state = "zav_jacket_alt"
+	item_state = "zav_jacket_alt"
 
-/obj/item/clothing/suit/storage/security/warden
-	name = "warden's jacket"
-	desc = "Perfectly suited for the warden that wants to leave an impression of style on those who visit the brig."
-	icon_state = "wardenjacket"
-	item_state = "wardenjacket"
-	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
+/obj/item/clothing/suit/storage/security/officer/idris
+	icon_state = "idris_jacket"
+	item_state = "idris_jacket"
 
-/obj/item/clothing/suit/storage/security/warden/blue
-	icon_state = "wardenbluejacket"
-	item_state = "wardenbluejacket"
+/obj/item/clothing/suit/storage/security/officer/idris/alt
+	icon_state = "idris_jacket_alt"
+	item_state = "idris_jacket_alt"
 
-/obj/item/clothing/suit/storage/security/warden/dnavy
-	icon_state = "wardendnavyjacket"
-	item_state = "wardendnavyjacket"
+/obj/item/clothing/suit/storage/security/officer/pmc
+	icon_state = "pmc_jacket"
+	item_state = "pmc_jacket"
 
-/obj/item/clothing/suit/storage/security/hos
+/obj/item/clothing/suit/storage/security/officer/pmc/alt
+	icon_state = "pmc_jacket_alt"
+	item_state = "pmc_jacket_alt"
+
+/obj/item/clothing/suit/storage/security/officer/hos
 	name = "head of security's jacket"
 	desc = "This piece of clothing was specifically designed for asserting superior authority."
-	icon_state = "hosjacket"
-	item_state = "hosjacket"
-	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
-
-/obj/item/clothing/suit/storage/security/hos/blue
-	icon_state = "hosbluejacket"
-	item_state = "hosbluejacket"
-
-/obj/item/clothing/suit/storage/security/hos/dnavy
-	icon_state = "hosdnavyjacket"
-	item_state = "hosdnavyjacket"
+	icon_state = "hos_jacket"
+	item_state = "hos_jacket"
 
 //Detective
 

code/modules/item_worth/worths_list.dm

@@ -488,12 +488,10 @@ var/list/worths = list(
 					/obj/item/clothing/suit/armor/reactive = 5000,
 					/obj/item/clothing/suit/armor/centcomm = 2000,
 					/obj/item/clothing/suit/armor/heavy = 1000,
-					/obj/item/clothing/suit/storage/security/hos = 100,
 					/obj/item/clothing/suit/armor/tactical = 1500,
 					/obj/item/clothing/suit/armor = 500,
 					/obj/item/clothing/suit/bio_suit = 150,
 					/obj/item/clothing/suit/captunic/capjacket = 100,
-					/obj/item/clothing/suit/storage/security/hos/dnavy = 80,
 					/obj/item/clothing/suit/storage/hazardvest = 60,
 					/obj/item/clothing/suit/storage/toggle/labcoat = 55,
 					/obj/item/clothing/suit/armor/riot/laser_tag = 125,

html/changelogs/wezzy_replacegensec.yml

@@ -0,0 +1,41 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.
+author: Wowzewow (Wezzy)
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - imageadd: "Removes and replaces generic security coats with corporate ones. The new ones can be found in the Factions loadout tab under the coat selection."