From 349a3325ec48b97a21edbb00fc943e054f6498f1 Mon Sep 17 00:00:00 2001
From: Zonespace <41448081+Zonespace27@users.noreply.github.com>
Date: Sat, 23 Apr 2022 09:34:08 -0700
Subject: [PATCH] Adds Gun Cargo (#12632)

* mega-commit

* js fix 1

* js fix 2

* documentation1

* balance?

* balance pass

* 2 -> 20 mins

* m90 increase

* thanks prophet (balance and stuff)

* more touchups

* mini correction

* cmg update

* tgui fix

* this took me too long

* permit pin removal (testing)

* price bump

* accidental commit

* ammo cheapening

* weh

* this is incredibly embarassing

* woo

* woo

* pepperballs

* permit-pins are lame anyway

* dep guards get permits

* CI fix

* model75 increase

* fix lint

* model75 removal

* Update cargo_stuff.dm

* ZONESPACE REEEEE

* not the bluie's anymore

* interdyne company fixes and stuff

* fix

* fix2

* nagant revolver removal

* threshold changes

* undo

* techshell to dynamics

* mag cost 3.5 -> 3

* dynamics 10mm auto

* ammo gens manifest

* ladon/osprey price changes

* if ixed it for you sir

* assault rifle rebalancing

* review

* Update modular_skyrat/modules/gun_cargo/code/datums/cargo_pack.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>

* Apply suggestions from code review

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

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

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

* weh

* add disabler crates back

Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
Co-authored-by: Dragonfruits <51841793+Spc-Dragonfruits@users.noreply.github.com>
---
 code/__DEFINES/atom_hud.dm                    |   8 +-
 code/__DEFINES/~skyrat_defines/armaments.dm   |  33 ++
 code/__DEFINES/~skyrat_defines/gun.dm         |  20 +
 code/__DEFINES/~skyrat_defines/projectiles.dm |   6 +
 code/__DEFINES/~skyrat_defines/span.dm        |   4 +
 code/controllers/subsystem/shuttle.dm         |   4 +
 code/datums/hud.dm                            |   1 +
 code/game/data_huds.dm                        |  10 +-
 .../crates_lockers/closets/secure/cargo.dm    |   1 +
 .../crates_lockers/closets/secure/security.dm |   5 +
 code/modules/cargo/goodies.dm                 |   8 +-
 code/modules/cargo/orderconsole.dm            |  11 +
 code/modules/cargo/packs.dm                   |  23 +-
 .../mob/living/carbon/human/human_defines.dm  |   2 +-
 .../file_system/programs/budgetordering.dm    |  10 +
 .../projectiles/guns/ballistic/pistol.dm      |   2 +-
 .../security_levels/keycard_authentication.dm |  12 +
 code/modules/shuttle/supply.dm                |   1 +
 code/modules/uplink/uplink_items/nukeops.dm   |   6 +-
 interface/stylesheet.dm                       |   4 +
 .../projectiles/guns/ballistic/automatic.dm   |  21 +-
 .../code/modules/projectiles/guns/gun.dm      |  43 ++
 .../master_files/icons/mob/huds/hud.dmi       | Bin 12691 -> 12766 bytes
 .../modules/ERT_Factions/FTU/code/items.dm    |   4 +-
 .../modules/aesthetics/guns/code/guns.dm      |  15 +-
 .../armaments/code/armament_component.dm      |   3 -
 .../code/armaments/_armament_primary.dm       |   6 -
 .../code/armaments/_armaments_secondary.dm    |   5 -
 .../code/armaments/armament_headgear.dm       |   4 -
 .../code/armaments/armament_medical.dm        |   5 -
 .../code/armaments/armament_melee.dm          |   4 -
 .../code/armaments/_armament_primary.dm       |   2 -
 .../modules/blueshield/code/blueshield.dm     |   4 +-
 modular_skyrat/modules/cargo/code/goodies.dm  | 120 ----
 modular_skyrat/modules/cargo/code/packs.dm    | 125 -----
 .../modules/goofsec/code/department_guards.dm |  20 +-
 .../modules/goofsec/code/projectiles.dm       |   6 +
 .../gun_cargo/code/armament_component.dm      | 516 ++++++++++++++++++
 .../gun_cargo/code/armament_datums/allstar.dm |  62 +++
 .../code/armament_datums/armadyne.dm          |  69 +++
 .../code/armament_datums/armadyne_oldarms.dm  |  58 ++
 .../gun_cargo/code/armament_datums/bolt.dm    |  60 ++
 .../code/armament_datums/cantalan.dm          |  81 +++
 .../code/armament_datums/dynamics.dm          | 119 ++++
 .../code/armament_datums/interdyne.dm         |  64 +++
 .../gun_cargo/code/armament_datums/izhevsk.dm |  50 ++
 .../gun_cargo/code/armament_datums/micron.dm  | 142 +++++
 .../code/armament_datums/nanotrasen.dm        |  55 ++
 .../code/armament_datums/parent_armament.dm   |  20 +
 .../code/armament_datums/scarborough.dm       |  64 +++
 .../modules/gun_cargo/code/company_datums.dm  | 113 ++++
 .../gun_cargo/code/datums/cargo_order.dm      |  29 +
 .../gun_cargo/code/datums/cargo_pack.dm       |  13 +
 .../modules/gun_cargo/code/datums/hud.dm      |   2 +
 .../modules/gun_cargo/code/gun_companies.dm   |  39 ++
 .../modules/gun_cargo/code/gun_subsystem.dm   | 150 +++++
 .../modules/gun_cargo/code/objects/access.dm  |   8 +
 .../gun_cargo/code/objects/ammo_boxes.dm      | 130 +++++
 .../modules/gun_cargo/code/objects/box.dm     |  15 +
 .../gun_cargo/code/objects/cargo_console.dm   |   3 +
 .../gun_cargo/code/objects/firing_pin.dm      |  34 ++
 .../gun_cargo/code/objects/guns/interdyne.dm  |  28 +
 .../gun_cargo/code/objects/hud_glasses.dm     |   7 +
 .../gun_cargo/code/objects/keycard_auth.dm    |   4 +
 .../modules/gun_cargo/icons/ammo.dmi          | Bin 0 -> 541 bytes
 .../modules/gun_cargo/icons/honeybee.dmi      | Bin 0 -> 595 bytes
 .../modules/gun_cargo/icons/hud_goggles.dmi   | Bin 0 -> 302 bytes
 .../gun_cargo/icons/hud_goggles_worn.dmi      | Bin 0 -> 288 bytes
 .../modules/gunsgalore/code/guns/akm.dm       |   3 +-
 .../modules/gunsgalore/code/guns/luger.dm     |   1 +
 .../modules/gunsgalore/code/guns/mp40.dm      |   1 +
 .../modules/gunsgalore/code/guns/ppsh.dm      |   1 +
 .../modules/gunsgalore/code/guns/stg.dm       |   1 +
 .../modules/mapping/code/shuttles.dm          |   4 +-
 .../modules/microfusion/code/cargo_stuff.dm   |   7 +-
 .../modules/microfusion/code/gun_types.dm     |  10 +-
 .../modular_weapons/code/autolathe_designs.dm |  42 +-
 .../modules/modular_weapons/code/automatic.dm |  38 +-
 .../modules/modular_weapons/code/energy.dm    |  11 +-
 .../code/modular_projectiles.dm               | 193 ++++++-
 .../modules/modular_weapons/code/pistol.dm    |  38 +-
 .../modules/modular_weapons/code/revolver.dm  |   3 +
 .../modules/modular_weapons/code/rifle.dm     |  20 +-
 .../modular_weapons/icons/obj/ammo.dmi        | Bin 4637 -> 2182 bytes
 .../sec_haul/code/guns/armory_spawns.dm       |   9 +
 .../modules/sec_haul/code/guns/guns.dm        |  59 +-
 .../sec_haul/code/guns/pepperball_gun.dm      |   6 +-
 .../code/guns/token_system/gunsets.dm         |   7 +-
 .../modules/sec_haul/code/misc/packs.dm       |  17 -
 tgstation.dme                                 |  26 +
 .../tgui-panel/styles/goon/chat-dark.scss     |  20 +
 .../tgui-panel/styles/goon/chat-light.scss    |  20 +
 tgui/packages/tgui/interfaces/Cargo.js        |   9 +
 .../tgui/interfaces/CargoGunConsole.js        | 201 +++++++
 tgui/packages/tgui/interfaces/KeycardAuth.js  |   8 +-
 95 files changed, 2778 insertions(+), 470 deletions(-)
 create mode 100644 modular_skyrat/modules/gun_cargo/code/armament_component.dm
 create mode 100644 modular_skyrat/modules/gun_cargo/code/armament_datums/allstar.dm
 create mode 100644 modular_skyrat/modules/gun_cargo/code/armament_datums/armadyne.dm
 create mode 100644 modular_skyrat/modules/gun_cargo/code/armament_datums/armadyne_oldarms.dm
 create mode 100644 modular_skyrat/modules/gun_cargo/code/armament_datums/bolt.dm
 create mode 100644 modular_skyrat/modules/gun_cargo/code/armament_datums/cantalan.dm
 create mode 100644 modular_skyrat/modules/gun_cargo/code/armament_datums/dynamics.dm
 create mode 100644 modular_skyrat/modules/gun_cargo/code/armament_datums/interdyne.dm
 create mode 100644 modular_skyrat/modules/gun_cargo/code/armament_datums/izhevsk.dm
 create mode 100644 modular_skyrat/modules/gun_cargo/code/armament_datums/micron.dm
 create mode 100644 modular_skyrat/modules/gun_cargo/code/armament_datums/nanotrasen.dm
 create mode 100644 modular_skyrat/modules/gun_cargo/code/armament_datums/parent_armament.dm
 create mode 100644 modular_skyrat/modules/gun_cargo/code/armament_datums/scarborough.dm
 create mode 100644 modular_skyrat/modules/gun_cargo/code/company_datums.dm
 create mode 100644 modular_skyrat/modules/gun_cargo/code/datums/cargo_order.dm
 create mode 100644 modular_skyrat/modules/gun_cargo/code/datums/cargo_pack.dm
 create mode 100644 modular_skyrat/modules/gun_cargo/code/datums/hud.dm
 create mode 100644 modular_skyrat/modules/gun_cargo/code/gun_companies.dm
 create mode 100644 modular_skyrat/modules/gun_cargo/code/gun_subsystem.dm
 create mode 100644 modular_skyrat/modules/gun_cargo/code/objects/access.dm
 create mode 100644 modular_skyrat/modules/gun_cargo/code/objects/ammo_boxes.dm
 create mode 100644 modular_skyrat/modules/gun_cargo/code/objects/box.dm
 create mode 100644 modular_skyrat/modules/gun_cargo/code/objects/cargo_console.dm
 create mode 100644 modular_skyrat/modules/gun_cargo/code/objects/firing_pin.dm
 create mode 100644 modular_skyrat/modules/gun_cargo/code/objects/guns/interdyne.dm
 create mode 100644 modular_skyrat/modules/gun_cargo/code/objects/hud_glasses.dm
 create mode 100644 modular_skyrat/modules/gun_cargo/code/objects/keycard_auth.dm
 create mode 100644 modular_skyrat/modules/gun_cargo/icons/ammo.dmi
 create mode 100644 modular_skyrat/modules/gun_cargo/icons/honeybee.dmi
 create mode 100644 modular_skyrat/modules/gun_cargo/icons/hud_goggles.dmi
 create mode 100644 modular_skyrat/modules/gun_cargo/icons/hud_goggles_worn.dmi
 create mode 100644 tgui/packages/tgui/interfaces/CargoGunConsole.js

diff --git a/code/__DEFINES/atom_hud.dm b/code/__DEFINES/atom_hud.dm
index 26e7b4ec2f7..f95d8029c08 100644
--- a/code/__DEFINES/atom_hud.dm
+++ b/code/__DEFINES/atom_hud.dm
@@ -44,9 +44,12 @@
 #define ANTAG_HUD "23"
 // for fans to identify pins
 #define FAN_HUD "24"
-//SKYRAT EDIT ADDITION - GUNHUD
-// ammo of guns
+//SKYRAT EDIT START
+/// ammo of guns
 #define AMMO_HUD	"25"
+/// if they have a gun permit
+#define PERMIT_HUD "26"
+//SKYRAT EDIT END
 
 //by default everything in the hud_list of an atom is an image
 //a value in hud_list with one of these will change that behavior
@@ -64,6 +67,7 @@
 #define DATA_HUD_SENTIENT_DISEASE 8
 #define DATA_HUD_AI_DETECT 9
 #define DATA_HUD_FAN 10
+#define DATA_HUD_PERMIT 11 //SKYRAT EDIT
 
 // Notification action types
 #define NOTIFY_JUMP "jump"
diff --git a/code/__DEFINES/~skyrat_defines/armaments.dm b/code/__DEFINES/~skyrat_defines/armaments.dm
index 198e7931446..e73bc8664a7 100644
--- a/code/__DEFINES/~skyrat_defines/armaments.dm
+++ b/code/__DEFINES/~skyrat_defines/armaments.dm
@@ -8,3 +8,36 @@
 /// To identify the limit of the category type in the associative list. Techical stuff.
 #define CATEGORY_LIMIT "Category Limit"
 #define CATEGORY_ENTRY "Category Entry"
+
+// All the categories
+#define ARMAMENT_CATEGORY_MELEE "Melee Weapons"
+#define ARMAMENT_CATEGORY_MELEE_LIMIT 1
+#define ARMAMENT_CATEGORY_PRIMARY "Primary Weapons"
+#define ARMAMENT_CATEGORY_PRIMARY_LIMIT 1
+#define ARMAMENT_CATEGORY_SECONDARY "Secondary Weapons"
+#define ARMAMENT_CATEGORY_SECONDARY_LIMIT 1
+#define ARMAMENT_CATEGORY_ARMOR_HEAD "Headgear"
+#define ARMAMENT_CATEGORY_ARMOR_HEAD_LIMIT 1
+#define ARMAMENT_CATEGORY_MEDICAL "Medical Supplies"
+#define ARMAMENT_CATEGORY_MEDICAL_LIMIT 5
+
+
+// All the subcategories
+#define ARMAMENT_SUBCATEGORY_AMMO "Ammunition"
+#define ARMAMENT_SUBCATEGORY_MELEE_LETHAL "Lethal Weaponry"
+#define ARMAMENT_SUBCATEGORY_MELEE_NONLETHAL "Non-Lethal Weaponry"
+#define ARMAMENT_SUBCATEGORY_SUBMACHINEGUN "Submachine Guns"
+#define ARMAMENT_SUBCATEGORY_ASSAULTRIFLE "Assault Rifles"
+#define ARMAMENT_SUBCATEGORY_SPECIAL "Special Weapons"
+#define ARMAMENT_SUBCATEGORY_PISTOL "Pistols"
+#define ARMAMENT_SUBCATEGORY_HELMET "Helmets"
+#define ARMAMENT_SUBCATEGORY_BERETS "Berets"
+#define ARMAMENT_SUBCATEGORY_MEDKIT "Medkits"
+#define ARMAMENT_SUBCATEGORY_INJECTOR "Injectors"
+#define ARMAMENT_SUBCATEGORY_SHOTGUN "Shotguns"
+#define ARMAMENT_SUBCATEGORY_LASER "Laser Weaponry"
+#define ARMAMENT_SUBCATEGORY_ARMOR "Armor"
+#define ARMAMENT_SUBCATEGORY_GUNPART "Gun Parts"
+#define ARMAMENT_SUBCATEGORY_EMITTER "Phase Emitter"
+#define ARMAMENT_SUBCATEGORY_CELL_UPGRADE "Cell Upgrade"
+#define ARMAMENT_SUBCATEGORY_CHEMICAL "Chemicals"
diff --git a/code/__DEFINES/~skyrat_defines/gun.dm b/code/__DEFINES/~skyrat_defines/gun.dm
index 05ce5118a30..da453fe6525 100644
--- a/code/__DEFINES/~skyrat_defines/gun.dm
+++ b/code/__DEFINES/~skyrat_defines/gun.dm
@@ -1,3 +1,23 @@
 #define SELECT_SEMI_AUTOMATIC 1
 #define SELECT_BURST_SHOT 2
 #define SELECT_FULLY_AUTOMATIC 3
+
+// Bitflags for what company produces the gun
+#define COMPANY_CANTALAN (1<<0)
+#define COMPANY_ARMADYNE (1<<1)
+#define COMPANY_SCARBOROUGH (1<<2)
+#define COMPANY_DONK (1<<3)
+#define COMPANY_BOLT (1<<4)
+#define COMPANY_OLDARMS (1<<5)
+#define COMPANY_IZHEVSK (1<<6)
+#define COMPANY_NANOTRASEN (1<<7)
+#define COMPANY_ALLSTAR (1<<8)
+#define COMPANY_MICRON (1<<9)
+#define COMPANY_DYNAMICS (1<<10)
+#define COMPANY_INTERDYNE (1<<12)
+
+#define COMPANY_INTEREST_GUN 10
+#define COMPANY_INTEREST_CHEMICAL 5
+#define COMPANY_INTEREST_ATTACHMENT 4
+#define COMPANY_INTEREST_AMMO_BULK 3
+#define COMPANY_INTEREST_AMMO 1
diff --git a/code/__DEFINES/~skyrat_defines/projectiles.dm b/code/__DEFINES/~skyrat_defines/projectiles.dm
index a15127a4872..96e0e61a103 100644
--- a/code/__DEFINES/~skyrat_defines/projectiles.dm
+++ b/code/__DEFINES/~skyrat_defines/projectiles.dm
@@ -15,3 +15,9 @@
 #define CALIBER_14GAUGE "14 Gauge"
 
 #define CALIBER_50BMG ".50 BMG"
+
+/// The caliber used by the CFA Lynx.
+#define CALIBER_42X30MM "4.2x30mm"
+
+/// The caliber used by the Catanheim.
+#define CALIBER_A68 "a68"
diff --git a/code/__DEFINES/~skyrat_defines/span.dm b/code/__DEFINES/~skyrat_defines/span.dm
index 50ba89e5094..df1212e462a 100644
--- a/code/__DEFINES/~skyrat_defines/span.dm
+++ b/code/__DEFINES/~skyrat_defines/span.dm
@@ -13,3 +13,7 @@
 #define span_crossooc(str) ("<span class='crossooc'>" + str + "</span>")
 #define span_crossasay(str) ("<span class='crossasay'>" + str + "</span>")
 #define span_doyourjobidiot(str) ("<span class='doyourjobidiot'>" + str + "</span>")
+#define span_brown(str) ("<span class='brown'>" + str + "</span>")
+#define span_cyan(str) ("<span class='cyan'>" + str + "</span>")
+#define span_orange(str) ("<span class='orange'>" + str + "</span>")
+#define span_yellow(str) ("<span class='yellow'>" + str + "</span>")
diff --git a/code/controllers/subsystem/shuttle.dm b/code/controllers/subsystem/shuttle.dm
index 6d67cee0f61..8651146f8cc 100644
--- a/code/controllers/subsystem/shuttle.dm
+++ b/code/controllers/subsystem/shuttle.dm
@@ -140,6 +140,10 @@ SUBSYSTEM_DEF(shuttle)
 	while(length(pack_processing))
 		var/datum/supply_pack/pack = pack_processing[length(pack_processing)]
 		pack_processing.len--
+		//SKYRAT EDIT START
+		if(pack == /datum/supply_pack/armament)
+			continue
+		//SKYRAT EDIT END
 		if(ispath(pack, /datum/supply_pack))
 			pack = new pack
 
diff --git a/code/datums/hud.dm b/code/datums/hud.dm
index 003ca63c5bc..fb5ef579490 100644
--- a/code/datums/hud.dm
+++ b/code/datums/hud.dm
@@ -14,6 +14,7 @@ GLOBAL_LIST_INIT(huds, list(
 	DATA_HUD_SENTIENT_DISEASE = new/datum/atom_hud/sentient_disease(),
 	DATA_HUD_AI_DETECT = new/datum/atom_hud/ai_detector(),
 	DATA_HUD_FAN = new/datum/atom_hud/data/human/fan_hud(),
+	DATA_HUD_PERMIT = new/datum/atom_hud/data/human/permit(), // SKYRAT EDIT
 ))
 
 /datum/atom_hud
diff --git a/code/game/data_huds.dm b/code/game/data_huds.dm
index ec771a9096c..ca1b6e5e129 100644
--- a/code/game/data_huds.dm
+++ b/code/game/data_huds.dm
@@ -47,7 +47,7 @@
 	hud_icons = list(ID_HUD)
 
 /datum/atom_hud/data/human/security/advanced
-	hud_icons = list(ID_HUD, IMPTRACK_HUD, IMPLOYAL_HUD, IMPCHEM_HUD, WANTED_HUD)
+	hud_icons = list(ID_HUD, IMPTRACK_HUD, IMPLOYAL_HUD, IMPCHEM_HUD, WANTED_HUD, PERMIT_HUD) //SKYRAT EDIT: ADD PERMIT_HUD
 
 /datum/atom_hud/data/human/fan_hud
 	hud_icons = list(FAN_HUD)
@@ -252,6 +252,14 @@ Security HUDs! Basic mode shows only the job.
 		sechud_icon_state = "hudno_id"
 	holder.icon_state = sechud_icon_state
 	sec_hud_set_security_status()
+	//SKYRAT EDIT START
+	var/image/permit_holder = hud_list[PERMIT_HUD]
+	permit_holder.pixel_y = I.Height() - world.icon_size
+	var/permit_icon_state = wear_id?.get_gun_permit_iconstate()
+	if(!permit_icon_state)
+		permit_icon_state = "hudfan_no"
+	permit_holder.icon_state = permit_icon_state
+	//SKYRAT EDIT END
 
 /mob/living/proc/sec_hud_set_implants()
 	var/image/holder
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
index 6bd7094b146..dd0c3c3d100 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
@@ -30,3 +30,4 @@
 	new /obj/item/clothing/suit/hooded/wintercoat/qm(src)
 	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!
 	new /obj/item/cargo_teleporter(src) // SKYRAT EDIT - Adds a cargo teleporter to QM locker, so they can intice others to research it
+	new /obj/item/clothing/glasses/hud/gun_permit(src) //SKYRAT EDIT - GUN CARGO
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
index 596e56c69c9..86727f3a8ac 100755
--- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
@@ -133,6 +133,8 @@
 	new /obj/item/assembly/flash/handheld(src)
 	new /obj/item/melee/baton/security/loaded/departmental/cargo(src)
 	new /obj/item/clothing/glasses/hud/security(src)
+	new /obj/item/clothing/glasses/hud/gun_permit(src)
+	new /obj/item/storage/box/gunset/pepperball(src)
 
 /obj/structure/closet/secure_closet/security/engine
 	name = "\proper engineering guard's locker"
@@ -150,6 +152,7 @@
 	new /obj/item/assembly/flash/handheld(src)
 	new /obj/item/melee/baton/security/loaded/departmental/engineering(src)
 	new /obj/item/clothing/glasses/hud/security(src)
+	new /obj/item/storage/box/gunset/pepperball(src)
 
 /obj/structure/closet/secure_closet/security/science
 	name = "\proper science guard's locker"
@@ -167,6 +170,7 @@
 	new /obj/item/assembly/flash/handheld(src)
 	new /obj/item/melee/baton/security/loaded/departmental/science(src)
 	new /obj/item/clothing/glasses/hud/security(src)
+	new /obj/item/storage/box/gunset/pepperball(src)
 
 /obj/structure/closet/secure_closet/security/med
 	name = "\proper orderly's locker"
@@ -184,6 +188,7 @@
 	new /obj/item/assembly/flash/handheld(src)
 	new /obj/item/melee/baton/security/loaded/departmental/medical(src)
 	new /obj/item/clothing/glasses/hud/security(src)
+	new /obj/item/storage/box/gunset/pepperball(src)
 // SKYRAT EDIT CHANGE END -- GOOFSEC DEP GUARDS
 
 /obj/structure/closet/secure_closet/detective
diff --git a/code/modules/cargo/goodies.dm b/code/modules/cargo/goodies.dm
index a9619f07f38..646ec634a9b 100644
--- a/code/modules/cargo/goodies.dm
+++ b/code/modules/cargo/goodies.dm
@@ -3,7 +3,7 @@
 	access = NONE
 	group = "Goodies"
 	goody = TRUE
-
+/* // SKYRAT EDIT START - CARGO GUN
 /datum/supply_pack/goody/dumdum38
 	name = ".38 DumDum Speedloader"
 	desc = "Contains one speedloader of .38 DumDum ammunition, good for embedding in soft targets."
@@ -31,7 +31,7 @@
 	cost = PAYCHECK_HARD * 40 //they really mean a premium here
 	access_view = ACCESS_FORENSICS
 	contains = list(/obj/item/gun/ballistic/revolver/detective)
-
+*/ //SKYRAT EDIT END
 /datum/supply_pack/goody/stingbang
 	name = "Stingbang Single-Pack"
 	desc = "Contains one \"stingbang\" grenade, perfect for playing meanhearted pranks."
@@ -44,7 +44,7 @@
 	desc = "Contains one sharpened survival knive. Guaranteed to fit snugly inside any Nanotrasen-standard boot. Weapons permit not included." //SKYRAT EDIT - CONTRABAND CLARIFICATION
 	cost = PAYCHECK_HARD * 1.75
 	contains = list(/obj/item/knife/combat/survival)
-
+/* //SKYRAT EDIT START - GUN CARGO
 /datum/supply_pack/goody/ballistic_single
 	name = "Combat Shotgun Single-Pack"
 	desc = "For when the enemy absolutely needs to be replaced with lead. Contains one Aussec-designed Combat Shotgun, and one Shotgun Bandolier."
@@ -72,7 +72,7 @@
 	cost = PAYCHECK_HARD * 15
 	access_view = ACCESS_ARMORY
 	contains = list(/obj/item/storage/belt/holster/thermal)
-
+*/ //SKYRAT EDIT END
 
 /datum/supply_pack/goody/sologamermitts
 	name = "Insulated Gloves Single-Pack"
diff --git a/code/modules/cargo/orderconsole.dm b/code/modules/cargo/orderconsole.dm
index 31a4550dfdf..223e58aa555 100644
--- a/code/modules/cargo/orderconsole.dm
+++ b/code/modules/cargo/orderconsole.dm
@@ -282,6 +282,11 @@
 				if(SO.applied_coupon)
 					say("Coupon refunded.")
 					SO.applied_coupon.forceMove(get_turf(src))
+				//SKYRAT EDIT START
+				if(istype(SO, /datum/supply_order/armament))
+					var/datum/supply_order/armament/the_order = SO
+					the_order.reimburse_armament()
+				//SKYRAT EDIT END
 				SSshuttle.shopping_list -= SO
 				. = TRUE
 				break
@@ -312,6 +317,12 @@
 		if("toggleprivate")
 			self_paid = !self_paid
 			. = TRUE
+		//SKYRAT EDIT START
+		if("gun_window")
+			var/datum/component/armament/cargo_gun/gun_comp = GetComponent(/datum/component/armament/cargo_gun)
+			gun_comp.ui_interact(usr)
+			. = TRUE
+		//SKYRAT EDIT END
 	if(.)
 		post_signal(cargo_shuttle)
 
diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm
index dab679eef00..dd3a904e422 100644
--- a/code/modules/cargo/packs.dm
+++ b/code/modules/cargo/packs.dm
@@ -279,7 +279,7 @@
 	group = "Security"
 	access = ACCESS_SECURITY
 	crate_type = /obj/structure/closet/crate/secure/gear
-
+/* //SKYRAT EDIT START - CARGO ARMAMENTS
 /datum/supply_pack/security/ammo
 	name = "Ammo Crate"
 	desc = "Contains three boxes of beanbag shotgun shells, three boxes of rubbershot shotgun shells and one of each special .38 speedloarders. Requires Security access to open."
@@ -295,7 +295,7 @@
 					/obj/item/ammo_box/c38/hotshot,
 					/obj/item/ammo_box/c38/iceblox)
 	crate_name = "ammo crate"
-
+*/ //SKYRAT EDIT END
 /* SKYRAT EDIT: Moved to Bloat.dm	name = "Armor Crate"
 /datum/supply_pack/security/armor
 	name = "Armor Crate"
@@ -305,20 +305,19 @@
 	contains = list(/obj/item/clothing/suit/armor/vest,
 					/obj/item/clothing/suit/armor/vest,
 					/obj/item/clothing/suit/armor/vest)
-	crate_name = "armor crate" */
-
+	crate_name = "armor crate"
+*/ //SKYRAT EDIT END
 
 /datum/supply_pack/security/disabler
 	name = "Disabler Crate"
 	desc = "Three stamina-draining disabler weapons. Requires Security access to open."
-	cost = CARGO_CRATE_VALUE * 3
+	cost = CARGO_CRATE_VALUE * 5 //SKYRAT EDIT 3 -> 5
 	access_view = ACCESS_SECURITY
 	contains = list(/obj/item/gun/energy/disabler,
 					/obj/item/gun/energy/disabler,
 					/obj/item/gun/energy/disabler)
 	crate_name = "disabler crate"
 
-
 /datum/supply_pack/security/forensics
 	name = "Forensics Crate"
 	desc = "Stay hot on the criminal's heels with Nanotrasen's Detective Essentials(tm). Contains a forensics scanner, six evidence bags, camera, tape recorder, white crayon, and of course, a fedora. Requires Security access to open."
@@ -341,7 +340,7 @@
 					/obj/item/clothing/head/helmet/sec)
 	crate_name = "helmet crate"
 
-
+/* //SKYRAT EDIT START - CARGO ARMAMENTS
 /datum/supply_pack/security/laser
 	name = "Lasers Crate"
 	desc = "Contains three lethal, high-energy laser guns. Requires Security access to open."
@@ -351,7 +350,7 @@
 					/obj/item/gun/energy/laser,
 					/obj/item/gun/energy/laser)
 	crate_name = "laser crate"
-
+*/ //SKYRAT EDIT END
 
 /datum/supply_pack/security/securitybarriers
 	name = "Security Barrier Grenades"
@@ -496,7 +495,7 @@
 	cost = CARGO_CRATE_VALUE * 3.5
 	contains = list(/obj/item/storage/box/chemimp)
 	crate_name = "chemical implant crate"
-
+/* //SKYRAT EDIT START - CARGO ARMAMENTS
 /datum/supply_pack/security/armory/ballistic
 	name = "Combat Shotguns Crate"
 	desc = "For when the enemy absolutely needs to be replaced with lead. Contains three Aussec-designed Combat Shotguns, and three Shotgun Bandoliers. Requires Armory access to open."
@@ -527,7 +526,7 @@
 					/obj/item/gun/energy/e_gun)
 	crate_name = "energy gun crate"
 	crate_type = /obj/structure/closet/crate/secure/plasma
-
+*/ //SKYRAT EDIT END
 
 /datum/supply_pack/security/armory/exileimp
 	name = "Exile Implants Crate"
@@ -651,7 +650,7 @@
 					/obj/item/clothing/gloves/tackler/combat,
 					/obj/item/clothing/gloves/tackler/combat)
 	crate_name = "swat crate"
-
+/* //SKYRAT EDIT START - CARGO ARMAMENTS
 /datum/supply_pack/security/armory/thermal
 	name = "Thermal Pistol Crate"
 	desc = "Contains a pair of holsters each with two experimental thermal pistols, using nanites as the basis for their ammo. Requires Armory access to open."
@@ -659,7 +658,7 @@
 	contains = list(/obj/item/storage/belt/holster/thermal,
 					/obj/item/storage/belt/holster/thermal)
 	crate_name = "thermal pistol crate"
-
+*/ //SKYRAT EDIT END
 //////////////////////////////////////////////////////////////////////////////
 //////////////////////////// Engineering /////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////
diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm
index 0ecd0665627..a4e6e5e828e 100644
--- a/code/modules/mob/living/carbon/human/human_defines.dm
+++ b/code/modules/mob/living/carbon/human/human_defines.dm
@@ -5,7 +5,7 @@
 	icon = 'icons/mob/human.dmi'
 	icon_state = "human_basic"
 	appearance_flags = KEEP_TOGETHER|TILE_BOUND|PIXEL_SCALE|LONG_GLIDE
-	hud_possible = list(HEALTH_HUD,STATUS_HUD,ID_HUD,WANTED_HUD,IMPLOYAL_HUD,IMPCHEM_HUD,IMPTRACK_HUD,ANTAG_HUD,GLAND_HUD,SENTIENT_DISEASE_HUD,FAN_HUD)
+	hud_possible = list(HEALTH_HUD,STATUS_HUD,ID_HUD,WANTED_HUD,IMPLOYAL_HUD,IMPCHEM_HUD,IMPTRACK_HUD,ANTAG_HUD,GLAND_HUD,SENTIENT_DISEASE_HUD,FAN_HUD,PERMIT_HUD) //SKYRAT EDIT: ADD PERMIT_HUD
 	hud_type = /datum/hud/human
 	pressure_resistance = 25
 	can_buckle = TRUE
diff --git a/code/modules/modular_computers/file_system/programs/budgetordering.dm b/code/modules/modular_computers/file_system/programs/budgetordering.dm
index d128399804b..b7fad7e93b7 100644
--- a/code/modules/modular_computers/file_system/programs/budgetordering.dm
+++ b/code/modules/modular_computers/file_system/programs/budgetordering.dm
@@ -278,6 +278,16 @@
 		if("toggleprivate")
 			self_paid = !self_paid
 			. = TRUE
+		//SKYRAT EDIT START
+		if("gun_window")
+			var/datum/component/armament/cargo_gun/gun_comp = holder.holder.GetComponent(/datum/component/armament/cargo_gun)
+			if(!gun_comp)
+				holder.holder.AddComponent(/datum/component/armament/cargo_gun, subtypesof(/datum/armament_entry/cargo_gun), 0)
+			gun_comp = holder.holder.GetComponent(/datum/component/armament/cargo_gun)
+			gun_comp.parent_prog ||= src
+			gun_comp.ui_interact(usr)
+			. = TRUE
+		//SKYRAT EDIT END
 	if(.)
 		post_signal(cargo_shuttle)
 
diff --git a/code/modules/projectiles/guns/ballistic/pistol.dm b/code/modules/projectiles/guns/ballistic/pistol.dm
index 411bd7f89bd..a72248ccae8 100644
--- a/code/modules/projectiles/guns/ballistic/pistol.dm
+++ b/code/modules/projectiles/guns/ballistic/pistol.dm
@@ -76,7 +76,7 @@
 
 /obj/item/gun/ballistic/automatic/pistol/aps
 	name = "stechkin APS machine pistol"
