Armoury Layout Tweaks and Security QoL Tweaks (#15032)

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

@@ -167,7 +167,6 @@
 
 /obj/structure/closet/secure_closet/warden/fill()
 	//Supply
-	new /obj/item/storage/box/holobadge(src)
 	new /obj/item/storage/box/ids(src)
 	new /obj/item/storage/box/flashbangs(src)
 	new /obj/item/storage/box/teargas(src)
@@ -194,8 +193,14 @@
 	new /obj/item/gun/energy/disruptorpistol(src)
 	//Belts
 	new /obj/item/clothing/accessory/storage/black_vest(src)
-	new /obj/item/clothing/accessory/holster/waist(src)
+	new /obj/item/clothing/accessory/holster/hip(src)
 	new /obj/item/storage/belt/security/full(src)
+	// Utility
+	new /obj/item/device/radio/sec(src)
+	new /obj/item/crowbar(src)
+	new /obj/item/device/flashlight/maglight(src)
+	new /obj/item/wrench(src)
+	new /obj/item/device/multitool(src)
 
 
 /obj/structure/closet/secure_closet/security_cadet

code/game/objects/structures/crates_lockers/closets/wardrobe.dm

@@ -36,6 +36,10 @@
 	new /obj/item/clothing/shoes/jackboots/knee(src)
 	new /obj/item/clothing/shoes/jackboots/knee(src)
 	new /obj/item/clothing/shoes/jackboots/toeless(src)
+	new /obj/item/clothing/accessory/holster/waist(src)
+	new /obj/item/clothing/accessory/holster/waist(src)
+	new /obj/item/clothing/accessory/holster/waist(src)
+	new /obj/item/clothing/accessory/holster/waist(src)
 
 	return
 

code/game/objects/structures/fireaxe_cabinet.dm

@@ -1,12 +1,13 @@
 /obj/structure/fireaxecabinet
 	name = "fire axe cabinet"
-	desc = "There is small label that reads \"For Emergency use only\" along with details for safe use of the axe. As if."
+	desc = "A fire axe cabinet. There is small label that reads \"FOR EMERGENCY USE ONLY\" along with details for safe use of the axe on the side of it. As if."
 	icon = 'icons/obj/wallmounts.dmi'
 	icon_state = "fireaxe"
-	anchored = 1
-	density = 0
+	anchored = TRUE
+	density = FALSE
+	req_access = null
 
-	var/damage_threshold = 15
+	var/damage_threshold = 10 // Damage needed to break the glass.
 	var/open
 	var/unlocked
 	var/shattered
@@ -15,15 +16,15 @@
 /obj/structure/fireaxecabinet/attack_generic(var/mob/user, var/damage, var/attack_verb, var/wallbreaker)
 	user.do_attack_animation(src)
 	playsound(user, 'sound/effects/glass_hit.ogg', 50, 1)
-	visible_message("<span class='danger'>[user] [attack_verb] \the [src]!</span>")
-	if(damage_threshold > damage)
-		to_chat(user, "<span class='danger'>Your strike is deflected by the reinforced glass!</span>")
+	visible_message(SPAN_WARNING("\The [user] [attack_verb] \the [src]!"))
+	if(damage_threshold >= damage)
+		to_chat(user, SPAN_WARNING("Your strike is deflected by the reinforced glass!"))
 		return
 	if(shattered)
 		return
-	shattered = 1
-	unlocked = 1
-	open = 1
+	shattered = TRUE
+	unlocked = TRUE
+	open = TRUE
 	playsound(user, /decl/sound_category/glass_break_sound, 100, 1)
 	update_icon()
 
@@ -55,7 +56,7 @@
 
 /obj/structure/fireaxecabinet/attack_hand(var/mob/user)
 	if(!unlocked)
-		to_chat(user, "<span class='warning'>\The [src] is locked.</span>")
+		to_chat(user, SPAN_NOTICE("\The [src] is locked."))
 		return
 	toggle_open(user)
 
@@ -66,11 +67,11 @@
 			return
 
 		if(!open)
-			to_chat(user, "<span class='warning'>\The [src] is closed.</span>")
+			to_chat(user, SPAN_NOTICE("\The [src] is closed."))
 			return
 
 		if(!fireaxe)
-			to_chat(user, "<span class='warning'>\The [src] is empty.</span>")
+			to_chat(user, SPAN_NOTICE("\The [src] is empty."))
 			return
 
 		fireaxe.forceMove(get_turf(user))
@@ -87,7 +88,6 @@
 	return ..()
 
 /obj/structure/fireaxecabinet/attackby(var/obj/item/O, var/mob/user)
-
 	if(O.ismultitool())
 		toggle_lock(user)
 		return
@@ -95,11 +95,11 @@
 	if(istype(O, /obj/item/material/twohanded/fireaxe))
 		if(open)
 			if(fireaxe)
-				to_chat(user, "<span class='warning'>There is already \a [fireaxe] inside \the [src].</span>")
+				to_chat(user, SPAN_ALERT("There is already \a [fireaxe] inside \the [src]."))
 			else if(user.unEquip(O))
 				O.forceMove(src)
 				fireaxe = O
-				to_chat(user, "<span class='notice'>You place \the [fireaxe] into \the [src].</span>")
+				to_chat(user, SPAN_NOTICE("You place \the [fireaxe] into \the [src]."))
 				update_icon()
 			return
 
@@ -112,34 +112,32 @@
 
 /obj/structure/fireaxecabinet/proc/toggle_open(var/mob/user)
 	if(shattered)
-		open = 1
-		unlocked = 1
+		open = TRUE
+		unlocked = TRUE
 	else
 		user.setClickCooldown(10)
 		open = !open
-		to_chat(user, "<span class='notice'>You [open ? "open" : "close"] \the [src].</span>")
+		to_chat(user, SPAN_NOTICE("You [open ? "open" : "close"] \the [src]."))
 	update_icon()
 
 /obj/structure/fireaxecabinet/proc/toggle_lock(var/mob/user)
-
-
 	if(open)
 		return
 
 	if(shattered)
-		open = 1
-		unlocked = 1
+		open = TRUE
+		unlocked = TRUE
 	else
 		user.setClickCooldown(10)
-		to_chat(user, "<span class='notice'>You begin [unlocked ? "enabling" : "disabling"] \the [src]'s maglock.</span>")
+		to_chat(user, SPAN_NOTICE("You begin [unlocked ? "enabling" : "disabling"] \the [src]'s maglock."))
 
 		if(!do_after(user, 20))
 			return
 
-		if(shattered) return
+		if(shattered)
+			return
 
 		unlocked = !unlocked
-		playsound(user, 'sound/machines/lockreset.ogg', 50, 1)
-		to_chat(user, "<span class = 'notice'>You [unlocked ? "disable" : "enable"] the maglock.</span>")
+		to_chat(user, SPAN_NOTICE("You [unlocked ? "disable" : "enable"] the maglock."))
 
-	update_icon()
+	update_icon()