From f930cc5476e22bf5e4b558ffa5a851cdf1c3a74f Mon Sep 17 00:00:00 2001
From: projectkepler-RU <99981766+projectkepler-ru@users.noreply.github.com>
Date: Fri, 23 Aug 2024 11:50:24 +0700
Subject: [PATCH] immediate followup upstream merge (#1998)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

<!-- Please make sure to actually test your PRs. If you have not tested
your PR mention it. -->

## Why It's Good For The Game

<!-- Argue for the merits of your changes and how they benefit the game,
especially if they are controversial and/or far reaching. If you can't
actually explain WHY what you are doing will improve the game, then it
probably isn't good for the game in the first place. -->

## Proof Of Testing

<!-- Compile and run your code locally. Make sure it works. This is the
place to show off your changes! We are not responsible for testing your
features. -->

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and its effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

:cl:
add: Added new mechanics or gameplay changes
add: Added more things
del: Removed old things
qol: made something easier to use
balance: rebalanced something
fix: fixed a few things
sound: added/modified/removed audio or sound effects
image: added/modified/removed some icons or images
spellcheck: fixed a few typos
code: changed some code
refactor: refactored some code
config: changed some config setting
admin: messed with admin stuff
server: something server ops should know
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

<!-- By opening a pull request. You have read and understood the
repository rules located on the main README.md on this project. -->

---------

Co-authored-by: nikothedude <59709059+nikothedude@users.noreply.github.com>
Co-authored-by: lessthanthree <83487515+lessthnthree@users.noreply.github.com>
Co-authored-by: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Co-authored-by: SmArtKar <44720187+SmArtKar@users.noreply.github.com>
Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com>
Co-authored-by: ATH1909 <42606352+ATH1909@ users.noreply.github.com>
Co-authored-by: Jacquerel <hnevard@ gmail.com>
Co-authored-by: Waterpig <49160555+Majkl-J@users.noreply.github.com>
Co-authored-by: Ghom <42542238+Ghommie@ users.noreply.github.com>
Co-authored-by: Changelogs <action@github.com>
---
 html/changelogs/AutoChangeLog-pr-29538.yml    |  5 ++
 .../modules/research/techweb/all_nodes.dm     | 11 ----
 .../code/armament_datums/deforest_medical.dm  |  2 +-
 .../armament_datums/micron_control_systems.dm |  1 +
 .../nanotrasen_system_inc/magazine.dm         |  2 +
 .../romulus_technology/rifle.dm               |  1 +
 .../modules/sec_haul/code/guns/cargo_stuff.dm | 57 ++++++++++++-------
 .../sec_haul/code/technode/all_nodes.dm       |  2 +
 8 files changed, 50 insertions(+), 31 deletions(-)
 create mode 100644 html/changelogs/AutoChangeLog-pr-29538.yml

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"