-	desc = "An old Soviet machine pistol. It fires quickly, but kicks like a mule. Uses 9mm ammo. Has a threaded barrel for suppressors."
+	desc = "A modernized reproduction of an old Soviet machine pistol. It fires quickly, but kicks like a mule. Uses 9mm ammo. Has a threaded barrel for suppressors." //SKYRAT EDIT
 	icon_state = "aps"
 	w_class = WEIGHT_CLASS_NORMAL
 	mag_type = /obj/item/ammo_box/magazine/m9mm_aps
diff --git a/code/modules/security_levels/keycard_authentication.dm b/code/modules/security_levels/keycard_authentication.dm
index 5be9ab1a82a..7c6dd6bfbf0 100644
--- a/code/modules/security_levels/keycard_authentication.dm
+++ b/code/modules/security_levels/keycard_authentication.dm
@@ -3,6 +3,7 @@ GLOBAL_DATUM_INIT(keycard_events, /datum/events, new)
 #define KEYCARD_RED_ALERT "Red Alert"
 #define KEYCARD_EMERGENCY_MAINTENANCE_ACCESS "Emergency Maintenance Access"
 #define KEYCARD_BSA_UNLOCK "Bluespace Artillery Unlock"
+#define KEYCARD_PIN_UNRESTRICT "Unrestrict Permit Firing Pins" //SKYRAT EDIT
 
 /obj/machinery/keycard_auth
 	name = "Keycard Authentication Device"
@@ -83,6 +84,12 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/keycard_auth, 26)
 			if(!event_source)
 				sendEvent(KEYCARD_BSA_UNLOCK)
 				. = TRUE
+		//SKYRAT EDIT START
+		if("pin_unrestrict")
+			if(!event_source)
+				sendEvent(KEYCARD_PIN_UNRESTRICT)
+				. = TRUE
+		//SKYRAT EDIT END
 
 /obj/machinery/keycard_auth/update_appearance(updates)
 	. = ..()
@@ -136,6 +143,10 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/keycard_auth, 26)
 			make_maint_all_access()
 		if(KEYCARD_BSA_UNLOCK)
 			toggle_bluespace_artillery()
+		//SKYRAT EDIT START
+		if(KEYCARD_PIN_UNRESTRICT)
+			toggle_permit_pins()
+		//SKYRAT EDIT END
 
 GLOBAL_VAR_INIT(emergency_access, FALSE)
 /proc/make_maint_all_access()
@@ -164,3 +175,4 @@ GLOBAL_VAR_INIT(emergency_access, FALSE)
 #undef KEYCARD_RED_ALERT
 #undef KEYCARD_EMERGENCY_MAINTENANCE_ACCESS
 #undef KEYCARD_BSA_UNLOCK
