Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765

code/game/objects/items/miscellaneous.dm

@@ -115,6 +115,20 @@
 	new /obj/item/toy/crayon/spraycan(src)
 	new /obj/item/clothing/shoes/sandal(src)
 
+/obj/item/choice_beacon/hosgun
+	name = "personal weapon beacon"
+	desc = "Use this to summon your personal Head of Security issued firearm!"
+
+/obj/item/choice_beacon/hosgun/generate_display_names()
+	var/static/list/hos_gun_list
+	if(!hos_gun_list)
+		hos_gun_list = list()
+		var/list/templist = subtypesof(/obj/item/storage/secure/briefcase/hos/) //we have to convert type = name to name = type, how lovely!
+		for(var/V in templist)
+			var/atom/A = V
+			hos_gun_list[initial(A.name)] = A
+	return hos_gun_list
+
 /obj/item/skub
 	desc = "It's skub."
 	name = "skub"

code/game/objects/items/storage/secure.dm

@@ -147,6 +147,35 @@
 	for(var/i = 0, i < STR.max_items - 2, i++)
 		new /obj/item/stack/spacecash/c1000(src)
 
+/obj/item/storage/secure/briefcase/mws_pack
+	name = "\improper \'MWS\' gun kit"
+	desc = "A storage case for a multi-purpose handgun. Variety hour!"
+
+/obj/item/storage/secure/briefcase/mws_pack/PopulateContents()
+	new /obj/item/gun/ballistic/revolver/mws(src)
+	new /obj/item/ammo_box/magazine/mws_mag(src)
+	for(var/path in subtypesof(/obj/item/ammo_casing/mws_batt))
+		new path(src)
+
+/obj/item/storage/secure/briefcase/hos/mws_pack_hos
+	name = "\improper \'MWS\' gun kit"
+	desc = "A storage case for a multi-purpose handgun. Variety hour!"
+
+/obj/item/storage/secure/briefcase/hos/mws_pack_hos/PopulateContents()
+	new /obj/item/gun/ballistic/revolver/mws(src)
+	new /obj/item/ammo_box/magazine/mws_mag(src)
+	new /obj/item/ammo_casing/mws_batt/lethal(src)
+	new /obj/item/ammo_casing/mws_batt/lethal(src)
+	new /obj/item/ammo_casing/mws_batt/stun(src)
+	new /obj/item/ammo_casing/mws_batt/stun(src)
+	new /obj/item/ammo_casing/mws_batt/ion(src)
+
+/obj/item/storage/secure/briefcase/hos/multiphase_box
+	name = "\improper X-01 Multiphase energy gun box"
+	desc = "A storage case for a high-tech energy firearm."
+
+/obj/item/storage/secure/briefcase/mws_pack_hos/PopulateContents()
+	new /obj/item/gun/energy/e_gun/hos(src)
 
 // -----------------------------
 //        Secure Safe
@@ -183,4 +212,4 @@
 	return attack_self(user)
 
 /obj/item/storage/secure/safe/HoS
-	name = "head of security's safe"
+	name = "head of security's safe"