[READY]Armadyne Anti Trust Act Part 2: Return of The Ballistic Security (#27409)

* Update pistol.dm

* Update pistol.dm

* Update pistol.dm

* we fix the linter

* Update pistol.dm

* Update pistol.dmi

* Update pistol.dm

* this shit

* Update pistol.dm

* Update pistol.dm

* Update pistol.dm

* Update rifle.dm

* I am happy.

* Update vending.dm

* new file

* fire delay

* Create magazine.dm

* finally

* Update pistol.dm

* bazinga

* Update pistol.dm

* this is impossible

* Update magazine.dm

* mm

* as

* i forgot!

* Update pistol.dm

* what the hell are we doing

* Update pistol.dm

* Update security.dm

* Update pistol.dm

* what

* i fixed linter

* help me gordon

* Update allstar.dm

* Update tgstation.dme

* Update pistol.dm

* Update pistol.dm

* now what

* Update tgstation.dme

* i crave sex

* Update smg.dm

* Update magazine.dm

* Update pistol.dm

* Update sec_research.dm

* Update sec_research.dm

* accurate

* mmm

* Update tgstation.dme

* Update sec_research.dm

* Update all_nodes.dm

* don't you feel silly?

* Update all_nodes.dm

* Update tgstation.dme

* Update cargo_stuff.dm

* Update cargo_stuff.dm

* Update magazine.dm

* Update magazine.dm

* we are ready

* Update all_nodes.dm

* Update rifle.dm

* Update gun48x32.dmi

* Update rifle.dm

* bird

* Update rifle.dm

* Why

* its ready?

* what

* Update rifle.dm

* i wish i can die soon

* Update ammo.dmi

* more curious about the result

* Update rifle.dm

* mister mister president i want to die

* Update magazines.dm

* what

* fml lol

* Update gun40x32.dmi

* this is sick af

* Update rifle.dm

* what

* Update rifle.dm

* Update all_nodes.dm

* what

* Update rifle.dm

* Update all_nodes.dm

* yeah

* Update all_nodes.dm

* Update pistol.dm

* so

* Update sec_research.dm

* Update rifle.dm

* ready

* Update head.dmi

* wwhat

* Update gun40x32.dmi

* yeah

* ww got vything done

* we h int at a darker past

* yeah I know that there's no pleasing you

* Update magazines.dm

* Update sol_fed.dm

* mhm

* Update rifle.dm

* Update rifle.dm

* Update magazines.dm

* Update magazine.dm

* Update cargo_stuff.dm

* Update cargo_stuff.dm

* Update gun_redemption.dm

* what

* Update rifle.dm

* how did we mess this up so badly

* be more thorough next time?

* fixed

* Update pistol.dm

* Update rifle.dm

* Update rifle.dm

* stats and stats

* Update rifle.dm

* Update ammobox.dm

* Update beams.dm

* Update magazine.dm

* Update rifle.dm

* Update rifle.dm

* Update magazine.dm

* Update rifle.dm

* Update helmet.dmi

* this should fix it

* Update packs.dm

* Update rifle.dm

* why doesnt this work is beyond me

* Update shotgun.dm

* Update pistol.dm

* i pray this fix it before i die

* Update ammobox.dm

* this should work

* Update shotgun.dm

* this is utterly shit code thati should die for

* Update shotgun.dm

* fix the helmet

* Update sec_clothing_overrides.dm

* Update shotgun.dm

* what did i do

* what else?

* Update pistol.dm

* Update shotgun.dm

* an ode to joy

* Update rifle.dm

* Update pistol.dm

* here we go

* Update tgstation.dme

* Update tgstation.dme

* Update tgstation.dme

* so

* forgive yourself

* Update pistol.dmi

* Update pistol.dm

* Update magazine.dmi

* Update magazine.dmi

* it was also my plan

* mmm

* Update magazine.dm

* Update rifle.dm

* vanilla expanded

* yeah

* Update sec_research.dm

* silly

* Update all_nodes.dm

* yeah

* Update sec_research.dm

* yes

* can  you even say, my name

* Update shotgun.dm

* this is easier

* wonderful

* Update tgstation.dme

* Update tgstation.dme

* Update rifle.dm

* Update rifle.dm

* done

* Update tgstation.dme

* yeah

* Update tgstation.dme

* yes

* Update tgstation.dme

* Update shotgun.dm

* there

* yeah!

* it feels right

* Update helmet.dmi

* Update cargo_packs.dm

* Update peacekeeper_clothing.dm

---------

Co-authored-by: SpaceLoveSs13 <68121607+SpaceLoveSs13@users.noreply.github.com>

modular_skyrat/modules/blueshield/code/blueshield.dm

@@ -37,6 +37,8 @@
 		/obj/item/stack/spacecash/c500 = 3,
 		/obj/item/disk/nuclear/fake/obvious = 2,
 		/obj/item/clothing/head/collectable/captain = 4,
+		/obj/item/gun/energy/disabler/smoothbore = 1,
+		/obj/item/restraints/legcuffs/bola/energy = 10,
 	)
 
 	veteran_only = TRUE

modular_skyrat/modules/blueshield/code/closet.dm

@@ -39,8 +39,9 @@
 	new /obj/item/assembly/flash/handheld(src)
 	new /obj/item/restraints/handcuffs(src)
 	new /obj/item/storage/medkit/tactical/blueshield(src)
-	new /obj/item/choice_beacon/blueshield(src)
+	new /obj/item/choice_beacon/station_magistrate(src)
 	new /obj/item/storage/bag/garment/blueshield(src)
 	new /obj/item/mod/control/pre_equipped/blueshield(src)
 	new /obj/item/storage/box/glasseskit(src)
 	new /obj/item/storage/medkit/brute(src)
+	new /obj/item/storage/toolbox/guncase/skyrat/blueshield_cmg(src)

modular_skyrat/modules/blueshield/code/energy_resholver.dm

@@ -2,7 +2,7 @@
 //Icon and such by @EspeciallyStrange 'Calvin'
 
 /obj/item/gun/energy/e_gun/blueshield
-	name = "energy revolver"
+	name = "X-02 energy revolver"
 	desc = "An energy weapon fitted with self recharging-cells. Feels somewhat heavy to carry and would certainly hurt to get whacked by."
 	icon = 'modular_skyrat/modules/blueshield/icons/energy.dmi'
 	icon_state = "blackgrip"
@@ -33,23 +33,6 @@
 	can_charge = TRUE //In case you aren't charging fast enough, the recharge is meant to be slow on purpose
 	selfcharge = 1
 
-//Choice Beacon for blueshield
-
-/obj/item/choice_beacon/blueshield
-	name = "blueshield weapon beacon"
-	desc = "A single use beacon to deliver a weapon of your choice. Please only call this in your office"
-	company_source = "Sol Security Solution"
-	company_message = span_bold("Supply Pod incoming please stand by")
-
-/obj/item/choice_beacon/blueshield/generate_display_names()
-	var/static/list/selectable_gun_types = list(
-		"Energy Revolver" = /obj/item/gun/energy/e_gun/blueshield,
-		"Energy Carbine" = /obj/item/gun/energy/e_gun/stun/blueshield,
-		".585 SMG" = /obj/item/storage/toolbox/guncase/skyrat/xhihao_large_case/bogseo //This can obviously be replaced out with any gun of your choice for future coder
-	)
-
-	return selectable_gun_types
-
 //Blueshield Energy
 /obj/item/ammo_casing/energy/electrode/blueshield
 	e_cost = LASER_SHOTS(6, STANDARD_CELL_CHARGE)