+#undef KEYCARD_PIN_UNRESTRICT //SKYRAT EDIT
diff --git a/code/modules/shuttle/supply.dm b/code/modules/shuttle/supply.dm
index 79555339b99..9633fe49465 100644
--- a/code/modules/shuttle/supply.dm
+++ b/code/modules/shuttle/supply.dm
@@ -162,6 +162,7 @@ GLOBAL_LIST_INIT(blacklisted_cargo_types, typecacheof(list(
 		SSshuttle.order_history += spawning_order
 		QDEL_NULL(spawning_order.applied_coupon)
 
+		spawning_order.on_spawn() //SKYRAT EDIT
 		if(!spawning_order.pack.goody) //we handle goody crates below
 			spawning_order.generate(pick_n_take(empty_turfs))
 
diff --git a/code/modules/uplink/uplink_items/nukeops.dm b/code/modules/uplink/uplink_items/nukeops.dm
index 7ec57b8baad..51245ebeb3d 100644
--- a/code/modules/uplink/uplink_items/nukeops.dm
+++ b/code/modules/uplink/uplink_items/nukeops.dm
@@ -154,9 +154,9 @@
 	illegal_tech = FALSE
 
 /datum/uplink_item/dangerous/machinegun
-	name = "L6 Squad Automatic Weapon"
-	desc = "A fully-loaded Aussec Armoury belt-fed machine gun. \
-			This deadly weapon has a massive 50-round magazine of devastating 7.12x82mm ammunition."
+	name = "L6 Machine Gun"
+	desc = "A fully-loaded Scarborough Arms belt-fed machine gun. \
+			This deadly weapon has a 50-round box chambered for 7.12x82mm ammunition." //SKYRAT EDIT - AUSSEC TO SCARBOROUGH
 	item = /obj/item/gun/ballistic/automatic/l6_saw
 	cost = 18
 	surplus = 0
diff --git a/interface/stylesheet.dm b/interface/stylesheet.dm
index c70adf01228..0a22f426ab1 100644
--- a/interface/stylesheet.dm
+++ b/interface/stylesheet.dm
@@ -216,4 +216,8 @@ h1.alert, h2.alert		{color: #000000;}
 
 .monkeyhive				{color: #774704;}
 .monkeylead				{color: #774704;	font-size: 2;}
+.brown					{color: #3d2009;}
+.orange 				{color: #b8761a;}
+.yellow					{color: #c7b72c;}
+.cyan					{color: #0ea1e6;}
 </style>"}
diff --git a/modular_skyrat/master_files/code/modules/projectiles/guns/ballistic/automatic.dm b/modular_skyrat/master_files/code/modules/projectiles/guns/ballistic/automatic.dm
index d2ea4fc2be1..57c296f9cc3 100644
--- a/modular_skyrat/master_files/code/modules/projectiles/guns/ballistic/automatic.dm
+++ b/modular_skyrat/master_files/code/modules/projectiles/guns/ballistic/automatic.dm
@@ -22,13 +22,14 @@
 	pin = null
 	bolt_type = BOLT_TYPE_LOCKING
 	show_bolt_icon = FALSE
+	company_flag = COMPANY_NANOTRASEN
 
 /obj/item/gun/ballistic/automatic/proto/unrestricted
 	pin = /obj/item/firing_pin
 
 /obj/item/gun/ballistic/automatic/c20r
 	name = "\improper C-20r SMG"
-	desc = "A bullpup three-round burst .45 SMG, designated 'C-20r'. Has a 'Scarborough Arms - Per falcis, per pravitas' buttstamp."
+	desc = "A bullpup three-round burst .45 SMG, designated 'C-20r'."
 	icon_state = "c20r"
 	inhand_icon_state = "c20r"
 	selector_switch_icon = TRUE
@@ -42,6 +43,7 @@
 	mag_display = TRUE
 	mag_display_ammo = TRUE
 	empty_indicator = TRUE
+	company_flag = COMPANY_SCARBOROUGH
 
 /obj/item/gun/ballistic/automatic/c20r/update_overlays()
 	. = ..()
@@ -72,6 +74,7 @@
 	mag_display = TRUE
 	mag_display_ammo = TRUE
 	empty_indicator = TRUE
+	company_flag = COMPANY_NANOTRASEN
 
 /obj/item/gun/ballistic/automatic/plastikov
 	name = "\improper PP-95 SMG"
@@ -86,6 +89,8 @@
 	mag_display = TRUE
 	empty_indicator = TRUE
 	fire_sound = 'sound/weapons/gun/smg/shot_alt.ogg'
+	company_flag = COMPANY_IZHEVSK
+	dirt_modifier = 0.75
 
 /obj/item/gun/ballistic/automatic/mini_uzi
 	name = "\improper type U3 uzi"
@@ -97,6 +102,7 @@
 	show_bolt_icon = FALSE
 	mag_display = TRUE
 	rack_sound = 'sound/weapons/gun/pistol/slide_lock.ogg'
+	company_flag = COMPANY_OLDARMS
 
 /obj/item/gun/ballistic/automatic/m90
 	name = "\improper M-90gl carbine"
@@ -115,6 +121,7 @@
 	mag_display = TRUE
 	empty_indicator = TRUE
 	fire_sound = 'sound/weapons/gun/smg/shot_alt.ogg'
+	company_flag = COMPANY_SCARBOROUGH
 
 /obj/item/gun/ballistic/automatic/m90/Initialize()
 	. = ..()
@@ -157,9 +164,12 @@
 	bolt_type = BOLT_TYPE_OPEN
 	empty_indicator = TRUE
 	show_bolt_icon = FALSE
+	company_flag = COMPANY_OLDARMS
 
 /obj/item/gun/ballistic/automatic/tommygun/therealtommy
 	name = "Tommy gun"
+	desc = "The classic 'Chicago Typewriter'."
+	company_flag = null //This is the real deal, you hear?
 
 /obj/item/gun/ballistic/automatic/ar
 	name = "\improper NT-ARG 'Boarder'"
@@ -171,13 +181,14 @@
 	can_suppress = FALSE
 	burst_size = 3
 	fire_delay = 1
+	company_flag = COMPANY_NANOTRASEN
 
 
 // L6 SAW //
 
 /obj/item/gun/ballistic/automatic/l6_saw
 	name = "\improper L6 SAW"
-	desc = "A heavily modified 7.12x82mm light machine gun, designated 'L6 SAW'. Has 'Aussec Armoury - 2531' engraved on the receiver below the designation."
+	desc = "A large light machine gun chambered for the 7.12x82mm cartridge."
 	icon_state = "l6"
 	inhand_icon_state = "l6"
 	base_icon_state = "l6"
@@ -199,6 +210,7 @@
 	rack_sound = 'sound/weapons/gun/l6/l6_rack.ogg'
 	suppressed_sound = 'sound/weapons/gun/general/heavy_shot_suppressed.ogg'
 	var/cover_open = FALSE
+	company_flag = COMPANY_SCARBOROUGH
 
 /obj/item/gun/ballistic/automatic/l6_saw/unrestricted
 	pin = /obj/item/firing_pin
@@ -291,6 +303,7 @@
 	can_suppress = TRUE
 	can_unsuppress = TRUE
 	pin = /obj/item/firing_pin/implant/pindicate
+	company_flag = COMPANY_SCARBOROUGH
 
 // Old Semi-Auto Rifle //
 
@@ -308,9 +321,10 @@
 	can_suppress = TRUE
 	w_class = WEIGHT_CLASS_HUGE
 	slot_flags = ITEM_SLOT_BACK
-	//actions_types = list() SKYRAT EDIT REMOVAL
 	fire_select_modes = list(SELECT_SEMI_AUTOMATIC)
 	mag_display = TRUE
+	company_flag = COMPANY_IZHEVSK
+	dirt_modifier = 0.75
 
 // Laser rifle (rechargeable magazine) //
 
@@ -329,3 +343,4 @@
 	fire_select_modes = list(SELECT_SEMI_AUTOMATIC)
 	fire_sound = 'sound/weapons/laser.ogg'
 	casing_ejector = FALSE
+	company_flag = COMPANY_NANOTRASEN
diff --git a/modular_skyrat/master_files/code/modules/projectiles/guns/gun.dm b/modular_skyrat/master_files/code/modules/projectiles/guns/gun.dm
index b33416952ce..69da7a6c0de 100644
--- a/modular_skyrat/master_files/code/modules/projectiles/guns/gun.dm
+++ b/modular_skyrat/master_files/code/modules/projectiles/guns/gun.dm
@@ -95,6 +95,8 @@
 	var/list/fire_select_modes = list(SELECT_SEMI_AUTOMATIC)
 	///if i`1t has an icon for a selector switch indicating current firemode.
 	var/selector_switch_icon = FALSE
+	/// Bitflags for the company that produces the gun, do not give more than one company.
+	var/company_flag
 
 /datum/action/item_action/toggle_safety
 	name = "Toggle Safety"
@@ -587,6 +589,9 @@
 		return remove_gun_attachment(user, tool, bayonet, "unfix")
 
 	else if(pin && user.is_holding(src))
+		if(!pin.can_remove)
+			to_chat(user, span_warning("You can't remove this firing pin!"))
+			return
 		user.visible_message(span_warning("[user] attempts to remove [pin] from [src] with [tool]."),
 		span_notice("You attempt to remove [pin] from [src]. (It will take [DisplayTimeText(FIRING_PIN_REMOVAL_DELAY)].)"), null, 3)
 		if(tool.use_tool(src, user, FIRING_PIN_REMOVAL_DELAY, volume = 50))
@@ -601,6 +606,9 @@
 	. = ..()
 	if(.)
 		return
+	if(!pin.can_remove)
+		to_chat(user, span_warning("You can't remove this firing pin!"))
+		return
 	if(!user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
 		return
 	if(pin && user.is_holding(src))
@@ -620,6 +628,9 @@
 		return
 	if(!user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
 		return
+	if(!pin.can_remove)
+		to_chat(user, span_warning("You can't remove this firing pin!"))
+		return
 	if(pin && user.is_holding(src))
 		user.visible_message(span_warning("[user] attempts to remove [pin] from [src] with [tool]."),
 		span_notice("You attempt to remove [pin] from [src]. (It will take [DisplayTimeText(FIRING_PIN_REMOVAL_DELAY)].)"), null, 3)
@@ -799,6 +810,30 @@
 /obj/item/gun/proc/before_firing(atom/target, mob/user)
 	return
 
+/obj/item/gun/examine_more(mob/user)
+	. = ..()
+	switch(company_flag)
+		if(COMPANY_CANTALAN)
+			. += "<br>It has <b>[span_purple("Cantalan Federal Arms")]</b> etched into the grip."
+		if(COMPANY_ARMADYNE)
+			. += "<br>It has <b>[span_red("Armadyne Corporation")]</b> etched into the barrel."
+		if(COMPANY_SCARBOROUGH)
+			. += "<br>It has <b>[span_orange("Scarborough Arms")]</b> stamped onto the grip."
+		if(COMPANY_BOLT)
+			. += "<br>It has <b>[span_yellow("Bolt Fabrications")]</b> stamped onto the reciever."
+		if(COMPANY_OLDARMS)
+			. += "<br>It has <b><i>[span_red("Armadyne Oldarms")]</i></b> etched into the barrel."
+		if(COMPANY_IZHEVSK)
+			. += "<br>It has <b>[span_brown("Izhevsk Coalition")]</b> cut in above the magwell."
+		if(COMPANY_NANOTRASEN)
+			. += "<br>It has <b>[span_blue("Nanotrasen Armories")]</b> etched into the reciever."
+		if(COMPANY_ALLSTAR)
+			. += "<br>It has <b>[span_red("Allstar Lasers Inc.")]</b> stamped on the front grip."
+		if(COMPANY_MICRON)
+			. += "<br>It has <b>[span_cyan("Micron Control Sys.")]</b> cut in above the cell slot."
+		if(COMPANY_INTERDYNE)
+			. += "<br>It has <b>[span_cyan("Interdyne Pharmaceuticals")]</b> stamped onto the barrel."
+
 /////////////
 // ZOOMING //
 /////////////
@@ -860,5 +895,13 @@
 		azoom = new()
 		azoom.gun = src
 
+/obj/item/gun/emag_act(mob/user, obj/item/card/emag/emag_card)
+	. = ..()
+	if(!pin.can_remove)
+		to_chat(user, span_notice("You short out the gun's firing pin, allowing it to be removed!"))
+		pin.can_remove = TRUE
+		if(!(pin.obj_flags & EMAGGED))
+			pin.obj_flags |= EMAGGED
+
 #undef FIRING_PIN_REMOVAL_DELAY
 #undef DUALWIELD_PENALTY_EXTRA_MULTIPLIER
diff --git a/modular_skyrat/master_files/icons/mob/huds/hud.dmi b/modular_skyrat/master_files/icons/mob/huds/hud.dmi
index f9a94a51ae6d893173efae7ceaed3a6fbf1c983c..0056f8d115092a13f3d2c8f979dc77a18e16d401 100644
GIT binary patch
literal 12766
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
B!(IRY

literal 12691
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

diff --git a/modular_skyrat/modules/ERT_Factions/FTU/code/items.dm b/modular_skyrat/modules/ERT_Factions/FTU/code/items.dm
index 32cd11dbfaa..94147d22130 100644
--- a/modular_skyrat/modules/ERT_Factions/FTU/code/items.dm
+++ b/modular_skyrat/modules/ERT_Factions/FTU/code/items.dm
@@ -57,10 +57,10 @@
 	realistic = TRUE
 	fire_sound = 'modular_skyrat/modules/ERT_Factions/FTU/sound/r37.ogg'
 	emp_damageable = FALSE
-	armadyne = FALSE
 	can_bayonet = FALSE
 	can_flashlight = TRUE
 	mag_type = /obj/item/ammo_box/magazine/pulse/r37
+	company_flag = null
 
 /obj/item/ammo_box/magazine/pulse/r37
 	name = "6.5mm XJP box magazine"
@@ -94,10 +94,10 @@
 	realistic = TRUE
 	fire_sound = 'modular_skyrat/modules/ERT_Factions/FTU/sound/r40.ogg'
 	emp_damageable = FALSE
-	armadyne = FALSE
 	can_bayonet = FALSE
 	can_flashlight = TRUE
 	mag_type = /obj/item/ammo_box/magazine/pulse/r40
+	company_flag = null
 
 /obj/item/ammo_box/magazine/pulse/r40
 	name = "7.2mm XJP belted box"
diff --git a/modular_skyrat/modules/aesthetics/guns/code/guns.dm b/modular_skyrat/modules/aesthetics/guns/code/guns.dm
index d30bbfd4961..c1a80c6fee4 100644
--- a/modular_skyrat/modules/aesthetics/guns/code/guns.dm
+++ b/modular_skyrat/modules/aesthetics/guns/code/guns.dm
@@ -49,8 +49,8 @@
 	ammo_x_offset = 2
 
 /obj/item/gun/ballistic/shotgun/riot
-	name = "\improper AS-1 'Peacekeeper' shotgun"
-	desc = "An Aussec-made 12 gauge riot control pump shotgun fitted with an extended tube and a fixed tactical stock."
+	name = "\improper Peacekeeper shotgun"
+	desc = "A Nanotrasen-made riot control shotgun fitted with an extended tube and a fixed tactical stock."
 	icon = 'modular_skyrat/modules/aesthetics/guns/icons/guns.dmi'
 	worn_icon = 'modular_skyrat/modules/aesthetics/guns/icons/guns_back.dmi'
 	lefthand_file = 'modular_skyrat/modules/aesthetics/guns/icons/guns_lefthand.dmi'
@@ -65,8 +65,8 @@
 	fire_sound = 'modular_skyrat/modules/aesthetics/guns/sound/shotgun_light.ogg'
 
 /obj/item/gun/ballistic/shotgun/automatic/combat
-	name = "\improper PK12 Mod 2 shotgun"
-	desc = "A modified Aussec Peacekeeper shotgun, this one has a pistol grip with a guard, hardlight front sight, and fitted with a heavier pin and parts for sustained fire, sadly it cannot be suppressed like its cousin. Atleast you can slamfire with it."
+	name = "\improper Peacekeeper combat shotgun"
+	desc = "A semi-automatic Nanotrasen Peacekeeper shotgun with tactical furnishing and heavier internals meant for sustained fire. Lacks a threaded barrel."
 	icon = 'modular_skyrat/modules/aesthetics/guns/icons/guns.dmi'
 	worn_icon = 'modular_skyrat/modules/aesthetics/guns/icons/guns_back.dmi'
 	lefthand_file = 'modular_skyrat/modules/aesthetics/guns/icons/guns_lefthand.dmi'
@@ -111,7 +111,7 @@
 	worn_icon_state = "gun"
 	worn_icon = null
 
-/obj/item/gun/energy/laser/thermal 
+/obj/item/gun/energy/laser/thermal
 	icon = 'icons/obj/guns/energy.dmi'
 	lefthand_file = 'icons/mob/inhands/weapons/guns_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/weapons/guns_righthand.dmi'
@@ -212,6 +212,7 @@
 	can_suppress = TRUE
 	can_unsuppress = TRUE
 	weapon_weight = WEAPON_LIGHT
+	company_flag = COMPANY_SCARBOROUGH
 
 /obj/item/gun/ballistic/automatic/sniper_rifle/modular/blackmarket  //Normal sniper but epic
 	name = "SA-107 anti-materiel rifle"
@@ -274,6 +275,7 @@
 	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'
+	company_flag = COMPANY_NANOTRASEN
 
 /obj/item/gun/ballistic/rifle/boltaction/brand_new/quartermaster
 	name = "\improper FTU 'Archangel' Mosin"
@@ -285,6 +287,7 @@
 	mag_type = /obj/item/ammo_box/magazine/internal/boltaction/bubba
 	can_be_sawn_off = FALSE
 	realistic = TRUE
+	company_flag = null //Cargonia's own
 
 /obj/item/ammo_box/magazine/internal/boltaction/bubba
 	name = "mosin nagant extended internal magazine"
@@ -304,6 +307,7 @@
 	desc = "A bullpup three-round burst .45 PDW with an eerily familiar design. It has a foldable stock and a dot sight."
 	icon_state = "cmg1"
 	icon = 'modular_skyrat/modules/aesthetics/guns/icons/guns.dmi'
+	company_flag = COMPANY_NANOTRASEN
 
 /obj/item/gun/ballistic/automatic/ar/modular/model75
 	name = "\improper NT ARG-75"
@@ -314,6 +318,7 @@
 	fire_delay = 5
 	fire_sound_volume = 90
 	mag_type = /obj/item/ammo_box/magazine/multi_sprite/ostwind/arg75
+	company_flag = COMPANY_NANOTRASEN
 
 /obj/item/ammo_box/magazine/multi_sprite/ostwind/arg75
 	name = "7.62mm straight magazine"
diff --git a/modular_skyrat/modules/armaments/code/armament_component.dm b/modular_skyrat/modules/armaments/code/armament_component.dm
index 60c7fc7f04e..8dff81ab4c3 100644
--- a/modular_skyrat/modules/armaments/code/armament_component.dm
+++ b/modular_skyrat/modules/armaments/code/armament_component.dm
@@ -23,9 +23,6 @@
 		stack_trace("No products specified for armament")
 		return COMPONENT_INCOMPATIBLE
 
-	if(!isatom(parent))
-		return COMPONENT_INCOMPATIBLE
-
 	parent_atom = parent
 
 	products = required_products
diff --git a/modular_skyrat/modules/assault_operatives/code/armaments/_armament_primary.dm b/modular_skyrat/modules/assault_operatives/code/armaments/_armament_primary.dm
index 16169b01e4c..7b835713d32 100644
--- a/modular_skyrat/modules/assault_operatives/code/armaments/_armament_primary.dm
+++ b/modular_skyrat/modules/assault_operatives/code/armaments/_armament_primary.dm
@@ -1,9 +1,3 @@
-#define ARMAMENT_CATEGORY_PRIMARY "Primary Weapons"
-#define ARMAMENT_CATEGORY_PRIMARY_LIMIT 1
-#define ARMAMENT_SUBCATEGORY_SUBMACHINEGUN "Submachine Guns"
-#define ARMAMENT_SUBCATEGORY_ASSAULTRIFLE "Assault Rifles"
-#define ARMAMENT_SUBCATEGORY_SPECIAL "Special Weapons"
-
 /datum/armament_entry/assault_operatives/primary
 	category = ARMAMENT_CATEGORY_PRIMARY
 	category_item_limit = ARMAMENT_CATEGORY_PRIMARY_LIMIT
diff --git a/modular_skyrat/modules/assault_operatives/code/armaments/_armaments_secondary.dm b/modular_skyrat/modules/assault_operatives/code/armaments/_armaments_secondary.dm
index e43fdb53256..566898a46a2 100644
--- a/modular_skyrat/modules/assault_operatives/code/armaments/_armaments_secondary.dm
+++ b/modular_skyrat/modules/assault_operatives/code/armaments/_armaments_secondary.dm
@@ -1,8 +1,3 @@
-
-#define ARMAMENT_CATEGORY_SECONDARY "Secondary Weapons"
-#define ARMAMENT_CATEGORY_SECONDARY_LIMIT 1
-#define ARMAMENT_SUBCATEGORY_PISTOL "Pistols"
-
 // SECONDARY WEAPONS
 /datum/armament_entry/assault_operatives/secondary
 	category = ARMAMENT_CATEGORY_SECONDARY
diff --git a/modular_skyrat/modules/assault_operatives/code/armaments/armament_headgear.dm b/modular_skyrat/modules/assault_operatives/code/armaments/armament_headgear.dm
index 9ed2bf93163..78d01b98789 100644
--- a/modular_skyrat/modules/assault_operatives/code/armaments/armament_headgear.dm
+++ b/modular_skyrat/modules/assault_operatives/code/armaments/armament_headgear.dm
@@ -1,8 +1,4 @@
 // HELMETS
-#define ARMAMENT_CATEGORY_ARMOR_HEAD "Headgear"
-#define ARMAMENT_CATEGORY_ARMOR_HEAD_LIMIT 1
-#define ARMAMENT_SUBCATEGORY_HELMET "Helmets"
-#define ARMAMENT_SUBCATEGORY_BERETS "Berets"
 
 /datum/armament_entry/assault_operatives/headgear
 	category = ARMAMENT_CATEGORY_ARMOR_HEAD
diff --git a/modular_skyrat/modules/assault_operatives/code/armaments/armament_medical.dm b/modular_skyrat/modules/assault_operatives/code/armaments/armament_medical.dm
index 35070690053..46a98f47678 100644
--- a/modular_skyrat/modules/assault_operatives/code/armaments/armament_medical.dm
+++ b/modular_skyrat/modules/assault_operatives/code/armaments/armament_medical.dm
@@ -1,8 +1,3 @@
-#define ARMAMENT_CATEGORY_MEDICAL "Medical Supplies"
-#define ARMAMENT_CATEGORY_MEDICAL_LIMIT 5
-#define ARMAMENT_SUBCATEGORY_MEDKIT "Medkits"
-#define ARMAMENT_SUBCATEGORY_INJECTOR "Injectors"
-
 /datum/armament_entry/assault_operatives/medical
 	category = ARMAMENT_CATEGORY_MEDICAL
 	category_item_limit = ARMAMENT_CATEGORY_MEDICAL_LIMIT
diff --git a/modular_skyrat/modules/assault_operatives/code/armaments/armament_melee.dm b/modular_skyrat/modules/assault_operatives/code/armaments/armament_melee.dm
index a382d667982..71ec971833e 100644
--- a/modular_skyrat/modules/assault_operatives/code/armaments/armament_melee.dm
+++ b/modular_skyrat/modules/assault_operatives/code/armaments/armament_melee.dm
@@ -1,9 +1,5 @@
 
 // MELEE WEAPONS
-#define ARMAMENT_CATEGORY_MELEE "Melee Weapons"
-#define ARMAMENT_CATEGORY_MELEE_LIMIT 1
-#define ARMAMENT_SUBCATEGORY_MELEE_LETHAL "Lethal Weaponry"
-#define ARMAMENT_SUBCATEGORY_MELEE_NONLETHAL "Non-Lethal Weaponry"
 
 /datum/armament_entry/assault_operatives/melee
 	category = ARMAMENT_CATEGORY_MELEE
diff --git a/modular_skyrat/modules/black_mesa/code/armaments/_armament_primary.dm b/modular_skyrat/modules/black_mesa/code/armaments/_armament_primary.dm
index e268e677334..31098900990 100644
--- a/modular_skyrat/modules/black_mesa/code/armaments/_armament_primary.dm
+++ b/modular_skyrat/modules/black_mesa/code/armaments/_armament_primary.dm
@@ -1,5 +1,3 @@
-#define ARMAMENT_SUBCATEGORY_SHOTGUN "Shotguns"
-
 /datum/armament_entry/hecu/primary
 	category = ARMAMENT_CATEGORY_PRIMARY
 	category_item_limit = 4
diff --git a/modular_skyrat/modules/blueshield/code/blueshield.dm b/modular_skyrat/modules/blueshield/code/blueshield.dm
index 1db3d3ebf19..5243c5d9771 100644
--- a/modular_skyrat/modules/blueshield/code/blueshield.dm
+++ b/modular_skyrat/modules/blueshield/code/blueshield.dm
@@ -97,11 +97,11 @@
 	name = "\improper Allstar SC-3 PDW 'Hellfire'"
 	desc = "A prototype energy carbine, despite NT's ban on hellfire weaponry due to negative press. \
             Allstar continued to work on it, compacting it into a small form-factor for personal defense. \
-            As part of the Asset Retention Program created by Nanotrasen, Allstar's prototype began to be put into use. \
-            It has the <b><span style='color:red'>Allstar Energy Weapons</span></b> logo painted next to the charge display."
+            As part of the Asset Retention Program created by Nanotrasen, Allstar's prototype began to be put into use."
 	icon = 'modular_skyrat/modules/aesthetics/guns/icons/guns.dmi'
 	worn_icon = 'modular_skyrat/modules/aesthetics/guns/icons/guns_back.dmi'
 	lefthand_file = 'modular_skyrat/modules/aesthetics/guns/icons/guns_lefthand.dmi'
 	righthand_file = 'modular_skyrat/modules/aesthetics/guns/icons/guns_righthand.dmi'
 	icon_state = "hellfirepdw"
 	ammo_type = list(/obj/item/ammo_casing/energy/laser/hellfire/bs)
+	company_flag = COMPANY_ALLSTAR
diff --git a/modular_skyrat/modules/cargo/code/goodies.dm b/modular_skyrat/modules/cargo/code/goodies.dm
index 1f70f1bf392..0eeba4a6e45 100644
--- a/modular_skyrat/modules/cargo/code/goodies.dm
+++ b/modular_skyrat/modules/cargo/code/goodies.dm
@@ -50,48 +50,6 @@
 //////////////////////////// Weapons or Ammo /////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////
 
-/datum/supply_pack/goody/wt550_single
-	name = "WT-550 Auto Rifle Single-Pack"
-	desc = "Contains one high-powered, semiautomatic rifle chambered in 4.6x30mm." // "high-powered" lol yea right
-	cost = PAYCHECK_HARD * 20
-	access_view = ACCESS_ARMORY
-	contains = list(/obj/item/gun/ballistic/automatic/wt550)
-
-/datum/supply_pack/goody/wt550ammo_single
-	name = "WT-550 Auto Rifle Ammo Single-Pack"
-	desc = "Contains a 20-round magazine for the WT-550 Auto Rifle. Each magazine is designed to facilitate rapid tactical reloads."
-	cost = PAYCHECK_HARD * 6
-	access_view = ACCESS_ARMORY
-	contains = list(/obj/item/ammo_box/magazine/wt550m9)
-
-/datum/supply_pack/goody/makarov
-	name = "Makarov Self Defense Pistol"
-	desc = "A small, slow firing and low capacity pistol, but hey, it's better then a crowbar, right? (Does not include a weapons permit.)"
-	cost = PAYCHECK_MEDIUM * 28
-	contains = list(/obj/item/storage/box/gunset/makarov)
-
-/datum/supply_pack/goody/makarov_ammo
-	name = "Makarov Ammo Resupply"
-	desc = "An ammobox and a few spare magazines for a Makarov 10mm self defense pistol, for self defense, of course."
-	cost = PAYCHECK_MEDIUM * 8
-	contains = list(/obj/item/ammo_box/advanced/b10mm,
-					/obj/item/ammo_box/magazine/multi_sprite/makarov,
-					/obj/item/ammo_box/magazine/multi_sprite/makarov)
-
-/datum/supply_pack/goody/pepperball
-	name = "PepperBall Self Defense Weapon"
-	desc = "A 'state of the art' self defense weapon, firing balls of condensed pepperspray, don't aim for the face. Weapons permit not included."
-	cost = PAYCHECK_MEDIUM * 17
-	contains = list(/obj/item/storage/box/gunset/pepperball)
-
-/datum/supply_pack/goody/pepperball_ammo
-	name = "PepperBall Ammo Resupply"
-	desc = "An ammobox and a few spare magazines for a PepperBall self defense weapon, in case you run out."
-	cost = PAYCHECK_MEDIUM * 6
-	contains = list(/obj/item/ammo_box/advanced/pepperballs,
-					/obj/item/ammo_box/magazine/pepperball,
-					/obj/item/ammo_box/magazine/pepperball)
-
 /datum/supply_pack/goody/gunmaint
 	name = "Gun Maintenance Kits"
 	desc = "Keep your pa's rifle in best condition, with two sets of cleaning supplies. Or your standard issue pistol if you're an itchy trigger, we're not here to judge."
@@ -99,84 +57,6 @@
 	contains = list(/obj/item/gun_maintenance_supplies,
 					/obj/item/gun_maintenance_supplies)
 
-/datum/supply_pack/goody/mcr_single
-	name = "MCR-01 Microfusion Single-Pack"
-	desc = "Contains one advanced Micron Control Systems Incorporated supplied MCR-01 Microfusion weapons platform."
-	cost = PAYCHECK_HARD * 22
-	access_view = ACCESS_ARMORY
-	contains = list(/obj/item/gun/microfusion/mcr01/advanced)
-
-/datum/supply_pack/goody/mcrammo_single
-	name = "Microfusion Cell Single-Pack"
-	desc = "Contains a box of three Microfusion cells, compatible with all MCR-01 Microfusion weapons."
-	cost = PAYCHECK_HARD * 6
-	access_view = ACCESS_ARMORY
-	contains = list(/obj/item/storage/box/ammo_box/microfusion/advanced)
-
-/datum/supply_pack/goody/wildcat_single
-	name = "CFA Wildcat Single-Pack"
-	desc = "Contains one Cantalan Federal Arms Wildcat Sub Machine Gun, chambered in .32 caliber."
-	cost = PAYCHECK_HARD * 8
-	access_view = ACCESS_ARMORY
-	contains = list(/obj/item/gun/ballistic/automatic/cfa_wildcat)
-
-/datum/supply_pack/goody/wildcatammo_single
-	name = "CFA Wildcat Ammo Single-Pack"
-	desc = "Contains a 30-round magazine for the CFA Wildcat."
-	cost = PAYCHECK_HARD * 4
-	access_view = ACCESS_ARMORY
-	contains = list(/obj/item/ammo_box/magazine/multi_sprite/cfa_wildcat)
-
-/datum/supply_pack/goody/temp_single
-	name = "Temperature Gun Kit Single-Pack"
-	desc = "Contains a gunkit for a temperature gun, usable on an Allstar SC-2 Laser Carbine to convert it into firing temperature-affecting shots instead of lasers."
-	cost = PAYCHECK_MEDIUM * 2
-	access_view = ACCESS_ARMORY
-	contains = list(/obj/item/weaponcrafting/gunkit/temperature)
-
-/datum/supply_pack/goody/croon_single
-	name = "Croon Single-Pack"
-	desc = "Contains one Croon Sub Machine Gun chambered in 6.3mm, not exactly reliable... but it'll do you okay."
-	cost = PAYCHECK_HARD * 10
-	access_view = ACCESS_ARMORY
-	contains = list(/obj/item/gun/ballistic/automatic/croon)
-	contraband = TRUE
-
-/datum/supply_pack/goody/croonammo_single
-	name = "Croon Ammo Single-Pack"
-	desc = "Contains a 15-round magazine for the Croon SMG."
-	cost = PAYCHECK_HARD * 3
-	access_view = ACCESS_ARMORY
-	contains = list(/obj/item/ammo_box/magazine/multi_sprite/croon)
-	contraband = TRUE
-
-/datum/supply_pack/goody/lasergun_single
-	name = "Allstar SC-1 Single-Pack"
-	desc = "Contains one Allstar Lasers SC-1 laser gun."
-	cost = PAYCHECK_HARD * 10
-	access_view = ACCESS_ARMORY
-	contains = list(/obj/item/gun/energy/laser)
-
-/datum/supply_pack/goody/cmg
-	name = "NT CMG-1 Single-kit"
-	desc = "Contains a single CMG-1 Weapons kit"
-	cost = PAYCHECK_HARD * 10
-	access_view = ACCESS_ARMORY
-	contains = list(
-		/obj/item/storage/box/gunset/cmg,
-		)
-
-/datum/supply_pack/goody/cmg_lethal_ammo
-	name = "NT CMG-1 Lethal Ammo"
-	desc = "Contains 3 24-round lethal CMG-1 magazines."
-	cost = PAYCHECK_HARD * 15
-	access_view = ACCESS_ARMORY
-	contains = list(
-		/obj/item/ammo_box/magazine/cmgm45,
-		/obj/item/ammo_box/magazine/cmgm45,
-		/obj/item/ammo_box/magazine/cmgm45,
-	)
-
 //////////////////////////////////////////////////////////////////////////////
 //////////////////////////// Carpet Packs ////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////
diff --git a/modular_skyrat/modules/cargo/code/packs.dm b/modular_skyrat/modules/cargo/code/packs.dm
index 13c62987711..b32039aa882 100644
--- a/modular_skyrat/modules/cargo/code/packs.dm
+++ b/modular_skyrat/modules/cargo/code/packs.dm
@@ -107,14 +107,6 @@
 					/obj/item/weaponcell/medical/toxin)
 	crate_name = "medicell replacement crate"
 
-/datum/supply_pack/medical/syringe_gun
-	name = "Syringe Gun"
-	desc = "A replacement medical syringe gun."
-	cost = CARGO_CRATE_VALUE * 30
-	access = ACCESS_MEDICAL
-	contains = list(/obj/item/gun/syringe)
-	crate_name = "replacement syringe gun crate"
-
 //////////////////////////////////////////////////////////////////////////////
 //////////////////////////// Security ////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////
@@ -127,123 +119,6 @@
 	contains = list(/obj/item/mod/control/pre_equipped/security)
 	crate_name = "security MODsuit crate"
 
-
-/datum/supply_pack/security/armory/wt550
-	name = "WT-550 Auto Rifle Crate"
-	desc = "Contains two high-powered, semiautomatic rifles chambered in 4.6x30mm. Requires Armory access to open."
-	cost = CARGO_CRATE_VALUE * 7
-	contains = list(/obj/item/gun/ballistic/automatic/wt550,
-					/obj/item/gun/ballistic/automatic/wt550)
-	crate_name = "auto rifle crate"
-
-/datum/supply_pack/security/armory/wt550ammo
-	name = "WT-550 Auto Rifle Ammo Crate"
-	desc = "Contains four 20-round magazine for the WT-550 Auto Rifle. Each magazine is designed to facilitate rapid tactical reloads. Requires Armory access to open."
-	cost = CARGO_CRATE_VALUE * 3.5
-	contains = list(/obj/item/ammo_box/magazine/wt550m9,
-					/obj/item/ammo_box/magazine/wt550m9,
-					/obj/item/ammo_box/magazine/wt550m9,
-					/obj/item/ammo_box/magazine/wt550m9)
-
-/datum/supply_pack/security/croonsurplus
-	name = "Croon Weapons Crate"
-	desc = "Help out in a local revolt, or fund a civil war, it's not like you have a choice in supplier. (Comes with four magazines of ammo.)"
-	cost = CARGO_CRATE_VALUE * 40
-	contraband = TRUE
-	contains = list(/obj/item/gun/ballistic/automatic/croon/nomag,
-					/obj/item/gun/ballistic/automatic/croon/nomag,
-					/obj/item/ammo_box/magazine/multi_sprite/croon,
-					/obj/item/ammo_box/magazine/multi_sprite/croon,
-					/obj/item/ammo_box/magazine/multi_sprite/croon,
-					/obj/item/ammo_box/magazine/multi_sprite/croon)
-	crate_name = "unmarked weapons crate"
-	dangerous = TRUE
-
-/datum/supply_pack/security/pepperballplus
-	name = "Pepperball Self-Defense Supply Crate"
-	desc = "Uneasy times, corporate security get lost during the transfer? Protect yourself.. somewhat."
-	cost = CARGO_CRATE_VALUE * 15
-	contraband = TRUE
-	contains = list(/obj/item/storage/box/gunset/pepperball,
-					/obj/item/storage/box/gunset/pepperball)
-	crate_name = "pepperball pistol crate"
-	dangerous = TRUE
-	
-/datum/supply_pack/security/cmg1
-	name = "NT CMG-1 Value-Pack"
-	desc = "Contains two CMG-1 Weapon kits, for all your automatic-fire needs."
-	cost = CARGO_CRATE_VALUE * 15
-	access_view = ACCESS_ARMORY
-	contains = list(
-		/obj/item/storage/box/gunset/cmg,
-		/obj/item/storage/box/gunset/cmg,
-		)
-	dangerous = TRUE
-
-/datum/supply_pack/security/wildcat
-	name = "CFA Wildcat Supply Crate"
-	desc = "Local police running low on equipment? Neighbor particularly loud in the early morning? This should help out. (Does not include weapons permits.)"
-	cost = CARGO_CRATE_VALUE * 15 // Bit cheaper then the next up, because it's not to good.
-	contains = list(/obj/item/gun/ballistic/automatic/cfa_wildcat,
-					/obj/item/gun/ballistic/automatic/cfa_wildcat,
-					/obj/item/ammo_box/magazine/multi_sprite/cfa_wildcat,
-					/obj/item/ammo_box/magazine/multi_sprite/cfa_wildcat,
-					/obj/item/ammo_box/magazine/multi_sprite/cfa_wildcat,
-					/obj/item/ammo_box/magazine/multi_sprite/cfa_wildcat)
-	crate_name = "CFA sponsored weapons crate"
-	dangerous = TRUE
-
-/datum/supply_pack/costumes_toys/randomised/improvised
-	name = "Improvised Weapons Crate"
-	desc = "Really hit rock bottom? Well, we've got a few things laying around from a sting-op on pirates we could lend you. (We'll expect these back.)" //they don't, actually.
-	contraband = TRUE
-	cost = CARGO_CRATE_VALUE * 7
-	num_contained = 3
-	contains = list(/obj/item/gun/ballistic/revolver/rifle/improvised,
-					/obj/item/gun/ballistic/revolver/rifle, //Above, but better.
-					/obj/item/gun/ballistic/rifle/irifle, //just a shittier mosin, in a much less statistically valuable crate.
-					/obj/item/gun/ballistic/rifle/ishotgun,
-					/obj/item/gun/ballistic/rifle/ishotgun/sawn, //Why not, helps pad the list.
-					/obj/item/storage/box/beanbag,
-					/obj/item/storage/box/lethalshot,
-					/obj/item/ammo_box/c38, //Revolver rifle ammo.
-					/obj/item/ammo_box/a762, //rifle ammo.
-					/obj/item/gun/ballistic/automatic/surplus, //It's bad
-					/obj/item/ammo_box/magazine/m10mm/rifle,
-					/obj/item/gun/ballistic/automatic/pistol/toy) //they just hate you.
-	crate_name = "dusty crate"
-/datum/supply_pack/security/armory/riotshotguns
-	name = "Peacekeeper Shotgun Crate"
-	desc = "For when the peace needs kept, and you're all out of gum. Contains 3 Peacekeeper shotguns and some non-lethal shells."
-	cost = CARGO_CRATE_VALUE * 13.25
-	contains = list(/obj/item/gun/ballistic/shotgun/riot,
-					/obj/item/gun/ballistic/shotgun/riot,
-					/obj/item/gun/ballistic/shotgun/riot,
-					/obj/item/storage/box/beanbag,
-					/obj/item/storage/box/rubbershot)
-	crate_name = "peacekeeper shotgun crate"
-
-/datum/supply_pack/security/armory/woodstock
-	name = "Woodstock Originals Crate"
-	desc = "For when Oldschool is Cool... Or the Bartender looses their gun. again. Contains 3 woodstock shotguns"
-	cost = CARGO_CRATE_VALUE * 9.5
-	contains = list(/obj/item/gun/ballistic/shotgun,
-					/obj/item/gun/ballistic/shotgun,
-					/obj/item/gun/ballistic/shotgun)
-	crate_name = "woodstock crate"
-
-/datum/supply_pack/security/armory/wt550ammovariety
-	name = "WT-550 Auto Rifle Ammo Variety Crate"
-	desc = "AI Gone rogue and blow the Security Lathe? Anti-Corporate scum steal it? Doesn't matter, we got you covered. Contains 2 of each magazine type for the WT550 Auto Rifle."
-	cost = CARGO_CRATE_VALUE * 4.5
-	contains = list(/obj/item/ammo_box/magazine/wt550m9,
-					/obj/item/ammo_box/magazine/wt550m9,
-					/obj/item/ammo_box/magazine/wt550m9/wtap,
-					/obj/item/ammo_box/magazine/wt550m9/wtap,
-					/obj/item/ammo_box/magazine/wt550m9/wtic,
-					/obj/item/ammo_box/magazine/wt550m9/wtic)
-	crate_name = "WT550 Ammo Variety Pack"
-
 /datum/supply_pack/security/armor
 	name = "Armor Crate"
 	desc = "Three vests of well-rounded, decently-protective armor. Requires Security access to open."
diff --git a/modular_skyrat/modules/goofsec/code/department_guards.dm b/modular_skyrat/modules/goofsec/code/department_guards.dm
index 82cf6bf995e..01276a4da36 100644
--- a/modular_skyrat/modules/goofsec/code/department_guards.dm
+++ b/modular_skyrat/modules/goofsec/code/department_guards.dm
@@ -125,8 +125,8 @@
 	trim_icon = 'modular_skyrat/master_files/icons/obj/card.dmi'
 	trim_state = "trim_orderly"
 	sechud_icon_state = SECHUD_ORDERLY
-	extra_access = list(ACCESS_BRIG_ENTRANCE, ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_PHARMACY, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_MECH_MEDICAL, ACCESS_MINERAL_STOREROOM)
-	minimal_access = list(ACCESS_BRIG_ENTRANCE, ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_PHARMACY, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_MECH_MEDICAL, ACCESS_MINERAL_STOREROOM)
+	extra_access = list(ACCESS_BRIG_ENTRANCE, ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_PHARMACY, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_MECH_MEDICAL, ACCESS_MINERAL_STOREROOM, ACCESS_WEAPONS)
+	minimal_access = list(ACCESS_BRIG_ENTRANCE, ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_PHARMACY, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_MECH_MEDICAL, ACCESS_MINERAL_STOREROOM, ACCESS_WEAPONS)
 	config_job = "orderly"
 	template_access = list(ACCESS_CAPTAIN, ACCESS_CMO, ACCESS_CHANGE_IDS)
 	job = /datum/job/orderly
@@ -194,9 +194,9 @@
 	trim_state = "trim_calhoun"
 	sechud_icon_state = SECHUD_SCIENCE_GUARD
 	extra_access = list(ACCESS_BRIG_ENTRANCE, ACCESS_ROBOTICS, ACCESS_RND, ACCESS_ORDNANCE, ACCESS_ORDNANCE_STORAGE, ACCESS_RESEARCH, ACCESS_XENOBIOLOGY,
-					ACCESS_MECH_SCIENCE, ACCESS_MINERAL_STOREROOM, ACCESS_TECH_STORAGE, ACCESS_GENETICS, ACCESS_AUX_BASE)
+					ACCESS_MECH_SCIENCE, ACCESS_MINERAL_STOREROOM, ACCESS_TECH_STORAGE, ACCESS_GENETICS, ACCESS_AUX_BASE, ACCESS_WEAPONS)
 	minimal_access = list(ACCESS_BRIG_ENTRANCE, ACCESS_ROBOTICS, ACCESS_RND, ACCESS_ORDNANCE, ACCESS_ORDNANCE_STORAGE, ACCESS_RESEARCH, ACCESS_XENOBIOLOGY,
-					ACCESS_MECH_SCIENCE, ACCESS_MINERAL_STOREROOM, ACCESS_TECH_STORAGE, ACCESS_GENETICS, ACCESS_AUX_BASE)
+					ACCESS_MECH_SCIENCE, ACCESS_MINERAL_STOREROOM, ACCESS_TECH_STORAGE, ACCESS_GENETICS, ACCESS_AUX_BASE, ACCESS_WEAPONS)
 	config_job = "science_guard"
 	template_access = list(ACCESS_CAPTAIN, ACCESS_RD, ACCESS_CHANGE_IDS)
 	job = /datum/job/science_guard
@@ -269,8 +269,8 @@
 	trim_icon = 'modular_skyrat/master_files/icons/obj/card.dmi'
 	trim_state = "trim_bouncer"
 	sechud_icon_state = SECHUD_BOUNCER
-	extra_access = list(ACCESS_BRIG_ENTRANCE, ACCESS_HYDROPONICS, ACCESS_BAR, ACCESS_KITCHEN, ACCESS_MORGUE, ACCESS_WEAPONS, ACCESS_MINERAL_STOREROOM, ACCESS_THEATRE)
-	minimal_access = list(ACCESS_BRIG_ENTRANCE, ACCESS_HYDROPONICS, ACCESS_BAR, ACCESS_KITCHEN, ACCESS_MORGUE, ACCESS_WEAPONS, ACCESS_MINERAL_STOREROOM, ACCESS_THEATRE, ACCESS_SERVICE)
+	extra_access = list(ACCESS_BRIG_ENTRANCE, ACCESS_HYDROPONICS, ACCESS_BAR, ACCESS_KITCHEN, ACCESS_MORGUE, ACCESS_WEAPONS, ACCESS_MINERAL_STOREROOM, ACCESS_THEATRE, ACCESS_WEAPONS)
+	minimal_access = list(ACCESS_BRIG_ENTRANCE, ACCESS_HYDROPONICS, ACCESS_BAR, ACCESS_KITCHEN, ACCESS_MORGUE, ACCESS_WEAPONS, ACCESS_MINERAL_STOREROOM, ACCESS_THEATRE, ACCESS_SERVICE, ACCESS_WEAPONS)
 	config_job = "bouncer"
 	template_access = list(ACCESS_CAPTAIN, ACCESS_HOP, ACCESS_CHANGE_IDS)
 	job = /datum/job/bouncer
@@ -337,8 +337,8 @@
 	trim_icon = 'modular_skyrat/master_files/icons/obj/card.dmi'
 	trim_state = "trim_customs"
 	sechud_icon_state = SECHUD_CUSTOMS_AGENT
-	extra_access = list(ACCESS_BRIG_ENTRANCE, ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_QM, ACCESS_MINING, ACCESS_MECH_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM)
-	minimal_access = list(ACCESS_BRIG_ENTRANCE, ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_QM, ACCESS_MINING, ACCESS_MECH_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM)
+	extra_access = list(ACCESS_BRIG_ENTRANCE, ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_QM, ACCESS_MINING, ACCESS_MECH_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM, ACCESS_WEAPONS)
+	minimal_access = list(ACCESS_BRIG_ENTRANCE, ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_QM, ACCESS_MINING, ACCESS_MECH_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM, ACCESS_WEAPONS)
 	config_job = "customs_agent"
 	template_access = list(ACCESS_CAPTAIN, ACCESS_QM, ACCESS_CHANGE_IDS)
 	job = /datum/job/customs_agent
@@ -406,9 +406,9 @@
 	trim_state = "trim_engiguard"
 	sechud_icon_state = SECHUD_ENGINEERING_GUARD
 	extra_access = list(ACCESS_BRIG_ENTRANCE, ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS, ACCESS_MECH_ENGINE, ACCESS_AUX_BASE,
-					ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CONSTRUCTION, ACCESS_ATMOSPHERICS, ACCESS_TCOMSAT, ACCESS_MINERAL_STOREROOM)
+					ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CONSTRUCTION, ACCESS_ATMOSPHERICS, ACCESS_TCOMSAT, ACCESS_MINERAL_STOREROOM, ACCESS_WEAPONS)
 	minimal_access = list(ACCESS_BRIG_ENTRANCE, ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS, ACCESS_MECH_ENGINE, ACCESS_AUX_BASE,
-					ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CONSTRUCTION, ACCESS_ATMOSPHERICS, ACCESS_TCOMSAT, ACCESS_MINERAL_STOREROOM)
+					ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CONSTRUCTION, ACCESS_ATMOSPHERICS, ACCESS_TCOMSAT, ACCESS_MINERAL_STOREROOM, ACCESS_WEAPONS)
 	config_job = "engineering_guard"
 	template_access = list(ACCESS_CAPTAIN, ACCESS_CE, ACCESS_CHANGE_IDS)
 	job = /datum/job/engineering_guard
diff --git a/modular_skyrat/modules/goofsec/code/projectiles.dm b/modular_skyrat/modules/goofsec/code/projectiles.dm
index 5c6ff37f26d..5cd8ab56b96 100644
--- a/modular_skyrat/modules/goofsec/code/projectiles.dm
+++ b/modular_skyrat/modules/goofsec/code/projectiles.dm
@@ -48,6 +48,7 @@
 	ammo_type = list(/obj/item/ammo_casing/energy/laser/hardlight_bullet/vintorez)
 	shaded_charge = TRUE
 	cell_type = /obj/item/stock_parts/cell/super
+	company_flag = COMPANY_OLDARMS
 
 /obj/item/ammo_casing/energy/laser/hardlight_bullet/vintorez
 	name = "hardlight bullet vintorez casing"
@@ -84,6 +85,7 @@
 	fire_delay = 10
 	shaded_charge = TRUE
 	cell_type = /obj/item/stock_parts/cell/super
+	company_flag = COMPANY_ARMADYNE
 
 /obj/item/ammo_casing/energy/laser/hardlight_bullet/norwind
 	name = "hardlight bullet norwind casing"
@@ -112,6 +114,8 @@
 	can_bayonet = TRUE
 	ammo_type = list(/obj/item/ammo_casing/energy/laser/hardlight_bullet/ostwind)
 	cell_type = /obj/item/stock_parts/cell/super
+	company_flag = COMPANY_ARMADYNE
+
 /obj/item/ammo_casing/energy/laser/hardlight_bullet/ostwind
 	name = "hardlight bullet norostwindwind casing"
 	projectile_type = /obj/projectile/beam/laser/hardlight_bullet/ostwind
@@ -142,6 +146,7 @@
 	ammo_type = list(/obj/item/ammo_casing/energy/laser/hardlight_bullet/pitbull)
 	shaded_charge = TRUE
 	cell_type = /obj/item/stock_parts/cell/super
+	company_flag = COMPANY_BOLT
 
 /obj/item/ammo_casing/energy/laser/hardlight_bullet/pitbull
 	name = "hardlight bullet pitbull casing"
@@ -170,6 +175,7 @@
 	ammo_type = list(/obj/item/ammo_casing/energy/laser/hardlight_bullet/pcr)
 	shaded_charge = TRUE
 	cell_type = /obj/item/stock_parts/cell/super
+	company_flag = COMPANY_BOLT
 
 /obj/item/ammo_casing/energy/laser/hardlight_bullet/pcr
 	name = "hardlight bullet pcr casing"
diff --git a/modular_skyrat/modules/gun_cargo/code/armament_component.dm b/modular_skyrat/modules/gun_cargo/code/armament_component.dm
new file mode 100644
index 00000000000..4f59979a950
--- /dev/null
+++ b/modular_skyrat/modules/gun_cargo/code/armament_component.dm
@@ -0,0 +1,516 @@
+#define MAX_AMMO_AMOUNT 10
+#define CARGO_CONSOLE 1
+#define IRN_CONSOLE 2
+
+/datum/component/armament/cargo_gun
+	/// Selected amount of ammo to purchase
+	var/ammo_purchase_num = 1
+	/// Is this set to private order
+	var/self_paid = FALSE
+	/// Cooldown to announce a requested order
+	COOLDOWN_DECLARE(radio_cooldown)
+	/// To cut down on redundant istypes(), what this component is attached to
+	var/console_state = null
+	/// If this is a tablet, the parent budgetordering
+	var/datum/computer_file/program/budgetorders/parent_prog
+
+/datum/component/armament/cargo_gun/Initialize(list/required_products, list/needed_access)
+	. = ..()
+	if(istype(parent, /obj/machinery/computer/cargo))
+		console_state = CARGO_CONSOLE
+	else if(istype(parent, /obj/item/modular_computer))
+		console_state = IRN_CONSOLE
+
+/datum/component/armament/cargo_gun/Destroy(force, silent)
+	parent_prog = null
+	. = ..()
+
+/datum/component/armament/cargo_gun/on_attack_hand(datum/source, mob/living/user)
+	return
+
+/datum/component/armament/cargo_gun/on_attackby(atom/target, obj/item, mob/user)
+	return
+
+/datum/component/armament/cargo_gun/ui_data(mob/user)
+	var/list/data = list()
+
+	var/mob/living/carbon/human/the_person = user
+	var/obj/item/card/id/id_card
+	var/datum/bank_account/buyer = SSeconomy.get_dep_account(ACCOUNT_CAR)
+
+	if(console_state == IRN_CONSOLE)
+		var/obj/item/computer_hardware/card_slot/card_slot = parent_prog.computer.all_components[MC_CARD]
+		id_card = card_slot.GetID()
+	else
+		if(istype(the_person))
+			id_card = the_person.get_idcard(TRUE)
+
+	var/budget_name = "Cargo Budget"
+
+	if(id_card?.registered_account && (console_state == IRN_CONSOLE))
+		if((ACCESS_HEADS in id_card.access) || (ACCESS_QM in id_card.access))
+			parent_prog.requestonly = FALSE
+			buyer = SSeconomy.get_dep_account(id_card.registered_account.account_job.paycheck_department)
+			parent_prog.can_approve_requests = TRUE
+		else
+			parent_prog.requestonly = TRUE
+			parent_prog.can_approve_requests = FALSE
+	else
+		parent_prog?.requestonly = TRUE
+
+	if(id_card)
+		budget_name = self_paid ? id_card.name : buyer.account_holder
+
+	data["budget_name"] = budget_name
+
+	data["budget_points"] = self_paid ? id_card?.registered_account?.account_balance : buyer?.account_balance
+	data["ammo_amount"] = ammo_purchase_num
+	data["self_paid"] = !!self_paid
+	data["armaments_list"] = list()
+
+	for(var/armament_category as anything in GLOB.armament_entries)
+		var/illegal_failure
+
+		for(var/company as anything in SSgun_companies.companies)
+			if(company != armament_category)
+				continue
+
+			var/datum/gun_company/selected_company = SSgun_companies.companies[company]
+
+			if(!(console_state == CARGO_CONSOLE) && selected_company.illegal)
+				illegal_failure = TRUE
+				break
+
+			var/obj/machinery/computer/cargo/cargo_comp = parent
+			if(selected_company.illegal && !cargo_comp.contraband)
+				illegal_failure = TRUE
+				break
+
+		if(illegal_failure)
+			continue
+
+		var/list/armament_subcategories = list()
+
+		for(var/subcategory as anything in GLOB.armament_entries[armament_category][CATEGORY_ENTRY])
+			var/list/subcategory_items = list()
+			for(var/datum/armament_entry/armament_entry as anything in GLOB.armament_entries[armament_category][CATEGORY_ENTRY][subcategory])
+				if(products && !(armament_entry.type in products))
+					continue
+
+				var/datum/armament_entry/cargo_gun/gun_entry = armament_entry
+
+				if(gun_entry.contraband)
+					if(!(console_state == CARGO_CONSOLE))
+						continue
+					var/obj/machinery/computer/cargo/parent_console = parent
+					if(!parent_console.contraband)
+						continue
+
+				var/cant_purchase = FALSE
+
+				if(gun_entry.interest_required)
+					for(var/company_interested as anything in SSgun_companies.companies)
+						if(company_interested != armament_category)
+							continue
+						var/datum/gun_company/company_datum = SSgun_companies.companies[company_interested]
+						if(company_datum.interest < gun_entry.interest_required)
+							cant_purchase = TRUE
+
+				subcategory_items += list(list(
+					"ref" = REF(armament_entry),
+					"icon" = armament_entry.cached_base64,
+					"name" = armament_entry.name,
+					"cost" = armament_entry.cost,
+					"buyable_ammo" = armament_entry.magazine ? TRUE : FALSE,
+					"magazine_cost" = armament_entry.magazine_cost,
+					"quantity" = gun_entry.stock,
+					"purchased" = purchased_items[armament_entry] ? purchased_items[armament_entry] : 0,
+					"description" = armament_entry.description,
+					"armament_category" = armament_entry.category,
+					"equipment_subcategory" = armament_entry.subcategory,
+					"cant_purchase" = !!cant_purchase,
+				))
+
+			if(!LAZYLEN(subcategory_items))
+				continue
+
+			armament_subcategories += list(list(
+				"subcategory" = subcategory,
+				"items" = subcategory_items,
+			))
+
+		if(!LAZYLEN(armament_subcategories))
+			continue
+
+		var/purchased_company = FALSE
+		var/company_cost = 0
+		var/handout_company = FALSE
+
+		for(var/company as anything in SSgun_companies.companies)
+			if(company != armament_category)
+				continue
+
+			if(company in SSgun_companies.purchased_companies)
+				purchased_company = TRUE
+
+			var/datum/gun_company/company_datum = SSgun_companies.companies[company]
+
+			if((company_datum in SSgun_companies.chosen_handouts) && !SSgun_companies.handout_picked)
+				handout_company = TRUE
+
+			company_cost = company_datum.cost
+
+
+		data["armaments_list"] += list(list(
+			"category" = armament_category,
+			"category_purchased" = !!purchased_company,
+			"category_uses" = used_categories[armament_category],
+			"subcategories" = armament_subcategories,
+			"cost" = company_cost,
+			"handout" = !!handout_company,
+		))
+
+	return data
+
+/datum/component/armament/cargo_gun/ui_interact(mob/user, datum/tgui/ui)
+	ui = SStgui.try_update_ui(user, src, ui)
+	if(!ui)
+		ui = new(user, src, "CargoGunConsole")
+		ui.open()
+
+/datum/component/armament/cargo_gun/select_armament(mob/user, datum/armament_entry/cargo_gun/armament_entry)
+	var/datum/bank_account/buyer = SSeconomy.get_dep_account(ACCOUNT_CAR)
+	var/obj/item/modular_computer/possible_downloader
+	var/obj/machinery/computer/cargo/possible_console
+
+	if(console_state == CARGO_CONSOLE)
+		possible_console = parent
+
+	else if(console_state == IRN_CONSOLE)
+		possible_downloader = parent
+
+	if(!istype(armament_entry))
+		return
+
+	var/mob/living/carbon/human/the_person = user
+
+	if(!istype(the_person))
+		return
+
+	var/obj/item/card/id/id_card
+
+	if(console_state == IRN_CONSOLE)
+		var/obj/item/computer_hardware/card_slot/card_slot = parent_prog.computer.all_components[MC_CARD]
+		id_card = card_slot.GetID()
+	else
+		id_card = the_person.get_idcard(TRUE)
+
+	if(id_card?.registered_account && (console_state == IRN_CONSOLE))
+		if((ACCESS_HEADS in id_card.access) || (ACCESS_QM in id_card.access))
+			parent_prog.requestonly = FALSE
+			buyer = SSeconomy.get_dep_account(id_card.registered_account.account_job.paycheck_department)
+			parent_prog.can_approve_requests = TRUE
+		else
+			parent_prog.requestonly = TRUE
+			parent_prog.can_approve_requests = FALSE
+	else
+		parent_prog?.requestonly = TRUE
+
+	if(self_paid)
+		if(!istype(id_card))
+			to_chat(user, span_warning("No ID card detected."))
+			return
+
+		if(istype(id_card, /obj/item/card/id/departmental_budget))
+			to_chat(user, span_warning("[id_card] cannot be used to make purchases."))
+			return
+
+		var/datum/bank_account/account = id_card.registered_account
+
+		if(!istype(account))
+			to_chat(user, span_warning("Invalid bank account."))
+			return
+
+		buyer = account
+
+	if(!buyer)
+		to_chat(user, span_warning("No budget found!"))
+		return
+
+	if(!armament_entry.stock)
+		to_chat(user, span_warning("No stock of this item left!"))
+		return
+
+	if(!ishuman(user))
+		return
+
+	if(!buyer.has_money(armament_entry.cost)) //so you can't "stash" guns for later merchant cycles
+		to_chat(user, span_warning("Not enough money!"))
+		return
+
+	var/name = the_person.get_authentification_name()
+	var/reason = ""
+
+	if(possible_console)
+		if(possible_console.requestonly && !self_paid)
+			reason = tgui_input_text(user, "Reason", name)
+			if(isnull(reason))
+				return
+
+	else if(possible_downloader)
+		var/datum/computer_file/program/budgetorders/parent_file = parent_prog
+		var/obj/item/computer_hardware/card_slot/card_slot = possible_downloader.all_components[MC_CARD]
+		if((parent_file.requestonly && !self_paid) || !(card_slot?.GetID()))
+			reason = tgui_input_text(user, "Reason", name)
+			if(isnull(reason))
+				return
+
+	used_categories[armament_entry.category]++
+
+	purchased_items[armament_entry]++
+	armament_entry.stock--
+
+	playsound(src, 'sound/machines/machine_vend.ogg', 50, TRUE, extrarange = -3)
+
+	var/datum/supply_pack/armament/created_pack = new
+	created_pack.name = initial(armament_entry.item_type.name)
+	created_pack.cost = cost_calculate(armament_entry.cost) //Paid for seperately
+	created_pack.contains = list(armament_entry.item_type)
+	var/rank = the_person.get_assignment(hand_first = TRUE)
+	var/ckey = the_person.ckey
+	var/datum/supply_order/armament/created_order
+	if(buyer != SSeconomy.get_dep_account(ACCOUNT_CAR))
+		created_order = new(created_pack, name, rank, ckey, paying_account = buyer, reason = reason)
+	else
+		created_order = new(created_pack, name, rank, ckey, reason = reason)
+	created_order.interest_addition = armament_entry.interest_addition
+	created_order.selected_entry = armament_entry
+	created_order.used_component = src
+	if(console_state == CARGO_CONSOLE)
+		created_order.generateRequisition(get_turf(parent))
+		if(possible_console.requestonly && !self_paid)
+			SSshuttle.request_list += created_order
+		else
+			SSshuttle.shopping_list += created_order
+	else if(console_state == IRN_CONSOLE)
+		var/datum/computer_file/program/budgetorders/comp_file = parent_prog
+		created_order.generateRequisition(get_turf(parent))
+		if(comp_file.requestonly && !self_paid)
+			SSshuttle.request_list += created_order
+		else
+			SSshuttle.shopping_list += created_order
+
+/datum/component/armament/cargo_gun/buy_ammo(mob/user, datum/armament_entry/cargo_gun/armament_entry)
+	var/datum/bank_account/buyer = SSeconomy.get_dep_account(ACCOUNT_CAR)
+	var/obj/machinery/computer/cargo/possible_console
+	var/obj/item/modular_computer/possible_downloader
+
+	if(console_state == CARGO_CONSOLE)
+		possible_console = parent
+
+	else if(console_state == IRN_CONSOLE)
+		possible_downloader = parent
+
+	var/mob/living/carbon/human/the_person = user
+
+	if(!istype(the_person))
+		return
+
+	var/obj/item/card/id/id_card
+
+	if(console_state == IRN_CONSOLE)
+		var/obj/item/computer_hardware/card_slot/card_slot = parent_prog.computer.all_components[MC_CARD]
+		id_card = card_slot.GetID()
+	else
+		id_card = the_person.get_idcard(TRUE)
+
+	if(id_card?.registered_account && (console_state == IRN_CONSOLE))
+		if((ACCESS_HEADS in id_card.access) || (ACCESS_QM in id_card.access))
+			parent_prog.requestonly = FALSE
+			buyer = SSeconomy.get_dep_account(id_card.registered_account.account_job.paycheck_department)
+			parent_prog.can_approve_requests = TRUE
+		else
+			parent_prog.requestonly = TRUE
+			parent_prog.can_approve_requests = FALSE
+	else
+		parent_prog?.requestonly = TRUE
+
+	if(self_paid)
+		if(!istype(id_card))
+			to_chat(user, span_warning("No ID card detected."))
+			return
+
+		if(istype(id_card, /obj/item/card/id/departmental_budget))
+			to_chat(user, span_warning("[id_card] cannot be used to make purchases."))
+			return
+
+		var/datum/bank_account/account = id_card.registered_account
+
+		if(!istype(account))
+			to_chat(user, span_warning("Invalid bank account."))
+			return
+
+		buyer = account
+
+	if(!armament_entry.magazine)
+		return
+
+	if(!buyer)
+		to_chat(user, span_warning("No budget found!"))
+		return
+
+	var/quantity_cost = armament_entry.magazine_cost * ammo_purchase_num
+
+	if(!buyer.has_money(quantity_cost))
+		to_chat(user, span_warning("Not enough money!"))
+		return
+
+	var/name = the_person.get_authentification_name()
+	var/reason = ""
+
+	if(possible_console)
+		if(possible_console.requestonly && !self_paid)
+			reason = tgui_input_text(user, "Reason", name)
+			if(isnull(reason))
+				return
+
+	else if(possible_downloader)
+		var/datum/computer_file/program/budgetorders/parent_file = parent_prog
+		var/obj/item/computer_hardware/card_slot/card_slot = possible_downloader.all_components[MC_CARD]
+		if((parent_file.requestonly && !self_paid) || !(card_slot?.GetID()))
+			reason = tgui_input_text(user, "Reason", name)
+			if(isnull(reason))
+				return
+
+
+	var/datum/supply_pack/created_pack = new
+	var/assembled_name = "[initial(armament_entry.item_type.name)] Ammunition (x[ammo_purchase_num])"
+	created_pack.name = assembled_name
+	created_pack.cost = cost_calculate(quantity_cost)
+	created_pack.contains = list()
+	for(var/i in 1 to ammo_purchase_num)
+		created_pack.contains += armament_entry.magazine
+	var/rank = the_person.get_assignment(hand_first = TRUE)
+	var/ckey = the_person.ckey
+	var/datum/supply_order/armament/created_order
+	if(buyer != SSeconomy.get_dep_account(ACCOUNT_CAR))
+		created_order = new(created_pack, name, rank, ckey, paying_account = buyer, reason = reason)
+	else
+		created_order = new(created_pack, name, rank, ckey, reason = reason)
+	created_order.interest_addition = 1 * ammo_purchase_num
+	var/datum/computer_file/program/budgetorders/file_p = parent_prog
+	if(console_state == CARGO_CONSOLE)
+		created_order.generateRequisition(get_turf(parent))
+		if(possible_console.requestonly && !self_paid)
+			SSshuttle.request_list += created_order
+		else
+			SSshuttle.shopping_list += created_order
+	else if(console_state == IRN_CONSOLE)
+		if(file_p.requestonly && !self_paid)
+			SSshuttle.request_list += created_order
+		else
+			SSshuttle.shopping_list += created_order
+
+/datum/component/armament/cargo_gun/proc/cost_calculate(cost)
+	. = cost
+	. *= SSeconomy.pack_price_modifier
+
+/datum/component/armament/cargo_gun/ui_act(action, list/params)
+	. = ..()
+	if(.)
+		return
+
+	switch(action)
+		if("set_ammo_amount")
+			var/target = text2num(params["chosen_amount"])
+			ammo_purchase_num = clamp(target, 1, MAX_AMMO_AMOUNT)
+
+		if("buy_company")
+			var/target = params["selected_company"]
+			var/obj/machinery/computer/cargo/possible_console
+
+			if(console_state == CARGO_CONSOLE)
+				possible_console = parent
+				if(possible_console.requestonly && !self_paid)
+					return
+			else if(console_state == IRN_CONSOLE)
+				if(parent_prog.requestonly && !self_paid)
+					return
+
+			for(var/find_company in SSgun_companies.unpurchased_companies)
+				if(find_company != target)
+					continue
+
+				var/datum/gun_company/found_company = SSgun_companies.unpurchased_companies[target]
+				var/datum/bank_account/buyer = SSeconomy.get_dep_account(ACCOUNT_CAR)
+
+				var/mob/living/carbon/human/user = usr
+
+				if(!istype(user))
+					return
+
+				var/obj/item/card/id/id_card = user.get_idcard(TRUE)
+
+				if(id_card?.registered_account && (console_state == IRN_CONSOLE))
+					if((ACCESS_HEADS in id_card.access) || (ACCESS_QM in id_card.access))
+						parent_prog.requestonly = FALSE
+						buyer = SSeconomy.get_dep_account(id_card.registered_account.account_job.paycheck_department)
+						parent_prog.can_approve_requests = TRUE
+					else
+						parent_prog.requestonly = TRUE
+						parent_prog.can_approve_requests = FALSE
+				else
+					parent_prog?.requestonly = TRUE
+
+				if(self_paid)
+
+					if(!istype(id_card))
+						to_chat(user, span_warning("No ID card detected."))
+						return
+
+					if(istype(id_card, /obj/item/card/id/departmental_budget))
+						to_chat(user, span_warning("[id_card] cannot be used to make purchases."))
+						return
+
+					var/datum/bank_account/account = id_card.registered_account
+
+					if(!istype(account))
+						to_chat(user, span_warning("Invalid bank account."))
+						return
+
+					buyer = account
+
+				var/assigned_cost = -found_company.cost
+				var/do_payment = TRUE
+				if(!SSgun_companies.handout_picked && (found_company in SSgun_companies.chosen_handouts))
+					do_payment = FALSE
+					SSgun_companies.handout_picked = TRUE
+				if(do_payment)
+					if(!buyer.adjust_money(assigned_cost))
+						return
+
+				SSgun_companies.purchased_companies[find_company] = found_company
+				SSgun_companies.unpurchased_companies.Remove(find_company)
+				break
+
+		if("toggleprivate")
+			var/obj/item/card/id/id_card
+			var/mob/living/carbon/human/the_person = usr
+
+			if(!istype(the_person))
+				return
+
+			if(console_state == IRN_CONSOLE)
+				var/obj/item/computer_hardware/card_slot/card_slot = parent_prog.computer.all_components[MC_CARD]
+				id_card = card_slot.GetID()
+			else
+				id_card = the_person.get_idcard(TRUE)
+
+			if(!id_card)
+				return
+
+			self_paid = !self_paid
+
+#undef MAX_AMMO_AMOUNT
+#undef CARGO_CONSOLE
+#undef IRN_CONSOLE
diff --git a/modular_skyrat/modules/gun_cargo/code/armament_datums/allstar.dm b/modular_skyrat/modules/gun_cargo/code/armament_datums/allstar.dm
new file mode 100644
index 00000000000..46586792e74
--- /dev/null
+++ b/modular_skyrat/modules/gun_cargo/code/armament_datums/allstar.dm
@@ -0,0 +1,62 @@
+#define ARMAMENT_CATEGORY_ALLSTAR "Allstar Lasers"
+
+/datum/armament_entry/cargo_gun/allstar
+	category = ARMAMENT_CATEGORY_ALLSTAR
+	company_bitflag = COMPANY_ALLSTAR
+
+/datum/armament_entry/cargo_gun/allstar/laser
+	subcategory = ARMAMENT_SUBCATEGORY_LASER
+
+/datum/armament_entry/cargo_gun/allstar/laser/sc1
+	item_type = /obj/item/gun/energy/laser
+	lower_cost = CARGO_CRATE_VALUE * 4
+	upper_cost = CARGO_CRATE_VALUE * 5
+
+/datum/armament_entry/cargo_gun/allstar/laser/sc2
+	item_type = /obj/item/gun/energy/e_gun
+	lower_cost = CARGO_CRATE_VALUE * 6
+	upper_cost = CARGO_CRATE_VALUE * 8
+
+/datum/armament_entry/cargo_gun/allstar/laser/sc3
+	item_type = /obj/item/gun/energy/laser/hellgun/blueshield
+	lower_cost = CARGO_CRATE_VALUE * 7
+	upper_cost = CARGO_CRATE_VALUE * 9
+
+/datum/armament_entry/cargo_gun/allstar/laser/mini_egun
+	item_type = /obj/item/gun/energy/e_gun/mini
+	lower_cost = CARGO_CRATE_VALUE * 5
+	upper_cost = CARGO_CRATE_VALUE * 7
+
+/datum/armament_entry/cargo_gun/allstar/laser/disabler
+	item_type = /obj/item/gun/energy/disabler
+	lower_cost = CARGO_CRATE_VALUE * 3
+	upper_cost = CARGO_CRATE_VALUE * 4
+
+/datum/armament_entry/cargo_gun/allstar/laser/dragnet
+	item_type = /obj/item/gun/energy/e_gun/dragnet
+	lower_cost = CARGO_CRATE_VALUE * 4
+	upper_cost = CARGO_CRATE_VALUE * 5
+
+/datum/armament_entry/cargo_gun/allstar/gunkit
+	subcategory = ARMAMENT_SUBCATEGORY_GUNPART
+	interest_addition = COMPANY_INTEREST_ATTACHMENT
+
+/datum/armament_entry/cargo_gun/allstar/gunkit/tempgun
+	item_type = /obj/item/weaponcrafting/gunkit/temperature
+	lower_cost = CARGO_CRATE_VALUE * 3
+	upper_cost = CARGO_CRATE_VALUE * 4
+
+/datum/armament_entry/cargo_gun/allstar/gunkit/adv_egun
+	item_type = /obj/item/weaponcrafting/gunkit/nuclear
+	lower_cost = CARGO_CRATE_VALUE * 6
+	upper_cost = CARGO_CRATE_VALUE * 9
+
+/datum/armament_entry/cargo_gun/allstar/gunkit/ion
+	item_type = /obj/item/weaponcrafting/gunkit/ion
+	lower_cost = CARGO_CRATE_VALUE * 6
+	upper_cost = CARGO_CRATE_VALUE * 10
+
+/datum/armament_entry/cargo_gun/allstar/gunkit/hellfire
+	item_type = /obj/item/weaponcrafting/gunkit/hellgun
+	lower_cost = CARGO_CRATE_VALUE * 5
+	upper_cost = CARGO_CRATE_VALUE * 8
diff --git a/modular_skyrat/modules/gun_cargo/code/armament_datums/armadyne.dm b/modular_skyrat/modules/gun_cargo/code/armament_datums/armadyne.dm
new file mode 100644
index 00000000000..f3fc790178b
--- /dev/null
+++ b/modular_skyrat/modules/gun_cargo/code/armament_datums/armadyne.dm
@@ -0,0 +1,69 @@
+#define ARMAMENT_CATEGORY_ARMADYNE "Armadyne Corporation"
+
+/datum/armament_entry/cargo_gun/armadyne
+	category = ARMAMENT_CATEGORY_ARMADYNE
+	company_bitflag = COMPANY_ARMADYNE
+
+/datum/armament_entry/cargo_gun/armadyne/pistol
+	subcategory = ARMAMENT_SUBCATEGORY_PISTOL
+
+/datum/armament_entry/cargo_gun/armadyne/pistol/osprey
+	item_type = /obj/item/gun/ballistic/automatic/pistol/pdh
+	lower_cost = CARGO_CRATE_VALUE * 8
+	upper_cost = CARGO_CRATE_VALUE * 14
+
+/datum/armament_entry/cargo_gun/armadyne/pistol/ladon
+	item_type = /obj/item/gun/ballistic/automatic/pistol/ladon
+	lower_cost = CARGO_CRATE_VALUE * 6
+	upper_cost = CARGO_CRATE_VALUE * 13
+
+/datum/armament_entry/cargo_gun/armadyne/pistol/firefly
+	item_type = /obj/item/gun/ballistic/automatic/pistol/firefly
+	lower_cost = CARGO_CRATE_VALUE * 3
+	upper_cost = CARGO_CRATE_VALUE * 4
+
+/datum/armament_entry/cargo_gun/armadyne/pistol/pdh6b
+	item_type = /obj/item/gun/ballistic/automatic/pistol/pdh/peacekeeper
+	lower_cost = CARGO_CRATE_VALUE * 2
+	upper_cost = CARGO_CRATE_VALUE * 3
+
+/datum/armament_entry/cargo_gun/armadyne/pistol/mk58
+	item_type = /obj/item/gun/ballistic/automatic/pistol/mk58
+	lower_cost = CARGO_CRATE_VALUE * 6
+	upper_cost = CARGO_CRATE_VALUE * 8
+
+/datum/armament_entry/cargo_gun/armadyne/shotgun
+	subcategory = ARMAMENT_SUBCATEGORY_SHOTGUN
+
+/datum/armament_entry/cargo_gun/armadyne/shotgun/as2
+	item_type = /obj/item/gun/ballistic/shotgun/automatic/as2
+	lower_cost = CARGO_CRATE_VALUE * 7
+	upper_cost = CARGO_CRATE_VALUE * 8
+
+/datum/armament_entry/cargo_gun/armadyne/smg
+	subcategory = ARMAMENT_SUBCATEGORY_SUBMACHINEGUN
+	interest_required = PASSED_INTEREST
+
+/datum/armament_entry/cargo_gun/armadyne/smg/dozer
+	item_type = /obj/item/gun/ballistic/automatic/dozer
+	lower_cost = CARGO_CRATE_VALUE * 8
+	upper_cost = CARGO_CRATE_VALUE * 12
+
+/datum/armament_entry/cargo_gun/armadyne/rifle
+	subcategory = ARMAMENT_SUBCATEGORY_ASSAULTRIFLE
+	interest_required = HIGH_INTEREST
+
+/datum/armament_entry/cargo_gun/armadyne/rifle/ripper
+	item_type = /obj/item/gun/ballistic/automatic/dmr
+	lower_cost = CARGO_CRATE_VALUE * 24
+	upper_cost = CARGO_CRATE_VALUE * 28
+
+/datum/armament_entry/cargo_gun/armadyne/rifle/norwind
+	item_type = /obj/item/gun/energy/norwind
+	lower_cost = CARGO_CRATE_VALUE * 10
+	upper_cost = CARGO_CRATE_VALUE * 14
+
+/datum/armament_entry/cargo_gun/armadyne/rifle/ostwind
+	item_type = /obj/item/gun/energy/ostwind
+	lower_cost = CARGO_CRATE_VALUE * 10
+	upper_cost = CARGO_CRATE_VALUE * 14
diff --git a/modular_skyrat/modules/gun_cargo/code/armament_datums/armadyne_oldarms.dm b/modular_skyrat/modules/gun_cargo/code/armament_datums/armadyne_oldarms.dm
new file mode 100644
index 00000000000..eee554e41ae
--- /dev/null
+++ b/modular_skyrat/modules/gun_cargo/code/armament_datums/armadyne_oldarms.dm
@@ -0,0 +1,58 @@
+#define ARMAMENT_CATEGORY_OLDARMS "Armadyne Oldarms"
+
+/datum/armament_entry/cargo_gun/oldarms
+	category = ARMAMENT_CATEGORY_OLDARMS
+	company_bitflag = COMPANY_OLDARMS
+
+/datum/armament_entry/cargo_gun/oldarms/pistol
+	subcategory = ARMAMENT_SUBCATEGORY_PISTOL
+
+/datum/armament_entry/cargo_gun/oldarms/pistol/luger
+	item_type = /obj/item/gun/ballistic/automatic/pistol/luger
+	lower_cost = CARGO_CRATE_VALUE * 7
+	upper_cost = CARGO_CRATE_VALUE * 9
+
+/datum/armament_entry/cargo_gun/oldarms/smg
+	subcategory = ARMAMENT_SUBCATEGORY_SUBMACHINEGUN
+
+/datum/armament_entry/cargo_gun/oldarms/smg/mp40
+	item_type = /obj/item/gun/ballistic/automatic/mp40
+	lower_cost = CARGO_CRATE_VALUE * 20
+	upper_cost = CARGO_CRATE_VALUE * 24
+	interest_required = HIGH_INTEREST
+
+/datum/armament_entry/cargo_gun/oldarms/smg/uzi
+	item_type = /obj/item/gun/ballistic/automatic/mini_uzi
+	lower_cost = CARGO_CRATE_VALUE * 14
+	upper_cost = CARGO_CRATE_VALUE * 18
+
+/datum/armament_entry/cargo_gun/oldarms/smg/ppsh
+	item_type = /obj/item/gun/ballistic/automatic/ppsh
+	lower_cost = CARGO_CRATE_VALUE * 32
+	upper_cost = CARGO_CRATE_VALUE * 38
+	interest_required = HIGH_INTEREST
+
+/datum/armament_entry/cargo_gun/oldarms/smg/thompson
+	item_type = /obj/item/gun/ballistic/automatic/tommygun
+	lower_cost = CARGO_CRATE_VALUE * 30
+	upper_cost = CARGO_CRATE_VALUE * 36
+	interest_required = HIGH_INTEREST
+
+/datum/armament_entry/cargo_gun/oldarms/rifle
+	subcategory = ARMAMENT_SUBCATEGORY_ASSAULTRIFLE
+	interest_required = HIGH_INTEREST
+
+/datum/armament_entry/cargo_gun/oldarms/rifle/vintorez
+	item_type = /obj/item/gun/energy/vintorez
+	lower_cost = CARGO_CRATE_VALUE * 12
+	upper_cost = CARGO_CRATE_VALUE * 18
+
+/datum/armament_entry/cargo_gun/oldarms/rifle/stg
+	item_type = /obj/item/gun/ballistic/automatic/stg
+	lower_cost = CARGO_CRATE_VALUE * 24
+	upper_cost = CARGO_CRATE_VALUE * 28
+
+/datum/armament_entry/cargo_gun/oldarms/rifle/g11
+	item_type = /obj/item/gun/ballistic/automatic/g11
+	lower_cost = CARGO_CRATE_VALUE * 30
+	upper_cost = CARGO_CRATE_VALUE * 35
diff --git a/modular_skyrat/modules/gun_cargo/code/armament_datums/bolt.dm b/modular_skyrat/modules/gun_cargo/code/armament_datums/bolt.dm
new file mode 100644
index 00000000000..c712b5383b7
--- /dev/null
+++ b/modular_skyrat/modules/gun_cargo/code/armament_datums/bolt.dm
@@ -0,0 +1,60 @@
+#define ARMAMENT_CATEGORY_BOLT "Bolt Fabrications"
+
+/datum/armament_entry/cargo_gun/bolt
+	category = ARMAMENT_CATEGORY_BOLT
+	company_bitflag = COMPANY_BOLT
+
+/datum/armament_entry/cargo_gun/bolt/pistol
+	subcategory = ARMAMENT_SUBCATEGORY_PISTOL
+
+/datum/armament_entry/cargo_gun/bolt/pistol/responder
+	item_type = /obj/item/gun/energy/disabler/bolt_disabler
+	lower_cost = CARGO_CRATE_VALUE * 3
+	upper_cost = CARGO_CRATE_VALUE * 4
+
+/datum/armament_entry/cargo_gun/bolt/pistol/m1911
+	item_type = /obj/item/gun/ballistic/automatic/pistol/m1911
+	lower_cost = CARGO_CRATE_VALUE * 4
+	upper_cost = CARGO_CRATE_VALUE * 5
+
+/datum/armament_entry/cargo_gun/bolt/pistol/pepperball
+	item_type = /obj/item/gun/ballistic/automatic/pistol/pepperball
+	lower_cost = CARGO_CRATE_VALUE * 3
+	upper_cost = CARGO_CRATE_VALUE * 5
+
+/datum/armament_entry/cargo_gun/bolt/pistol/spurchamber
+	item_type = /obj/item/gun/ballistic/revolver/zeta
+	lower_cost = CARGO_CRATE_VALUE * 5
+	upper_cost = CARGO_CRATE_VALUE * 7
+
+/datum/armament_entry/cargo_gun/bolt/pistol/spurmaster
+	item_type = /obj/item/gun/ballistic/revolver/revolution
+	lower_cost = CARGO_CRATE_VALUE * 6
+	upper_cost = CARGO_CRATE_VALUE * 8
+
+/datum/armament_entry/cargo_gun/bolt/shotgun
+	subcategory = ARMAMENT_SUBCATEGORY_SHOTGUN
+
+/datum/armament_entry/cargo_gun/bolt/m23
+	item_type = /obj/item/gun/ballistic/shotgun/m23
+	lower_cost = CARGO_CRATE_VALUE * 10
+	upper_cost = CARGO_CRATE_VALUE * 12
+
+/datum/armament_entry/cargo_gun/bolt/generic_shotgun
+	item_type = /obj/item/gun/ballistic/shotgun
+	lower_cost = CARGO_CRATE_VALUE * 8
+	upper_cost = CARGO_CRATE_VALUE * 10
+
+/datum/armament_entry/cargo_gun/bolt/smg
+	subcategory = ARMAMENT_SUBCATEGORY_SUBMACHINEGUN
+	interest_required = PASSED_INTEREST
+
+/datum/armament_entry/cargo_gun/bolt/smg/pcr
+	item_type = /obj/item/gun/energy/pcr
+	lower_cost = CARGO_CRATE_VALUE * 16
+	upper_cost = CARGO_CRATE_VALUE * 20
+
+/datum/armament_entry/cargo_gun/bolt/smg/pitbull
+	item_type = /obj/item/gun/energy/pitbull
+	lower_cost = CARGO_CRATE_VALUE * 16
+	upper_cost = CARGO_CRATE_VALUE * 20
diff --git a/modular_skyrat/modules/gun_cargo/code/armament_datums/cantalan.dm b/modular_skyrat/modules/gun_cargo/code/armament_datums/cantalan.dm
new file mode 100644
index 00000000000..b9597085983
--- /dev/null
+++ b/modular_skyrat/modules/gun_cargo/code/armament_datums/cantalan.dm
@@ -0,0 +1,81 @@
+#define ARMAMENT_CATEGORY_CANTALAN "Cantalan Federal Arms"
+
+/datum/armament_entry/cargo_gun/cantalan
+	category = ARMAMENT_CATEGORY_CANTALAN
+	company_bitflag = COMPANY_CANTALAN
+
+/datum/armament_entry/cargo_gun/cantalan/pistol
+	subcategory = ARMAMENT_SUBCATEGORY_PISTOL
+
+/datum/armament_entry/cargo_gun/cantalan/pistol/glock17
+	item_type = /obj/item/gun/ballistic/automatic/pistol/g17
+	lower_cost = CARGO_CRATE_VALUE * 6
+	upper_cost = CARGO_CRATE_VALUE * 7
+
+/datum/armament_entry/cargo_gun/cantalan/pistol/glock18
+	item_type = /obj/item/gun/ballistic/automatic/pistol/g18
+	lower_cost = CARGO_CRATE_VALUE * 10
+	upper_cost = CARGO_CRATE_VALUE * 12
+
+/datum/armament_entry/cargo_gun/cantalan/pistol/snub
+	item_type = /obj/item/gun/ballistic/automatic/pistol/cfa_snub
+	lower_cost = CARGO_CRATE_VALUE * 8
+	upper_cost = CARGO_CRATE_VALUE * 9
+
+/datum/armament_entry/cargo_gun/cantalan/pistol/ruby
+	item_type = /obj/item/gun/ballistic/automatic/pistol/cfa_ruby
+	lower_cost = CARGO_CRATE_VALUE * 8
+	upper_cost = CARGO_CRATE_VALUE * 9
+
+/datum/armament_entry/cargo_gun/cantalan/smg
+	subcategory = ARMAMENT_SUBCATEGORY_SUBMACHINEGUN
+
+/datum/armament_entry/cargo_gun/cantalan/smg/lynx
+	item_type = /obj/item/gun/ballistic/automatic/cfa_lynx
+	lower_cost = CARGO_CRATE_VALUE * 12
+	upper_cost = CARGO_CRATE_VALUE * 15
+
+/datum/armament_entry/cargo_gun/cantalan/smg/wildcat
+	item_type = /obj/item/gun/ballistic/automatic/cfa_wildcat
+	lower_cost = CARGO_CRATE_VALUE * 9
+	upper_cost = CARGO_CRATE_VALUE * 11
+
+/datum/armament_entry/cargo_gun/cantalan/rifle
+	subcategory = ARMAMENT_SUBCATEGORY_ASSAULTRIFLE
+	interest_required = HIGH_INTEREST
+
+/datum/armament_entry/cargo_gun/cantalan/rifle/catanheim
+	item_type = /obj/item/gun/ballistic/automatic/cfa_rifle
+	lower_cost = CARGO_CRATE_VALUE * 28
+	upper_cost = CARGO_CRATE_VALUE * 32
+
+/datum/armament_entry/cargo_gun/cantalan/ammo
+	subcategory = ARMAMENT_SUBCATEGORY_AMMO
+	stock_mult = 2
+	interest_addition = COMPANY_INTEREST_AMMO
+	lower_cost = CARGO_CRATE_VALUE * 1
+	upper_cost = CARGO_CRATE_VALUE * 2
+
+/datum/armament_entry/cargo_gun/cantalan/ammo/c34
+	item_type = /obj/item/ammo_box/c34
+
+/datum/armament_entry/cargo_gun/cantalan/ammo/c34_ap
+	item_type = /obj/item/ammo_box/c34/ap
+
+/datum/armament_entry/cargo_gun/cantalan/ammo/c34_in
+	item_type = /obj/item/ammo_box/c34/fire
+
+/datum/armament_entry/cargo_gun/cantalan/ammo/c34_rub
+	item_type = /obj/item/ammo_box/c34/rubber
+
+/datum/armament_entry/cargo_gun/cantalan/ammo/c12mm
+	item_type = /obj/item/ammo_box/c12mm
+
+/datum/armament_entry/cargo_gun/cantalan/ammo/c12mm_ap
+	item_type = /obj/item/ammo_box/c12mm/ap
+
+/datum/armament_entry/cargo_gun/cantalan/ammo/c12mm_in
+	item_type = /obj/item/ammo_box/c12mm/fire
+
+/datum/armament_entry/cargo_gun/cantalan/ammo/c12mm_hp
+	item_type = /obj/item/ammo_box/c12mm/hp
diff --git a/modular_skyrat/modules/gun_cargo/code/armament_datums/dynamics.dm b/modular_skyrat/modules/gun_cargo/code/armament_datums/dynamics.dm
new file mode 100644
index 00000000000..15e6fa9d462
--- /dev/null
+++ b/modular_skyrat/modules/gun_cargo/code/armament_datums/dynamics.dm
@@ -0,0 +1,119 @@
+#define ARMAMENT_CATEGORY_DYNAMICS "Armament Dynamics Inc."
+
+/datum/armament_entry/cargo_gun/dynamics
+	category = ARMAMENT_CATEGORY_DYNAMICS
+	company_bitflag = COMPANY_DYNAMICS
+	stock_mult = 2 //To compensate for their interest being fairly low most of the time
+
+/datum/armament_entry/cargo_gun/dynamics/ammo
+	subcategory = ARMAMENT_SUBCATEGORY_AMMO
+	lower_cost = CARGO_CRATE_VALUE * 0.75
+	upper_cost = CARGO_CRATE_VALUE * 1.25
+	interest_addition = COMPANY_INTEREST_AMMO
+
+/datum/armament_entry/cargo_gun/dynamics/ammo/c9mm
+	item_type = /obj/item/ammo_box/c9mm
+
+/datum/armament_entry/cargo_gun/dynamics/ammo/c9mm_ap
+	item_type = /obj/item/ammo_box/c9mm/ap
+
+/datum/armament_entry/cargo_gun/dynamics/ammo/c9mm_hp
+	item_type = /obj/item/ammo_box/c9mm/hp
+
+/datum/armament_entry/cargo_gun/dynamics/ammo/c9mm_in
+	item_type = /obj/item/ammo_box/c9mm/fire
+
+/datum/armament_entry/cargo_gun/dynamics/ammo/c10mm
+	item_type = /obj/item/ammo_box/c10mm
+
+/datum/armament_entry/cargo_gun/dynamics/ammo/c10mm_ap
+	item_type = /obj/item/ammo_box/c10mm/ap
+
+/datum/armament_entry/cargo_gun/dynamics/ammo/c10mm_hp
+	item_type = /obj/item/ammo_box/c10mm/hp
+
+/datum/armament_entry/cargo_gun/dynamics/ammo/c10mm_in
+	item_type = /obj/item/ammo_box/c10mm/fire
+
+/datum/armament_entry/cargo_gun/dynamics/ammo/c12ga
+	item_type = /obj/item/storage/box/lethalshot
+
+/datum/armament_entry/cargo_gun/dynamics/ammo/c12ga_rub
+	item_type = /obj/item/storage/box/rubbershot
+
+/datum/armament_entry/cargo_gun/dynamics/ammo/c12ga_bean
+	item_type = /obj/item/storage/box/beanbag
+
+/datum/armament_entry/cargo_gun/dynamics/ammo/c12ga_tech
+	item_type = /obj/item/storage/box/techshell
+
+/datum/armament_entry/cargo_gun/dynamics/ammo/c46mm
+	item_type = /obj/item/ammo_box/c46x30mm
+
+/datum/armament_entry/cargo_gun/dynamics/ammo/c46mm_ap
+	item_type = /obj/item/ammo_box/c46x30mm/ap
+
+/datum/armament_entry/cargo_gun/dynamics/ammo/c46mm_rub
+	item_type = /obj/item/ammo_box/c46x30mm/rubber
+
+/datum/armament_entry/cargo_gun/dynamics/ammo/c32
+	item_type = /obj/item/ammo_box/c32
+
+/datum/armament_entry/cargo_gun/dynamics/ammo/c32_ap
+	item_type = /obj/item/ammo_box/c32/ap
+
+/datum/armament_entry/cargo_gun/dynamics/ammo/c32_in
+	item_type = /obj/item/ammo_box/c32/fire
+
+/datum/armament_entry/cargo_gun/dynamics/ammo/c32_rub
+	item_type = /obj/item/ammo_box/c32/rubber
+
+/datum/armament_entry/cargo_gun/dynamics/ammo/c38
+	item_type = /obj/item/ammo_box/c38
+	lower_cost = CARGO_CRATE_VALUE * 0.5
+	upper_cost = CARGO_CRATE_VALUE * 1
+	stock_mult = 3
+
+/datum/armament_entry/cargo_gun/dynamics/ammo/c38/dum
+	item_type = /obj/item/ammo_box/c38/dumdum
+
+/datum/armament_entry/cargo_gun/dynamics/ammo/c38/hot
+	item_type = /obj/item/ammo_box/c38/hotshot
+
+/datum/armament_entry/cargo_gun/dynamics/ammo/c38/ice
+	item_type = /obj/item/ammo_box/c38/iceblox
+
+/datum/armament_entry/cargo_gun/dynamics/ammo/c38/mat
+	item_type = /obj/item/ammo_box/c38/match
+
+/datum/armament_entry/cargo_gun/dynamics/ammo/c38/trc
+	item_type = /obj/item/ammo_box/c38/trac
+
+/datum/armament_entry/cargo_gun/dynamics/ammo/b10mm
+	item_type = /obj/item/ammo_box/b10mm
+
+/datum/armament_entry/cargo_gun/dynamics/ammo/b10mm_hp
+	item_type = /obj/item/ammo_box/b10mm/hp
+
+/datum/armament_entry/cargo_gun/dynamics/ammo/b10mm_rub
+	item_type = /obj/item/ammo_box/b10mm/rubber
+
+/datum/armament_entry/cargo_gun/dynamics/misc
+	subcategory = ARMAMENT_SUBCATEGORY_SPECIAL
+
+/datum/armament_entry/cargo_gun/dynamics/misc/bandolier
+	item_type = /obj/item/storage/belt/bandolier
+	lower_cost = CARGO_CRATE_VALUE * 2
+	upper_cost = CARGO_CRATE_VALUE * 4
+
+/datum/armament_entry/cargo_gun/dynamics/misc/ammo_bench
+	item_type = /obj/item/circuitboard/machine/ammo_workbench
+	lower_cost = CARGO_CRATE_VALUE * 28
+	upper_cost = CARGO_CRATE_VALUE * 33
+	interest_required = PASSED_INTEREST
+
+/datum/armament_entry/cargo_gun/dynamics/misc/lethal_disk
+	item_type = /obj/item/disk/ammo_workbench/lethal
+	lower_cost = CARGO_CRATE_VALUE * 22
+	upper_cost = CARGO_CRATE_VALUE * 27
+	interest_required = HIGH_INTEREST
diff --git a/modular_skyrat/modules/gun_cargo/code/armament_datums/interdyne.dm b/modular_skyrat/modules/gun_cargo/code/armament_datums/interdyne.dm
new file mode 100644
index 00000000000..f31611f5a21
--- /dev/null
+++ b/modular_skyrat/modules/gun_cargo/code/armament_datums/interdyne.dm
@@ -0,0 +1,64 @@
+#define ARMAMENT_CATEGORY_INTERDYNE "Interdyne Pharmaceuticals"
+
+/datum/armament_entry/cargo_gun/interdyne
+	category = ARMAMENT_CATEGORY_INTERDYNE
+	company_bitflag = COMPANY_INTERDYNE
+
+/datum/armament_entry/cargo_gun/interdyne/pistol
+	subcategory = ARMAMENT_SUBCATEGORY_PISTOL
+
+/datum/armament_entry/cargo_gun/interdyne/pistol/honeybee
+	item_type = /obj/item/gun/ballistic/automatic/pistol/firefly/smartdart
+	lower_cost = CARGO_CRATE_VALUE * 5
+	upper_cost = CARGO_CRATE_VALUE * 6
+
+/datum/armament_entry/cargo_gun/interdyne/special
+	subcategory = ARMAMENT_SUBCATEGORY_SPECIAL
+
+/datum/armament_entry/cargo_gun/interdyne/special/syringe_gun
+	item_type = /obj/item/gun/syringe
+	lower_cost = CARGO_CRATE_VALUE * 8
+	upper_cost = CARGO_CRATE_VALUE * 12
+
+/datum/armament_entry/cargo_gun/interdyne/special/smartdart_gun
+	item_type = /obj/item/gun/syringe/smartdart
+	lower_cost = CARGO_CRATE_VALUE * 6
+	upper_cost = CARGO_CRATE_VALUE * 8
+
+/datum/armament_entry/cargo_gun/interdyne/special/rapid_syringe_gun
+	item_type = /obj/item/gun/syringe/rapidsyringe
+	lower_cost = CARGO_CRATE_VALUE * 16
+	upper_cost = CARGO_CRATE_VALUE * 18
+	interest_required = PASSED_INTEREST
+
+/datum/armament_entry/cargo_gun/interdyne/ammo
+	subcategory = ARMAMENT_SUBCATEGORY_AMMO
+	interest_addition = COMPANY_INTEREST_AMMO
+
+/datum/armament_entry/cargo_gun/interdyne/ammo/pierce_syringe
+	item_type = /obj/item/storage/box/syringes/piercing
+	lower_cost = CARGO_CRATE_VALUE * 5
+	upper_cost = CARGO_CRATE_VALUE * 8
+	interest_required = PASSED_INTEREST
+
+/datum/armament_entry/cargo_gun/interdyne/ammo/bluespace_syringe
+	item_type = /obj/item/storage/box/syringes/bluespace
+	lower_cost = CARGO_CRATE_VALUE * 9
+	upper_cost = CARGO_CRATE_VALUE * 12
+	interest_required = HIGH_INTEREST
+
+/datum/armament_entry/cargo_gun/interdyne/chemical
+	subcategory = ARMAMENT_SUBCATEGORY_CHEMICAL
+	interest_addition = COMPANY_INTEREST_CHEMICAL
+	contraband = TRUE
+
+/datum/armament_entry/cargo_gun/interdyne/chemical/toxin
+	item_type = /obj/item/reagent_containers/glass/bottle/toxin
+	lower_cost = CARGO_CRATE_VALUE * 2
+	upper_cost = CARGO_CRATE_VALUE * 4
+
+/datum/armament_entry/cargo_gun/interdyne/chemical/cyanide
+	item_type = /obj/item/reagent_containers/glass/bottle/cyanide
+	lower_cost = CARGO_CRATE_VALUE * 4
+	upper_cost = CARGO_CRATE_VALUE * 6
+	interest_required = PASSED_INTEREST
diff --git a/modular_skyrat/modules/gun_cargo/code/armament_datums/izhevsk.dm b/modular_skyrat/modules/gun_cargo/code/armament_datums/izhevsk.dm
new file mode 100644
index 00000000000..55a22503650
--- /dev/null
+++ b/modular_skyrat/modules/gun_cargo/code/armament_datums/izhevsk.dm
@@ -0,0 +1,50 @@
+#define ARMAMENT_CATEGORY_IZHEVSK "Izhevsk Coalition"
+
+/datum/armament_entry/cargo_gun/izhevsk
+	category = ARMAMENT_CATEGORY_IZHEVSK
+	company_bitflag = COMPANY_IZHEVSK
+
+/datum/armament_entry/cargo_gun/izhevsk/pistol
+	subcategory = ARMAMENT_SUBCATEGORY_PISTOL
+
+/datum/armament_entry/cargo_gun/izhevsk/pistol/makarov
+	item_type = /obj/item/gun/ballistic/automatic/pistol/makarov
+	lower_cost = CARGO_CRATE_VALUE * 4
+	upper_cost = CARGO_CRATE_VALUE * 5
+
+/datum/armament_entry/cargo_gun/izhevsk/smg
+	subcategory = ARMAMENT_SUBCATEGORY_SUBMACHINEGUN
+
+/datum/armament_entry/cargo_gun/izhevsk/smg/surplus
+	item_type = /obj/item/gun/ballistic/automatic/plastikov
+	lower_cost = CARGO_CRATE_VALUE * 3
+	upper_cost = CARGO_CRATE_VALUE * 4
+
+/datum/armament_entry/cargo_gun/izhevsk/smg/croon
+	item_type = /obj/item/gun/ballistic/automatic/croon
+	lower_cost = CARGO_CRATE_VALUE * 5
+	upper_cost = CARGO_CRATE_VALUE * 7
+
+/datum/armament_entry/cargo_gun/izhevsk/rifle
+	subcategory = ARMAMENT_SUBCATEGORY_ASSAULTRIFLE
+
+/datum/armament_entry/cargo_gun/izhevsk/rifle/akm
+	item_type = /obj/item/gun/ballistic/automatic/akm
+	lower_cost = CARGO_CRATE_VALUE * 40
+	upper_cost = CARGO_CRATE_VALUE * 45
+	interest_required = HIGH_INTEREST
+
+/datum/armament_entry/cargo_gun/izhevsk/rifle/surplus
+	item_type = /obj/item/gun/ballistic/automatic/surplus
+	lower_cost = CARGO_CRATE_VALUE * 5
+	upper_cost = CARGO_CRATE_VALUE * 6
+
+/datum/armament_entry/cargo_gun/izhevsk/rifle/mosin
+	item_type = /obj/item/gun/ballistic/rifle/boltaction
+	lower_cost = CARGO_CRATE_VALUE * 5
+	upper_cost = CARGO_CRATE_VALUE * 6
+
+/datum/armament_entry/cargo_gun/izhevsk/rifle/revrifle
+	item_type = /obj/item/gun/ballistic/revolver/rifle
+	lower_cost = CARGO_CRATE_VALUE * 3
+	upper_cost = CARGO_CRATE_VALUE * 4
diff --git a/modular_skyrat/modules/gun_cargo/code/armament_datums/micron.dm b/modular_skyrat/modules/gun_cargo/code/armament_datums/micron.dm
new file mode 100644
index 00000000000..e9fd838e8e2
--- /dev/null
+++ b/modular_skyrat/modules/gun_cargo/code/armament_datums/micron.dm
@@ -0,0 +1,142 @@
+#define ARMAMENT_CATEGORY_MICRON "Micron Control Systems"
+
+/datum/armament_entry/cargo_gun/micron
+	category = ARMAMENT_CATEGORY_MICRON
+	company_bitflag = COMPANY_MICRON
+
+/datum/armament_entry/cargo_gun/micron/rifle
+	subcategory = ARMAMENT_SUBCATEGORY_ASSAULTRIFLE
+
+/datum/armament_entry/cargo_gun/micron/rifle/mcr
+	item_type = /obj/item/gun/microfusion/mcr01
+	lower_cost = CARGO_CRATE_VALUE * 12
+	upper_cost = CARGO_CRATE_VALUE * 16
+
+/datum/armament_entry/cargo_gun/micron/ammo
+	subcategory = ARMAMENT_SUBCATEGORY_AMMO
+	interest_addition = COMPANY_INTEREST_AMMO
+
+/datum/armament_entry/cargo_gun/micron/ammo/cell
+	item_type = /obj/item/stock_parts/cell/microfusion
+	lower_cost = CARGO_CRATE_VALUE * 1
+	upper_cost = CARGO_CRATE_VALUE * 1
+
+/datum/armament_entry/cargo_gun/micron/ammo/cell_bulk
+	item_type = /obj/item/storage/box/ammo_box/microfusion/bagless
+	lower_cost = CARGO_CRATE_VALUE * 1
+	upper_cost = CARGO_CRATE_VALUE * 2
+	interest_addition = COMPANY_INTEREST_AMMO_BULK
+
+/datum/armament_entry/cargo_gun/micron/ammo/cell_adv
+	item_type = /obj/item/stock_parts/cell/microfusion/advanced
+	lower_cost = CARGO_CRATE_VALUE * 1
+	upper_cost = CARGO_CRATE_VALUE * 2
+
+/datum/armament_entry/cargo_gun/micron/ammo/cell_adv_bulk
+	item_type = /obj/item/storage/box/ammo_box/microfusion/advanced/bagless
+	lower_cost = CARGO_CRATE_VALUE * 2
+	upper_cost = CARGO_CRATE_VALUE * 3
+	interest_addition = COMPANY_INTEREST_AMMO_BULK
+
+/datum/armament_entry/cargo_gun/micron/ammo/cell_blue
+	item_type = /obj/item/stock_parts/cell/microfusion/bluespace
+	interest_required = HIGH_INTEREST
+	lower_cost = CARGO_CRATE_VALUE * 3
+	upper_cost = CARGO_CRATE_VALUE * 3
+
+/datum/armament_entry/cargo_gun/micron/ammo/cell_blue_bulk
+	item_type = /obj/item/storage/box/ammo_box/microfusion/bluespace/bagless
+	interest_required = HIGH_INTEREST
+	lower_cost = CARGO_CRATE_VALUE * 3
+	upper_cost = CARGO_CRATE_VALUE * 4
+	interest_addition = COMPANY_INTEREST_AMMO_BULK
+
+/datum/armament_entry/cargo_gun/micron/part
+	subcategory = ARMAMENT_SUBCATEGORY_GUNPART
+	interest_addition = COMPANY_INTEREST_ATTACHMENT
+
+/datum/armament_entry/cargo_gun/micron/part/grip
+	item_type = /obj/item/microfusion_gun_attachment/grip
+	lower_cost = CARGO_CRATE_VALUE * 2
+	upper_cost = CARGO_CRATE_VALUE * 3
+
+/datum/armament_entry/cargo_gun/micron/part/scatter
+	item_type = /obj/item/microfusion_gun_attachment/scatter
+	lower_cost = CARGO_CRATE_VALUE * 4
+	upper_cost = CARGO_CRATE_VALUE * 5
+
+/datum/armament_entry/cargo_gun/micron/part/scope
+	item_type = /obj/item/microfusion_gun_attachment/scope
+	lower_cost = CARGO_CRATE_VALUE * 2
+	upper_cost = CARGO_CRATE_VALUE * 3
+
+/datum/armament_entry/cargo_gun/micron/part/rail
+	item_type = /obj/item/microfusion_gun_attachment/rail
+	lower_cost = CARGO_CRATE_VALUE * 2
+	upper_cost = CARGO_CRATE_VALUE * 3
+
+/datum/armament_entry/cargo_gun/micron/part/heatsink
+	item_type = /obj/item/microfusion_gun_attachment/heatsink
+	lower_cost = CARGO_CRATE_VALUE * 3
+	upper_cost = CARGO_CRATE_VALUE * 5
+
+/datum/armament_entry/cargo_gun/micron/part/lance
+	item_type = /obj/item/microfusion_gun_attachment/lance
+	interest_required = PASSED_INTEREST
+	lower_cost = CARGO_CRATE_VALUE * 4
+	upper_cost = CARGO_CRATE_VALUE * 5
+
+/datum/armament_entry/cargo_gun/micron/emitter
+	subcategory = ARMAMENT_SUBCATEGORY_EMITTER
+	interest_addition = COMPANY_INTEREST_ATTACHMENT
+
+/datum/armament_entry/cargo_gun/micron/emitter/enh_emitter
+	item_type = /obj/item/microfusion_phase_emitter/enhanced
+	lower_cost = CARGO_CRATE_VALUE * 3
+	upper_cost = CARGO_CRATE_VALUE * 4
+
+/datum/armament_entry/cargo_gun/micron/emitter/adv_emitter
+	item_type = /obj/item/microfusion_phase_emitter/advanced
+	lower_cost = CARGO_CRATE_VALUE * 5
+	upper_cost = CARGO_CRATE_VALUE * 7
+
+/datum/armament_entry/cargo_gun/micron/emitter/blue_emitter
+	item_type = /obj/item/microfusion_phase_emitter/bluespace
+	interest_required = HIGH_INTEREST
+	lower_cost = CARGO_CRATE_VALUE * 7
+	upper_cost = CARGO_CRATE_VALUE * 10
+
+/datum/armament_entry/cargo_gun/micron/cell_upgrade
+	subcategory = ARMAMENT_SUBCATEGORY_CELL_UPGRADE
+	interest_addition = COMPANY_INTEREST_ATTACHMENT
+
+/datum/armament_entry/cargo_gun/micron/cell_upgrade/recharge
+	item_type = /obj/item/microfusion_cell_attachment/rechargeable
+	lower_cost = CARGO_CRATE_VALUE * 4
+	upper_cost = CARGO_CRATE_VALUE * 6
+
+/datum/armament_entry/cargo_gun/micron/cell_upgrade/stabilize
+	item_type = /obj/item/microfusion_cell_attachment/stabiliser
+	lower_cost = CARGO_CRATE_VALUE * 2
+	upper_cost = CARGO_CRATE_VALUE * 3
+
+/datum/armament_entry/cargo_gun/micron/cell_upgrade/overcapacity
+	item_type = /obj/item/microfusion_cell_attachment/overcapacity
+	lower_cost = CARGO_CRATE_VALUE * 3
+	upper_cost = CARGO_CRATE_VALUE * 4
+
+/datum/armament_entry/cargo_gun/micron/cell_upgrade/selfcharge
+	item_type = /obj/item/microfusion_cell_attachment/selfcharging
+	interest_required = HIGH_INTEREST
+	lower_cost = CARGO_CRATE_VALUE * 5
+	upper_cost = CARGO_CRATE_VALUE * 6
+
+/datum/armament_entry/cargo_gun/micron/cell_upgrade/tactical
+	item_type = /obj/item/microfusion_cell_attachment/tactical
+	lower_cost = CARGO_CRATE_VALUE * 2
+	upper_cost = CARGO_CRATE_VALUE * 3
+
+/datum/armament_entry/cargo_gun/micron/cell_upgrade/reloader
+	item_type = /obj/item/microfusion_cell_attachment/reloader
+	lower_cost = CARGO_CRATE_VALUE * 2
+	upper_cost = CARGO_CRATE_VALUE * 3
diff --git a/modular_skyrat/modules/gun_cargo/code/armament_datums/nanotrasen.dm b/modular_skyrat/modules/gun_cargo/code/armament_datums/nanotrasen.dm
new file mode 100644
index 00000000000..2047e68f600
--- /dev/null
+++ b/modular_skyrat/modules/gun_cargo/code/armament_datums/nanotrasen.dm
@@ -0,0 +1,55 @@
+#define ARMAMENT_CATEGORY_NANOTRASEN "Nanotrasen Armories"
+
+/datum/armament_entry/cargo_gun/nanotrasen
+	category = ARMAMENT_CATEGORY_NANOTRASEN
+	company_bitflag = COMPANY_NANOTRASEN
+
+/datum/armament_entry/cargo_gun/nanotrasen/pistol
+	subcategory = ARMAMENT_SUBCATEGORY_PISTOL
+
+/datum/armament_entry/cargo_gun/nanotrasen/pistol/thermal_holster
+	item_type = /obj/item/storage/belt/holster/thermal
+	lower_cost = CARGO_CRATE_VALUE * 8
+	upper_cost = CARGO_CRATE_VALUE * 12
+
+/datum/armament_entry/cargo_gun/nanotrasen/shotgun
+	subcategory = ARMAMENT_SUBCATEGORY_SHOTGUN
+
+/datum/armament_entry/cargo_gun/nanotrasen/shotgun/riot
+	item_type = /obj/item/gun/ballistic/shotgun/riot
+	lower_cost = CARGO_CRATE_VALUE * 8
+	upper_cost = CARGO_CRATE_VALUE * 12
+
+/datum/armament_entry/cargo_gun/nanotrasen/shotgun/combat
+	item_type = /obj/item/gun/ballistic/shotgun/automatic/combat
+	lower_cost = CARGO_CRATE_VALUE * 10
+	upper_cost = CARGO_CRATE_VALUE * 14
+
+/datum/armament_entry/cargo_gun/nanotrasen/smg
+	subcategory = ARMAMENT_SUBCATEGORY_SUBMACHINEGUN
+	interest_required = PASSED_INTEREST
+
+/datum/armament_entry/cargo_gun/nanotrasen/smg/saber
+	item_type = /obj/item/gun/ballistic/automatic/proto
+	lower_cost = CARGO_CRATE_VALUE * 12
+	upper_cost = CARGO_CRATE_VALUE * 18
+
+/datum/armament_entry/cargo_gun/nanotrasen/smg/cmg
+	item_type = /obj/item/gun/ballistic/automatic/cmg
+	lower_cost = CARGO_CRATE_VALUE * 8
+	upper_cost = CARGO_CRATE_VALUE * 13
+
+/datum/armament_entry/cargo_gun/nanotrasen/rifle
+	subcategory = ARMAMENT_SUBCATEGORY_ASSAULTRIFLE
+	interest_required = HIGH_INTEREST
+
+/datum/armament_entry/cargo_gun/nanotrasen/rifle/wtrifle
+	item_type = /obj/item/gun/ballistic/automatic/wt550
+	lower_cost = CARGO_CRATE_VALUE * 12
+	upper_cost = CARGO_CRATE_VALUE * 16
+	interest_required = PASSED_INTEREST
+
+/datum/armament_entry/cargo_gun/nanotrasen/rifle/boarder
+	item_type = /obj/item/gun/ballistic/automatic/ar
+	lower_cost = CARGO_CRATE_VALUE * 28
+	upper_cost = CARGO_CRATE_VALUE * 32
diff --git a/modular_skyrat/modules/gun_cargo/code/armament_datums/parent_armament.dm b/modular_skyrat/modules/gun_cargo/code/armament_datums/parent_armament.dm
new file mode 100644
index 00000000000..e55c5b45d84
--- /dev/null
+++ b/modular_skyrat/modules/gun_cargo/code/armament_datums/parent_armament.dm
@@ -0,0 +1,20 @@
+/datum/armament_entry/cargo_gun
+	max_purchase = 10
+	category_item_limit = 10
+	cost = 1
+	/// Bitflag of the company
+	var/company_bitflag
+	/// How much stock of this item is left
+	var/stock = 10
+	/// Lower bound of random pricing
+	var/lower_cost = 100
+	/// Upper bound of random pricing
+	var/upper_cost = 200
+	/// How much the stock is multiplied by
+	var/stock_mult = 1
+	/// How much will be added to a company's reputation on-buy
+	var/interest_addition = COMPANY_INTEREST_GUN
+	/// What interest level is needed to purchase the armament, set to 0 for none
+	var/interest_required = 0
+	/// If this requires a multitooled console to be visible
+	var/contraband = FALSE
diff --git a/modular_skyrat/modules/gun_cargo/code/armament_datums/scarborough.dm b/modular_skyrat/modules/gun_cargo/code/armament_datums/scarborough.dm
new file mode 100644
index 00000000000..a7eaff1b2e1
--- /dev/null
+++ b/modular_skyrat/modules/gun_cargo/code/armament_datums/scarborough.dm
@@ -0,0 +1,64 @@
+#define ARMAMENT_CATEGORY_SCARBOROUGH "Scarborough Arms"
+
+/datum/armament_entry/cargo_gun/scarborough
+	category = ARMAMENT_CATEGORY_SCARBOROUGH
+	company_bitflag = COMPANY_SCARBOROUGH
+
+/datum/armament_entry/cargo_gun/scarborough/pistol
+	subcategory = ARMAMENT_SUBCATEGORY_PISTOL
+
+/datum/armament_entry/cargo_gun/scarborough/pistol/makarov
+	item_type = /obj/item/gun/ballistic/automatic/pistol
+	lower_cost = CARGO_CRATE_VALUE * 10
+	upper_cost = CARGO_CRATE_VALUE * 15
+
+/datum/armament_entry/cargo_gun/scarborough/pistol/aps
+	item_type = /obj/item/gun/ballistic/automatic/pistol/aps
+	lower_cost = CARGO_CRATE_VALUE * 18
+	upper_cost = CARGO_CRATE_VALUE * 22
+	interest_required = PASSED_INTEREST
+
+/datum/armament_entry/cargo_gun/scarborough/shotgun
+	subcategory = ARMAMENT_SUBCATEGORY_SHOTGUN
+
+/datum/armament_entry/cargo_gun/scarborough/shotgun/bulldog
+	item_type = /obj/item/gun/ballistic/shotgun/bulldog/unrestricted
+	lower_cost = CARGO_CRATE_VALUE * 18
+	upper_cost = CARGO_CRATE_VALUE * 20
+	interest_required = PASSED_INTEREST
+
+/datum/armament_entry/cargo_gun/scarborough/smg
+	subcategory = ARMAMENT_SUBCATEGORY_SUBMACHINEGUN
+
+/datum/armament_entry/cargo_gun/scarborough/smg/c20r
+	item_type = /obj/item/gun/ballistic/automatic/c20r/unrestricted
+	lower_cost = CARGO_CRATE_VALUE * 20
+	upper_cost = CARGO_CRATE_VALUE * 25
+
+/datum/armament_entry/cargo_gun/scarborough/rifle
+	subcategory = ARMAMENT_SUBCATEGORY_ASSAULTRIFLE
+
+/datum/armament_entry/cargo_gun/scarborough/rifle/m90gl // Fucking expensive as hell.
+	item_type = /obj/item/gun/ballistic/automatic/m90/unrestricted
+	lower_cost = CARGO_CRATE_VALUE * 42
+	upper_cost = CARGO_CRATE_VALUE * 47
+	interest_required = HIGH_INTEREST
+
+/datum/armament_entry/cargo_gun/scarborough/part
+	subcategory = ARMAMENT_SUBCATEGORY_GUNPART
+	interest_addition = COMPANY_INTEREST_ATTACHMENT
+
+/datum/armament_entry/cargo_gun/scarborough/part/suppressor
+	item_type = /obj/item/suppressor
+	lower_cost = CARGO_CRATE_VALUE * 10
+	upper_cost = CARGO_CRATE_VALUE * 15
+
+/datum/armament_entry/cargo_gun/scarborough/ammo
+	subcategory = ARMAMENT_SUBCATEGORY_AMMO
+	interest_addition = COMPANY_INTEREST_AMMO
+
+/datum/armament_entry/cargo_gun/scarborough/ammo/grenade
+	item_type = /obj/item/ammo_casing/a40mm
+	lower_cost = CARGO_CRATE_VALUE * 15
+	upper_cost = CARGO_CRATE_VALUE * 24
+	interest_required = HIGH_INTEREST
diff --git a/modular_skyrat/modules/gun_cargo/code/company_datums.dm b/modular_skyrat/modules/gun_cargo/code/company_datums.dm
new file mode 100644
index 00000000000..b5e29d11b52
--- /dev/null
+++ b/modular_skyrat/modules/gun_cargo/code/company_datums.dm
@@ -0,0 +1,113 @@
+/datum/gun_company
+	/// Name of the company
+	var/name
+	/// UNUSED, description of the company
+	var/desc
+	/// Bitflag that should match what guns the company produces
+	var/company_flag
+	/// If the company needs a multitooled console to see
+	var/illegal = FALSE
+	/// Var for internal calculations, don't touch
+	var/base_cost = 0
+	/// How much the company costs, can shift over time
+	var/cost = 0
+	/// Multiplier added to the cost before showing the final price to the user
+	var/cost_mult = 1
+	/// On a subsystem fire, will lower/raise company values by a random value between lower and upper
+	var/cost_change_lower = -100
+	/// On a subsystem fire, will lower/raise company values by a random value between lower and upper
+	var/cost_change_upper = 100
+	/// If this company can be picked to be a handout company to start
+	var/can_roundstart_pick = TRUE
+	/// The "interest" value of the company, to determine how much stock the company has, goes down passively and is raised by things being bought
+	var/interest = 0
+	/// Multiplier for magazine costs
+	var/magazine_cost_mult = 1
+
+/datum/gun_company/armadyne
+	name = "Armadyne Corporation"
+	can_roundstart_pick = FALSE
+	company_flag = COMPANY_ARMADYNE
+	cost = 7500
+	cost_change_lower = -2500
+	cost_change_upper = 8500
+
+/datum/gun_company/cantalan
+	name = "Cantalan Federal Arms"
+	can_roundstart_pick = FALSE
+	company_flag = COMPANY_CANTALAN
+	magazine_cost_mult = 3 //RIP
+	cost = 4500
+	cost_change_lower = -4000
+	cost_change_upper = 7500
+
+/datum/gun_company/scarborough
+	name = "Scarborough Arms"
+	illegal = TRUE
+	can_roundstart_pick = FALSE
+	company_flag = COMPANY_SCARBOROUGH
+	cost = 20000
+	cost_change_lower = 0 //stonks never go down
+	cost_change_upper = 20000
+	cost_mult = 1.1
+
+/datum/gun_company/bolt
+	name = "Bolt Fabrications"
+	company_flag = COMPANY_BOLT
+	cost = 4500
+	cost_change_lower = -4250
+	cost_change_upper = 8500
+
+/datum/gun_company/oldarms
+	name = "Armadyne Oldarms"
+	can_roundstart_pick = FALSE
+	company_flag = COMPANY_OLDARMS
+	cost_change_lower = -2000
+	cost_change_upper = 15000
+	cost = 10000
+	magazine_cost_mult = 2.5
+
+/datum/gun_company/izhevsk
+	name = "Izhevsk Coalition"
+	company_flag = COMPANY_IZHEVSK
+	cost_change_lower = -2500 //cheap as hell "company" is cheap as hell to buy
+	cost_change_upper = 4500
+	cost = 3000
+	cost_mult = 0.9
+
+/datum/gun_company/nanotrasen
+	name = "Nanotrasen Armories"
+	company_flag = COMPANY_NANOTRASEN
+	cost_change_lower = -2000
+	cost_change_upper = 10000
+	cost = 7500
+
+/datum/gun_company/allstar
+	name = "Allstar Lasers"
+	company_flag = COMPANY_ALLSTAR
+	cost_change_lower = -5000
+	cost_change_upper = 8750
+	cost = 6500
+
+/datum/gun_company/micron
+	name = "Micron Control Systems"
+	can_roundstart_pick = FALSE
+	company_flag = COMPANY_MICRON
+	cost_change_lower = -2250
+	cost_change_upper = 12500 //This is an alternative to R&D, so it's expensive as hell
+	cost = 10000
+
+/datum/gun_company/interdyne
+	name = "Interdyne Pharmaceuticals"
+	company_flag = COMPANY_INTERDYNE
+	cost_change_lower = -4500
+	cost_change_upper = 6500
+	cost = 7500
+
+/datum/gun_company/dynamics
+	name = "Armament Dynamics Inc."
+	can_roundstart_pick = FALSE
+	company_flag = COMPANY_DYNAMICS
+	cost_change_lower = -5000
+	cost_change_upper = 8500
+	cost = 4500 //subsidized or smth
diff --git a/modular_skyrat/modules/gun_cargo/code/datums/cargo_order.dm b/modular_skyrat/modules/gun_cargo/code/datums/cargo_order.dm
new file mode 100644
index 00000000000..23f0170bd4f
--- /dev/null
+++ b/modular_skyrat/modules/gun_cargo/code/datums/cargo_order.dm
@@ -0,0 +1,29 @@
+/datum/supply_order/armament
+	/// The armament entry used to fill the supply order
+	var/datum/armament_entry/cargo_gun/selected_entry
+	/// The component used to create the order
+	var/datum/component/armament/cargo_gun/used_component
+	/// How much it'll add to a company's interest on-buy
+	var/interest_addition
+
+/datum/supply_order/armament/Destroy(force, ...)
+	selected_entry = null
+	used_component = null
+	. = ..()
+
+/datum/supply_order/armament/proc/reimburse_armament()
+	if(!selected_entry || !used_component)
+		return
+	used_component.purchased_items[selected_entry]--
+	selected_entry.stock++
+
+/// A proc to be overriden if you want custom code to happen when SSshuttle spawns the order
+/datum/supply_order/proc/on_spawn()
+	return
+
+/datum/supply_order/armament/on_spawn()
+	for(var/company in SSgun_companies.companies)
+		var/datum/gun_company/comp_datum = SSgun_companies.companies[company]
+		if(comp_datum.company_flag == selected_entry?.company_bitflag)
+			comp_datum.interest += interest_addition
+			break
diff --git a/modular_skyrat/modules/gun_cargo/code/datums/cargo_pack.dm b/modular_skyrat/modules/gun_cargo/code/datums/cargo_pack.dm
new file mode 100644
index 00000000000..0cd6a87c562
--- /dev/null
+++ b/modular_skyrat/modules/gun_cargo/code/datums/cargo_pack.dm
@@ -0,0 +1,13 @@
+/datum/supply_pack/armament
+
+/datum/supply_pack/armament/generate(atom/A, datum/bank_account/paying_account)
+	. = ..()
+	/*
+	var/obj/structure/container = .
+	for(var/obj/item/gun/gun_actually in container.contents)
+		if(gun_actually.company_flag & COMPANY_SCARBOROUGH) //illegal company doesn't care about pins
+			continue
+		QDEL_NULL(gun_actually.pin)
+		var/obj/item/firing_pin/permit_pin/new_pin = new(gun_actually)
+		gun_actually.pin = new_pin
+*/
diff --git a/modular_skyrat/modules/gun_cargo/code/datums/hud.dm b/modular_skyrat/modules/gun_cargo/code/datums/hud.dm
new file mode 100644
index 00000000000..e48060a363e
--- /dev/null
+++ b/modular_skyrat/modules/gun_cargo/code/datums/hud.dm
@@ -0,0 +1,2 @@
+/datum/atom_hud/data/human/permit
+	hud_icons = list(PERMIT_HUD)
diff --git a/modular_skyrat/modules/gun_cargo/code/gun_companies.dm b/modular_skyrat/modules/gun_cargo/code/gun_companies.dm
new file mode 100644
index 00000000000..0a7fcb0f96b
--- /dev/null
+++ b/modular_skyrat/modules/gun_cargo/code/gun_companies.dm
@@ -0,0 +1,39 @@
+/obj/item/gun/ballistic/automatic/pistol
+	company_flag = COMPANY_SCARBOROUGH
+
+/obj/item/gun/ballistic/automatic/pistol/m1911
+	company_flag = COMPANY_BOLT
+
+/obj/item/gun/ballistic/automatic/pistol/aps
+	company_flag = COMPANY_SCARBOROUGH
+
+/obj/item/gun/ballistic/revolver
+	company_flag = COMPANY_SCARBOROUGH
+
+/obj/item/gun/ballistic/revolver/nagant
+	company_flag = COMPANY_OLDARMS
+
+/obj/item/gun/ballistic/rifle/boltaction
+	company_flag = COMPANY_IZHEVSK
+	dirt_modifier = 0.75
+
+/obj/item/gun/ballistic/shotgun/riot
+	company_flag = COMPANY_NANOTRASEN
+
+/obj/item/gun/ballistic/shotgun/bulldog
+	company_flag = COMPANY_SCARBOROUGH
+
+/obj/item/gun/energy/e_gun
+	company_flag = COMPANY_ALLSTAR
+
+/obj/item/gun/energy/laser
+	company_flag = COMPANY_ALLSTAR
+
+/obj/item/gun/energy/pulse
+	company_flag = COMPANY_NANOTRASEN
+
+/obj/item/gun/ballistic/shotgun/automatic/combat
+	company_flag = COMPANY_NANOTRASEN
+
+/obj/item/gun/syringe
+	company_flag = COMPANY_INTERDYNE
diff --git a/modular_skyrat/modules/gun_cargo/code/gun_subsystem.dm b/modular_skyrat/modules/gun_cargo/code/gun_subsystem.dm
new file mode 100644
index 00000000000..9a429a2bf4f
--- /dev/null
+++ b/modular_skyrat/modules/gun_cargo/code/gun_subsystem.dm
@@ -0,0 +1,150 @@
+#define MAX_HANDOUT_CHOICES 3
+#define FAILED_INTEREST 1
+#define PASSED_INTEREST 2
+#define HIGH_INTEREST 3
+#define INTEREST_HIGH_MULT 10
+#define INTEREST_CAP 75
+#define INTEREST_LOWER_RAND 5
+#define INTEREST_HIGHER_RAND 25
+#define BASE_COST_MINIMUM 1000
+#define BASE_COST_MAXIMUM 75000
+#define INTEREST_LOW_MAG_COST 0.1
+#define INTEREST_MED_MAG_COST 0.11
+#define INTEREST_HIGH_MAG_COST 0.125
+
+SUBSYSTEM_DEF(gun_companies)
+	name = "Gun Companies"
+	wait = 20 MINUTES
+	runlevels = RUNLEVEL_GAME
+	/// Assoc list of companies that the subsystem has initialized, `"NAME" = datum_reference`
+	var/list/companies = list()
+	/// Assoc list of unpurchased companies
+	var/list/unpurchased_companies = list()
+	/// Assoc list of purchased companies
+	var/list/purchased_companies = list()
+	/// List of chosen handout company datums, for the user to pick 1
+	var/list/chosen_handouts = list()
+	/// Picked a free company yet?
+	var/handout_picked = FALSE
+
+/datum/controller/subsystem/gun_companies/Initialize(start_timeofday)
+	// Adds the company refs to the unchanging companies list and the changing unpurchased_companies list
+	for(var/datum/gun_company/company as anything in subtypesof(/datum/gun_company))
+		var/datum/gun_company/new_company = new company
+		companies[new_company.name] = new_company
+		unpurchased_companies[new_company.name] = new_company
+
+	// Cargo gets to pick one company from several for free
+	var/list/potential_handouts = list()
+	for(var/company_name in unpurchased_companies)
+		var/datum/gun_company/picked_company = unpurchased_companies[company_name]
+		if(!picked_company.can_roundstart_pick)
+			continue
+		potential_handouts += picked_company
+	for(var/i in 1 to MAX_HANDOUT_CHOICES)
+		chosen_handouts += pick_n_take(potential_handouts)
+	fire() //Gotta get the prices randomized to start
+	return ..()
+
+/datum/controller/subsystem/gun_companies/Destroy()
+	for(var/company in companies)
+		QDEL_NULL(company)
+	for(var/company_unbought in unpurchased_companies)
+		QDEL_NULL(unpurchased_companies)
+	for(var/company_bought in purchased_companies)
+		QDEL_NULL(purchased_companies)
+	. = ..()
+
+/datum/controller/subsystem/gun_companies/Recover()
+	companies = SSgun_companies.companies
+	unpurchased_companies = SSgun_companies.unpurchased_companies
+	purchased_companies = SSgun_companies.purchased_companies
+
+/datum/controller/subsystem/gun_companies/fire(resumed)
+	var/list/passed_interest_tier = list()
+	// Company handling
+	for(var/company in companies)
+		var/datum/gun_company/company_datum = companies[company]
+
+		// Set the prices of the companies, is intended to slowly scale up over time
+		company_datum.base_cost += max(rand(company_datum.cost_change_lower, company_datum.cost_change_upper), 0)
+		company_datum.base_cost = clamp(company_datum.base_cost, BASE_COST_MINIMUM, BASE_COST_MAXIMUM)
+		company_datum.base_cost = company_datum.base_cost <= BASE_COST_MINIMUM ? BASE_COST_MINIMUM : company_datum.base_cost
+		company_datum.cost = round(company_datum.base_cost * company_datum.cost_mult)
+		// knocking down the interest of all companies
+		var/interest_threshold = rand(INTEREST_LOWER_RAND, INTEREST_HIGHER_RAND)
+		var/interest_knockdown = 0.5 * interest_threshold
+
+		if(company_datum in unpurchased_companies)
+			interest_knockdown *= 0.5
+
+		company_datum.interest = max(company_datum.interest - interest_knockdown, 0)
+
+		// determining what heirarchy of interest the company falls in
+		if(company_datum.interest < interest_threshold)
+			passed_interest_tier[company_datum] = FAILED_INTEREST
+
+		else
+			var/non_zero_threshold = interest_threshold ? interest_threshold : 1
+			var/calc_threshold = non_zero_threshold * INTEREST_HIGH_MULT
+			if(calc_threshold > INTEREST_CAP)
+				calc_threshold = INTEREST_CAP
+			if(company_datum.interest < calc_threshold)
+				passed_interest_tier[company_datum] = PASSED_INTEREST
+
+			else
+				passed_interest_tier[company_datum] = HIGH_INTEREST
+
+
+	var/list/products = subtypesof(/datum/armament_entry/cargo_gun)
+	// Setting cost and stock of armament entries
+	for(var/armament_category as anything in GLOB.armament_entries)
+		for(var/subcategory as anything in GLOB.armament_entries[armament_category][CATEGORY_ENTRY])
+			for(var/datum/armament_entry/armament_entry as anything in GLOB.armament_entries[armament_category][CATEGORY_ENTRY][subcategory])
+				if(products && !(armament_entry.type in products))
+					continue
+
+				var/datum/armament_entry/cargo_gun/entry_typecast = armament_entry
+
+				for(var/company_gun in companies)
+					var/datum/gun_company/the_datum = companies[company_gun]
+
+					if(the_datum.company_flag != entry_typecast.company_bitflag)
+						continue
+
+					switch(passed_interest_tier[the_datum])
+
+						if(FAILED_INTEREST)
+							var/stock_failed = rand(0, 2)
+							entry_typecast.stock = max((round(stock_failed * entry_typecast.stock_mult)), 0)
+							var/gun_cost_failed = rand(entry_typecast.lower_cost, entry_typecast.upper_cost)
+							var/compound_cost = round(entry_typecast.cost * 0.1)
+							entry_typecast.cost = max((round((gun_cost_failed + (compound_cost + CARGO_CRATE_VALUE)) - (0.25 * entry_typecast.lower_cost)) ), 0)
+							entry_typecast.magazine_cost = round((entry_typecast.cost * INTEREST_LOW_MAG_COST) * the_datum.magazine_cost_mult)
+
+						if(PASSED_INTEREST)
+							var/stock_passed = rand(0, 4)
+							entry_typecast.stock = max((round(stock_passed * entry_typecast.stock_mult) + 1), 0)
+							var/gun_cost_passed = rand(entry_typecast.lower_cost, entry_typecast.upper_cost)
+							var/compound_cost = round(entry_typecast.cost * 0.1)
+							entry_typecast.cost = max((round(gun_cost_passed + compound_cost) + CARGO_CRATE_VALUE), 0)
+							entry_typecast.magazine_cost = round((entry_typecast.cost * INTEREST_MED_MAG_COST) * the_datum.magazine_cost_mult)
+
+						if(HIGH_INTEREST)
+							var/stock_interested = rand(0, 6)
+							entry_typecast.stock = max((round(stock_interested * entry_typecast.stock_mult) + 2), 0)
+							var/gun_cost_high = rand(entry_typecast.lower_cost, entry_typecast.upper_cost)
+							var/compound_cost = round(entry_typecast.cost * 0.1)
+							entry_typecast.cost = max(round(gun_cost_high + (compound_cost + CARGO_CRATE_VALUE)) , 0)
+							entry_typecast.magazine_cost = round((entry_typecast.cost * INTEREST_HIGH_MAG_COST) * the_datum.magazine_cost_mult)
+
+#undef MAX_HANDOUT_CHOICES
+#undef INTEREST_HIGH_MULT
+#undef INTEREST_CAP
+#undef INTEREST_LOWER_RAND
+#undef INTEREST_HIGHER_RAND
+#undef BASE_COST_MINIMUM
+#undef BASE_COST_MAXIMUM
+#undef INTEREST_LOW_MAG_COST
+#undef INTEREST_MED_MAG_COST
+#undef INTEREST_HIGH_MAG_COST
diff --git a/modular_skyrat/modules/gun_cargo/code/objects/access.dm b/modular_skyrat/modules/gun_cargo/code/objects/access.dm
new file mode 100644
index 00000000000..e7e33cbafd1
--- /dev/null
+++ b/modular_skyrat/modules/gun_cargo/code/objects/access.dm
@@ -0,0 +1,8 @@
+/obj/item/proc/get_gun_permit_iconstate()
+	var/obj/item/card/id/id_card = GetID()
+
+	if(!id_card)
+		return "hudfan_no"
+	if(ACCESS_WEAPONS in id_card.GetAccess())
+		return "hud_permit"
+	return "hudfan_no"
diff --git a/modular_skyrat/modules/gun_cargo/code/objects/ammo_boxes.dm b/modular_skyrat/modules/gun_cargo/code/objects/ammo_boxes.dm
new file mode 100644
index 00000000000..78de9353ebd
--- /dev/null
+++ b/modular_skyrat/modules/gun_cargo/code/objects/ammo_boxes.dm
@@ -0,0 +1,130 @@
+/obj/item/ammo_box/c9mm/ap
+	name = "ammo box (9mm AP)"
+	ammo_type = /obj/item/ammo_casing/c9mm/ap
+
+/obj/item/ammo_box/c9mm/hp
+	name = "ammo box (9mm HP)"
+	ammo_type = /obj/item/ammo_casing/c9mm/hp
+
+/obj/item/ammo_box/c9mm/fire
+	name = "ammo box (9mm Incen)"
+	ammo_type = /obj/item/ammo_casing/c9mm/fire
+
+/obj/item/ammo_box/c10mm/ap
+	name = "ammo box (10mm AP)"
+	ammo_type = /obj/item/ammo_casing/c10mm/ap
+	max_ammo = 20
+
+/obj/item/ammo_box/c10mm/hp
+	name = "ammo box (10mm HP)"
+	ammo_type = /obj/item/ammo_casing/c10mm/hp
+	max_ammo = 20
+
+/obj/item/ammo_box/c10mm/fire
+	name = "ammo box (10mm Incen)"
+	ammo_type = /obj/item/ammo_casing/c10mm/fire
+	max_ammo = 20
+
+/obj/item/ammo_box/c46x30mm
+	name = "ammo box (4.6x30mm)"
+	icon = 'modular_skyrat/modules/gun_cargo/icons/ammo.dmi'
+	icon_state = "ammo_46"
+	ammo_type = /obj/item/ammo_casing/c46x30mm
+	max_ammo = 20
+
+/obj/item/ammo_box/c46x30mm/ap
+	name = "ammo box (4.6x30mm AP)"
+	ammo_type = /obj/item/ammo_casing/c46x30mm/ap
+
+/obj/item/ammo_box/c46x30mm/rubber
+	name = "ammo box (4.6x30mm Rubber)"
+	ammo_type = /obj/item/ammo_casing/c46x30mm/rubber
+
+/obj/item/ammo_box/c32
+	name = "ammo box (.32)"
+	icon = 'modular_skyrat/modules/gun_cargo/icons/ammo.dmi'
+	icon_state = "ammo_32"
+	ammo_type = /obj/item/ammo_casing/c32
+	max_ammo = 20
+
+/obj/item/ammo_box/c32/ap
+	name = "ammo box (.32 AP)"
+	ammo_type = /obj/item/ammo_casing/c32/ap
+
+/obj/item/ammo_box/c32/rubber
+	name = "ammo box (.32 Rubber)"
+	ammo_type = /obj/item/ammo_casing/c32/rubber
+
+/obj/item/ammo_box/c32/fire
+	name = "ammo box (.32 Incen)"
+	ammo_type = /obj/item/ammo_casing/c32_incendiary
+
+/obj/item/ammo_box/c34
+	name = "ammo box (.34)"
+	icon = 'modular_skyrat/modules/gun_cargo/icons/ammo.dmi'
+	icon_state = "ammo_34"
+	ammo_type = /obj/item/ammo_casing/c34
+	max_ammo = 20
+
+/obj/item/ammo_box/c34/ap
+	name = "ammo box (.34 AP)"
+	ammo_type = /obj/item/ammo_casing/c34/ap
+
+/obj/item/ammo_box/c34/rubber
+	name = "ammo box (.34 Rubber)"
+	ammo_type = /obj/item/ammo_casing/c34/rubber
+
+/obj/item/ammo_box/c34/fire
+	name = "ammo box (.34 Incen)"
+	ammo_type = /obj/item/ammo_casing/c34_incendiary
+
+/obj/item/ammo_box/c12mm
+	name = "ammo box (12mm)"
+	icon = 'modular_skyrat/modules/gun_cargo/icons/ammo.dmi'
+	icon_state = "ammo_12mm"
+	ammo_type = /obj/item/ammo_casing/c12mm
+	max_ammo = 20
+
+/obj/item/ammo_box/c12mm/ap
+	name = "ammo box (12mm AP)"
+	ammo_type = /obj/item/ammo_casing/c12mm/ap
+
+/obj/item/ammo_box/c12mm/hp
+	name = "ammo box (12mm HP)"
+	ammo_type = /obj/item/ammo_casing/c12mm/hp
+
+/obj/item/ammo_box/c12mm/fire
+	name = "ammo box (12mm Incen)"
+	ammo_type = /obj/item/ammo_casing/c12mm/fire
+
+/obj/item/storage/box/ammo_box/microfusion/bluespace
+	name = "bluespace microfusion cell container"
+	desc = "A box filled with microfusion cells."
+
+/obj/item/storage/box/ammo_box/microfusion/bluespace/PopulateContents()
+	new /obj/item/storage/bag/ammo(src)
+	new /obj/item/stock_parts/cell/microfusion/bluespace(src)
+	new /obj/item/stock_parts/cell/microfusion/bluespace(src)
+	new /obj/item/stock_parts/cell/microfusion/bluespace(src)
+
+/obj/item/storage/box/ammo_box/microfusion/bluespace/bagless
+
+/obj/item/storage/box/ammo_box/microfusion/bluespace/bagless/PopulateContents()
+	new /obj/item/stock_parts/cell/microfusion/bluespace(src)
+	new /obj/item/stock_parts/cell/microfusion/bluespace(src)
+	new /obj/item/stock_parts/cell/microfusion/bluespace(src)
+
+/obj/item/ammo_box/b10mm
+	name = "ammo box (10mm Auto)"
+	ammo_type = /obj/item/ammo_casing/b10mm
+	max_ammo = 20
+
+/obj/item/ammo_box/b10mm/hp
+	name = "ammo box (10mm Auto HP)"
+	ammo_type = /obj/item/ammo_casing/b10mm/hp
+	max_ammo = 20
+
+/obj/item/ammo_box/b10mm/rubber
+	name = "ammo box (10mm Auto Rubber)"
+	ammo_type = /obj/item/ammo_casing/b10mm/rubber
+	max_ammo = 20
diff --git a/modular_skyrat/modules/gun_cargo/code/objects/box.dm b/modular_skyrat/modules/gun_cargo/code/objects/box.dm
new file mode 100644
index 00000000000..3295b47feb6
--- /dev/null
+++ b/modular_skyrat/modules/gun_cargo/code/objects/box.dm
@@ -0,0 +1,15 @@
+/obj/item/storage/box/syringes/piercing
+	name = "piercing syringe box"
+	desc = "A five-pack of piercing syringes."
+
+/obj/item/storage/box/syringes/piercing/PopulateContents()
+	for(var/i in 1 to 5)
+		new /obj/item/reagent_containers/syringe/piercing(src)
+
+/obj/item/storage/box/syringes/bluespace
+	name = "bluespace syringe box"
+	desc = "A three-pack of piercing syringes."
+
+/obj/item/storage/box/syringes/piercing/PopulateContents()
+	for(var/i in 1 to 3)
+		new /obj/item/reagent_containers/syringe/bluespace(src)
diff --git a/modular_skyrat/modules/gun_cargo/code/objects/cargo_console.dm b/modular_skyrat/modules/gun_cargo/code/objects/cargo_console.dm
new file mode 100644
index 00000000000..b9f1e33e340
--- /dev/null
+++ b/modular_skyrat/modules/gun_cargo/code/objects/cargo_console.dm
@@ -0,0 +1,3 @@
+/obj/machinery/computer/cargo/ComponentInitialize()
+	. = ..()
+	AddComponent(/datum/component/armament/cargo_gun, subtypesof(/datum/armament_entry/cargo_gun), 0)
diff --git a/modular_skyrat/modules/gun_cargo/code/objects/firing_pin.dm b/modular_skyrat/modules/gun_cargo/code/objects/firing_pin.dm
new file mode 100644
index 00000000000..3c15a754296
--- /dev/null
+++ b/modular_skyrat/modules/gun_cargo/code/objects/firing_pin.dm
@@ -0,0 +1,34 @@
+GLOBAL_VAR_INIT(permit_pin_unrestricted, FALSE)
+// Firing pin that can be used off station freely, and requires a permit to use on-station
+/obj/item/firing_pin/permit_pin
+	name = "permit-locked firing pin"
+	desc = "A firing pin for a station who can't trust their crew. Only allows you to fire the weapon off-station or with a firearms permit.."
+	icon_state = "firing_pin_explorer"
+	fail_message = "<span class='warning'>You must have a permit or be off-station to fire this!</span>"
+	can_remove = TRUE
+
+// This checks that the user isn't on the station Z-level.
+/obj/item/firing_pin/permit_pin/pin_auth(mob/living/user)
+	var/turf/station_check = get_turf(user)
+
+	if(obj_flags & EMAGGED)
+		return TRUE
+
+	if(GLOB.permit_pin_unrestricted)
+		return TRUE
+
+	var/obj/item/card/id/the_id = user.get_idcard()
+
+	if(!the_id && is_station_level(station_check.z))
+		return FALSE
+
+	if(!is_station_level(station_check.z) || (ACCESS_WEAPONS in the_id.GetAccess()))
+		return TRUE
+
+
+/obj/item/firing_pin
+	var/can_remove = TRUE
+
+/obj/item/firing_pin/emag_act(mob/user)
+	. = ..()
+	can_remove = TRUE
diff --git a/modular_skyrat/modules/gun_cargo/code/objects/guns/interdyne.dm b/modular_skyrat/modules/gun_cargo/code/objects/guns/interdyne.dm
new file mode 100644
index 00000000000..963132e0a1d
--- /dev/null
+++ b/modular_skyrat/modules/gun_cargo/code/objects/guns/interdyne.dm
@@ -0,0 +1,28 @@
+/obj/item/gun/ballistic/automatic/pistol/firefly/smartdart
+	name = "\improper I-94 'Honeybee'"
+	desc = "A 9mm sidearm made by Armadyne and modified by Interdyne, it features a slightly modified paint job and sports a SmartDart underbarrel attachment which can be fired with right click."
+	company_flag = COMPANY_INTERDYNE
+	icon = 'modular_skyrat/modules/gun_cargo/icons/honeybee.dmi'
+	icon_state = "honeybee"
+	company_flag = COMPANY_INTERDYNE
+	var/obj/item/gun/syringe/smartdart/underbarrel/underbarrel
+
+/obj/item/gun/ballistic/automatic/pistol/firefly/smartdart/Initialize()
+	. = ..()
+	underbarrel = new(src)
+	update_appearance()
+
+/obj/item/gun/ballistic/automatic/pistol/firefly/smartdart/afterattack_secondary(atom/target, mob/living/user, flag, params)
+	underbarrel.afterattack(target, user, flag, params)
+	return SECONDARY_ATTACK_CONTINUE_CHAIN
+
+/obj/item/gun/ballistic/automatic/pistol/firefly/smartdart/attackby(obj/item/attacking_item, mob/user, params)
+	if(istype(attacking_item, /obj/item/reagent_containers/syringe/smartdart))
+		underbarrel.attackby(attacking_item, user, params)
+	else
+		..()
+
+/obj/item/gun/syringe/smartdart/underbarrel
+	name = "SmartDart underbarrel device"
+	desc = "An underbarrel attachment for a pistol that fits a SmartDart."
+	has_gun_safety = FALSE
diff --git a/modular_skyrat/modules/gun_cargo/code/objects/hud_glasses.dm b/modular_skyrat/modules/gun_cargo/code/objects/hud_glasses.dm
new file mode 100644
index 00000000000..7c9ffdaf066
--- /dev/null
+++ b/modular_skyrat/modules/gun_cargo/code/objects/hud_glasses.dm
@@ -0,0 +1,7 @@
+/obj/item/clothing/glasses/hud/gun_permit
+	name = "permit HUD"
+	desc = "A heads-up display that scans humanoids in view, and displays if their current ID possesses a firearms permit or not."
+	icon = 'modular_skyrat/modules/gun_cargo/icons/hud_goggles.dmi'
+	worn_icon = 'modular_skyrat/modules/gun_cargo/icons/hud_goggles_worn.dmi'
+	icon_state = "permithud"
+	hud_type = DATA_HUD_PERMIT
diff --git a/modular_skyrat/modules/gun_cargo/code/objects/keycard_auth.dm b/modular_skyrat/modules/gun_cargo/code/objects/keycard_auth.dm
new file mode 100644
index 00000000000..364d367830e
--- /dev/null
+++ b/modular_skyrat/modules/gun_cargo/code/objects/keycard_auth.dm
@@ -0,0 +1,4 @@
+/proc/toggle_permit_pins()
+	GLOB.permit_pin_unrestricted = !GLOB.permit_pin_unrestricted
+	minor_announce("Permit-locked firing pins have now had their locks [GLOB.permit_pin_unrestricted ? "removed" : "reinstated"].", "Weapons Systems Update:")
+	SSblackbox.record_feedback("nested tally", "keycard_auths", 1, list("permit-locked pins", GLOB.permit_pin_unrestricted ? "unlocked" : "locked"))
diff --git a/modular_skyrat/modules/gun_cargo/icons/ammo.dmi b/modular_skyrat/modules/gun_cargo/icons/ammo.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..77460d0fcac59e079c2cefefb0bdcbf8bfda1657
GIT binary patch
literal 541
zcmV+&0^<FNP)<h;3K|Lk000e1NJLTq002M$002M;0{{R3owtGP0000^P)t-sz`(!=
zQd0;hQwwQj3p8mDeRmH<eHoCG8Ca7AJ30j)JAeQHnIR$9-(a?n4n`vYA_Y4;1ra+7
zX=w{9Mh|^`4?}Mmlam=nG6+*s2p}sGFNXjC00DGTPE!Ct=GbNc004V>R9JLGWpiV4
zX>fFDZ*Bkpc$`yKaB_9`^iy#0_2eo`Eh^5;&r`5fFwryM;w;ZhDainGjE%TBGg33t
zGfE(w;*!LYR3K9+F*i3q-o#9ai!&v&s2C_>$i<mfl$e_eVWX-uHX>4;332KSjdF8w
zsZ>^Q^>YDx2>`KMJbYm^+oS*h0QN~lK~z|U?bShU!yo`e(WGEQ0<l}LA-VrWTdAtb
z%&<#V4qsw5(i02IoKB<BU*}%U{?Q8nqXA&G7Xy<9z^ok(a2fz!1K`rD*{{6-a4ulZ
z0pLCD-Xk!Dc#E+)VFF;5eP&>}EwMQQ@P0hNgk|{|{!cIfSlKND>$=9~2*A4ld_}nd
z?F<<DPz(W<c1ysspYmul`t7q<vw!shAZY+(?Zv>R0kCU_1BwPf)d0BnYW7Dj07{|X
zb}0bVN_(vcZ1VnZ0PM2w4Didt0Pn{GlDz*3fGm4vfZu-xco%@LC^w*;fkYolA|TVA
f33&EXe($~k?RZsr2=T!|00000NkvXXu0mjfWTe*3

literal 0
HcmV?d00001

diff --git a/modular_skyrat/modules/gun_cargo/icons/honeybee.dmi b/modular_skyrat/modules/gun_cargo/icons/honeybee.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..e59ef5c0461c740ce27bd74fe024dfd023fa53c6
GIT binary patch
literal 595
zcmV-Z0<8UsP)<h;3K|Lk000e1NJLTq002M$002M;0{{R3owtGP0001NP)t-sz`(#S
zNJub7Mo?sAIyrWf2O5r#nAhIke6-o_NK=lOm_K>Jx)Bk(#m68pFCZ{5XagcpWMPS)
zpE@)&-{0Sqz})X)YO1QLR8&+#LPBO_WXZ|NV`F1nSy_L7e^6CqFf~TI$H&**-Y`Z*
za}3tY00001bW%=J06^y0W&i*HgnCq1bVOxyV{&P5bZKvH004NLQ&w<tb@%jBaPjrz
zDoZUY&dkqKuvIY8GvMMZ&rB)F0CJ3txHvOXGt)ClAe`co#FA7XQz;`qFSRl$HC2g=
zGbOXA7${`O#hF%=n41b=V<?QzO-v_VaZ-Lx32Cb1bMlk3Q&VthQdV&Fa{>Dl08A-I
zrtPcm>Hq)%1xZ9fR9J=WmeFp*APhx`-IC2MWZBYgZ8loi|NrA`+P6mCfR|PBu@WVM
zd$}T!j4_Jxuj#saE#PX6w!=y}BJ@wseUE*m0TIw<ORlp8BJY9g0>A*P7rB=haPASt
zD>(s`=y~5>v+^23HW7y+191S>^RjP~_q+Y@{&6Ud0N!|Gj?+Bv_VfJtRjMCHFHaDr
zY!J!=fZ<QTFClEUp<K@nMVh4m4F-(?jF$ku!GQneU*)IMxnY5Groli_lm`OucJuqA
zGK@rs7-Phxxo9nSPt4bn0T3qEMoKABjJNvam_cyMEfX9e*SA1)qjwg$K(ICE7LdaN
h*M$lLMNyPL@dM`_4$cA~PA>oe002ovPDHLkV1oB=1yBG0

literal 0
HcmV?d00001

diff --git a/modular_skyrat/modules/gun_cargo/icons/hud_goggles.dmi b/modular_skyrat/modules/gun_cargo/icons/hud_goggles.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..c4121b3b3b7d76c8b6be2afb2509cbb0e1beb3f1
GIT binary patch
literal 302
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvxd5LK*8>L*2nh+L85_?`Gd`1M
z{6Edu-rincUtdK<#lyqnQhmP?P$gqYkY6x^!?PP{Ku&H|NJNQCYH@N=W<g12ejWou
z#hl=<f}+yzUxEuhetn|lt*dqJ%=zFAp#~R?A3V}I@1uE=p{S>KhlO#F@nvH#g*lHV
z9hnrO5WG@htA_bzmBl8mo!!Q&n^#C^q@6fAGi=I?*<6X*+B<&jZ0KcUI1nLyS7brr
zS)j$Po-U3d8WWQfBnlk@CNv6mJZuQO8R~FC#fL#LK}b*I%`7#J@FOqc^b~^P6b%{~
vmw7Cj(718&#Ky^ug3DMmlsgQPZZI$yFJ$++IVX54&_D)HS3j3^P6<r_gw<>i

literal 0
HcmV?d00001

diff --git a/modular_skyrat/modules/gun_cargo/icons/hud_goggles_worn.dmi b/modular_skyrat/modules/gun_cargo/icons/hud_goggles_worn.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..8ec8b7fe6024034e0ef4a3d6aa79634777cf6bc4
GIT binary patch
literal 288
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJqN<RH5|`BC<f6=ilFa-(28N0`
zs>iMQ4l4+-9++i&RQR3p|EO6UrxzKNZ#Z%+=i!m2-r~O^CC0MzPD?5M5qt40=;`OS
z!+&0!{G*cDcGzUnNgelV(^l;^l6iCVsmR&;DJNAlMfsR#hTrthd$+-be?RLl<^vJZ
zcXQ@UnhUf&)6>N<B%<~0<&A<33Oub3+n);=@Y-522&XY@O_#cMVVc>Ta+CU1*HwOY
zscgBnWz)8$w;35GY^j#cTDyHo(Xu70zo(x`E30_kI@A1&<$goAnUNBkt1sw0I3HEV
d3^X1NelVQqm1YpX68sq?<mu|?vd$@?2>{yMbrApn

literal 0
HcmV?d00001

diff --git a/modular_skyrat/modules/gunsgalore/code/guns/akm.dm b/modular_skyrat/modules/gunsgalore/code/guns/akm.dm
index 0beba814134..34e05065b25 100644
--- a/modular_skyrat/modules/gunsgalore/code/guns/akm.dm
+++ b/modular_skyrat/modules/gunsgalore/code/guns/akm.dm
@@ -21,7 +21,8 @@
 	load_empty_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/interact/ltrifle_magin.ogg'
 	eject_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/interact/ltrifle_magout.ogg'
 	alt_icons = TRUE
-	realistic = TRUE
+	dirt_modifier = 0.75
+	company_flag = COMPANY_IZHEVSK
 
 /obj/item/ammo_box/magazine/akm
 	name = "\improper AKM magazine"
diff --git a/modular_skyrat/modules/gunsgalore/code/guns/luger.dm b/modular_skyrat/modules/gunsgalore/code/guns/luger.dm
index 385b6863e77..c3be38587c7 100644
--- a/modular_skyrat/modules/gunsgalore/code/guns/luger.dm
+++ b/modular_skyrat/modules/gunsgalore/code/guns/luger.dm
@@ -14,3 +14,4 @@
 	rack_sound =  'modular_skyrat/modules/gunsgalore/sound/guns/fire/luger_rack.ogg'
 	fire_sound_volume = 100
 	suppressor_x_offset = 14
+	company_flag = COMPANY_OLDARMS
diff --git a/modular_skyrat/modules/gunsgalore/code/guns/mp40.dm b/modular_skyrat/modules/gunsgalore/code/guns/mp40.dm
index bfb53248894..bfd9f1a9232 100644
--- a/modular_skyrat/modules/gunsgalore/code/guns/mp40.dm
+++ b/modular_skyrat/modules/gunsgalore/code/guns/mp40.dm
@@ -21,6 +21,7 @@
 	eject_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/interact/smg_magout.ogg'
 	alt_icons = TRUE
 	realistic = TRUE
+	company_flag = COMPANY_OLDARMS
 
 /obj/item/ammo_box/magazine/mp40
 	name = "mp40 magazine (9mmx19)"
diff --git a/modular_skyrat/modules/gunsgalore/code/guns/ppsh.dm b/modular_skyrat/modules/gunsgalore/code/guns/ppsh.dm
index e3115d87d5c..322514db307 100644
--- a/modular_skyrat/modules/gunsgalore/code/guns/ppsh.dm
+++ b/modular_skyrat/modules/gunsgalore/code/guns/ppsh.dm
@@ -24,6 +24,7 @@
 	load_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/interact/smg_magin.ogg'
 	load_empty_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/interact/smg_magin.ogg'
 	eject_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/interact/smg_magout.ogg'
+	company_flag = COMPANY_OLDARMS
 
 /obj/item/ammo_box/magazine/ppsh
 	name = "Asha 76 magazine (7.62x25mm)"
diff --git a/modular_skyrat/modules/gunsgalore/code/guns/stg.dm b/modular_skyrat/modules/gunsgalore/code/guns/stg.dm
index 192f89efbc1..c96d426e172 100644
--- a/modular_skyrat/modules/gunsgalore/code/guns/stg.dm
+++ b/modular_skyrat/modules/gunsgalore/code/guns/stg.dm
@@ -24,6 +24,7 @@
 	load_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/interact/ltrifle_magin.ogg'
 	load_empty_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/interact/ltrifle_magin.ogg'
 	eject_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/interact/ltrifle_magout.ogg'
+	company_flag = COMPANY_OLDARMS
 
 /obj/item/ammo_box/magazine/stg
 	name = "stg magazine (7.92x33mm)"
diff --git a/modular_skyrat/modules/mapping/code/shuttles.dm b/modular_skyrat/modules/mapping/code/shuttles.dm
index ee947eb7963..f0f589b9053 100644
--- a/modular_skyrat/modules/mapping/code/shuttles.dm
+++ b/modular_skyrat/modules/mapping/code/shuttles.dm
@@ -118,7 +118,7 @@
 	implants = list(/obj/item/implant/weapons_auth)
 	belt = /obj/item/storage/belt/military
 	r_pocket = /obj/item/storage/bag/ammo
-	l_pocket = /obj/item/gun/energy/disabler/cfa_disabler
+	l_pocket = /obj/item/gun/energy/disabler/bolt_disabler
 	id = /obj/item/card/id/advanced/chameleon
 	id_trim = /datum/id_trim/chameleon/operative
 	skillchips = list(/obj/item/skillchip/job/engineer)
@@ -148,7 +148,7 @@
 	implants = list(/obj/item/implant/weapons_auth)
 	belt = /obj/item/storage/belt/military
 	r_pocket = /obj/item/storage/bag/ammo
-	l_pocket = /obj/item/gun/energy/disabler/cfa_disabler
+	l_pocket = /obj/item/gun/energy/disabler/bolt_disabler
 	id = /obj/item/card/id/advanced/chameleon
 	id_trim = /datum/id_trim/chameleon/operative
 	skillchips = list(/obj/item/skillchip/job/engineer)
diff --git a/modular_skyrat/modules/microfusion/code/cargo_stuff.dm b/modular_skyrat/modules/microfusion/code/cargo_stuff.dm
index f4d49054a98..85fc96a0895 100644
--- a/modular_skyrat/modules/microfusion/code/cargo_stuff.dm
+++ b/modular_skyrat/modules/microfusion/code/cargo_stuff.dm
@@ -34,7 +34,7 @@
 	)
 	crate_name = "Microfusion Cell Crate"
 
-/datum/supply_pack/security/mcr01_attachments_A
+/datum/supply_pack/security/mcr01_attachments_a
 	name = "MCR-01 Military Attachments Crate Type A"
 	desc = "Micron Control Systems Incorporated supplied MCR-01 Military spec attachments! This crate comes with two utilitarian repeater loadout."
 	cost = CARGO_CRATE_VALUE * 14
@@ -52,7 +52,7 @@
 	)
 	crate_name = "MCR-01 Military Attachments Crate Type A"
 
-/datum/supply_pack/security/mcr01_attachments_type_B
+/datum/supply_pack/security/mcr01_attachments_type_b
 	name = "MCR-01 Military Attachments Crate Type B"
 	desc = "Micron Control Systems Incorporated supplied MCR-01 Military spec attachments! This crate comes in a mixed specialist loadout."
 	cost = CARGO_CRATE_VALUE * 16
@@ -69,7 +69,7 @@
 	crate_name = "MCR-01 Military Attachments Crate Type B"
 
 
-/datum/supply_pack/security/mcr01_attachments_H
+/datum/supply_pack/security/mcr01_attachments_h
 	name = "HCR-01 Military Attachments Crate Type H"
 	desc = "Honkicron Clownery Systems Inhonkorated supplied HCR-01 Clownery spec attachments! This crate oddly smells of bananas."
 	cost = CARGO_CRATE_VALUE * 20
@@ -86,4 +86,3 @@
 		/obj/item/food/pie/cream,
 	)
 	crate_name = "MCR-01 Military Attachments Crate Type H"
-
diff --git a/modular_skyrat/modules/microfusion/code/gun_types.dm b/modular_skyrat/modules/microfusion/code/gun_types.dm
index bc59c449176..b65a84bf461 100644
--- a/modular_skyrat/modules/microfusion/code/gun_types.dm
+++ b/modular_skyrat/modules/microfusion/code/gun_types.dm
@@ -1,9 +1,10 @@
 /obj/item/gun/microfusion/mcr01
 	name = "MCR-01"
-	desc = "An advanced, modular energy weapon produced by Allstar Lasers Incorporated. These cutting edge weapons differ from traditional beam weaponry in producing individual bolts, as well as utilizing hotswapped cells rather than being tied to immobile power sources."
+	desc = "An advanced, modular energy weapon produced by Micron Control Systems. These cutting edge weapons differ from traditional beam weaponry in producing individual bolts, as well as utilizing hotswapped cells rather than being tied to immobile power sources."
 	icon_state = "mcr01"
 	inhand_icon_state = "mcr01"
 	shaded_charge = TRUE
+	company_flag = COMPANY_MICRON
 
 /// Gun for cargo crates.
 /obj/item/gun/microfusion/mcr01/advanced
@@ -49,6 +50,13 @@
 	new /obj/item/stock_parts/cell/microfusion/advanced(src)
 	new /obj/item/stock_parts/cell/microfusion/advanced(src)
 
+/obj/item/storage/box/ammo_box/microfusion/advanced/bagless
+
+/obj/item/storage/box/ammo_box/microfusion/advanced/bagless/PopulateContents()
+	new /obj/item/stock_parts/cell/microfusion/advanced(src)
+	new /obj/item/stock_parts/cell/microfusion/advanced(src)
+	new /obj/item/stock_parts/cell/microfusion/advanced(src)
+
 //////////////MICROFUSION SPAWNERS
 /obj/effect/spawner/armory_spawn/microfusion
 	icon_state = "random_rifle"
diff --git a/modular_skyrat/modules/modular_weapons/code/autolathe_designs.dm b/modular_skyrat/modules/modular_weapons/code/autolathe_designs.dm
index 657ca37590d..23d59345159 100644
--- a/modular_skyrat/modules/modular_weapons/code/autolathe_designs.dm
+++ b/modular_skyrat/modules/modular_weapons/code/autolathe_designs.dm
@@ -9,7 +9,7 @@
 // .32 - 15 damage pistol round.
 
 /datum/design/c32
-	name = "4.6x30mm Bullet"
+	name = ".32 Bullet"
 	id = "c32"
 	build_type = AUTOLATHE
 	materials = list(/datum/material/iron = 1000)
@@ -24,30 +24,6 @@
 	build_path = /obj/item/ammo_casing/c32/rubber
 	category = list("initial", "Security")
 
-/datum/design/c32/ap
-	name = ".32 Armor-Piercing Bullet"
-	id = "c32/ap"
-	build_type = AUTOLATHE
-	materials = list(/datum/material/iron = 2000)
-	build_path = /obj/item/ammo_casing/c32/ap
-	category = list("hacked", "Security")
-
-/datum/design/c32_incendiary
-	name = ".32 Incendiary Bullet"
-	id = "c32_incendiary"
-	build_type = AUTOLATHE
-	materials = list(/datum/material/iron = 2000)
-	build_path = /obj/item/ammo_casing/c32_incendiary
-	category = list("hacked", "Security")
-
-/datum/design/smg32acp
-	name = "Empty .32 SMG Magazine"
-	id = "smg32acp"
-	build_type = AUTOLATHE
-	materials = list(/datum/material/iron = 3000)
-	build_path = /obj/item/ammo_box/magazine/multi_sprite/cfa_wildcat/empty
-	category = list("hacked", "Security")
-
 /datum/design/a762
 	name = "7.62 Bullet"
 	id = "a762"
@@ -82,22 +58,6 @@
 	build_path = /obj/item/ammo_casing/c46x30mm/rubber
 	category = list("initial", "Security")
 
-/datum/design/c46x30mm_ap
-	name = "4.6x30mm Armor-Piercing Bullet"
-	id = "c46x30mm_ap"
-	build_type = AUTOLATHE
-	materials = list(/datum/material/iron = 1000)
-	build_path = /obj/item/ammo_casing/c46x30mm/ap
-	category = list("hacked", "Security")
-
-/datum/design/c46x30mm_incendiary
-	name = "4.6x30mm Incendiary Bullet"
-	id = "c46x30mm_incendiary"
-	build_type = AUTOLATHE
-	materials = list(/datum/material/iron = 1000)
-	build_path = /obj/item/ammo_casing/c46x30mm/inc
-	category = list("hacked", "Security")
-
 // .45
 
 /datum/design/c45_lethal
diff --git a/modular_skyrat/modules/modular_weapons/code/automatic.dm b/modular_skyrat/modules/modular_weapons/code/automatic.dm
index 0757dd5b60f..5599ee8ca09 100644
--- a/modular_skyrat/modules/modular_weapons/code/automatic.dm
+++ b/modular_skyrat/modules/modular_weapons/code/automatic.dm
@@ -5,26 +5,26 @@
 // Magazines
 
 /obj/item/ammo_box/magazine/multi_sprite/cfa_wildcat
-	name = "CFA Wildcat magazine (.32)"
-	desc = "Magazines taking .32 ammunition; it fits in the CFA Wildcat. Alt+click to reskin it."
+	name = "CFA Wildcat magazine (.34)"
+	desc = "Magazines taking .34 ammunition; it fits in the CFA Wildcat. Alt+click to reskin it."
 	icon = 'modular_skyrat/modules/modular_weapons/icons/obj/ammo.dmi'
-	icon_state = "smg32"
+	icon_state = "smg34"
 	possible_types = list(AMMO_TYPE_LETHAL, AMMO_TYPE_AP, AMMO_TYPE_RUBBER, AMMO_TYPE_INCENDIARY)
-	ammo_type = /obj/item/ammo_casing/c32
-	caliber = "c32acp"
+	ammo_type = /obj/item/ammo_casing/c34
+	caliber = "c34acp"
 	max_ammo = 30
 	multiple_sprites = AMMO_BOX_FULL_EMPTY_BASIC
 
 /obj/item/ammo_box/magazine/multi_sprite/cfa_wildcat/ap
-	ammo_type = /obj/item/ammo_casing/c32/ap
+	ammo_type = /obj/item/ammo_casing/c34/ap
 	round_type = AMMO_TYPE_AP
 
 /obj/item/ammo_box/magazine/multi_sprite/cfa_wildcat/rubber
-	ammo_type = /obj/item/ammo_casing/c32/rubber
+	ammo_type = /obj/item/ammo_casing/c34/rubber
 	round_type = AMMO_TYPE_RUBBER
 
 /obj/item/ammo_box/magazine/multi_sprite/cfa_wildcat/incendiary
-	ammo_type = /obj/item/ammo_casing/c32_incendiary
+	ammo_type = /obj/item/ammo_casing/c34_incendiary
 	round_type = AMMO_TYPE_INCENDIARY
 
 /obj/item/ammo_box/magazine/multi_sprite/cfa_wildcat/empty
@@ -37,7 +37,7 @@
 // Fills the role of a low damage, high magazine capacity magdump gun.
 /obj/item/gun/ballistic/automatic/cfa_wildcat
 	name = "\improper CFA Wildcat"
-	desc = "An old SMG, this one is chambered in .32, a very common and dirt-cheap cartridge. It has Cantalan Federal Arms etched above the magazine well."
+	desc = "A robust roller-delayed SMG chambered for .34 ammunition."
 	icon = 'modular_skyrat/modules/modular_weapons/icons/obj/guns/projectile40x32.dmi'
 	icon_state = "mp5"
 	inhand_icon_state = "arg"
@@ -52,6 +52,8 @@
 	fire_sound = 'sound/weapons/gun/smg/shot_alt.ogg'
 	weapon_weight = WEAPON_MEDIUM
 	w_class = WEIGHT_CLASS_BULKY
+	company_flag = COMPANY_CANTALAN
+	dirt_modifier = 0.2
 
 /obj/item/gun/ballistic/automatic/cfa_wildcat/no_mag
 	spawnwithmagazine = FALSE
@@ -62,7 +64,7 @@
 
 /obj/item/gun/ballistic/automatic/cfa_lynx
 	name = "\improper CFA Lynx"
-	desc = "A carbine with a high magazine capacity. Chambered in 4.6x30mm. It has Cantalan Federal Arms etched above the magazine well."
+	desc = "A carbine with a high magazine capacity. Chambered in 4.2x30mm."
 	icon = 'modular_skyrat/modules/modular_weapons/icons/obj/guns/projectile.dmi'
 	icon_state = "cfa-lynx"
 	inhand_icon_state = "arg"
@@ -77,31 +79,33 @@
 	fire_sound = 'sound/weapons/gun/smg/shot_alt.ogg'
 	weapon_weight = WEAPON_MEDIUM
 	w_class = WEIGHT_CLASS_BULKY
+	company_flag = COMPANY_CANTALAN
+	dirt_modifier = 0.2
 
 /obj/item/gun/ballistic/automatic/cfa_lynx/no_mag
 	spawnwithmagazine = FALSE
 
 /obj/item/ammo_box/magazine/multi_sprite/cfa_lynx
-	name = "CFA Lynx Magazine (4.6x30mm)"
-	desc = "A magazine for the CFA Lynx. It has a small inscription on the base, '4.6x30mm'. Alt+click to reskin it."
+	name = "CFA Lynx Magazine (4.2x30mm)"
+	desc = "A magazine for the CFA Lynx. It has a small inscription on the base, '4.2x30mm'. Alt+click to reskin it."
 	icon = 'modular_skyrat/modules/modular_weapons/icons/obj/ammo.dmi'
 	icon_state = "lynx"
 	possible_types = list(AMMO_TYPE_LETHAL, AMMO_TYPE_AP, AMMO_TYPE_RUBBER, AMMO_TYPE_INCENDIARY)
-	ammo_type = /obj/item/ammo_casing/c46x30mm
-	caliber = CALIBER_46X30MM
+	ammo_type = /obj/item/ammo_casing/c42x30mm
+	caliber = CALIBER_42X30MM
 	max_ammo = 40
 	multiple_sprites = AMMO_BOX_FULL_EMPTY_BASIC
 
 /obj/item/ammo_box/magazine/multi_sprite/cfa_lynx/ap
-	ammo_type = /obj/item/ammo_casing/c46x30mm/ap
+	ammo_type = /obj/item/ammo_casing/c42x30mm/ap
 	round_type = AMMO_TYPE_AP
 
 /obj/item/ammo_box/magazine/multi_sprite/cfa_lynx/rubber
-	ammo_type = /obj/item/ammo_casing/c46x30mm/rubber
+	ammo_type = /obj/item/ammo_casing/c42x30mm/rubber
 	round_type = AMMO_TYPE_RUBBER
 
 /obj/item/ammo_box/magazine/multi_sprite/cfa_lynx/incendiary
-	ammo_type = /obj/item/ammo_casing/c46x30mm/inc
+	ammo_type = /obj/item/ammo_casing/c42x30mm/inc
 	round_type = AMMO_TYPE_INCENDIARY
 
 /obj/item/ammo_box/magazine/multi_sprite/cfa_lynx/empty
diff --git a/modular_skyrat/modules/modular_weapons/code/energy.dm b/modular_skyrat/modules/modular_weapons/code/energy.dm
index a1a7a88baaf..96ec60e501a 100644
--- a/modular_skyrat/modules/modular_weapons/code/energy.dm
+++ b/modular_skyrat/modules/modular_weapons/code/energy.dm
@@ -1,11 +1,11 @@
 //////////////////////
-//   CFA Defender   //
+//  Bolt Responder  //
 //////////////////////
 // A mini disabler with 12 shot capacity in comparison to the normal disabler's 20.
 
-/obj/item/gun/energy/disabler/cfa_disabler
-	name = "CFA Responder"
-	desc = "A pocket-sized self-defense weapon popular with law enforcement due to its safe non-lethal payload that physically exhausts organic targets and cheap pricetag. The size makes it popular with smaller species, however, gives the obvious drawback of a smaller battery. It has <b><span style='color:purple'>Cantalan Federal Arms</span></b> eteched into the grip."
+/obj/item/gun/energy/disabler/bolt_disabler
+	name = "Bolt Responder"
+	desc = "A pocket-sized non-lethal energy gun with low ammo capacity."
 	icon = 'modular_skyrat/modules/modular_weapons/icons/obj/guns/projectile.dmi'
 	icon_state = "cfa-disabler"
 	inhand_icon_state = null
@@ -18,8 +18,9 @@
 	can_flashlight = FALSE // Can't attach or detach the flashlight, and override it's icon update
 	gunlight_state = "cfa-disabler-light"
 	has_gun_safety = FALSE
+	company_flag = COMPANY_BOLT
 
-/obj/item/gun/energy/disabler/cfa_disabler/Initialize()
+/obj/item/gun/energy/disabler/bolt_disabler/Initialize()
 	set_gun_light(new /obj/item/flashlight/seclite(src))
 	return ..()
 
diff --git a/modular_skyrat/modules/modular_weapons/code/modular_projectiles.dm b/modular_skyrat/modules/modular_weapons/code/modular_projectiles.dm
index 6cd84dbf866..0cbb9a9eca3 100644
--- a/modular_skyrat/modules/modular_weapons/code/modular_projectiles.dm
+++ b/modular_skyrat/modules/modular_weapons/code/modular_projectiles.dm
@@ -207,4 +207,195 @@
 
 /////  5.56x45mm   /////
 ////////////////////////
-//////    7.62    //////
+//////   .34 ACP  //////
+// Why? Blame CFA, they want their bullets to be *proprietary*
+/obj/item/ammo_casing/c34
+	name = ".34 bullet casing"
+	desc = "A .34 bullet casing."
+	caliber = "c32acp"
+	projectile_type = /obj/projectile/bullet/c34
+
+/obj/projectile/bullet/c34
+	name = ".34 bullet"
+	damage = 15
+	wound_bonus = 0
+
+/obj/item/ammo_casing/c34/rubber
+	name = ".34 rubber bullet casing"
+	desc = "A .34 rubber bullet casing."
+	caliber = "c34acp"
+	projectile_type = /obj/projectile/bullet/c34/rubber
+	harmful = FALSE
+
+/obj/projectile/bullet/c34/rubber
+	name = ".34 rubber bullet"
+	damage = 5
+	stamina = 20
+	wound_bonus = -75
+	shrapnel_type = null
+	sharpness = NONE
+	embedding = null
+
+/obj/item/ammo_casing/c34/ap
+	name = ".34 armor-piercing bullet"
+	desc = "A .34 armor-piercing bullet casing."
+	caliber = "c34acp"
+	projectile_type = /obj/projectile/bullet/c34/ap
+
+/obj/projectile/bullet/c34/ap
+	name = ".34 armor-piercing bullet"
+	damage = 15
+	armour_penetration = 40
+	wound_bonus = -75
+
+/obj/item/ammo_casing/c34_incendiary
+	name = ".34 incendiary bullet"
+	desc = "A .34 incendiary bullet casing."
+	caliber = "c34acp"
+	projectile_type = /obj/projectile/bullet/incendiary/c34_incendiary
+
+/obj/projectile/bullet/incendiary/c34_incendiary
+	name = ".34 incendiary bullet"
+	damage = 8
+	fire_stacks = 1
+	wound_bonus = -90
+
+//////   .34 ACP  //////
+////////////////////////
+//////  4.2x30mm  //////
+
+/obj/item/ammo_casing/c42x30mm
+	name = "4.2x30mm bullet casing"
+	desc = "A 4.2x30mm bullet casing."
+	caliber = CALIBER_42X30MM
+	projectile_type = /obj/projectile/bullet/c42x30mm
+
+/obj/item/ammo_casing/c42x30mm/ap
+	name = "4.2x30mm armor-piercing bullet casing"
+	desc = "A 4.2x30mm armor-piercing bullet casing."
+	projectile_type = /obj/projectile/bullet/c42x30mm/ap
+
+/obj/item/ammo_casing/c42x30mm/inc
+	name = "4.2x30mm incendiary bullet casing"
+	desc = "A 4.2x30mm incendiary bullet casing."
+	projectile_type = /obj/projectile/bullet/incendiary/c42x30mm
+
+/obj/projectile/bullet/c42x30mm
+	name = "4.2x30mm bullet"
+	damage = 20
+	wound_bonus = -5
+	bare_wound_bonus = 5
+	embed_falloff_tile = -4
+
+/obj/projectile/bullet/c42x30mm/ap
+	name = "4.2x30mm armor-piercing bullet"
+	damage = 15
+	armour_penetration = 40
+	embedding = null
+
+/obj/projectile/bullet/incendiary/c42x30mm
+	name = "4.2x30mm incendiary bullet"
+	damage = 10
+	fire_stacks = 1
+
+/obj/projectile/bullet/c42x30mm_rubber
+	name = "4.2x30mm rubber bullet"
+	damage = 3
+	stamina = 17
+	ricochets_max = 6
+	ricochet_incidence_leeway = 0
+	ricochet_chance = 130
+	ricochet_decay_damage = 0.7
+	shrapnel_type = null
+	sharpness = NONE
+	embedding = null
+	wound_bonus = -50
+
+/obj/item/ammo_casing/c42x30mm/rubber
+	name = "4.2x30mm rubber bullet casing"
+	desc = "A 4.2x30mm rubber bullet casing."
+	projectile_type = /obj/projectile/bullet/c42x30mm_rubber
+	harmful = FALSE
+
+//////  4.2x30mm  //////
+////////////////////////
+//////    12mm    //////
+
+/obj/item/ammo_casing/c12mm
+	name = "12mm Magnum bullet casing"
+	desc = "A 12mm Magnum bullet casing."
+	caliber = CALIBER_12MM
+	projectile_type = /obj/projectile/bullet/c12mm
+
+/obj/item/ammo_casing/c12mm/ap
+	name = "12mm Magnum armor-piercing bullet casing"
+	desc = "A 12mm Magnum bullet casing with a tungsten core tip."
+	projectile_type = /obj/projectile/bullet/c12mm/ap
+
+/obj/item/ammo_casing/c12mm/hp
+	name = "12mm Magnum hollow-point bullet casing"
+	desc = "A 12mm Magnum bullet casing with a hollow tip that fragments on contact."
+	projectile_type = /obj/projectile/bullet/c12mm/hp
+
+/obj/item/ammo_casing/c12mm/fire
+	name = "12mm Magnum incendiary bullet casing"
+	desc = "A 12mm Magnum bullet casing with a magnesium coated tip meant for setting things on fire."
+	projectile_type = /obj/projectile/bullet/incendiary/c12mm
+
+/obj/item/ammo_casing/c12mm/rubber
+	name = "12mm Magnum rubber bullet casing"
+	desc = "A low powder load 12mm Magnum bullet casing with a flat rubber tip. Headshots heavily discouraged."
+	projectile_type = /obj/projectile/bullet/c12mm/rubber
+	harmful = FALSE
+
+/obj/projectile/bullet/c12mm
+	name = "12mm bullet"
+	damage = 40
+
+/obj/projectile/bullet/c12mm/ap
+	name = "12mm armor-piercing bullet"
+	damage = 37
+	armour_penetration = 40
+
+/obj/projectile/bullet/c12mm/hp
+	name = "12mm hollow-point bullet"
+	damage = 60
+	weak_against_armour = TRUE
+
+/obj/projectile/bullet/incendiary/c12mm
+	name = "12mm incendiary bullet"
+	damage = 20
+	fire_stacks = 2
+
+/obj/projectile/bullet/c12mm/rubber
+	name = "12mm Magnum rubber ball"
+	damage = 10
+	stamina = 40
+	ricochets_max = 6
+	ricochet_incidence_leeway = 0
+	ricochet_chance = 130
+	ricochet_decay_damage = 0.7
+	shrapnel_type = null
+	sharpness = NONE
+	embedding = null
+
+//////    12mm    //////
+////////////////////////
+//////  6.8x43mm  //////
+
+
+/obj/item/ammo_casing/a68
+	name = "6.8mm bullet casing"
+	desc = "A 6.8mm bullet casing."
+	icon_state = "762-casing"
+	caliber = CALIBER_A68
+	projectile_type = /obj/projectile/bullet/a68
+
+/obj/projectile/bullet/a68
+	name = "6.8 bullet"
+	damage = 55
+	armour_penetration = 10
+	wound_bonus = -45
+	wound_falloff_tile = 0
+
+//////  6.8x43mm  //////
diff --git a/modular_skyrat/modules/modular_weapons/code/pistol.dm b/modular_skyrat/modules/modular_weapons/code/pistol.dm
index dd077e39d31..61f64db38ff 100644
--- a/modular_skyrat/modules/modular_weapons/code/pistol.dm
+++ b/modular_skyrat/modules/modular_weapons/code/pistol.dm
@@ -8,7 +8,7 @@
 
 /obj/item/gun/ballistic/automatic/pistol/cfa_snub
 	name = "CFA Snub"
-	desc = "A small easily-concealable modern pistol chambered in the more widely-used 4.6x30mm. It's specifically designed to be compact. It has <b><span style='color:purple'>Cantalan Federal Arms</span></b> etched into the slide.	"
+	desc = "An  easily-concealable pistol chambered for 4.2x30mm."
 	icon = 'modular_skyrat/modules/modular_weapons/icons/obj/guns/projectile.dmi'
 	icon_state = "cfa-snub"
 	mag_type = /obj/item/ammo_box/magazine/multi_sprite/cfa_snub
@@ -16,13 +16,15 @@
 	fire_sound_volume = 30
 	w_class = WEIGHT_CLASS_SMALL
 	has_gun_safety = FALSE
+	company_flag = COMPANY_CANTALAN
+	dirt_modifier = 0.2
 
 /obj/item/gun/ballistic/automatic/pistol/cfa_snub/empty
 	spawnwithmagazine = FALSE
 
 /obj/item/gun/ballistic/automatic/pistol/cfa_ruby
 	name = "CFA Ruby"
-	desc = "A large and loud modern handgun made to fit more universally used cartridges. It's chambered in .45, or 11.43x23mm. It has <b><span style='color:purple'>Cantalan Federal Arms</span></b> etched into the slide."
+	desc = "A heavy-duty sidearm chambered in 12x27mm."
 	icon = 'modular_skyrat/modules/modular_weapons/icons/obj/guns/projectile.dmi'
 	icon_state = "cfa_ruby"
 	mag_type = /obj/item/ammo_box/magazine/multi_sprite/cfa_ruby
@@ -30,6 +32,8 @@
 	fire_sound_volume = 120
 	w_class = WEIGHT_CLASS_NORMAL
 	has_gun_safety = FALSE
+	company_flag = COMPANY_CANTALAN
+	dirt_modifier = 0.2
 
 /obj/item/gun/ballistic/automatic/pistol/cfa_ruby/empty
 	spawnwithmagazine = FALSE
@@ -38,39 +42,39 @@
 //        AMMO        //
 ////////////////////////
 /obj/item/ammo_box/magazine/multi_sprite/cfa_snub
-	name = "CFA Snub magazine (4.6x30mm)"
+	name = "CFA Snub magazine (4.2x30mm)"
 	desc = "An advanced magazine with smart type displays. Alt+click to reskin it."
 	icon = 'modular_skyrat/modules/modular_weapons/icons/obj/ammo.dmi'
-	icon_state = "m46x30"
+	icon_state = "m42x30"
 	possible_types = list(AMMO_TYPE_LETHAL, AMMO_TYPE_AP, AMMO_TYPE_RUBBER, AMMO_TYPE_INCENDIARY)
-	ammo_type = /obj/item/ammo_casing/c46x30mm
-	caliber = CALIBER_46X30MM
+	ammo_type = /obj/item/ammo_casing/c42x30mm
+	caliber = CALIBER_42X30MM
 	max_ammo = 16
 	multiple_sprites = AMMO_BOX_FULL_EMPTY_BASIC
 
 /obj/item/ammo_box/magazine/multi_sprite/cfa_snub/ap
-	ammo_type = /obj/item/ammo_casing/c46x30mm/ap
+	ammo_type = /obj/item/ammo_casing/c42x30mm/ap
 	round_type = AMMO_TYPE_AP
 
 /obj/item/ammo_box/magazine/multi_sprite/cfa_snub/rubber
-	ammo_type = /obj/item/ammo_casing/c46x30mm/rubber
+	ammo_type = /obj/item/ammo_casing/c42x30mm/rubber
 	round_type = AMMO_TYPE_RUBBER
 
 /obj/item/ammo_box/magazine/multi_sprite/cfa_snub/incendiary
-	ammo_type = /obj/item/ammo_casing/c46x30mm/inc
+	ammo_type = /obj/item/ammo_casing/c42x30mm/inc
 	round_type = AMMO_TYPE_INCENDIARY
 
 /obj/item/ammo_box/magazine/multi_sprite/cfa_snub/empty
 	start_empty = TRUE
 
 /obj/item/ammo_box/magazine/multi_sprite/cfa_ruby
-	name = "CFA Ruby magazine (10mm Magnum)"
+	name = "CFA Ruby magazine (12mm Magnum)"
 	desc = "An advanced magazine with smart type displays. Alt+click to reskin it."
 	icon = 'modular_skyrat/modules/modular_weapons/icons/obj/ammo.dmi'
-	icon_state = "m10mm"
+	icon_state = "m12mm"
 	possible_types = list(AMMO_TYPE_LETHAL, AMMO_TYPE_AP, AMMO_TYPE_RUBBER, AMMO_TYPE_HOLLOWPOINT, AMMO_TYPE_INCENDIARY)
-	ammo_type = /obj/item/ammo_casing/c10mm
-	caliber = CALIBER_10MM
+	ammo_type = /obj/item/ammo_casing/c12mm
+	caliber = CALIBER_12MM
 	max_ammo = 8
 	multiple_sprites = AMMO_BOX_FULL_EMPTY_BASIC
 
@@ -78,17 +82,17 @@
 	start_empty = TRUE
 
 /obj/item/ammo_box/magazine/multi_sprite/cfa_ruby/ap
-	ammo_type = /obj/item/ammo_casing/c10mm/ap
+	ammo_type = /obj/item/ammo_casing/c12mm/ap
 	round_type = AMMO_TYPE_AP
 
 /obj/item/ammo_box/magazine/multi_sprite/cfa_ruby/rubber
-	ammo_type = /obj/item/ammo_casing/c10mm/rubber
+	ammo_type = /obj/item/ammo_casing/c12mm/rubber
 	round_type = AMMO_TYPE_RUBBER
 
 /obj/item/ammo_box/magazine/multi_sprite/cfa_ruby/hp
-	ammo_type = /obj/item/ammo_casing/c10mm/hp
+	ammo_type = /obj/item/ammo_casing/c12mm/hp
 	round_type = AMMO_TYPE_HOLLOWPOINT
 
 /obj/item/ammo_box/magazine/multi_sprite/cfa_ruby/incendiary
-	ammo_type = /obj/item/ammo_casing/c10mm/fire
+	ammo_type = /obj/item/ammo_casing/c12mm/fire
 	round_type = AMMO_TYPE_INCENDIARY
diff --git a/modular_skyrat/modules/modular_weapons/code/revolver.dm b/modular_skyrat/modules/modular_weapons/code/revolver.dm
index 79c9fb32c05..21515953d9b 100644
--- a/modular_skyrat/modules/modular_weapons/code/revolver.dm
+++ b/modular_skyrat/modules/modular_weapons/code/revolver.dm
@@ -25,6 +25,8 @@
 	righthand_file = 'modular_skyrat/modules/modular_weapons/icons/mob/inhands/weapons/64x_guns_right.dmi'
 	pixel_x = -8
 	inhand_icon_state = "revolving"
+	company_flag = COMPANY_IZHEVSK
+	dirt_modifier = 0.75
 
 /obj/item/gun/ballistic/revolver/rifle/improvised
 	name = "\improper Improvised .38 Revolving Rifle"
@@ -33,6 +35,7 @@
 	mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev38	//TAs far as improvised weapons go, this is fairly decent, this isn't half bad.
 	fire_delay = 15
 	recoil = 1
+	company_flag = null
 
 /obj/item/gun/ballistic/revolver/rifle/gold
 	name = "\improper .45 Revolving Rifle"
diff --git a/modular_skyrat/modules/modular_weapons/code/rifle.dm b/modular_skyrat/modules/modular_weapons/code/rifle.dm
index fd160221b5e..31713b3bba3 100644
--- a/modular_skyrat/modules/modular_weapons/code/rifle.dm
+++ b/modular_skyrat/modules/modular_weapons/code/rifle.dm
@@ -118,8 +118,8 @@
 ////////////////////////
 
 /obj/item/gun/ballistic/automatic/cfa_rifle
-	name = "Cantanheim 7.62 rifle"
-	desc = "An old semi-automatic rifle used in a war long ago. Uses 7.62 bullets in a ten round magazine."
+	name = "Cantanheim 6.8mm rifle"
+	desc = "A simple semi-automatic rifle chambered in 6.8mm. The letters 'XJP' are crossed out in the receiver." //Different 6.8mm than the FTU's propietary pulse ballistics
 	icon = 'modular_skyrat/modules/modular_weapons/icons/obj/guns/projectile40x32.dmi'
 	icon_state = "cfa_rifle"
 	inhand_icon_state = "irifle"
@@ -128,11 +128,11 @@
 	lefthand_file = 'modular_skyrat/modules/modular_weapons/icons/mob/inhands/weapons/64x_guns_left.dmi'
 	righthand_file = 'modular_skyrat/modules/modular_weapons/icons/mob/inhands/weapons/64x_guns_right.dmi'
 	worn_icon_state = null
-	mag_type = /obj/item/ammo_box/magazine/cm762
+	mag_type = /obj/item/ammo_box/magazine/cm68
 	fire_delay = 5
 	can_suppress = FALSE
 	burst_size = 0
-	fire_select_modes = list(SELECT_SEMI_AUTOMATIC) //SKYRAT EDIT CHANGE
+	fire_select_modes = list(SELECT_SEMI_AUTOMATIC)
 	mag_display = FALSE
 	mag_display_ammo = FALSE
 	empty_indicator = FALSE
@@ -144,16 +144,18 @@
 	zoom_out_amt = 2
 	has_gun_safety = FALSE
 	w_class = WEIGHT_CLASS_BULKY
+	company_flag = COMPANY_CANTALAN
+	dirt_modifier = 0.25
 
 /obj/item/gun/ballistic/automatic/cfa_rifle/empty
 	spawnwithmagazine = FALSE
 
-/obj/item/ammo_box/magazine/cm762
-	name = "rifle magazine (7.62mm)"
+/obj/item/ammo_box/magazine/cm68
+	name = "rifle magazine (6.8mm)"
 	icon = 'modular_skyrat/modules/modular_weapons/icons/obj/ammo.dmi'
-	icon_state = "7.62"
-	ammo_type = /obj/item/ammo_casing/a762
-	caliber = CALIBER_A762
+	icon_state = "6.8"
+	ammo_type = /obj/item/ammo_casing/a68
+	caliber = CALIBER_A68
 	max_ammo = 10
 	multiple_sprites = 2
 
diff --git a/modular_skyrat/modules/modular_weapons/icons/obj/ammo.dmi b/modular_skyrat/modules/modular_weapons/icons/obj/ammo.dmi
index 49bac414e39b5635f58ba4f59a903f13048a40df..9531519b341b49c5b819f6bcf552c2c160976b66 100644
GIT binary patch
delta 2166
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

literal 4637
zcmZWt2{@GN`+mO}`#MPo8B4Ynq{R|u$eJ*UWDA9oWh5eDhKSU$WbII+PMuV?R<g|`
zTR5a-NsN6g*-e%i^Zh5Cb2|P0*Y&;6^Ss~nelzpk_p{vBT*FzL3Gzwu0RRLo%#Du%
z0AblnmIukcvrz6-!*;Q_BX%Yf3Po60I1^}^m%s`NyX#vVZ=E!Ba`H4awcov4D-vjW
zf~{KdWJPBp48sALo{eFePBAzcJ%zEcuoo{(Gcz^eOkAd?On|9jrl+2h=5F=}_Vn~r
z1l6YQzK0i&EG{liPfyP`c?!ZB*BVXN);!@s+}c_u2z~`{nQO(SQvuwypNfd=-vb37
zwLS*0W8L2Dcrx7XM6j{fh0{Skfx$lb006>rGqS1pH#iVSq8FD9-pcF#C?jDQv+I@q
zSBt~yRp%KB{(|tjTBm9zJy$E^!tcddv&MGDcn#?`V}kChYR}w!4OH7b`zOv1s)CNS
zxpZ4S8L@ad|DoCBrtYJC>dhCARa(V+JsEkdy$8Rq;DhePh)b8&r7W4h_0=BzM7Q?U
z*s-pnFXpX$W!W}VUZNu|^AYWAjH0i*d7pz&!!-%fw0ey(bXC85>)qOl(WCVOtv1L*
zlBvqWaZd3J6+6QwjZt5T?yzr~+4P3KRb}q{m<$1z(OR>s>RmN+YDa3)`Ti($qPcfP
zx*6}Vcza5o9MW`p3FCOU<py`9&ghswXJ(p-(RyXQs-dHFeS0t8F4gPCm)Fda#WLbN
zT_X!T5<<C*IuA&kw(*$T)N0%0@O$ju15{$%=q-1z=li^NwH?yQ!Bd(Rj#R!7-v8P0
z&dpcfs^j(?F!vyxyFEmze29B#+YnUu^kQM3YUhfCG~c1mu_eQL%8#IED1Wd~e4vkF
z`@X8Nro&}GqUFd4|J>mLl_g!h7vtwCgWa}e>d|gzKgQI{ey|=oc)d0aSQ@zK$rT;W
zeUP~)Y|*Q1uMO|jQp2*(<%0%!jan7p;F2$sI$XrFxJrWWtZ*eN^`5)40to^jY-?d`
zXcv|{efxTN?*WlGMX8g$J!<#AdKbHWD7X4BGrCU2E5-omJn_vfIirT#r*nez7gCq_
zWpTbi!P=U-0-f6w3SoT(I#Pppcq{gSK;BU<oGLOu9kSyC<4Np9C*(WNhYZC7Y$^ue
zMv@^v;lsAu5Gr%=;IIrDF*iRkF|p!8hAg&0Vaqdp6~pK$mK{5W-wI=-VY_AJDGhA6
z?DZ)woFl9c<??ojds}P+Dhu48Nybg6nGtpt`togi_S*#m87J^m?#_?kO@l*{7D*_C
z*xNc7RJj@~0nHhyZ<_>f8qR=>Wc>cPWV))}(Dt(5YeMO&yXM`j1{rIjV*1secy_JY
z0xf;sB2)Kw$q1g+;tijmZvauOXeB^)L>(mPSI4-Xh<ie#+y#+NY>(Z7B^@7})WLC=
z$TxX3rw#lK$#5F@vanqRN?5T3M#(maz-FCYe{Y15VV(h?_%t|A5Xc*t_W;66Hd{gj
zWM`5gQ9T3Hz!(CmK|n*A|BLBlt@#v8F`puM->0A9&W8M&!45Bw@$WfjgebiY0wydr
z-0&+vqdw|~?g>GnD~A9lD+i%hMSxi=w6$${lROl1#LC>@N>@3?-VCs&7pM*7uJuRd
z&^{ubJ8#_H1LQTLL7CwcKl1%|kZVtFY4x~-7T!(FCj5Xsy|g-IJ#92>aRSGkP_@J5
z2jJNRo&E^j4(Ob&R>C(7vP=$39t)KZfOM}F{5f|hlFyRqaBRheRP(u0{23u=Kf*Ff
z6g$5CnPjvghEH~cyy5fi(c{j-n?dXtaRc%Evync~lFyc+J4pNgft<6X6Laa5aUUW`
z<dXY+I%e;OHT2eNKwfzhFSgbVftp7nP`8jG!~`;j>=1bmwvr%(Okl8ahkt{H)-On4
zzo6NBydX-9=lhij*){!&=q^h8TECQvnXtz3e-iuO6YJKXoLTcatSlqXWRLs8s!8e`
z$6E0ul-8!67^_@Jpo}c=(}v`rT%XrdG-LG$%P-i=466=t&kOnQjPdWZ+Sk+@$8c%a
z`fuXz(cMz4m|r;B<M5j)SbswYZWaE{dCU8okvOq};Vg4yF4-AEVx={I`F^ap_q3dJ
z?!kRf&1($<&o{=2{qP^WsMff7Iew+1ORQ>M)PgWlqvf+UU*80mdv0Z`Vqy;BMp_rc
z`1~>A`Gs(jN&ugR^+}qD3BsMynOn2i-1_Mt_S5rEZ`;uJM7fw}gEk%iyZH+pLJTlH
z;T)$p?V*FkC=?Xd+`Q2yok!Z#dECRI{*2K3zj(Ty1U?)AjBn9F#7G8K2YV6St&Ge^
zs_1YUsaA;)*a=1Ec0UpMR?hW!7fNqTyP$e7MQyf|#!l6Und|Yvm&gX(iA>rBH@*AK
z$1Vy5_s|xmuY%`oqrHNVH>tT)3ejSag;yoc`-)Ol_Vc+jB{?;s3PC1}KFZlxC1lb$
zEUFfd=EaSm9|r0$&581`c3ksdsbqA#8nI3MW%%3taN{l{ZV25@2k9$j!Mi9v;<x{N
zY6)M-rGiD#oAlV$hHXoIl?k!YkLWhz5nl|cZP(2uvYp`A*1By=J|~T9C<V9tl|0cZ
zo1O`$pKXrJGyi`%u@!4dy^I{4`L`s0o){BZf;o?<kptCa4j{)DugecwOrdL+%#KSb
zIT(b&Ut;`*Xi5oc5fuoPuo$tQNfJ*gWhhKdpWCV6SYn;`D$f_hlJYK$gq(c8AJniu
zCckDijy|~e;6g&cV8&>Ti<?Zs=I*%p6Of9f(!!6Fa6zghoH;1H!fN~)_iE@FH_Cy~
zs8oF6+A01#*%Qh~PR?$w6T`mAN!qiXS_KYqc>QrHHvi0%_#8|<5a`ZUEdXI>m&{Iq
zr{5XRVKY9MGT0LqlMpWSzKzHCNnqog--^T3G^?@F?JSB?9htX%`<5Q=M5Cjn=}?D7
z2j&deOL(UmX0Tj$s665X329>U{s-YF*)b~~*^BP!#i(*;N2*afK@5vlMqBJL)tD~i
zC9X)e(9OPmvzdhIi*3PhmkKe1)!5InaD-iQYewgK#oSk6xn88_n!;s<ve){BO|IP7
z_RXU0AwYB$J=9YGr97hcgHBA=``2YxqO!$PH8d8fS$c-Nx04T!FaBT}Gg2|W&+6^t
z!L><Us8^zWGl$=4V^#%!5BK5NuSl}xuT$-N@e8K^I_g>!t<Owxd>?6iOgUmMS^IV&
zTK20jB6i)7*n+N&o$#AL+dc<gKfUtM?ma%l8)UuP{=B2(K*jt_^H6sfF|aIqxkIYP
z9_n1LoA9#~W!KoK){!&L_fVOhyT~58&WJF>t<<|AGN}lHp{}#oc3YQzb}EYlygD8n
zX7UqDv$TK?;nD#y4%A`;bc&@-@jp`nb@WG<B&<Xz_DH+miQkVHSPIB)J}l3rt#{iB
zh2wqjoENcUemR@EBAS4#9b%9A6MC{jCH)3IU>VVUTUdo-!)TKb!v_L&&@sSk{aW3D
zHE$C&sEK*qf9bD87exB1c<*@5me(BGp5h53$R_3m;&cS|7C}fO>Lm!Myk@unjRMAZ
z6B!%2zyLRLCfIa(hl^6mZXHLY)0LHijSbv+abu+Sn^uX6>?e(~SV@7ui*F)4Pxa0j
zPO|Z@39ceYDJ;%X>l>Mj(mlE463nIz9gxU`h^N=~GN7goVcefl#4Dcv8Hijdsrzxi
zj7Tojrum0lJbC+E3dGswYtEz0)=pv6OdAraVNs7~1ixBJ&UYj}3w-+1-;aMHqISIY
z={&egeoSi9I`5~4T?u*0Vqyx<{ln7%0r7u$DmxL%A|376N#dmRHcJt2I(YwJ=D|DN
z+Y`Rh_IGsY97EtK6oVA4eAdT1H@|S+b!_L9o`V)KIXPJ^{}i>T3mUt0LIG@;i(~NX
zhY!t`zur;HK7093>t!;;z*<zxvwIM2=QmYE_$kmi8N9qn0A*SF7D}=#-AgRq;vQ;{
zhx%cb8Ol4M4;A^Rq#~coX92H@7k@{eDzIwsY|NMsV#$uPyC}`~gir~aZ)b%K_UKAV
zk)MD82IB@?la~Yo={qRZ5m=ocrj>~)O{j*7`X!=ILwDLvLuw5d+3&nW{UD+%k1pX*
znQF5fPl%w1<h8)4_TQS|<{8ifcancgrPJv6)1E9UE*O>qxDFCGyHsb3qKKMwB-8r8
zT81mIB<aQr7Q34&@7xfS|IS?xFwceA5KEp&j`Mdx?{JW-8FY`OLh&E7S3=2t8Q@05
zUNOWHk7y)dMTm{0Q9<`h-2MBouVDYEoclxDB@I_)h%s3g6;yQH(*?p}nSTcbYc}in
zjGQ~gb7kT7HUJgwVFgeN;=oT2a|F)G>8;oS9@@;ltph|kt2)}<9XSXApB)Cm_7L=J
z9j_1GdPq|OCAc-D?Z8x@SrvHBTU8xdP!Y$GZFRN~!>f_=K7}kYurJbC0r$Z<g@k+<
zNUG;aU!l<`s$U-NK{yh&U@>yi+<{3Zl3Z-_S<u~occ%d*=r7meIwyF;rC>h7^~mkt
zG@tZxOED#)Lch#j2)RntUuM(^YOLd>u{P734xzxWxM|+@vSA@1Dfu%$g5?MI3Z(R#
zcioR9ay+*M77(jarHnn8z`&aFef!lz8(Ob%wK*0rX(kPXPmGWGx(M7*GVo-2)tJe4
z4#X#8ThQoe1|-T0R761FjsNKUCZH*~4Yx8Tr7ieV{5Jt3C-^BpGGUqKu_1DG^8)+e
zs|deYR%eK)>|`>+cpYC{GHHN-g76V9A7253?kH5=0mnKZNpXcliX%*MOHyak@a_Ut
zno{5CLclzULK2Ed8P4{7qgxWoH<TgIDnH<hF_d&@1Xn}(7guwx`tt>@Rj$~GBf-^u
zTS)Pbzd{<)^^idPc{V!&*mH?#Y*zkSH*ipfyf-^d*&te!UUZVmj2zqAqCe(z?KjOE
z;caP)?waV8jQ$YY5+;;e6Dg?>SSxT6wBi|B0(m4<5>mTCewwS~m6-1=_Vrj%*Qr9n
z4+od`Bh0^gl~HMv0%Y!)<=47zXIs_{a1SBcN`95>GQ&l`!EBoIB}>QPoO(X}OfgnN
ziZdm>ljQCVHo<t_6sEH{NMSf{b>s%$yP7;a#AgRfA#fi^@$5FQ02EnuTU2UScnYY{
z<D?&yWMg)MJae|(2gK9AHoo?9#b@bjT>a(0aP_kn1`^R*8>%L|v}0^YQOrl*F87k-
z{@N}*a2<be#y+&IZ8}uQYtqOB=Q<zaP!$p3la$&wIkP(P_*@LyL7b0sWucwGTzxQ8
z>b8y;U!8x=TjD6b1KCJ}U1#dlS;NiEZR-0EzGB^aMDUn&dqVF*lw`o6gNqYc&FjVG
zu9HQMa0L9?5nh<e@?M|9vrk0w+ypyU37g4i!Z|&I<#+q1#G_!AO%9a+ca1GiWjRHL
z5+hjD+Ttii*L+uj4O5bS&Fv3^`6r#BT<ot6nfLuF!nN4Dm0dKg0i<Et#chQ6+dP^~
zF=BB9%i5u5tNUJf_GKG&LboEB!bRb~D@L9Y@Se1aa){Z@UeaU-p}B$IBXrq!vcl7-
z85#`AvTV0-N~Gm*)l{*}z*HA=Ii}P4sbki-6}0`(;nZ?0o_|2-SE2V2hG5;~w8zFI
SY4-msz{14ZxX8#o=KlZ=Vu+*w

diff --git a/modular_skyrat/modules/sec_haul/code/guns/armory_spawns.dm b/modular_skyrat/modules/sec_haul/code/guns/armory_spawns.dm
index 586d570d347..6f78cf18e28 100644
--- a/modular_skyrat/modules/sec_haul/code/guns/armory_spawns.dm
+++ b/modular_skyrat/modules/sec_haul/code/guns/armory_spawns.dm
@@ -78,7 +78,16 @@
 
 /obj/item/storage/box/ammo_box/microfusion/PopulateContents()
 	new /obj/item/storage/bag/ammo(src)
+	new /obj/item/stock_parts/cell/microfusion(src)
+	new /obj/item/stock_parts/cell/microfusion(src)
+	new /obj/item/stock_parts/cell/microfusion(src)
 
+/obj/item/storage/box/ammo_box/microfusion/bagless
+
+/obj/item/storage/box/ammo_box/microfusion/bagless/PopulateContents()
+	new /obj/item/stock_parts/cell/microfusion(src)
+	new /obj/item/stock_parts/cell/microfusion(src)
+	new /obj/item/stock_parts/cell/microfusion(src)
 
 /obj/effect/spawner/armory_spawn/centcom_rifles
 	icon_state = "random_rifle"
diff --git a/modular_skyrat/modules/sec_haul/code/guns/guns.dm b/modular_skyrat/modules/sec_haul/code/guns/guns.dm
index 7f008c001e1..7852d05f783 100644
--- a/modular_skyrat/modules/sec_haul/code/guns/guns.dm
+++ b/modular_skyrat/modules/sec_haul/code/guns/guns.dm
@@ -1,6 +1,5 @@
 /obj/item/gun/ballistic
 	var/emp_damageable = FALSE
-	var/armadyne = FALSE
 
 /obj/item/gun/ballistic/automatic/emp_act(severity)
 	. = ..()
@@ -14,13 +13,11 @@
 	. = ..()
 	if(!emp_damageable)
 		. += "It has an EMP prevention system."
-	if(armadyne)
-		. +=  "It has an <p style='color:red'>Armadyne</p> embroidery on the grip."
 
 //////////////////GLOCK
 /obj/item/gun/ballistic/automatic/pistol/g17
-	name = "\improper Glock-17"
-	desc = "A weapon from bygone times, this has been made to feel and look exactly like the 21st century version. Let's hope it's more reliable. Chambered in 9mm."
+	name = "\improper GK-17"
+	desc = "A weapon from bygone times, this has been made to look like an old, blocky firearm from the 21st century. Let's hope it's more reliable. Chambered in 9mm."
 	icon = 'modular_skyrat/modules/sec_haul/icons/guns/glock.dmi'
 	icon_state = "glock"
 	w_class = WEIGHT_CLASS_NORMAL
@@ -30,12 +27,11 @@
 	rack_sound = 'sound/weapons/gun/pistol/rack.ogg'
 	lock_back_sound = 'sound/weapons/gun/pistol/slide_lock.ogg'
 	bolt_drop_sound = 'sound/weapons/gun/pistol/slide_drop.ogg'
-	realistic = TRUE
 	can_flashlight = TRUE
 	dirt_modifier = 1
 	emp_damageable = TRUE
-	armadyne = TRUE
 	fire_delay = 1.90
+	company_flag = COMPANY_CANTALAN
 
 /obj/item/ammo_box/magazine/multi_sprite/g17
 	name = "9x19mm double stack magazine"
@@ -59,8 +55,8 @@
 	round_type = AMMO_TYPE_RUBBER
 
 /obj/item/gun/ballistic/automatic/pistol/g18
-	name = "\improper Glock-18"
-	desc = "A burst-firing special anniversary edition of the Glock-18 from Armadyne. Its heavier barrel negatively affects firerate minimally."
+	name = "\improper GK-18"
+	desc = "A CFA-made burst firing cheap polymer pistol chambered in 9mm. Its heavy duty barrel affects firerate."
 	icon = 'modular_skyrat/modules/sec_haul/icons/guns/glock.dmi'
 	icon_state = "glock_spec"
 	w_class = WEIGHT_CLASS_NORMAL
@@ -73,10 +69,11 @@
 	burst_size = 3
 	fire_delay = 2.10
 	spread = 8
-	realistic = TRUE
 	mag_display = FALSE
 	mag_display_ammo = FALSE
 	can_flashlight = TRUE
+	company_flag = COMPANY_CANTALAN
+	dirt_modifier = 1
 
 /obj/item/ammo_box/magazine/multi_sprite/g18
 	name = "extended 9x19mm magazine"
@@ -115,8 +112,8 @@
 	can_flashlight = TRUE
 	dirt_modifier = 0.2
 	emp_damageable = FALSE
-	armadyne = FALSE
 	fire_delay = 0.9
+	company_flag = null
 
 ////////////////PDH 40x32
 /obj/item/gun/ballistic/automatic/pistol/pdh
@@ -135,9 +132,9 @@
 	lock_back_sound = 'sound/weapons/gun/pistol/slide_lock.ogg'
 	bolt_drop_sound = 'sound/weapons/gun/pistol/slide_drop.ogg'
 	realistic = TRUE
-	armadyne = TRUE
 	can_flashlight = TRUE
 	emp_damageable = TRUE
+	company_flag = COMPANY_ARMADYNE
 
 /obj/item/gun/ballistic/automatic/pistol/pdh/alt
 	name = "\improper PDH-6C 'SOCOM'"
@@ -187,6 +184,7 @@
 	realistic = TRUE
 	dirt_modifier = 0.1
 	can_flashlight = TRUE
+	company_flag = COMPANY_ARMADYNE
 
 /obj/item/ammo_box/magazine/multi_sprite/pdh_corpo
 	name = ".357 pistol magazine"
@@ -201,14 +199,15 @@
 
 ///////////////////////////PDH PEACEKEEPER
 /obj/item/gun/ballistic/automatic/pistol/pdh/peacekeeper
-	name = "\improper PDH-6B 'Peacekeeper'"
-	desc = "A modern ballistic sidearm, used primarily by law enforcement, however this one has had a paintjob to match the peacekeeper theme."
+	name = "\improper PDH-6B"
+	desc = "A modern ballistic sidearm, used primarily by law enforcement."
 	fire_delay = 1.95
 	icon_state = "pdh_peacekeeper"
 	mag_type = /obj/item/ammo_box/magazine/multi_sprite/pdh_peacekeeper
 	fire_sound = 'modular_skyrat/modules/sec_haul/sound/pistol_fire.ogg'
 	realistic = TRUE
 	can_flashlight = TRUE
+	company_flag = COMPANY_ARMADYNE
 
 /obj/item/ammo_box/magazine/multi_sprite/pdh_peacekeeper
 	name = "9x19mm polymer magazine"
@@ -233,8 +232,8 @@
 
 ///////////////////////LADON 40x32
 /obj/item/gun/ballistic/automatic/pistol/ladon
-	name = "\improper P-3 'Ladon'"
-	desc = "A modern ballistic sidearm based off the PDH models, chambered in 10mm and quite recent on the market. It has an <p style='color:red'>Armadyne</p> embroidery on the grip."
+	name = "\improper Ladon pistol"
+	desc = "Modern handgun based off the PDH series, chambered in 10mm."
 	icon = 'modular_skyrat/modules/sec_haul/icons/guns/ladon.dmi'
 	righthand_file = 'modular_skyrat/modules/sec_haul/icons/guns/inhands/righthand40x32.dmi'
 	lefthand_file = 'modular_skyrat/modules/sec_haul/icons/guns/inhands/lefthand40x32.dmi'
@@ -251,8 +250,8 @@
 	can_flashlight = TRUE
 	dirt_modifier = 0.8
 	emp_damageable = TRUE
-	armadyne = TRUE
 	fire_delay = 4.20
+	company_flag = COMPANY_ARMADYNE
 
 /obj/item/ammo_box/magazine/multi_sprite/ladon
 	name = "10mm Auto pistol magazine"
@@ -287,9 +286,9 @@
 	rack_sound = 'sound/weapons/gun/pistol/rack.ogg'
 	lock_back_sound = 'sound/weapons/gun/pistol/slide_lock.ogg'
 	bolt_drop_sound = 'sound/weapons/gun/pistol/slide_drop.ogg'
-	realistic = TRUE
-	dirt_modifier = 0.7
+	dirt_modifier = 0.75
 	emp_damageable = TRUE
+	company_flag = COMPANY_IZHEVSK
 
 /obj/item/ammo_box/magazine/multi_sprite/makarov
 	name = "small 10mm Auto pistol magazine"
@@ -329,6 +328,7 @@
 	realistic = TRUE
 	dirt_modifier = 0.4
 	emp_damageable = TRUE
+	company_flag = COMPANY_ARMADYNE
 
 /obj/item/ammo_box/magazine/multi_sprite/mk58
 	name = "outdated 9x19mm magazine"
@@ -367,7 +367,7 @@
 	realistic = TRUE
 	can_flashlight = TRUE
 	emp_damageable = TRUE
-	armadyne = TRUE
+	company_flag = COMPANY_ARMADYNE
 
 /obj/item/ammo_box/magazine/multi_sprite/firefly
 	name = "9x19mm special pistol magazine"
@@ -417,9 +417,9 @@
 	mag_display_ammo = FALSE
 	fire_select_modes = list(SELECT_SEMI_AUTOMATIC, SELECT_BURST_SHOT)
 	realistic = TRUE
-	dirt_modifier = 1.7
+	dirt_modifier = 1.7 //the croon is an EXTRA piece of shit
 	emp_damageable = TRUE
-	armadyne = TRUE
+	company_flag = COMPANY_IZHEVSK
 
 /obj/item/ammo_box/magazine/multi_sprite/croon
 	name = "6.3mm SMG magazine"
@@ -462,7 +462,7 @@
 	bolt_drop_sound = 'sound/weapons/gun/pistol/slide_drop.ogg'
 	realistic = TRUE
 	emp_damageable = TRUE
-	armadyne = TRUE
+	company_flag = COMPANY_ARMADYNE
 
 /obj/item/ammo_box/magazine/multi_sprite/dozer
 	name = "9x19mm small PDW magazine"
@@ -507,6 +507,7 @@
 	realistic = TRUE
 	fire_sound_volume = 60
 	fire_sound = 'modular_skyrat/modules/sec_haul/sound/sniper_fire.ogg'
+	company_flag = COMPANY_ARMADYNE
 
 /obj/item/ammo_box/magazine/dmr
 	name = ".557 DMR Magazine"
@@ -528,8 +529,8 @@
 	inhand_icon_state = "zeta"
 	mag_type = /obj/item/ammo_box/magazine/internal/cylinder/zeta
 	fire_sound = 'modular_skyrat/modules/sec_haul/sound/revolver_fire.ogg'
-	armadyne = TRUE
 	fire_delay = 3
+	company_flag = COMPANY_BOLT
 
 /obj/item/ammo_box/magazine/internal/cylinder/zeta
 	name = "10mm Auto revolver cylinder"
@@ -561,8 +562,8 @@
 	inhand_icon_state = "revolution"
 	mag_type = /obj/item/ammo_box/magazine/internal/cylinder/revolution
 	fire_sound = 'modular_skyrat/modules/sec_haul/sound/revolver_fire.ogg'
-	armadyne = TRUE
 	fire_delay = 1.90
+	company_flag = COMPANY_BOLT
 
 /obj/item/ammo_box/magazine/internal/cylinder/revolution
 	name = "revolver cylinder"
@@ -617,7 +618,7 @@
 	load_empty_sound = 'modular_skyrat/modules/sec_haul/sound/chaingun_magout.ogg'
 	var/recharge_time = 5 SECONDS
 	var/recharging = FALSE
-	armadyne = TRUE
+	company_flag = COMPANY_ARMADYNE
 
 /obj/item/gun/ballistic/automatic/smartgun/process_chamber()
 	. = ..()
@@ -690,10 +691,10 @@
 	realistic = TRUE
 	fire_sound = 'modular_skyrat/modules/sec_haul/sound/ltrifle_fire.ogg'
 	emp_damageable = FALSE
-	armadyne = TRUE
 	can_bayonet = TRUE
 	can_flashlight = TRUE
 	dirt_modifier = 0.1
+	company_flag = COMPANY_OLDARMS
 
 /obj/item/ammo_box/magazine/multi_sprite/g11
 	name = "4.73x33mm top-loader magazine"
@@ -724,6 +725,7 @@
 	mag_type = /obj/item/ammo_box/magazine/internal/shot/m23
 	w_class = WEIGHT_CLASS_BULKY
 	slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_BELT | ITEM_SLOT_OCLOTHING
+	company_flag = COMPANY_BOLT
 
 /obj/item/ammo_box/magazine/internal/shot/m23
 	name = "m23 shotgun internal magazine"
@@ -751,6 +753,7 @@
 	mag_type = /obj/item/ammo_box/magazine/internal/shot/as2
 	w_class = WEIGHT_CLASS_BULKY
 	slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_BELT | ITEM_SLOT_OCLOTHING
+	company_flag = COMPANY_ARMADYNE
 
 /obj/item/ammo_box/magazine/internal/shot/as2
 	name = "shotgun internal magazine"
@@ -779,7 +782,7 @@
 	fire_select_modes = list(SELECT_SEMI_AUTOMATIC)
 	semi_auto = TRUE
 	internal_magazine = FALSE
-	armadyne = TRUE
+	company_flag = COMPANY_ARMADYNE
 
 /obj/item/ammo_box/magazine/sas14
 	name = "14 Gauge box magazine"
diff --git a/modular_skyrat/modules/sec_haul/code/guns/pepperball_gun.dm b/modular_skyrat/modules/sec_haul/code/guns/pepperball_gun.dm
index 352ca5db8cc..8bd6cb8a497 100644
--- a/modular_skyrat/modules/sec_haul/code/guns/pepperball_gun.dm
+++ b/modular_skyrat/modules/sec_haul/code/guns/pepperball_gun.dm
@@ -1,6 +1,6 @@
 /obj/item/gun/ballistic/automatic/pistol/pepperball
-	name = "\improper Armadyne Pepperball AHG"
-	desc = "A fantastically shit weapon used for self defence and created for the sole purpose of underfunded security forces, meet the Pepperball AHG."
+	name = "\improper Bolt Pepperball AHG"
+	desc = "An incredibly mediocre 'firearm' designed to fire soft pepper balls meant to easily subdue targets."
 	icon = 'modular_skyrat/modules/sec_haul/icons/guns/pepperball.dmi'
 	icon_state = "peppergun"
 	w_class = WEIGHT_CLASS_NORMAL
@@ -14,8 +14,8 @@
 	can_flashlight = TRUE
 	dirt_modifier = 2
 	emp_damageable = TRUE
-	armadyne = TRUE
 	fire_sound_volume = 50
+	company_flag = COMPANY_BOLT
 
 /obj/item/ammo_box/magazine/pepperball
 	name = "pistol magazine (pepperball)"
diff --git a/modular_skyrat/modules/sec_haul/code/guns/token_system/gunsets.dm b/modular_skyrat/modules/sec_haul/code/guns/token_system/gunsets.dm
index f37dec93a19..cdd1087297e 100644
--- a/modular_skyrat/modules/sec_haul/code/guns/token_system/gunsets.dm
+++ b/modular_skyrat/modules/sec_haul/code/guns/token_system/gunsets.dm
@@ -53,7 +53,7 @@
 
 //G-17
 /obj/item/storage/box/gunset/glock17
-	name = "glock-17 supply box"
+	name = "GK-17 supply box"
 
 /obj/item/gun/ballistic/automatic/pistol/g17/nomag
 	spawnwithmagazine = FALSE
@@ -248,9 +248,10 @@
 
 //HOS
 /obj/item/storage/box/gunset/glock18_hos
-	name = "glock-18 supply box"
-	desc = "Ideally contains a fast-firing 9x19mm Pistol made out of cheap plastic."
+	name = "GK-18 supply box"
+	desc = "Ideally contains a fast-firing 9x19mm pistol made out of cheap plastic."
 	w_class = WEIGHT_CLASS_NORMAL
+
 /obj/item/gun/ballistic/automatic/pistol/g18/nomag
 	spawnwithmagazine = FALSE
 
diff --git a/modular_skyrat/modules/sec_haul/code/misc/packs.dm b/modular_skyrat/modules/sec_haul/code/misc/packs.dm
index 652c7c38926..20532c63d3d 100644
--- a/modular_skyrat/modules/sec_haul/code/misc/packs.dm
+++ b/modular_skyrat/modules/sec_haul/code/misc/packs.dm
@@ -15,20 +15,3 @@
 					/obj/item/vending_refill/wardrobe/law_wardrobe)
 	crate_name = "security department supply crate"
 
-/datum/supply_pack/security/primary_case
-	name = "Primary Armory Token Crate"
-	desc = "Contains a box of primary armory tokens for the Armadyne weapons vendor."
-	cost = CARGO_CRATE_VALUE * 15
-	access_view = ACCESS_ARMORY
-	contains = list(/obj/item/storage/box/armament_tokens_primary)
-	crate_name = "primary armory token crate"
-
-/datum/supply_pack/security/energy_case
-	name = "Energy Armory Token Crate"
-	desc = "Contains a box of energy armory tokens for the Armadyne weapons vendor."
-	cost = CARGO_CRATE_VALUE * 15
-	access_view = ACCESS_ARMORY
-	contains = list(/obj/item/storage/box/armament_tokens_energy)
-	crate_name = "energy armory token crate"
-
-
diff --git a/tgstation.dme b/tgstation.dme
index cddb16c1656..4c415c43393 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -5162,6 +5162,32 @@
 #include "modular_skyrat\modules\goofsec\code\projectiles.dm"
 #include "modular_skyrat\modules\goofsec\code\sec_clothing_overrides.dm"
 #include "modular_skyrat\modules\goofsec\code\sol_fed.dm"
+#include "modular_skyrat\modules\gun_cargo\code\armament_component.dm"
+#include "modular_skyrat\modules\gun_cargo\code\company_datums.dm"
+#include "modular_skyrat\modules\gun_cargo\code\gun_subsystem.dm"
+#include "modular_skyrat\modules\gun_cargo\code\armament_datums\allstar.dm"
+#include "modular_skyrat\modules\gun_cargo\code\armament_datums\armadyne.dm"
+#include "modular_skyrat\modules\gun_cargo\code\armament_datums\armadyne_oldarms.dm"
+#include "modular_skyrat\modules\gun_cargo\code\armament_datums\bolt.dm"
+#include "modular_skyrat\modules\gun_cargo\code\armament_datums\cantalan.dm"
+#include "modular_skyrat\modules\gun_cargo\code\armament_datums\dynamics.dm"
+#include "modular_skyrat\modules\gun_cargo\code\armament_datums\interdyne.dm"
+#include "modular_skyrat\modules\gun_cargo\code\armament_datums\izhevsk.dm"
+#include "modular_skyrat\modules\gun_cargo\code\armament_datums\micron.dm"
+#include "modular_skyrat\modules\gun_cargo\code\armament_datums\nanotrasen.dm"
+#include "modular_skyrat\modules\gun_cargo\code\armament_datums\parent_armament.dm"
+#include "modular_skyrat\modules\gun_cargo\code\armament_datums\scarborough.dm"
+#include "modular_skyrat\modules\gun_cargo\code\datums\cargo_order.dm"
+#include "modular_skyrat\modules\gun_cargo\code\datums\cargo_pack.dm"
+#include "modular_skyrat\modules\gun_cargo\code\datums\hud.dm"
+#include "modular_skyrat\modules\gun_cargo\code\objects\access.dm"
+#include "modular_skyrat\modules\gun_cargo\code\objects\ammo_boxes.dm"
+#include "modular_skyrat\modules\gun_cargo\code\objects\box.dm"
+#include "modular_skyrat\modules\gun_cargo\code\objects\cargo_console.dm"
+#include "modular_skyrat\modules\gun_cargo\code\objects\firing_pin.dm"
+#include "modular_skyrat\modules\gun_cargo\code\objects\hud_glasses.dm"
+#include "modular_skyrat\modules\gun_cargo\code\objects\keycard_auth.dm"
+#include "modular_skyrat\modules\gun_cargo\code\objects\guns\interdyne.dm"
 #include "modular_skyrat\modules\gunhud\code\gun_hud.dm"
 #include "modular_skyrat\modules\gunhud\code\gun_hud_component.dm"
 #include "modular_skyrat\modules\gunpoint\code\gunpoint.dm"
diff --git a/tgui/packages/tgui-panel/styles/goon/chat-dark.scss b/tgui/packages/tgui-panel/styles/goon/chat-dark.scss
index 47b1d0b4d25..9fbd3db9877 100644
--- a/tgui/packages/tgui-panel/styles/goon/chat-dark.scss
+++ b/tgui/packages/tgui-panel/styles/goon/chat-dark.scss
@@ -1021,3 +1021,23 @@ em {
   color: #ff00ff;
   font-weight: bold;
 }
+
+.brown {
+  color: #3d2009;
+  font-weight: bold;
+}
+
+.orange {
+  color: #b8761a;
+  font-weight: bold;
+}
+
+.yellow {
+  color: #c7b72c;
+  font-weight: bold;
+}
+
+.cyan {
+  color: #0ea1e6;
+  font-weight: bold;
+}
diff --git a/tgui/packages/tgui-panel/styles/goon/chat-light.scss b/tgui/packages/tgui-panel/styles/goon/chat-light.scss
index 6178a9f5abc..20ed07138ce 100644
--- a/tgui/packages/tgui-panel/styles/goon/chat-light.scss
+++ b/tgui/packages/tgui-panel/styles/goon/chat-light.scss
@@ -972,3 +972,23 @@ h1.alert, h2.alert {
   color: #ff00ff;
   font-weight: bold;
 }
+
+.brown {
+  color: #3d2009;
+  font-weight: bold;
+}
+
+.orange {
+  color: #b8761a;
+  font-weight: bold;
+}
+
+.yellow {
+  color: #c7b72c;
+  font-weight: bold;
+}
+
+.cyan {
+  color: #0ea1e6;
+  font-weight: bold;
+}
diff --git a/tgui/packages/tgui/interfaces/Cargo.js b/tgui/packages/tgui/interfaces/Cargo.js
index f1186f1dd45..cb3d2fd6c2f 100644
--- a/tgui/packages/tgui/interfaces/Cargo.js
+++ b/tgui/packages/tgui/interfaces/Cargo.js
@@ -45,6 +45,12 @@ export const CargoContent = (props, context) => {
             onClick={() => setTab('requests')}>
             Requests ({requests.length})
           </Tabs.Tab>
+          <Tabs.Tab
+            icon="clipboard-list"
+            selected={tab === 'gun_window'}
+            onClick={() => act('gun_window')}>
+            Gun Requisitions
+          </Tabs.Tab>
           {!requestonly && (
             <>
               <Tabs.Tab
@@ -78,6 +84,9 @@ export const CargoContent = (props, context) => {
       {tab === 'help' && (
         <CargoHelp />
       )}
+      {tab === 'gun_window' && (
+        tab === 'catalog'
+      )}
     </Box>
   );
 };
diff --git a/tgui/packages/tgui/interfaces/CargoGunConsole.js b/tgui/packages/tgui/interfaces/CargoGunConsole.js
new file mode 100644
index 00000000000..19727bf9c80
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/CargoGunConsole.js
@@ -0,0 +1,201 @@
+import { useBackend, useLocalState } from '../backend';
+import { Section, Stack, Box, Divider, Button, NumberInput } from '../components';
+import { Window } from '../layouts';
+
+export const CargoGunConsole = (props, context) => {
+  const [category, setCategory] = useLocalState(context, 'category', '');
+  const [weapon, setArmament] = useLocalState(context, 'weapon');
+  const { act, data } = useBackend(context);
+  const {
+    armaments_list = [],
+    budget_points,
+    budget_name,
+    ammo_amount,
+    self_paid,
+  } = data;
+  return (
+    <Window
+      theme="armament"
+      title="Firearm Requisition Console"
+      width={1000}
+      height={600}>
+      <Window.Content>
+        <Section grow height="100%" title="Firearm Requisition Console">
+          <Stack>
+            <Stack.Item grow fill>
+              <Button.Checkbox
+                content="Buy Privately"
+                checked={self_paid}
+                onClick={() => act('toggleprivate')} />
+              <Box>
+                <b>Current Budget:</b> {budget_name}
+              </Box>
+              <Box>
+                <b>Budget Remaining:</b> {budget_points}
+              </Box>
+            </Stack.Item>
+          </Stack>
+          <Divider />
+          <Stack fill grow>
+            <Stack.Item mr={1}>
+              <Section title="Companies">
+                <Stack vertical>
+                  {armaments_list.map(armament_category => (
+                    <Stack.Item key={armament_category.category}>
+                      {armament_category.category_purchased ? (
+                        <Button
+                          width="100%"
+                          content={armament_category.category}
+                          selected={category === armament_category.category}
+                          onClick={() =>
+                            setCategory(armament_category.category)} />
+                      ) : (
+                        <Button
+                          width="100%"
+                          color="bad"
+                          onClick={() => act('buy_company', {
+                            selected_company: armament_category.category })}
+                          content={'Purchase '
+                          + (armament_category.category)
+                          + ' ('
+                          + (armament_category.handout ? 'Handout [Choose One]' : armament_category.cost)
+                          + ' Cr)'} />
+                      )}
+                    </Stack.Item>
+                  ))}
+                </Stack>
+              </Section>
+            </Stack.Item>
+            <Divider vertical />
+            <Stack.Item grow mr={1}>
+              <Section title={category} scrollable fill height="480px">
+                {armaments_list.map(armament_category => (
+                  armament_category.category === category && (
+                    armament_category.subcategories.map(subcat => (
+                      <Section
+                        key={subcat.subcategory}
+                        title={subcat.subcategory}>
+                        <Stack vertical>
+                          {subcat.items.map(item => (
+                            <Stack.Item key={item.ref}>
+                              <Button
+                                fontSize="15px"
+                                textAlign="center"
+                                selected={weapon === item.ref}
+                                color={item.cant_purchase ? "bad" : item.purchased >= item.quantity ? "bad" : "default"}
+                                width="100%"
+                                key={item.ref}
+                                onClick={() =>
+                                  setArmament(item.ref)}>
+                                <img
+                                  src={`data:image/jpeg;base64,${item.icon}`}
+                                  style={{
+                                    'vertical-align': 'middle',
+                                    'horizontal-align': 'middle',
+                                  }}
+                                />
+                                &nbsp;{item.name}
+                              </Button>
+                            </Stack.Item>
+                          ))}
+                        </Stack>
+                      </Section>
+                    ))
+                  )
+                ))}
+              </Section>
+            </Stack.Item>
+            <Divider vertical />
+            <Stack.Item width="20%">
+              <Section title="Selected Armament">
+                {armaments_list.map(armament_category => (
+                  armament_category.subcategories.map(subcat => (
+                    subcat.items.map(item => (
+                      item.ref === weapon && (
+                        <Stack vertical>
+                          <Stack.Item>
+                            <Box key={item.ref}>
+                              <img
+                                height="100%"
+                                width="100%"
+                                src={`data:image/jpeg;base64,${item.icon}`}
+                                style={{
+                                  'vertical-align': 'middle',
+                                  'horizontal-align': 'middle',
+                                  '-ms-interpolation-mode': 'nearest-neighbor',
+                                }}
+                              />
+                            </Box>
+                          </Stack.Item>
+                          <Stack.Item>
+                            {item.description}
+                          </Stack.Item>
+                          {!!item.cant_purchase && (
+                            <Stack.Item
+                              textColor={"red"}>
+                              {'Company interest needs to be higher to buy this item!'}
+                            </Stack.Item>
+                          )}
+                          <Stack.Item
+                            textColor={(item.quantity) <= 0 ? "red" : "green"}>
+                            {'Quantity Remaining: ' + (item.quantity)}
+                          </Stack.Item>
+                          <Stack.Item
+                            textColor={(item.cost > budget_points) ? "red" : "green"}>
+                            {'Cost: ' + item.cost}
+                          </Stack.Item>
+                          {!!item.buyable_ammo && (
+                            <Stack.Item
+                              textColor={(item.magazine_cost > budget_points) ? "red" : "green"}>
+                              {'Ammo Cost: ' + item.magazine_cost}
+                            </Stack.Item>
+                          )}
+                          <Stack.Item>
+                            <Button
+                              content="Buy"
+                              textAlign="center"
+                              width="100%"
+                              disabled={item.cost > budget_points
+                                || 0 >= item.quantity
+                                || !!item.cant_purchase}
+                              onClick={() => act('equip_item', {
+                                armament_ref: item.ref })}
+                            />
+                          </Stack.Item>
+                          {!!item.buyable_ammo && (
+                            <Stack.Item>
+                              <Button
+                                content="Buy Ammo"
+                                textAlign="center"
+                                width="100%"
+                                disabled={item.magazine_cost > budget_points}
+                                onClick={() => act('buy_ammo', {
+                                  armament_ref: item.ref })}
+                              />
+                            </Stack.Item>
+                          )}
+                          {!!item.buyable_ammo && (
+                            <NumberInput
+                              value={ammo_amount}
+                              width="59px"
+                              minValue={0}
+                              maxValue={10}
+                              step={1}
+                              stepPixelSize={2}
+                              onChange={(e, value) => act('set_ammo_amount', {
+                                chosen_amount: value,
+                              })} />
+                          )}
+                        </Stack>
+                      )
+                    ))
+                  ))
+                ))}
+              </Section>
+            </Stack.Item>
+          </Stack>
+        </Section>
+      </Window.Content>
+    </Window>
+  );
+};
diff --git a/tgui/packages/tgui/interfaces/KeycardAuth.js b/tgui/packages/tgui/interfaces/KeycardAuth.js
index 3229bf2d077..0c4ccca0f79 100644
--- a/tgui/packages/tgui/interfaces/KeycardAuth.js
+++ b/tgui/packages/tgui/interfaces/KeycardAuth.js
@@ -5,9 +5,10 @@ import { Window } from '../layouts';
 export const KeycardAuth = (props, context) => {
   const { act, data } = useBackend(context);
   return (
+    // SKYRAT EDIT: height 125 -> 150, addition of permit-locked firing pin
     <Window
       width={375}
-      height={125}>
+      height={150}>
       <Window.Content>
         <Section>
           <Box>
@@ -47,6 +48,11 @@ export const KeycardAuth = (props, context) => {
                       fluid
                       onClick={() => act('bsa_unlock')}
                       content="Bluespace Artillery Unlock" />
+                    <Button
+                      icon="key"
+                      fluid
+                      onClick={() => act('pin_unrestrict')}
+                      content="Permit-Locked Firing Pin Unrestriction" />
                   </>
                 )}
               </>