From 908a07b00360a8aa3668ffaa0a40caa71aed6b60 Mon Sep 17 00:00:00 2001
From: Casper3667 <8396443+Casper3667@users.noreply.github.com>
Date: Fri, 22 Aug 2025 13:51:53 +0200
Subject: [PATCH] Give officers and wardens breath analyzers and investigators
 a gas mask (#21215)

From a request I saw a bit ago, I have now added breath analyzers to the
security officer and warden lockers, should they wish to use them. It is
mostly intended to check if people are drunk on duty or similar.

Investigators were given a half gas mask, given the amount of
pepperspray used in some cases and they were the only ones not to get it
in the department. If they want the bigger mask, they can ask the
warden.

Lastly while I was messing around in the file, I cleaned out the cadet
and investigator locker slightly. The clothing items that already
existed in the security drobe were removed from their lockers. The
security officer and warden lockers were already free of that, so they
did not get anything removed.
---
 code/game/objects/items/weapons/storage/belt.dm          | 3 ++-
 .../structures/crates_lockers/closets/secure/security.dm | 9 +++------
 html/changelogs/SecEquipment.yml                         | 9 +++++++++
 3 files changed, 14 insertions(+), 7 deletions(-)
 create mode 100644 html/changelogs/SecEquipment.yml

diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm
index cd3c3f4af8e..1cfe487e80c 100644
--- a/code/game/objects/items/weapons/storage/belt.dm
+++ b/code/game/objects/items/weapons/storage/belt.dm
@@ -348,7 +348,8 @@
 		/obj/item/device/laser_pointer,
 		/obj/item/device/camera,
 		/obj/item/clipboard,
-		/obj/item/journal/notepad
+		/obj/item/journal/notepad,
+		/obj/item/device/breath_analyzer
 		)
 	content_overlays = TRUE
 
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
index 425efd3783f..6763cd0fed6 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
@@ -202,6 +202,7 @@
 	new /obj/item/clothing/glasses/sunglasses/sechud(src)
 	new /obj/item/taperoll/police(src)
 	new /obj/item/gun/energy/disruptorpistol(src)
+	new /obj/item/device/breath_analyzer(src)
 	//Belts
 	new /obj/item/clothing/accessory/storage/black_vest(src)
 	new /obj/item/clothing/accessory/holster/hip(src)
@@ -228,8 +229,6 @@
 	else
 		new /obj/item/storage/backpack/satchel/sec(src)
 	new /obj/item/storage/backpack/duffel/sec(src)
-	new /obj/item/clothing/head/beret/security(src)
-	new /obj/item/clothing/head/softcap/security(src)
 	new /obj/item/clothing/suit/storage/hazardvest/security(src)
 	new /obj/item/clothing/under/rank/cadet(src)
 	//Tools
@@ -273,6 +272,7 @@
 	new /obj/item/taperoll/police(src)
 	new /obj/item/device/hailer(src)
 	new /obj/item/device/flashlight/flare/glowstick/red(src)
+	new /obj/item/device/breath_analyzer(src)
 	//Belts
 	new /obj/item/clothing/accessory/storage/black_vest(src)
 	new /obj/item/clothing/accessory/holster/hip(src)
@@ -290,12 +290,9 @@
 	//Appearance
 	new /obj/item/storage/backpack/satchel/leather/recolorable(src)
 	new /obj/item/clothing/suit/storage/toggle/labcoat(src)
-	new /obj/item/clothing/under/det(src)
-	new /obj/item/clothing/under/det/idris(src)
-	new /obj/item/clothing/under/det/pmc(src)
-	new /obj/item/clothing/under/det/zavod(src)
 	new /obj/item/clothing/accessory/badge/investigator(src)
 	new /obj/item/clothing/shoes/laceup(src)
+	new /obj/item/clothing/mask/gas/half(src)
 	//Tools
 	new /obj/item/device/radio/headset/headset_sec(src)
 	new /obj/item/device/radio/headset/headset_sec/alt(src)
diff --git a/html/changelogs/SecEquipment.yml b/html/changelogs/SecEquipment.yml
new file mode 100644
index 00000000000..ca8f99dcf6e
--- /dev/null
+++ b/html/changelogs/SecEquipment.yml
@@ -0,0 +1,9 @@
+author: TheGreyWolf
+
+delete-after: True
+
+changes:
+  - rscadd: "Added breath analyzers to the warden and security officer lockers."
+  - rscadd: "Security belts can now hold breath analyzers."
+  - rscadd: "Added a gas mask to the investigator locker."
+  - rscdel: "Removed the uniforms from the investigator locker, and the cap and beret from the cadet locker, which can be found in the security drobe."