XO and SCC clothing mostly. (#14899)

aurorastation.dme

@@ -1604,6 +1604,7 @@
 #include "code\modules\clothing\rings\rings.dm"
 #include "code\modules\clothing\sets\acting_captain.dm"
 #include "code\modules\clothing\sets\captain.dm"
+#include "code\modules\clothing\sets\xo.dm"
 #include "code\modules\clothing\sets\infiltrator.dm"
 #include "code\modules\clothing\sets\laser_tag.dm"
 #include "code\modules\clothing\shoes\colour.dm"

code/game/objects/random/random.dm

@@ -898,6 +898,24 @@
 		/obj/item/clothing/under/color/darkred
 	)
 
+/obj/random/suit
+	name = "random suit"
+	desc = "This is a random suit."
+	icon = 'icons/obj/clothing/uniforms.dmi'
+	icon_state = "checkered_suit"
+	spawnlist = list(
+		/obj/item/clothing/under/suit_jacket/charcoal,
+		/obj/item/clothing/under/suit_jacket/navy,
+		/obj/item/clothing/under/suit_jacket/burgundy,
+		/obj/item/clothing/under/suit_jacket/checkered,
+		/obj/item/clothing/under/suit_jacket/tan,
+		/obj/item/clothing/under/sl_suit,
+		/obj/item/clothing/under/suit_jacket,
+		/obj/item/clothing/under/suit_jacket/really_black,
+		/obj/item/clothing/under/suit_jacket/red,
+		/obj/item/clothing/under/suit_jacket/white
+	)
+
 /obj/random/loot
 	name = "random maintenance loot items"
 	desc = "Stuff for the maint-dwellers."

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

@@ -13,6 +13,7 @@
 	new /obj/item/clothing/shoes/brown(src)
 	new /obj/item/device/radio/headset/operations_manager(src)
 	new /obj/item/device/radio/headset/operations_manager/alt(src)
+	new /obj/item/storage/box/fancy/keypouch/cargo(src)
 	new /obj/item/clothing/gloves/black(src)
 	new /obj/item/clothing/suit/fire(src)
 	new /obj/item/tank/emergency_oxygen(src)

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

@@ -57,7 +57,7 @@
 	//Supply
 	new /obj/item/storage/box/ids(src)
 	new /obj/item/storage/box/ids(src)
-	new /obj/item/storage/box/fancy/keypouch/cargo(src)
+	new /obj/item/storage/box/fancy/keypouch/sec(src)
 	new /obj/item/storage/box/fancy/keypouch/service(src)
 	//Appearance
 	new /obj/item/clothing/glasses/sunglasses(src)
@@ -82,11 +82,14 @@
 /obj/structure/closet/secure_closet/xo2/fill()
 	..()
 	new /obj/item/clothing/under/rank/xo(src)
-	new /obj/item/clothing/under/lawyer/red(src)
+	new /obj/random/suit(src)
+	new /obj/random/suit(src)
 	new /obj/item/clothing/shoes/brown(src)
 	new /obj/item/clothing/shoes/black(src)
 	new /obj/item/clothing/shoes/laceup/brown(src)
 	new /obj/item/clothing/shoes/white(src)
+	new /obj/item/clothing/head/caphat/cap/beret/xo(src)
+	new /obj/item/clothing/gloves/captain/white/xo(src)
 
 /obj/structure/closet/secure_closet/hos
 	name = "head of security's locker"

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

@@ -39,7 +39,6 @@
 /datum/gear/accessory/armband/New()
 	..()
 	var/list/armbands = list()
-	armbands["Stellar Corporate Conglomerate armband"] = /obj/item/clothing/accessory/armband/scc
 	armbands["red armband"] = /obj/item/clothing/accessory/armband
 	armbands["security armband"] = /obj/item/clothing/accessory/armband/sec
 	armbands["operations armband"] = /obj/item/clothing/accessory/armband/operations
@@ -344,11 +343,6 @@
 	path = /obj/item/clothing/accessory/sleevepatch
 	flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
 
-/datum/gear/accessory/scc_patch
-	display_name = "stellar corporate conglomerate sleeve patch"
-	path = /obj/item/clothing/accessory/sleevepatch/scc
-	flags = 0
-
 /datum/gear/accessory/whalebone
 	display_name = "europan bone charm"
 	path = /obj/item/clothing/accessory/whalebone

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

@@ -411,3 +411,35 @@
 	cost = 0
 	faction = "NanoTrasen"
 	allowed_roles = list("Janitor")
+
+/datum/gear/faction/scc_armband
+	display_name = "SCC armband"
+	path = /obj/item/clothing/accessory/armband/scc
+	slot = slot_tie
+	sort_category = "Factions"
+	cost = 1
+	faction = null
+
+/datum/gear/faction/scc_sleevepatch
+	display_name = "SCC sleeve patch"
+	path = /obj/item/clothing/accessory/sleevepatch/scc
+	slot = slot_tie
+	sort_category = "Factions"
+	cost = 1
+	faction = null
+
+/datum/gear/faction/scc_jacket
+	display_name = "SCC jacket"
+	path = /obj/item/clothing/suit/storage/toggle/brown_jacket/scc
+	slot = slot_wear_suit
+	sort_category = "Factions"
+	cost = 1
+	faction = null
+
+/datum/gear/faction/scc_beret
+	display_name = "SCC beret"
+	path = /obj/item/clothing/head/beret/scc
+	slot = slot_head
+	sort_category = "Factions"
+	cost = 1
+	faction = null

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

