From 093c73ae3c03a4e927dbf250d84c672d93b75433 Mon Sep 17 00:00:00 2001
From: SplinterGP <isseisanloverias@gmail.com>
Date: Fri, 28 Aug 2020 20:44:31 -0300
Subject: [PATCH] tweaks to sec hailer masks

---
 .../crates_lockers/closets/secure/security.dm        |  3 ++-
 code/modules/clothing/masks/gasmask.dm               |  6 +++---
 code/modules/clothing/masks/hailer.dm                | 12 +++++++-----
 3 files changed, 12 insertions(+), 9 deletions(-)

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 763bf9b72b..dc9f13f769 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
@@ -62,7 +62,7 @@
 /obj/structure/closet/secure_closet/hos
 	name = "head of security's locker"
 	req_access = list(access_hos)
-	storage_capacity = 2.5 * MOB_MEDIUM
+	storage_capacity = 2.6 * MOB_MEDIUM
 	closet_appearance = /decl/closet_appearance/secure_closet/security/hos
 
 	starts_with = list(
@@ -113,6 +113,7 @@
 
 /obj/structure/closet/secure_closet/warden
 	name = "warden's locker"
+	storage_capacity = 42
 	req_access = list(access_armory)
 	closet_appearance = /decl/closet_appearance/secure_closet/security/warden
 
diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm
index 7dee530436..0d8cb0a2a1 100644
--- a/code/modules/clothing/masks/gasmask.dm
+++ b/code/modules/clothing/masks/gasmask.dm
@@ -46,6 +46,7 @@
 /obj/item/clothing/mask/gas/half/attackby(obj/item/I, mob/user)
 	if(istype(I, /obj/item/device/hailer))
 		playsound(src, 'sound/items/Screwdriver.ogg', 50, 1)
+		user.drop_item(src)
 		var/obj/item/clothing/mask/gas/sechailer/N = new /obj/item/clothing/mask/gas/sechailer(src.loc)
 		N.fingerprints = src.fingerprints
 		N.fingerprintshidden = src.fingerprintshidden
@@ -53,10 +54,9 @@
 		N.suit_fibers = src.suit_fibers
 		N.hailer = I
 		I.loc = N
+		if(!isturf(N.loc))
+			user.put_in_hands(N)
 		qdel(src)
-		if(!user.put_in_inactive_hand(N))
-			N.loc = get_turf(user)
-		return
 	..()
 
 //Plague Dr suit can be found in clothing/suits/bio.dm
diff --git a/code/modules/clothing/masks/hailer.dm b/code/modules/clothing/masks/hailer.dm
index 3dcd97b02e..9d236de43f 100644
--- a/code/modules/clothing/masks/hailer.dm
+++ b/code/modules/clothing/masks/hailer.dm
@@ -131,16 +131,18 @@
 			to_chat(user, "<span class='warning'>This mask has an integrated hailer, you can't remove it!</span>")
 		else
 			var/obj/N = new /obj/item/clothing/mask/gas/half(src.loc)
+			playsound(src, 'sound/items/Screwdriver.ogg', 50, 1)
 			N.fingerprints = src.fingerprints
 			N.fingerprintshidden = src.fingerprintshidden
 			N.fingerprintslast = src.fingerprintslast
 			N.suit_fibers = src.suit_fibers
-			if(!user.put_in_any_hand_if_possible(hailer))
-				hailer.loc = get_turf(user)
-			if(!user.put_in_any_hand_if_possible(N))
-				N.loc = get_turf(user)
+			if(!isturf(N.loc))
+				user.put_in_hands(hailer)
+				user.put_in_hands(N)
+			else
+				hailer.loc = N.loc
 			qdel(src)
-			
+			return
 	..()
  
 /obj/item/clothing/mask/gas/sechailer/verb/halt()