Merge pull request #8933 from VOREStation/upstream-merge-7552

[MIRROR] Adds hailer gas (face) masks.

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

@@ -66,7 +66,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(
@@ -102,7 +102,8 @@
 		/obj/item/clothing/suit/storage/hooded/wintercoat/security,
 		/obj/item/clothing/shoes/boots/winter/security,
 		/obj/item/device/flashlight/maglight,
-		/obj/item/clothing/mask/gas/half)
+		/obj/item/clothing/mask/gas/half,
+		/obj/item/clothing/mask/gas/sechailer/swat/hos)
 
 /obj/structure/closet/secure_closet/hos/Initialize()
 	if(prob(50))
@@ -116,6 +117,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
 
@@ -147,7 +149,8 @@
 		/obj/item/clothing/shoes/boots/winter/security,
 		/obj/item/device/flashlight/maglight,
 		/obj/item/device/megaphone,
-		/obj/item/clothing/mask/gas/half)
+		/obj/item/clothing/mask/gas/half,
+		/obj/item/clothing/mask/gas/sechailer/swat/warden)
 
 /obj/structure/closet/secure_closet/warden/Initialize()
 	if(prob(50))

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

@@ -406,7 +406,8 @@
 		/obj/item/clothing/gloves/swat,
 		/obj/item/clothing/mask/balaclava/tactical,
 		/obj/item/clothing/mask/balaclava,
-		/obj/item/clothing/mask/bandana/skull = 2)
+		/obj/item/clothing/mask/bandana/skull = 2,
+		/obj/item/clothing/mask/gas/sechailer/swat)
 
 
 /obj/structure/closet/wardrobe/suit

code/modules/clothing/masks/gasmask.dm

@@ -42,6 +42,23 @@
 	w_class = ITEMSIZE_SMALL
 	armor = list(melee = 10, bullet = 10, laser = 10, energy = 0, bomb = 0, bio = 55, rad = 0)
 
+//Turn it into a hailer mask
+/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
+		N.fingerprintslast = src.fingerprintslast
+		N.suit_fibers = src.suit_fibers
+		N.hailer = I
+		I.loc = N
+		if(!isturf(N.loc))
+			user.put_in_hands(N)
+		qdel(src)
+	..()
+
 //Plague Dr suit can be found in clothing/suits/bio.dm
 /obj/item/clothing/mask/gas/plaguedoctor
 	name = "plague doctor mask"

html/changelogs/splintergp - hailermasks.yml

@@ -0,0 +1,37 @@
+################################
+# 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
+#################################
+
+# Your name.  
+author: SplinterGP
+
+# 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: "Adds new hailer masks with quotes with sound, allowing you to use a hailer on a face mask to attach a security hailer into one."
+  - soundadd: "Adds new sound effects for hailer face masks."

vorestation.dme

@@ -1865,6 +1865,7 @@
 #include "code\modules\clothing\masks\breath_vr.dm"
 #include "code\modules\clothing\masks\gasmask.dm"
 #include "code\modules\clothing\masks\gasmask_vr.dm"
+#include "code\modules\clothing\masks\hailer.dm"
 #include "code\modules\clothing\masks\miscellaneous.dm"
 #include "code\modules\clothing\masks\voice.dm"
 #include "code\modules\clothing\rings\material.dm"