ace security outfit

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

@@ -136,6 +136,8 @@
 	closet_appearance = /decl/closet_appearance/secure_closet/security/warden
 
 	starts_with = list(
+		/obj/item/clothing/under/rank/security/aces,
+		/obj/item/clothing/suit/storage/vest/aces,
 		/obj/item/clothing/suit/storage/vest/warden,
 		/obj/item/clothing/under/rank/warden,
 		/obj/item/clothing/under/rank/warden/corp,
@@ -189,6 +191,8 @@
 	closet_appearance = /decl/closet_appearance/secure_closet/security
 
 	starts_with = list(
+		/obj/item/clothing/under/rank/security/aces,
+		/obj/item/clothing/suit/storage/vest/aces,
 		/obj/item/clothing/suit/storage/vest/officer,
 		/obj/item/clothing/head/helmet,
 		/obj/item/cartridge/security,

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

@@ -234,7 +234,8 @@
 		"TG&C bodyguard's skirt"=/obj/item/clothing/under/rank/bodyguard_skirt,
 		"TG&C bodyguard's turtleneck"=/obj/item/clothing/under/rank/bodyguard_turtleneck,
 		"TG&C bodyguard's turtleneck w/ skirt"=/obj/item/clothing/under/rank/bodyguard_turtleskirt,
-		"TG&C gorka suit"=/obj/item/clothing/under/rank/neo_gorka/sec
+		"TG&C gorka suit"=/obj/item/clothing/under/rank/neo_gorka/sec,
+		"ACE security undersuit"=/obj/item/clothing/under/rank/security/aces
 	)
 	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
 

code/modules/clothing/suits/armor.dm

@@ -300,6 +300,15 @@
 	icon_badge = "officervest_badge"
 	icon_nobadge = "officervest_nobadge"
 
+/obj/item/clothing/suit/storage/vest/aces
+	name = "ACE security rig"
+	desc = "A set of lightweight armor designed to be worn over the matching ACE security undersuit. Includes thigh, shin, and forearm protectors in addition to standard torso and groin guards."
+	icon_state = "aces_armor"
+	item_state_slots = list(slot_r_hand_str = "armor", slot_l_hand_str = "armor")
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
+	cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
+	heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
+
 /obj/item/clothing/suit/storage/vest/warden
 	name = "warden armor vest"
 	desc = "A simple kevlar plate carrier. This one has a silver badge clipped to the chest."

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

@@ -26,6 +26,27 @@
 	siemens_coefficient = 0.9
 	rolled_sleeves = 0
 
+/obj/item/clothing/under/rank/security/aces
+	name = "ACE security undersuit"
+	desc = "A snug but comfortable undersuit with removable arm sleeves, originally developed for the ACE Security Group. Includes a wrist-mounted minicomp."
+	icon_state = "aces_undersuit"
+	item_state_slots = list(slot_r_hand_str = "black", slot_l_hand_str = "black")
+	armor = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
+	siemens_coefficient = 0.9
+	rolled_sleeves = 0	//sleeves can be removed, but this disables the minicomp
+	rolled_down = -1	//can't be rolled down
+
+/obj/item/clothing/under/rank/security/aces/examine(mob/user)
+	. = ..()
+
+	if(!rolled_sleeves && Adjacent(user))	//can't see the comp if you've taken the sleeves off, or if you're not adjacent
+		. += "<span class='notice'>The minicomp reports that the current station time is [stationtime2text()] and that it is [stationdate2text()].</span>"
+		var/TB = src.loc.loc
+		if(istype(TB, /turf/simulated))	//no point returning atmospheric data from unsimulated tiles (they don't track pressure anyway, only temperature)
+			var/turf/simulated/T = TB
+			var/datum/gas_mixture/env = T.return_air()
+			. += "<span class='notice'>The minicomp reports the current atmospheric pressure: [env.return_pressure()]kPa, and temperature: [env.temperature]K </span>"
+
 /obj/item/clothing/under/rank/security/modern
 	name = "modernized security officer's jumpsuit"
 	desc = "A recent redesign of the classic Security jumpsuit, featuring sturdy materials, joint padding, one giant zipper, and tight-fitting synthleather."

code/modules/economy/vending_machines.dm

@@ -1243,6 +1243,7 @@
 		/obj/item/clothing/under/rank/security2 = 5,
 		/obj/item/clothing/under/rank/security/turtleneck = 5,
 		/obj/item/clothing/under/rank/security/modern = 5,
+		/obj/item/clothing/under/rank/security/aces = 5,
 		/obj/item/clothing/under/rank/security/skirt = 5,
 		/obj/item/clothing/shoes/boots/jackboots = 5,
 		/obj/item/clothing/head/soft/sec = 5,