CCIA HRA makeover (#18029)

* fixes

* Auto equips holster + fixes suit open state

* aviator sunglasses

code/game/jobs/job/hra.dm

@@ -31,13 +31,15 @@
 	name = "Human Resources Assistant"
 	jobtype = /datum/job/hra
 
-	uniform = /obj/item/clothing/under/rank/scc2
-	suit = /obj/item/clothing/suit/storage/toggle/armor/vest/scc
+	uniform = /obj/item/clothing/under/rank/scc2/ccia
+	suit = /obj/item/clothing/suit/storage/toggle/armor/ccia
 	shoes = /obj/item/clothing/shoes/laceup
 	gloves = /obj/item/clothing/gloves/white
-	accessory = /obj/item/clothing/accessory/tie/corporate/scc
-	glasses = /obj/item/clothing/glasses/sunglasses/sechud
-	head = /obj/item/clothing/head/beret/scc
+	accessory = /obj/item/clothing/accessory/holster/waist
+	accessory_contents = list(/obj/item/gun/energy/repeater/pistol = 1)
+	glasses = /obj/item/clothing/glasses/sunglasses/sechud/aviator
+	head = /obj/item/clothing/head/beret/scc/alt
+	belt = /obj/item/melee/telebaton
 
 	headset = /obj/item/device/radio/headset/representative
 	bowman = /obj/item/device/radio/headset/representative/alt
@@ -52,3 +54,18 @@
 	r_pocket = /obj/item/device/taperecorder/cciaa
 	l_hand = /obj/item/storage/lockbox/cciaa
 	id = /obj/item/card/id/gold
+
+
+
+	backpack_contents = list(
+			/obj/item/modular_computer/laptop/preset/command = 1,
+	)
+
+/datum/outfit/job/hra/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+	. = ..()
+	if(H && H.w_uniform)
+		var/obj/item/clothing/under/U = H.w_uniform
+		var/obj/item/clothing/accessory/tie/corporate/scc/alt/tie = new()
+		U.attach_accessory(null, tie)
+
+	return TRUE

code/modules/cciaa/cciaa_items.dm

@@ -356,7 +356,7 @@
 /obj/item/storage/lockbox/cciaa
 	req_access = list(access_cent_ccia)
 	name = "CCIA agent briefcase"
-	desc = "A smart looking briefcase with an SCC logo on the side"
+	desc = "A smart looking briefcase with an SCC logo on the side."
 	storage_slots = 8
 	max_storage_space = 16
 

code/modules/clothing/factions/scc.dm

@@ -6,6 +6,12 @@
 	item_state = "scc_liaison"
 	contained_sprite = TRUE
 
+/obj/item/clothing/under/rank/scc2/ccia
+	name = "\improper SCC internal affairs uniform"
+	desc = "The ubiquitous well-ironed dress uniform of SCC internal affairs personnel."
+	icon_state = "scc_ccia"
+	item_state = "scc_ccia"
+
 /obj/item/clothing/suit/storage/toggle/armor/vest/scc
 	name = "\improper SCC vest"
 	desc = "A stylish vest worn by SCC personnel."
@@ -35,6 +41,33 @@
 /obj/item/clothing/suit/storage/toggle/armor/vest/scc/toggle_open()
 	return
 
+/obj/item/clothing/suit/storage/toggle/armor/ccia
+	name = "\improper SCC CCIA armored jacket"
+	desc = "A long armored coat worn by SCC internal affairs personnel. Layered with armor lining for added protection."
+	icon = 'icons/obj/item/clothing/department_uniforms/scc.dmi'
+	icon_state = "scc_coat"
+	item_state = "scc_coat"
+	contained_sprite = TRUE
+	opened = TRUE
+
+	allowed = list(
+		/obj/item/gun,
+		/obj/item/reagent_containers/spray/pepper,
+		/obj/item/ammo_magazine,
+		/obj/item/ammo_casing,
+		/obj/item/melee/baton,
+		/obj/item/handcuffs,
+		/obj/item/device/flashlight
+	)
+	body_parts_covered = UPPER_TORSO|ARMS
+	armor = list(
+		melee = ARMOR_MELEE_KNIVES,
+		bullet = ARMOR_BALLISTIC_PISTOL,
+		laser = ARMOR_LASER_SMALL,
+		energy = ARMOR_ENERGY_MINOR,
+		bomb = ARMOR_BOMB_PADDED
+	)
+
 /obj/item/clothing/accessory/tie/corporate/scc
 	name = "\improper SCC tie"
 	desc = "A sleek corporate tie, worn by SCC employees."
@@ -43,6 +76,10 @@
 	item_state = "scc_tie"
 	contained_sprite = TRUE
 
+/obj/item/clothing/accessory/tie/corporate/scc/alt
+	icon_state = "scc_tie_blue"
+	item_state = "scc_tie_blue"
+
 /obj/item/clothing/head/beret/scc
 	name = "\improper SCC beret"
 	desc = "A corporate beret in the colours of the Stellar Corporate Conglomerate."
@@ -51,3 +88,8 @@
 	icon_state = "scc_beret"
 	item_state = "scc_beret"
 	contained_sprite = TRUE
+
+/obj/item/clothing/head/beret/scc/alt
+	icon_state = "scc_beret_dark"
+	item_state = "scc_beret_dark"
+

html/changelogs/nauticall-ccia-makeover.yml

@@ -0,0 +1,42 @@
+################################
+# 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: nauticall
+
+# 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:
+  - rscadd: "Revamped the CCIA Human Resources Asssistant to wear a more formal coat and tie. They now (subjectively) look twice as intimidating."
+  - rscadd: "CCIA HRAs now come with additional self-defense weaponry - a gun and a baton - as well as a holster for said gun and a laptop."