@@ -26,7 +26,6 @@ datum/gear/suit/colorvest
 	..()
 	var/list/jackets = list()
 	jackets["bomber jacket"] = /obj/item/clothing/suit/storage/toggle/bomber
-	jackets["Stellar Corporate Conglomerate jacket"] = /obj/item/clothing/suit/storage/toggle/brown_jacket/scc
 	jackets["NanoTrasen black jacket"] = /obj/item/clothing/suit/storage/toggle/leather_jacket/nanotrasen
 	jackets["NanoTrasen brown jacket"] = /obj/item/clothing/suit/storage/toggle/brown_jacket/nanotrasen
 	jackets["black jacket"] = /obj/item/clothing/suit/storage/toggle/leather_jacket

code/modules/clothing/factions/scc.dm

@@ -46,6 +46,7 @@
 /obj/item/clothing/head/beret/scc
 	name = "\improper SCC beret"
 	desc = "A corporate beret in the colours of the Stellar Corporate Conglomerate."
+	desc_fluff = "The Stellar Corporate Conglomerate, also known as the Chainlink, is a joint alliance between the NanoTrasen, Hephaestus Industries, Idris Incorporated, Zeng-Hu Pharmaceuticals, and Zavodskoi Interstellar corporations to exercise an undisputed economic dominance over the Orion Spur."
 	icon = 'icons/obj/contained_items/scc.dmi'
 	icon_state = "scc_beret"
 	item_state = "scc_beret"

code/modules/clothing/head/jobs.dm

@@ -56,7 +56,7 @@
 
 /obj/item/clothing/head/caphat/bridge_crew/alt
 	name = "bridge crew cap"
-	desc = " A more formal in a Colettish style, authorized for the bridge crew of SCC vessels."
+	desc = "A more formal hat in a Colettish style, authorized for the bridge crew of SCC vessels."
 	desc_fluff = "Designed to allow the wearer to wear both a peaked cap and a radio headset, Colettish 'crusher' caps are prized throughout the Alliance and Republic for their comfort."
 	icon = 'icons/contained_items/clothing/hats/bridge_crew_cap_alt.dmi'
 	contained_sprite = TRUE

code/modules/clothing/sets/xo.dm

@@ -0,0 +1,7 @@
+/obj/item/clothing/head/caphat/cap/beret/xo
+	name = "executive officer's beret"
+	desc = "A beret in white, with the executive officer's gold emblem."
+
+/obj/item/clothing/gloves/captain/white/xo
+	name = "executive officer's gloves"
+	desc = "Shiny white gloves, with a nice gold trim."

code/modules/clothing/under/jobs/civilian.dm

@@ -204,7 +204,7 @@
 
 /obj/item/clothing/under/rank/bridge_crew/sancolette
 	name = "bridge crew's uniform"
-	desc = "A command staff uniform in SCC colors but Colettish style, consisting of trousers and meant to be paired with a jacket. Fancy!"
+	desc = "A bridge staff uniform in SCC colors but Colettish style, consisting of trousers and meant to be paired with a jacket. Fancy!"
 	desc_fluff = "This uniform is based upon an officer's uniform of the Civil Guard of San Colette. The blue-and-white \
 	uniforms of the Civil Guard are one of the more striking uniforms found in the local military forces of the Alliance, and are often copied by both corporate and civil actors."
 	icon = 'icons/contained_items/clothing/bottomwear/bridge_crew_sancol.dmi'
@@ -214,7 +214,7 @@
 
 /obj/item/clothing/under/rank/bridge_crew/sancolette/alt
 	name = "bridge crew's uniform"
-	desc = "A command staff uniform in SCC colors but Colettish style, consisting of navy trousers and meant to be paired with a jacket. Fancy!"
+	desc = "A bridge staff uniform in SCC colors but Colettish style, consisting of navy trousers and meant to be paired with a jacket. Fancy!"
 	desc_fluff = "This uniform is based upon an officer's uniform of the Civil Guard of San Colette. The blue-and-white \
 	uniforms of the Civil Guard are one of the more striking uniforms found in the local military forces of the Alliance, and are often copied by both corporate and civil actors."
 	icon = 'icons/contained_items/clothing/bottomwear/bridge_crew_sancol.dmi'

html/changelogs/DreamySkrell.yml

@@ -0,0 +1,13 @@
+author: DreamySkrell
+
+delete-after: True
+
+changes:
+  - rscadd: "Adds a random suit item for mapping stuff."
+  - rscadd: "Adds a cargo radio key pouch to OM's locker."
+  - tweak: "Replaces XO's cargo radio key pouch with a security one."
+  - rscadd: "Adds XO's white beret and gloves."
+  - tweak: "Tweaks the contents of XO's attire locker."
+  - tweak: "Moves SCC loadout items to the faction tab."
+  - rscadd: "Adds a SCC beret to the loadout."
+  - tweak: "Tweaks the descriptions of the new San Colettish bridge crew uniforms."