[SEMI-MODULAR] Gubman 3.1: A bureaucrat? With a hand cannon!? (#5584)

* Mosin resprite, Bubba mosin, Riot shotgun & Combat shotgun resprite, C20r fix

* mosin so cool!

* Get rid of HoP's gun in favor of old energy gun

* QM Mosin

* oops forgot to update obrez

* disclaimer

* Small wording change

* Skyrat edit note

* I messed a / up

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

@@ -26,3 +26,4 @@
 	new /obj/item/card/id/departmental_budget/car(src)
 	new /obj/item/clothing/suit/hooded/wintercoat/qm(src)
 	new /obj/item/circuitboard/computer/stockexchange(src) //SKYRAT EDIT - Adds stock exchange computer board to locker so QM has control over stonks
+	new /obj/item/gun/ballistic/rifle/boltaction/brand_new/quartermaster(src) // SKYRAT EDIT - The QM's 'special' head item. It spawns loaded, but you have to find more ammo if you run out and get ready to manually load rounds in!

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

@@ -55,7 +55,7 @@
 	new /obj/item/clothing/suit/armor/vest/alt(src)
 	new /obj/item/assembly/flash/handheld(src)
 	new /obj/item/clothing/glasses/sunglasses(src)
-	new /obj/item/storage/box/gunset/pdh_hop(src) //SKYRAT EDIT CHANGE - SEC_HAUL
+	new /obj/item/gun/energy/e_gun(src) //SKYRAT EDIT
 	new /obj/item/clothing/neck/petcollar(src)
 	new /obj/item/pet_carrier(src)
 	new /obj/item/door_remote/civilian(src)

code/modules/jobs/job_types/quartermaster.dm

@@ -32,6 +32,10 @@
 	if(announce_captaincy)
 		SSticker.OnRoundstart(CALLBACK(GLOBAL_PROC, .proc/minor_announce, "Due to extreme staffing shortages, newly promoted Acting Captain [H.real_name] on deck!"))
 
+/datum/job/quartermaster/after_spawn(mob/living/carbon/human/H, mob/M) //SKYRAT EDIT - Gubman 3.1
+	. = ..()
+	to_chat(M, "<span class='userdanger'>The firearm in your locker is for <b><u>SELF DEFENSE</b></u>, keep it within your department unless the situation is <i>extremely</i>dire. Security can confiscate it!.")
+
 /datum/outfit/job/quartermaster
 	name = "Quartermaster"
 	jobtype = /datum/job/quartermaster

modular_skyrat/modules/aesthetics/guns/code/guns.dm

@@ -226,3 +226,31 @@
 
 /obj/item/gun/energy/kinetic_accelerator
 	icon = 'modular_skyrat/modules/aesthetics/guns/icons/energy.dmi'
+	
+/obj/item/gun/ballistic/rifle/boltaction
+	name = "\improper Mosin Nagant 91-30"
+	desc = "This piece of junk looks like something that could have been used 700 years ago. It feels slightly moist."
+	sawn_desc = "An extremely sawn-off Mosin Nagant, popularly known as an \"obrez\". There was probably a reason it wasn't manufactured this short to begin with."
+	icon = 'modular_skyrat/modules/aesthetics/guns/icons/guns.dmi'
+	
+/obj/item/gun/ballistic/rifle/boltaction/brand_new
+	name = "\improper Mosin Nagant M39"
+	desc = "A freshly-produced Mosin Nagant variant issued by Nanotrasen for their interns. You would rather not damage it."
+	icon = 'modular_skyrat/modules/aesthetics/guns/icons/guns.dmi'
+	
+/obj/item/gun/ballistic/rifle/boltaction/brand_new/quartermaster
+	name = "\improper FTU 'Archangel' Mosin"
+	desc = "A very... Modernized MN91-30 rifle, the frame even feels a little flimsy. This thing was probably built with a conversion kit from spaceBay."
+	icon = 'modular_skyrat/modules/aesthetics/guns/icons/guns.dmi'
+	icon_state = "bubba"
+	mag_type = /obj/item/ammo_box/magazine/internal/boltaction/bubba
+	can_be_sawn_off = FALSE
+	realistic = TRUE
+	
+/obj/item/ammo_box/magazine/internal/boltaction/bubba
+	name = "mosin nagant extended internal magazine"
+	desc = "How did you get it out?"
+	ammo_type = /obj/item/ammo_casing/a762
+	caliber = CALIBER_A762
+	max_ammo = 8
+	multiload = TRUE