diff --git a/html/changelogs/AutoChangeLog-pr-29538.yml b/html/changelogs/AutoChangeLog-pr-29538.yml
new file mode 100644
index 00000000000..6aa5d524b49
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-29538.yml
@@ -0,0 +1,5 @@
+author: "projectkepler-ru"
+delete-after: True
+changes:
+ - bugfix: "erronously the c10 speedloader was normal sized"
+ - rscadd: "you can now buy sidearm crate again"
\ No newline at end of file
diff --git a/modular_skyrat/master_files/code/modules/research/techweb/all_nodes.dm b/modular_skyrat/master_files/code/modules/research/techweb/all_nodes.dm
index 9c85f1995ee..e6e828d3236 100644
--- a/modular_skyrat/master_files/code/modules/research/techweb/all_nodes.dm
+++ b/modular_skyrat/master_files/code/modules/research/techweb/all_nodes.dm
@@ -218,17 +218,6 @@
/////////////////////////weaponry tech/////////////////////////
-/datum/techweb_node/basic_arms/New()
- design_ids += list(
- "ammoworkbench_disk_lethal",
- )
- return ..()
-
-/datum/techweb_node/riot_supression/New()
- design_ids += list(
- "ammo_workbench",
- )
- return ..()
/datum/techweb_node/electric_weapons/New()
design_ids += list(
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 658b5126939..a81c0db7f0d 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
@@ -196,7 +196,7 @@
/datum/armament_entry/company_import/deforest/equipment/loaded_belt_defib
item_type = /obj/item/defibrillator/compact/loaded
cost = PAYCHECK_COMMAND*2
-
+
/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 a174a73b523..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
@@ -5,6 +5,7 @@
/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
diff --git a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/nanotrasen_system_inc/magazine.dm b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/nanotrasen_system_inc/magazine.dm
index cff942dd8f5..c1465c08d5d 100644
--- a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/nanotrasen_system_inc/magazine.dm
+++ b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/nanotrasen_system_inc/magazine.dm
@@ -73,6 +73,8 @@
custom_premium_price = 50
+ w_class = WEIGHT_CLASS_SMALL
+
/obj/item/ammo_box/c10mm/speedloader/rubber
name = "speed loader (10mm Auto Rubber)"
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 41cf95c0d0a..f2a3cdec7bc 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
@@ -144,6 +144,7 @@
fire_delay = 2
spread = 5
pin = /obj/item/firing_pin/alert_level
+ fire_sound = 'modular_skyrat/modules/modular_weapons/sounds/smg_light.ogg'
accepted_magazine_type = /obj/item/ammo_box/magazine/caflechette
spawn_magazine_type = /obj/item/ammo_box/magazine/caflechette
diff --git a/modular_skyrat/modules/sec_haul/code/guns/cargo_stuff.dm b/modular_skyrat/modules/sec_haul/code/guns/cargo_stuff.dm
index 66c5dbbf9d8..036fd7cce59 100644
--- a/modular_skyrat/modules/sec_haul/code/guns/cargo_stuff.dm
+++ b/modular_skyrat/modules/sec_haul/code/guns/cargo_stuff.dm
@@ -52,6 +52,7 @@
)
crate_name = "anti riot shotgun ammo crate"
+
//SOL GUNS
/datum/supply_pack/security/wespe
@@ -92,16 +93,6 @@
contraband = TRUE
*/
-/datum/supply_pack/security/armory/cmg
- name = "Romulus Technology CMG Assault Rifle Crate"
- desc = "Two CMG-1, chambered in experimental steel flechette."
- cost = CARGO_CRATE_VALUE * 20
- contains = list(
- /obj/item/storage/toolbox/guncase/skyrat/rom_flech,
- /obj/item/storage/toolbox/guncase/skyrat/rom_flech,
- )
- crate_name = "RomTech CMG-1 Crate"
-
/datum/supply_pack/security/armory/sindano
name = "Carwo 'Sindano' Submachinegun Crate"
desc = "Three entirely proprietary Sindano kits, chambered in .35 Sol Short. Each kit contains three empty magazines and a box each of incapacitator and lethal rounds."
@@ -120,6 +111,28 @@
)
crate_name = "Carwil Marksman Rifle Crate"
+//NT Guns and Ammo
+
+/datum/supply_pack/security/sidearmcrate
+ name = "Sidearm Crate"
+ desc = "Contains Two Sidearm Beacon, rated for NanoTrasen usage."
+ cost = CARGO_CRATE_VALUE * 12
+ contains = list(/obj/item/choice_beacon/security_pistol = 2,
+ )
+ crate_name = "NanoTrasen Sidearm Crate"
+
+// RomFed Gun
+
+/datum/supply_pack/security/armory/cmg
+ name = "Romulus Technology CMG Assault Rifle Crate"
+ desc = "Two CMG-1, chambered in experimental steel flechette."
+ cost = CARGO_CRATE_VALUE * 20
+ contains = list(
+ /obj/item/storage/toolbox/guncase/skyrat/rom_flech,
+ /obj/item/storage/toolbox/guncase/skyrat/rom_flech,
+ )
+ crate_name = "RomTech CMG-1 Crate"
+
/datum/supply_pack/security/armory/rom_ceremonial_rifle
name = "Romulus Ceremonial Bolt Action Rifle Crate"
desc = "Contains Three Ceremonial Bolt Action Rifle in .40 , as well as ammo for it."
@@ -128,15 +141,9 @@
)
crate_name = "Romulus Ceremonial Rifle Crate"
-/datum/supply_pack/security/ammo
- contains = list(/obj/item/ammo_box/advanced/s12gauge/bean = 3,
- /obj/item/ammo_box/advanced/s12gauge/rubber = 3,
- /obj/item/ammo_box/c38/trac,
- /obj/item/ammo_box/c38/hotshot,
- /obj/item/ammo_box/c38/iceblox,
- )
- special = FALSE
-//This makes the Security ammo crate use the cool advanced ammo boxes instead of the old ones
+
+
+//Misc
/datum/supply_pack/security/armory/kiboko
name = "Kiboko Grenade Launcher Crate"
@@ -171,3 +178,15 @@
//Goodies
+//Override
+/datum/supply_pack/security/ammo
+ contains = list(/obj/item/ammo_box/advanced/s12gauge/bean = 3,
+ /obj/item/ammo_box/advanced/s12gauge/rubber = 3,
+ /obj/item/ammo_box/c38/trac,
+ /obj/item/ammo_box/c38/hotshot,
+ /obj/item/ammo_box/c38/iceblox,
+ )
+ special = FALSE
+//This makes the Security ammo crate use the cool advanced ammo boxes instead of the old ones
+
+
diff --git a/modular_skyrat/modules/sec_haul/code/technode/all_nodes.dm b/modular_skyrat/modules/sec_haul/code/technode/all_nodes.dm
index 72d569b69cb..9977f16161f 100644
--- a/modular_skyrat/modules/sec_haul/code/technode/all_nodes.dm
+++ b/modular_skyrat/modules/sec_haul/code/technode/all_nodes.dm
@@ -35,6 +35,8 @@
design_ids += "c10mm_r"
design_ids += "c10mm_rihdf"
design_ids += "s12c_fslug"
+ design_ids += "ammoworkbench_disk_lethal"
+ design_ids += "ammo_workbench"
/datum/techweb_node/magazineresearch_heavy
id = "storedmunition_tech_three"