Heads of staff once again get their guns (#12940)

* wewwww

* wew

* wew

* Update token_system.dm

* Update modular_skyrat/modules/blueshield/code/blueshield.dm

Co-authored-by: Dragonfruits <51841793+Spc-Dragonfruits@users.noreply.github.com>

* Update modular_skyrat/modules/sec_haul/code/guns/cmg.dm

Co-authored-by: Dragonfruits <51841793+Spc-Dragonfruits@users.noreply.github.com>

* Update modular_skyrat/modules/sec_haul/code/guns/cmg.dm

Co-authored-by: Dragonfruits <51841793+Spc-Dragonfruits@users.noreply.github.com>

* Revert "Update token_system.dm"

This reverts commit 0a1f2c1bee599e7223107c2e7e3aed6c7dd61016.

* Update MetaStation_skyrat.dmm

* wew

* Update KiloStation_skyrat.dmm

* Update security_officer.dm

* Update warden.dm

* Update bullets.dm

Co-authored-by: Dragonfruits <51841793+Spc-Dragonfruits@users.noreply.github.com>

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

@@ -17,7 +17,7 @@
 	new /obj/item/radio/headset/heads/captain/alt(src)
 	new /obj/item/radio/headset/heads/captain(src)
 	new /obj/item/storage/belt/sabre(src)
-	new /obj/item/gun/energy/e_gun(src)
+	new /obj/item/storage/box/gunset/pdh_captain(src) // SKYRAT EDIT ADDITION
 	new /obj/item/door_remote/captain(src)
 	new /obj/item/storage/photo_album/captain(src)
 
@@ -37,7 +37,7 @@
 	new /obj/item/storage/box/ids(src)
 	new /obj/item/megaphone/command(src)
 	new /obj/item/assembly/flash/handheld(src)
-	new /obj/item/gun/energy/e_gun(src)
+	new /obj/item/storage/box/gunset/pdh(src) // SKYRAT EDIT ADDITION
 	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/head_of_security.dm

@@ -52,9 +52,10 @@
 	id_trim = /datum/id_trim/job/head_of_security
 	uniform = /obj/item/clothing/under/rank/security/head_of_security
 	suit = /obj/item/clothing/suit/armor/hos/trenchcoat/black //SKYRAT EDIT CHANGE
-	suit_store = /obj/item/gun/energy/e_gun
+	//suit_store = /obj/item/gun/energy/e_gun SKYRAT EDIT REMOVAL
 	backpack_contents = list(
 		/obj/item/evidencebag = 1,
+		/obj/item/storage/box/gunset/glock18_hos = 1, // SKYRAT EDIT ADDITION
 		)
 	belt = /obj/item/modular_computer/tablet/pda/heads/hos
 	ears = /obj/item/radio/headset/heads/hos/alt

modular_skyrat/modules/blueshield/code/blueshield.dm

@@ -53,7 +53,9 @@
 	shoes = /obj/item/clothing/shoes/jackboots
 	ears = /obj/item/radio/headset/headset_bs/alt
 	glasses = /obj/item/clothing/glasses/hud/security/sunglasses
-	backpack_contents = list(/obj/item/storage/box/gunset/blueshield, /obj/item/melee/baton/security/loaded = 1)
+	backpack_contents = list(
+		/obj/item/storage/box/gunset/blueshield = 1,
+		/obj/item/melee/baton/security/loaded = 1,)
 	implants = list(/obj/item/implant/mindshield)
 	backpack = /obj/item/storage/backpack/blueshield
 	satchel = /obj/item/storage/backpack/satchel/blueshield
@@ -71,12 +73,20 @@
 	uniform = /obj/item/clothing/under/plasmaman/blueshield
 
 /obj/item/storage/box/gunset/blueshield
-	name = "Allstar SC-3 PDW 'Hellfire' Gunset"
+	name = "CMG-1 Gunset"
 	w_class = WEIGHT_CLASS_NORMAL
 
+/obj/item/gun/ballistic/automatic/cmg/nomag
+	spawnwithmagazine = FALSE
+
 /obj/item/storage/box/gunset/blueshield/PopulateContents()
 	. = ..()
-	new /obj/item/gun/energy/laser/hellgun/blueshield(src)
+	new /obj/item/gun/ballistic/automatic/cmg/nomag(src)
+	new /obj/item/ammo_box/magazine/cmgm45(src)
+	new /obj/item/ammo_box/magazine/cmgm45(src)
+	new /obj/item/ammo_box/magazine/cmgm45/lethal(src)
+	new /obj/item/ammo_box/magazine/cmgm45/lethal(src)
+	new /obj/item/suppressor(src)
 
 /obj/item/ammo_casing/energy/laser/hellfire/bs
 	projectile_type = /obj/projectile/beam/laser/hellfire

modular_skyrat/modules/nanotrasen_rep/code/nanotrasen_consultant.dm

@@ -58,7 +58,10 @@
 	suit = /obj/item/clothing/suit/armor/vest/nanotrasen_consultant
 	shoes = /obj/item/clothing/shoes/jackboots
 	head = /obj/item/clothing/head/nanotrasen_consultant
-	backpack_contents = list(/obj/item/melee/baton/telescopic)
+	backpack_contents = list(
+		/obj/item/melee/baton/telescopic = 1,
+		/obj/item/storage/box/gunset/nanotrasen_consultant = 1,
+		)
 
 	skillchips = list(/obj/item/skillchip/disk_verifier)
 
@@ -152,4 +155,3 @@
 	new /obj/item/storage/photo_album/personal(src)
 	new /obj/item/bedsheet/centcom(src)
 	new /obj/item/clothing/suit/hooded/wintercoat/centcom/nt_consultant(src)
-	new /obj/item/gun/energy/e_gun(src)

modular_skyrat/modules/sec_haul/code/guns/bullets.dm

@@ -213,7 +213,8 @@
 
 /obj/projectile/bullet/advanced/b12mm
 	name = "12.7x30mm bullet"
-	damage = 45
+	damage = 35
+	wound_bonus = 30
 	speed = 1
 
 /obj/item/ammo_casing/b12mm/rubber
@@ -229,7 +230,7 @@
 	name = "12.7x30mm beanbag slug"
 	icon_state = "bullet_r"
 	damage = 10
-	stamina = 50
+	stamina = 35
 	ricochets_max = 6
 	ricochet_incidence_leeway = 0
 	ricochet_chance = 130
@@ -250,7 +251,7 @@
 /obj/projectile/bullet/advanced/b12mm/hp
 	name = "12mm hollowpoint bullet"
 	icon_state = "bullet_h"
-	damage = 47
+	damage = 35
 	wound_bonus = 40
 	embedding = list(embed_chance=75, fall_chance=3, jostle_chance=4, ignore_throwspeed_threshold=TRUE, pain_stam_pct=0.4, pain_mult=5, jostle_pain_mult=6, rip_time=10)
 	weak_against_armour = TRUE

modular_skyrat/modules/sec_haul/code/guns/cmg.dm

@@ -25,6 +25,7 @@
 	empty_indicator = TRUE
 
 /obj/item/ammo_box/magazine/cmgm45
+	name = "\improper CMG-1 magazine (non-lethal)"
 	icon_state = "c20r45-24"
 	base_icon_state = "c20r45"
 	ammo_type = /obj/item/ammo_casing/c45/rubber
@@ -36,6 +37,7 @@
 	icon_state = "[base_icon_state]-[round(ammo_count(), 2)]"
 
 /obj/item/ammo_box/magazine/cmgm45/lethal
+	name = "\improper CMG-1 magazine (lethal)"
 	ammo_type = /obj/item/ammo_casing/c45
 
 /obj/item/ammo_casing/c45/rubber