diff --git a/code/modules/jobs/job_types/head_of_security.dm b/code/modules/jobs/job_types/head_of_security.dm
index f3627c3c2a2..17dcf4d0b50 100644
--- a/code/modules/jobs/job_types/head_of_security.dm
+++ b/code/modules/jobs/job_types/head_of_security.dm
@@ -55,6 +55,7 @@
 	suit_store = /obj/item/gun/energy/e_gun
 	backpack_contents = list(
 		/obj/item/evidencebag = 1,
+		/obj/item/choice_beacon/security_pistol = 1, //Skyrat Addition
 		)
 	belt = /obj/item/modular_computer/pda/heads/hos
 	ears = /obj/item/radio/headset/heads/hos/alt
diff --git a/modular_skyrat/modules/company_imports/code/armament_datums/allstar.dm b/modular_skyrat/modules/company_imports/code/armament_datums/allstar.dm
index df88a5e099d..2158986cce0 100644
--- a/modular_skyrat/modules/company_imports/code/armament_datums/allstar.dm
+++ b/modular_skyrat/modules/company_imports/code/armament_datums/allstar.dm
@@ -26,6 +26,7 @@
 
 /datum/armament_entry/company_import/allstar/basic_energy_long_weapons
 	subcategory = "Basic Energy Longarms"
+	restricted = TRUE
 
 /datum/armament_entry/company_import/allstar/basic_energy_long_weapons/laser
 	item_type = /obj/item/gun/energy/laser
diff --git a/modular_skyrat/modules/company_imports/code/armament_datums/deforest_medical.dm b/modular_skyrat/modules/company_imports/code/armament_datums/deforest_medical.dm
index 58c091d1a90..b8166368cbd 100644
--- a/modular_skyrat/modules/company_imports/code/armament_datums/deforest_medical.dm
+++ b/modular_skyrat/modules/company_imports/code/armament_datums/deforest_medical.dm
@@ -197,10 +197,6 @@
 	item_type = /obj/item/defibrillator/compact/loaded
 	cost = PAYCHECK_COMMAND*2
 
-/datum/armament_entry/company_import/deforest/equipment/loaded_belt_defib2
-	item_type = /obj/item/defibrillator/compact/combat/loaded/nanotrasen
-	cost = PAYCHECK_COMMAND*8
-
 /datum/armament_entry/company_import/deforest/equipment/surgical_tools
 	item_type = /obj/item/surgery_tray/full
 	cost = PAYCHECK_COMMAND
diff --git a/modular_skyrat/modules/company_imports/code/armament_datums/micron_control_systems.dm b/modular_skyrat/modules/company_imports/code/armament_datums/micron_control_systems.dm
index c5dc4077736..67682a3e149 100644
--- a/modular_skyrat/modules/company_imports/code/armament_datums/micron_control_systems.dm
+++ b/modular_skyrat/modules/company_imports/code/armament_datums/micron_control_systems.dm
@@ -6,10 +6,12 @@
 /datum/armament_entry/company_import/micron/rifle
 	subcategory = ARMAMENT_SUBCATEGORY_SPECIAL
 
+/*
 /datum/armament_entry/company_import/micron/rifle/mcr
 	item_type = /obj/item/gun/microfusion/mcr01
 	cost = PAYCHECK_COMMAND * 4
 
+*/
 
 /datum/armament_entry/company_import/micron/ammo
 	subcategory = ARMAMENT_SUBCATEGORY_AMMO
diff --git a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/romulus_technology/ammo/rifle.dm b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/romulus_technology/ammo/rifle.dm
index ae33c1ccc4d..7f4572174a1 100644
--- a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/romulus_technology/ammo/rifle.dm
+++ b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/romulus_technology/ammo/rifle.dm
@@ -26,6 +26,7 @@
 	projectile_type = /obj/projectile/bullet/caflechette
 	custom_materials = AMMO_MATS_SHOTGUN_FLECH
 	advanced_print_req = TRUE
+	can_be_printed = TRUE
 
 /obj/item/ammo_casing/caflechette/Initialize(mapload)
 	. = ..()
diff --git a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/romulus_technology/magazines.dm b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/romulus_technology/magazines.dm
index c258e4a658f..57bed6df208 100644
--- a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/romulus_technology/magazines.dm
+++ b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/romulus_technology/magazines.dm
@@ -36,6 +36,8 @@
 	icon = 'modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/romulus_technology/ammo.dmi'
 	icon_state = "cmg_penetrator"
 	max_ammo = 25
+	multitype = TRUE
+	multiple_sprites = AMMO_BOX_FULL_EMPTY
 
 /obj/item/ammo_box/magazine/caflechette/ripper
 	name = "flechette ripper box"
diff --git a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/romulus_technology/rifle.dm b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/romulus_technology/rifle.dm
index 10e63c044f8..41cf95c0d0a 100644
--- a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/romulus_technology/rifle.dm
+++ b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/romulus_technology/rifle.dm
@@ -156,7 +156,10 @@
 	var/unfolded_spread = 5
 	/// what's our spread with a folded stock (see above comment)?
 	var/folded_spread = 20
-
+	/// Do we have any recoil if it's folded?
+	var/folded_recoil = 5
+	///Do we lose any recoil when it's not?
+	var/unfolded_recoil = 0
 /obj/item/gun/ballistic/automatic/rom_flech/examine(mob/user)
 	. = ..()
 	. += span_notice("<b>Alt-click</b> to [folded ? "extend" : "collapse"] the stock.")
@@ -185,8 +188,12 @@
 /obj/item/gun/ballistic/automatic/rom_flech/proc/update_fold_stats()
 	if(folded)
 		spread = folded_spread
+		w_class = WEIGHT_CLASS_NORMAL
+		recoil = folded_recoil
 	else
 		spread = unfolded_spread
+		w_class = WEIGHT_CLASS_BULKY
+		recoil = unfolded_recoil
 	update_icon()
 
 /obj/item/gun/ballistic/automatic/rom_flech/update_overlays()
@@ -228,6 +235,8 @@
 	pin = /obj/item/firing_pin
 	unfolded_spread = 0
 	folded_spread = 7
+	folded_recoil = 2
+	unfolded_recoil = 0
 
 /obj/item/gun/ballistic/automatic/rom_flech/blueshield/empty
 	spawnwithmagazine = FALSE