Paxilmaniac makes the best skyrat pr ever | Deletes germany (every single weapon from the gunsgalore module) (#25388)

* cant wait for all the compile this will make * compile errors pt 1 * solfed outfit gun fixing * fixes black mesa, again * i missed two m16s --------- Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com>
2026-08-29 08:08:49 +01:00 · 2023-12-16 15:24:23 +00:00
parent c08c468d9e
commit a99a9b32b1
98 changed files with 83 additions and 873 deletions
@@ -1053,7 +1053,7 @@
 /area/awaymission/black_mesa/entrance_hall)
 "ans" = (
 /obj/structure/table/wood,
-/obj/item/gun/ballistic/automatic/p90,
+/obj/item/gun/ballistic/automatic/sol_smg,
 /turf/open/floor/bamboo,
 /area/awaymission/black_mesa/xen/freeman_arena)
 "ant" = (
@@ -1603,7 +1603,7 @@
 /area/awaymission/black_mesa/cryo_storage)
 "auV" = (
 /obj/structure/table/wood,
-/obj/item/ammo_box/magazine/p90,
+/obj/item/ammo_box/magazine/c35sol_pistol/stendo,
 /turf/open/floor/bamboo,
 /area/awaymission/black_mesa/xen/freeman_arena)
 "auX" = (
@@ -1807,7 +1807,7 @@
 /turf/open/misc/xen,
 /area/awaymission/black_mesa/xen/freeman_arena)
 "axn" = (
-/obj/item/ammo_box/magazine/mp5,
+/obj/item/ammo_box/magazine/c585trappiste_pistol,
 /turf/open/floor/iron,
 /area/awaymission/black_mesa/security_outpost)
 "axy" = (
@@ -2140,8 +2140,8 @@
 /area/awaymission/black_mesa/entrance_hall)
 "aBo" = (
 /obj/structure/rack/gunrack,
-/obj/item/gun/ballistic/automatic/mp5,
-/obj/item/ammo_box/magazine/mp5,
+/obj/item/gun/ballistic/automatic/xhihao_smg,
+/obj/item/ammo_box/magazine/c585trappiste_pistol,
 /turf/open/floor/iron,
 /area/awaymission/black_mesa/security_outpost)
 "aBq" = (
@@ -4473,7 +4473,7 @@
 /turf/open/floor/iron/textured_large,
 /area/awaymission/black_mesa/equipment_room)
 "bRK" = (
-/obj/item/ammo_box/magazine/m16,
+/obj/item/ammo_box/magazine/c40sol_rifle/standard,
 /turf/open/floor/iron/smooth_large,
 /area/awaymission/black_mesa/hecu_zone_external_sec)
 "bSz" = (
@@ -4691,7 +4691,7 @@
 /area/awaymission/black_mesa/hecu_zone_atrium)
 "cjr" = (
 /obj/structure/table,
-/obj/item/gun/ballistic/automatic/mp5,
+/obj/item/gun/ballistic/automatic/xhihao_smg,
 /turf/open/misc/xen,
 /area/awaymission/black_mesa/xen/mp5_outpost)
 "cjE" = (
@@ -6193,7 +6193,7 @@
 /area/awaymission/black_mesa/deep_sci_feesh)
 "eZJ" = (
 /obj/structure/rack/shelf,
-/obj/item/ammo_box/magazine/p90,
+/obj/item/ammo_box/magazine/c35sol_pistol/stendo,
 /turf/open/floor/iron/smooth,
 /area/awaymission/black_mesa/black_ops_armory)
 "fah" = (
@@ -6364,7 +6364,7 @@
 /area/awaymission/black_mesa/genetics)
 "fmF" = (
 /obj/structure/rack/gunrack,
-/obj/item/gun/ballistic/automatic/mp5,
+/obj/item/gun/ballistic/automatic/xhihao_smg,
 /obj/effect/turf_decal/tile/blue/fourcorners,
 /turf/open/floor/iron/dark,
 /area/awaymission/black_mesa/science_internal)
@@ -6732,7 +6732,7 @@
 "gee" = (
 /obj/structure/rack/shelf,
 /obj/machinery/light/cold,
-/obj/item/gun/ballistic/automatic/m16,
+/obj/item/gun/ballistic/automatic/sol_rifle,
 /turf/open/floor/iron/smooth,
 /area/awaymission/black_mesa/black_ops_armory)
 "gew" = (
@@ -6966,7 +6966,7 @@
 /turf/open/floor/iron/dark,
 /area/awaymission/black_mesa/xen/acid_lake_building)
 "gCB" = (
-/obj/item/gun/ballistic/automatic/m16/oldarms,
+/obj/item/gun/ballistic/automatic/sol_rifle,
 /turf/open/misc/ironsand/black_mesa,
 /area/awaymission/black_mesa/black_ops_bus)
 "gDg" = (
@@ -7134,7 +7134,7 @@
 /area/awaymission/black_mesa/black_ops_button)
 "gVv" = (
 /obj/structure/rack/shelf,
-/obj/item/ammo_box/magazine/m16,
+/obj/item/ammo_box/magazine/c40sol_rifle/standard,
 /turf/open/floor/iron/smooth,
 /area/awaymission/black_mesa/black_ops_armory)
 "gVw" = (
@@ -7279,7 +7279,7 @@
 /turf/open/floor/iron/dark,
 /area/awaymission/black_mesa/science_decon_room)
 "hgL" = (
-/obj/item/ammo_box/magazine/m16/vintage/oldarms,
+/obj/item/ammo_box/magazine/c40sol_rifle,
 /turf/open/floor/iron/dark/textured_large,
 /area/awaymission/black_mesa/black_ops_bus)
 "hhL" = (
@@ -7465,7 +7465,7 @@
 /area/awaymission/black_mesa/hecu_zone_camp)
 "hzF" = (
 /obj/structure/rack/shelf,
-/obj/item/gun/ballistic/automatic/m16,
+/obj/item/gun/ballistic/automatic/sol_rifle,
 /obj/machinery/light/small/directional/north,
 /turf/open/floor/iron/smooth_large,
 /area/awaymission/black_mesa/hecu_zone_external_sec)
@@ -8395,11 +8395,11 @@
 /area/awaymission/black_mesa/black_ops_bus)
 "jpM" = (
 /obj/structure/rack/shelf,
-/obj/item/ammo_box/magazine/mp5,
-/obj/item/ammo_box/magazine/mp5,
-/obj/item/ammo_box/magazine/mp5,
-/obj/item/ammo_box/magazine/mp5,
-/obj/item/ammo_box/magazine/mp5,
+/obj/item/ammo_box/magazine/c585trappiste_pistol,
+/obj/item/ammo_box/magazine/c585trappiste_pistol,
+/obj/item/ammo_box/magazine/c585trappiste_pistol,
+/obj/item/ammo_box/magazine/c585trappiste_pistol,
+/obj/item/ammo_box/magazine/c585trappiste_pistol,
 /turf/open/floor/iron/smooth_large,
 /area/awaymission/black_mesa/high_security_armory)
 "jpR" = (
@@ -9079,7 +9079,7 @@
 /area/awaymission/black_mesa/black_ops_button)
 "kBT" = (
 /obj/structure/table,
-/obj/item/ammo_box/magazine/mp5,
+/obj/item/ammo_box/magazine/c585trappiste_pistol,
 /obj/effect/turf_decal/tile/blue/fourcorners,
 /turf/open/floor/iron/dark,
 /area/awaymission/black_mesa/science_internal)
@@ -9727,8 +9727,8 @@
 "lNE" = (
 /obj/structure/rack/shelf,
 /obj/item/reagent_containers/hypospray/medipen/stimulants,
-/obj/item/ammo_box/magazine/mp5,
-/obj/item/ammo_box/magazine/mp5,
+/obj/item/ammo_box/magazine/c585trappiste_pistol,
+/obj/item/ammo_box/magazine/c585trappiste_pistol,
 /turf/open/floor/iron/smooth,
 /area/awaymission/black_mesa/black_ops_armory)
 "lNP" = (
@@ -9983,7 +9983,7 @@
 /area/awaymission/black_mesa/deep_sci_chem)
 "moe" = (
 /obj/machinery/light/cold/directional/west,
-/obj/item/ammo_box/magazine/m16/vintage/oldarms,
+/obj/item/ammo_box/magazine/c40sol_rifle,
 /turf/open/floor/iron/dark/textured_large,
 /area/awaymission/black_mesa/black_ops_bus)
 "mpE" = (
@@ -10033,7 +10033,7 @@
 /area/awaymission/black_mesa/lambda_hallway)
 "muZ" = (
 /obj/structure/rack/shelf,
-/obj/item/gun/ballistic/automatic/mp5,
+/obj/item/gun/ballistic/automatic/xhihao_smg,
 /obj/structure/sign/flag/usa/directional/south,
 /turf/open/floor/iron/smooth_large,
 /area/awaymission/black_mesa/high_security_armory)
@@ -10753,7 +10753,7 @@
 /turf/closed/wall/r_wall,
 /area/awaymission/black_mesa/tram_room)
 "nPp" = (
-/obj/item/ammo_box/magazine/mp5,
+/obj/item/ammo_box/magazine/c585trappiste_pistol,
 /turf/open/misc/xen,
 /area/awaymission/black_mesa/xen/freeman_puzzle)
 "nQD" = (
@@ -10974,12 +10974,12 @@
 /area/awaymission/black_mesa/entrance_internal_hall)
 "orr" = (
 /obj/structure/rack/shelf,
-/obj/item/ammo_box/magazine/m16,
-/obj/item/ammo_box/magazine/m16,
-/obj/item/ammo_box/magazine/m16,
-/obj/item/ammo_box/magazine/m16,
-/obj/item/ammo_box/magazine/m16,
-/obj/item/ammo_box/magazine/m16,
+/obj/item/ammo_box/magazine/c40sol_rifle/standard,
+/obj/item/ammo_box/magazine/c40sol_rifle/standard,
+/obj/item/ammo_box/magazine/c40sol_rifle/standard,
+/obj/item/ammo_box/magazine/c40sol_rifle/standard,
+/obj/item/ammo_box/magazine/c40sol_rifle/standard,
+/obj/item/ammo_box/magazine/c40sol_rifle/standard,
 /turf/open/floor/iron/smooth_large,
 /area/awaymission/black_mesa/hecu_zone_external_sec)
 "osI" = (
@@ -11112,7 +11112,7 @@
 /area/awaymission/black_mesa/entrance_internal_hall)
 "oEs" = (
 /obj/structure/rack/shelf,
-/obj/item/ammo_box/magazine/m16,
+/obj/item/ammo_box/magazine/c40sol_rifle,
 /obj/item/reagent_containers/hypospray/medipen/stimulants,
 /turf/open/floor/iron/smooth,
 /area/awaymission/black_mesa/black_ops_armory)
@@ -11279,7 +11279,7 @@
 /area/awaymission/black_mesa/black_ops_turret_blockade)
 "oWN" = (
 /obj/structure/closet/crate/large,
-/obj/item/ammo_box/magazine/m16/vintage/oldarms,
+/obj/item/ammo_box/magazine/c40sol_rifle,
 /turf/open/misc/ironsand/black_mesa,
 /area/awaymission/black_mesa/hecu_zone_towards_facility)
 "oXc" = (
@@ -11762,7 +11762,7 @@
 /area/awaymission/black_mesa/high_security_hallway)
 "pYd" = (
 /obj/structure/closet/crate/large,
-/obj/item/ammo_box/magazine/mp5,
+/obj/item/ammo_box/magazine/c585trappiste_pistol,
 /turf/open/floor/plating,
 /area/awaymission/black_mesa/science_tunnel)
 "pYl" = (
@@ -11922,7 +11922,7 @@
 /turf/open/floor/iron/dark,
 /area/awaymission/black_mesa/resonant_chamber)
 "qoi" = (
-/obj/item/ammo_box/magazine/p90,
+/obj/item/ammo_box/magazine/c35sol_pistol/stendo,
 /turf/open/misc/dirt/planet/xen,
 /area/awaymission/black_mesa/xen/freeman_puzzle)
 "qoM" = (
@@ -12308,7 +12308,7 @@
 /turf/open/floor/iron/dark,
 /area/awaymission/black_mesa/xen/acid_lake_building)
 "qUX" = (
-/obj/item/ammo_box/magazine/m16,
+/obj/item/ammo_box/magazine/c40sol_rifle/standard,
 /turf/open/floor/iron/textured,
 /area/awaymission/black_mesa/black_ops_downstairs_atrium)
 "qVm" = (
@@ -12544,7 +12544,7 @@
 "rnS" = (
 /obj/structure/rack/shelf,
 /obj/machinery/light/cold/directional/north,
-/obj/item/ammo_box/magazine/p90,
+/obj/item/ammo_box/magazine/c35sol_pistol/stendo,
 /turf/open/floor/iron/smooth,
 /area/awaymission/black_mesa/black_ops_armory)
 "rox" = (
@@ -13526,7 +13526,7 @@
 	},
 /area/awaymission/black_mesa/xen/acid_lake_hallway)
 "tjL" = (
-/obj/item/ammo_box/magazine/mp5,
+/obj/item/ammo_box/magazine/c585trappiste_pistol,
 /turf/open/misc/dirt/planet/xen,
 /area/awaymission/black_mesa/xen/freeman_puzzle)
 "tjX" = (
@@ -13729,7 +13729,7 @@
 "tJD" = (
 /obj/structure/rack/shelf,
 /obj/item/reagent_containers/hypospray/medipen/stimpack/traitor,
-/obj/item/gun/ballistic/automatic/p90,
+/obj/item/gun/ballistic/automatic/sol_smg,
 /turf/open/floor/iron/smooth,
 /area/awaymission/black_mesa/black_ops_armory)
 "tKZ" = (
@@ -13899,9 +13899,9 @@
 /area/awaymission/black_mesa/science_labs)
 "uam" = (
 /obj/structure/table,
-/obj/item/gun/ballistic/automatic/p90,
-/obj/item/ammo_box/magazine/p90,
-/obj/item/ammo_box/magazine/p90,
+/obj/item/gun/ballistic/automatic/sol_smg,
+/obj/item/ammo_box/magazine/c35sol_pistol/stendo,
+/obj/item/ammo_box/magazine/c35sol_pistol/stendo,
 /turf/open/floor/iron/dark,
 /area/awaymission/black_mesa/xen/acid_lake_building)
 "uaK" = (
@@ -14125,12 +14125,12 @@
 /area/awaymission/black_mesa/resonant_chamber)
 "uwo" = (
 /obj/structure/table,
-/obj/item/ammo_box/magazine/mp5,
-/obj/item/ammo_box/magazine/mp5,
-/obj/item/ammo_box/magazine/mp5,
-/obj/item/ammo_box/magazine/mp5,
-/obj/item/ammo_box/magazine/mp5,
-/obj/item/ammo_box/magazine/mp5,
+/obj/item/ammo_box/magazine/c585trappiste_pistol,
+/obj/item/ammo_box/magazine/c585trappiste_pistol,
+/obj/item/ammo_box/magazine/c585trappiste_pistol,
+/obj/item/ammo_box/magazine/c585trappiste_pistol,
+/obj/item/ammo_box/magazine/c585trappiste_pistol,
+/obj/item/ammo_box/magazine/c585trappiste_pistol,
 /turf/open/misc/xen,
 /area/awaymission/black_mesa/xen/mp5_outpost)
 "uwM" = (
@@ -14624,12 +14624,12 @@
 /area/awaymission/black_mesa/hecu_zone_camp)
 "vtU" = (
 /obj/structure/rack/shelf,
-/obj/item/gun/ballistic/automatic/mp5,
-/obj/item/ammo_box/magazine/mp5,
-/obj/item/ammo_box/magazine/mp5,
-/obj/item/ammo_box/magazine/mp5,
-/obj/item/ammo_box/magazine/mp5,
-/obj/item/ammo_box/magazine/mp5,
+/obj/item/gun/ballistic/automatic/xhihao_smg,
+/obj/item/ammo_box/magazine/c585trappiste_pistol,
+/obj/item/ammo_box/magazine/c585trappiste_pistol,
+/obj/item/ammo_box/magazine/c585trappiste_pistol,
+/obj/item/ammo_box/magazine/c585trappiste_pistol,
+/obj/item/ammo_box/magazine/c585trappiste_pistol,
 /turf/open/floor/iron/textured,
 /area/awaymission/black_mesa/high_security_sec_point)
 "vtX" = (
@@ -15283,13 +15283,13 @@
 /turf/open/floor/iron/textured,
 /area/awaymission/black_mesa/entrance_large_office)
 "wIx" = (
-/obj/item/ammo_box/magazine/p90,
+/obj/item/ammo_box/magazine/c35sol_pistol/stendo,
 /turf/open/misc/xen,
 /area/awaymission/black_mesa/xen/acid_lake_hallway)
 "wIC" = (
 /obj/structure/rack/shelf,
 /obj/machinery/light/cold,
-/obj/item/ammo_box/magazine/m16,
+/obj/item/ammo_box/magazine/c40sol_rifle/standard,
 /turf/open/floor/iron/smooth,
 /area/awaymission/black_mesa/black_ops_armory)
 "wJo" = (
@@ -15504,7 +15504,7 @@
 /obj/structure/rack/shelf,
 /obj/item/reagent_containers/hypospray/medipen/stimulants,
 /obj/machinery/light/cold/directional/north,
-/obj/item/ammo_box/magazine/p90,
+/obj/item/ammo_box/magazine/c35sol_pistol/stendo,
 /turf/open/floor/iron/smooth,
 /area/awaymission/black_mesa/black_ops_armory)
 "xbw" = (
@@ -15631,10 +15631,10 @@
 /obj/item/gun_maintenance_supplies,
 /obj/item/gun_maintenance_supplies,
 /obj/item/gun_maintenance_supplies,
-/obj/item/ammo_box/magazine/mp5,
-/obj/item/ammo_box/magazine/mp5,
-/obj/item/ammo_box/magazine/m16,
-/obj/item/ammo_box/magazine/m16,
+/obj/item/ammo_box/magazine/c585trappiste_pistol,
+/obj/item/ammo_box/magazine/c585trappiste_pistol,
+/obj/item/ammo_box/magazine/c40sol_rifle,
+/obj/item/ammo_box/magazine/c40sol_rifle,
 /obj/item/gun/ballistic/automatic/pistol/sol{
 	burst_size = 3;
 	desc = "A weapon from bygone times, and this is the exact 21st century version. In fact, even more reliable, but it also can run full automatic fire mode. Chambered in 9mm.";
@@ -62,14 +62,3 @@
 /obj/effect/landmark/start/assaultop/Initialize(mapload)
 	. = ..()
 	GLOB.assault_operative_start += get_turf(src)
-
-/obj/effect/spawner/armory_spawn/assaultops
-	name = "gun spawner"
-	guns = list(
-				/obj/item/gun/ballistic/automatic/m16,
-				/obj/item/gun/ballistic/automatic/pistol/deagle,
-				/obj/item/gun/ballistic/automatic/sniper_rifle/modular/syndicate,
-				/obj/item/gun/ballistic/automatic/mp40,
-				/obj/item/gun/ballistic/automatic/c20r,
-				/obj/item/gun/ballistic/automatic/m90,
-				)
@@ -8,13 +8,13 @@
 	subcategory = ARMAMENT_SUBCATEGORY_SUBMACHINEGUN
 	mags_to_spawn = 4

-/datum/armament_entry/hecu/primary/submachinegun/p90
-	item_type = /obj/item/gun/ballistic/automatic/p90
+/datum/armament_entry/hecu/primary/submachinegun/sindano
+	item_type = /obj/item/gun/ballistic/automatic/sol_smg
 	max_purchase = 4
 	cost = 7

-/datum/armament_entry/hecu/primary/submachinegun/mp5
-	item_type = /obj/item/gun/ballistic/automatic/mp5
+/datum/armament_entry/hecu/primary/submachinegun/bogseo
+	item_type = /obj/item/gun/ballistic/automatic/xhihao_smg
 	max_purchase = 2
 	cost = 8

@@ -22,17 +22,17 @@
 	subcategory = ARMAMENT_SUBCATEGORY_ASSAULTRIFLE
 	mags_to_spawn = 3

-/datum/armament_entry/hecu/primary/assaultrifle/m16
-	item_type = /obj/item/gun/ballistic/automatic/m16
+/datum/armament_entry/hecu/primary/assaultrifle/automaties
+	item_type = /obj/item/gun/ballistic/automatic/sol_rifle/machinegun
 	max_purchase = 1
 	cost = 14
-	magazine = /obj/item/ammo_box/magazine/m16
+	magazine = /obj/item/ammo_box/magazine/c40sol_rifle/drum

-/datum/armament_entry/hecu/primary/assaultrifle/m16_but_horrible
-	item_type = /obj/item/gun/ballistic/automatic/m16/oldarms
+/datum/armament_entry/hecu/primary/assaultrifle/infanteria
+	item_type = /obj/item/gun/ballistic/automatic/sol_rifle
 	max_purchase = 2
 	cost = 11
-	magazine = /obj/item/ammo_box/magazine/m16/vintage/oldarms
+	magazine = /obj/item/ammo_box/magazine/c40sol_rifle/standard

 /datum/armament_entry/hecu/primary/shotgun
 	subcategory = ARMAMENT_SUBCATEGORY_SHOTGUN
@@ -33,47 +33,3 @@
 	tracer_type = /obj/effect/projectile/tracer/solar
 	muzzle_type = /obj/effect/projectile/muzzle/solar
 	impact_type = /obj/effect/projectile/impact/solar
-
-/obj/item/gun/ballistic/automatic/mp5
-	name = "\improper MP5/40"
-	desc = "An old SMG, this one is chambered in 10mm Auto. It has Heckler & Koch etched above the magazine well."
-	icon = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_guns40x32.dmi'
-	lefthand_file = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_lefthand.dmi'
-	righthand_file ='modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_righthand.dmi'
-	icon_state = "mp5"
-	inhand_icon_state = "mp5"
-	accepted_magazine_type = /obj/item/ammo_box/magazine/mp5
-	bolt_type = BOLT_TYPE_LOCKING
-	can_suppress = TRUE
-	fire_delay = 1.25
-	spread = 2.5
-	mag_display = TRUE
-	alt_icons = TRUE
-	load_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/interact/mp5_magin.ogg'
-	load_empty_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/interact/mp5_magin.ogg'
-	rack_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/interact/mp5_cock.ogg'
-	lock_back_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/interact/mp5_boltback.ogg'
-	eject_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/interact/mp5_magout.ogg'
-	eject_empty_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/interact/mp5_magout.ogg'
-	bolt_drop_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/interact/mp5_boltforward.ogg'
-	fire_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/fire/mp5_fire.ogg'
-	alternative_fire_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/fire/mp5_fire_suppressed.ogg'
-	suppressed_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/fire/mp5_fire_suppressed.ogg'
-	weapon_weight = WEAPON_MEDIUM
-	w_class = WEIGHT_CLASS_NORMAL
-	projectile_damage_multiplier = 0.7
-
-/obj/item/gun/ballistic/automatic/mp5/Initialize(mapload)
-	. = ..()
-
-	AddComponent(/datum/component/automatic_fire, fire_delay)
-
-/obj/item/ammo_box/magazine/mp5
-	name = "MP5 magazine (10mm Auto)"
-	desc = "Magazines taking 10mm ammunition; it fits in the MP5."
-	icon = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_items.dmi'
-	icon_state = "mp5"
-	ammo_type = /obj/item/ammo_casing/c10mm
-	caliber = CALIBER_10MM
-	max_ammo = 30
-	multiple_sprites = AMMO_BOX_FULL_EMPTY
@@ -1,68 +0,0 @@
-/obj/item/gun/ballistic/automatic/m16/oldarms
-	name = "\improper Mk-11.4 Rifle"
-	desc = "An old-fashioned rifle from Sol-3's bygone era. Rumor has it that it can shoot apart an entire jungle (or desert, given the time). It has \"Keep out of water\" laser-engraved on the side. Now including a free reflex sight!"
-	icon = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_guns40x32.dmi'
-	icon_state = "m16"
-	lefthand_file = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_lefthand.dmi'
-	righthand_file = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_righthand.dmi'
-	inhand_icon_state = "m16"
-	worn_icon = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_back.dmi'
-	worn_icon_state = "m16"
-	slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK
-	w_class = WEIGHT_CLASS_BULKY
-	weapon_weight = WEAPON_HEAVY
-	accepted_magazine_type = /obj/item/ammo_box/magazine/m16/vintage/oldarms
-	fire_delay = 3.5
-	burst_size = 1
-	actions_types = list()
-	fire_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/fire/m16_fire.ogg'
-	fire_sound_volume = 50
-	rack_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/interact/sfrifle_cock.ogg'
-	load_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/interact/sfrifle_magin.ogg'
-	load_empty_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/interact/sfrifle_magin.ogg'
-	eject_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/interact/sfrifle_magout.ogg'
-	alt_icons = TRUE
-
-/obj/item/gun/ballistic/automatic/m16/oldarms/Initialize(mapload)
-	. = ..()
-
-	AddComponent(/datum/component/automatic_fire, fire_delay)
-
-/obj/item/ammo_box/magazine/m16/vintage/oldarms
-	name = "old-fashioned mk-11.4 rifle magazine"
-	desc = "A double-stack solid magazine that looks rather dated. Holds 20 rounds of .223 Stinger."
-	icon = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_items.dmi'
-	icon_state = "m16"
-	ammo_type = /obj/item/ammo_casing/oldarms/a223s
-	caliber = CALIBER_223S
-	max_ammo = 20
-	multiple_sprites = AMMO_BOX_FULL_EMPTY
-
-/obj/item/ammo_casing/oldarms/a223s
-	name = ".223 Stinger bullet casing"
-	desc = "A cheaply made .223 Stinger bullet casing."
-	caliber = CALIBER_223S
-	projectile_type = /obj/projectile/bullet/oldarms/a223s
-
-/obj/projectile/bullet/oldarms/a223s
-	name = ".223 bullet"
-	damage = 26
-	armour_penetration = 5
-	wound_bonus = -20
-
-/obj/item/ammo_casing/oldarms/a223s/rubber
-	name = ".223 Stinger rubber bullet casing"
-	desc = "A cheaply made .233 Stinger bullet casing, now in rubber."
-	projectile_type = /obj/projectile/bullet/oldarms/a223s/rubber
-
-/obj/projectile/bullet/oldarms/a223s/rubber
-	name = ".223 Rubber bullet"
-	damage = 5
-	stamina = 25
-	ricochets_max = 3
-	ricochet_incidence_leeway = 0
-	ricochet_chance = 130
-	ricochet_decay_damage = 0.5
-	shrapnel_type = null
-	sharpness = NONE
-	embedding = null
@@ -219,8 +219,8 @@
 	minimum_distance = 5
 	icon_state = "blackops_ranged"
 	icon_living = "blackops_ranged"
-	casingtype = /obj/item/ammo_casing/a223/weak
-	projectilesound = 'modular_skyrat/modules/gunsgalore/sound/guns/fire/m16_fire.ogg'
+	casingtype = /obj/item/ammo_casing/c40sol
+	projectilesound = 'modular_skyrat/modules/modular_weapons/sounds/rifle_heavy.ogg'
 	attack_sound = 'sound/weapons/punch1.ogg'
-	loot = list(/obj/effect/gibspawner/human, /obj/item/ammo_box/magazine/m16)
+	loot = list(/obj/effect/gibspawner/human, /obj/item/ammo_box/magazine/c40sol_rifle/standard)
 	rapid_melee = 1
@@ -494,10 +494,10 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list(
 	ears = /obj/item/radio/headset/headset_sec/alt
 	l_pocket = /obj/item/restraints/handcuffs
 	id = /obj/item/card/id/advanced/solfed
-	r_hand = /obj/item/gun/ballistic/automatic/m16
+	r_hand = /obj/item/gun/ballistic/automatic/sol_rifle
 	backpack_contents = list(/obj/item/storage/box/handcuffs = 1,
 		/obj/item/melee/baton/security/loaded = 1,
-		/obj/item/ammo_box/magazine/m16 = 4
+		/obj/item/ammo_box/magazine/c40sol_rifle/standard = 4
 	)

 	id_trim = /datum/id_trim/solfed
@@ -1,51 +0,0 @@
-///NEW CARTRIDGES
-
-/obj/item/ammo_casing/realistic
-	icon = 'modular_skyrat/modules/gunsgalore/icons/ammo/ammo.dmi'
-
-//GERMAN
-//7.92x33mm Kurz
-/obj/item/ammo_casing/realistic/a792x33
-	name = "7.92x33 bullet casing"
-	desc = "A 7.92x33mm Kurz bullet casing."
-	icon_state = "792x33-casing"
-	caliber = "a792x33"
-	projectile_type = /obj/projectile/bullet/a792x33
-
-/obj/projectile/bullet/a792x33
-	name = "7.92x33 bullet"
-	damage = 32
-	wound_bonus = 10
-	wound_falloff_tile = 0
-//
-
-//7.92x57mm Mauser
-/obj/item/ammo_casing/realistic/a792x57
-	name = "7.92x57 bullet casing"
-	desc = "A 7.92x57mm Mauser bullet casing."
-	icon_state = "792x57-casing"
-	caliber = "a792x57"
-	projectile_type = /obj/projectile/bullet/a792x57
-
-/obj/projectile/bullet/a792x57
-	name = "7.92x57 bullet"
-	damage = 35
-	armour_penetration = 5
-	wound_bonus = 15
-	wound_falloff_tile = 0
-//
-
-//RUSSIAN - NRI
-//7.62x25 tokarev
-/obj/item/ammo_casing/realistic/a762x25
-	name = "7.62x25 bullet casing"
-	desc = "A 7.62x25 Tokarev bullet casing."
-	icon_state = "762x25-casing"
-	caliber = "a762x25"
-	projectile_type = /obj/projectile/bullet/a762x25
-
-/obj/projectile/bullet/a762x25
-	name = "7.62x25 bullet"
-	damage = 20
-	wound_falloff_tile = 0
-//
@@ -1,41 +0,0 @@
-/obj/item/gun/ballistic/automatic/fg42
-	name = "\improper FGP-90"
-	desc = "A German paratrooper rifle designed to be used at long range chambered in 7.92x57mm. Most likely a reproduction of the original."
-	icon = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_guns40x32.dmi'
-	icon_state = "fg42"
-	lefthand_file = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_lefthand.dmi'
-	righthand_file = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_righthand.dmi'
-	inhand_icon_state = "fg42"
-	slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK
-	w_class = WEIGHT_CLASS_BULKY
-	weapon_weight = WEAPON_HEAVY
-	accepted_magazine_type = /obj/item/ammo_box/magazine/fg42
-	can_suppress = FALSE
-	burst_size = 2
-	spread = 0
-	fire_delay = 2
-	worn_icon = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_back.dmi'
-	worn_icon_state = "fg42"
-	fire_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/fire/fg42_fire.ogg'
-	alt_icons = TRUE
-	rack_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/interact/batrifle_cock.ogg'
-	load_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/interact/batrifle_magin.ogg'
-	load_empty_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/interact/batrifle_magin.ogg'
-	eject_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/interact/batrifle_magout.ogg'
-	eject_empty_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/interact/batrifle_magout.ogg'
-
-/obj/item/gun/ballistic/automatic/fg42/Initialize(mapload)
-	. = ..()
-
-	AddComponent(/datum/component/scope, range_modifier = 1)
-
-	AddComponent(/datum/component/automatic_fire, fire_delay)
-
-/obj/item/ammo_box/magazine/fg42
-	name = "fg42 magazine (7.92x57mm)"
-	icon = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_items.dmi'
-	icon_state = "fg42"
-	ammo_type = /obj/item/ammo_casing/realistic/a792x57
-	caliber = "a792x57"
-	max_ammo = 20
-	multiple_sprites = AMMO_BOX_FULL_EMPTY
@@ -1,16 +0,0 @@
-/obj/item/gun/ballistic/automatic/pistol/luger
-	name = "\improper Armadyne P-09X"
-	desc = "A small, light-weight reproduction of the Luger P08 from the 20th century, manufactured by the Oldarms division of the Armadyne Corporation. Chambered in 9x25mm."
-	icon_state = "luger"
-	inhand_icon_state = "luger"
-	icon = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_guns.dmi'
-	lefthand_file = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_lefthand.dmi'
-	righthand_file = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_righthand.dmi'
-	fire_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/fire/luger_fire.ogg'
-	load_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/fire/luger_mag_insert.ogg'
-	load_empty_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/fire/luger_mag_insert.ogg'
-	eject_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/fire/luger_mag_release.ogg'
-	eject_empty_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/fire/luger_mag_release.ogg'
-	rack_sound =  'modular_skyrat/modules/gunsgalore/sound/guns/fire/luger_rack.ogg'
-	fire_sound_volume = 100
-	suppressor_x_offset = 14
@@ -1,75 +0,0 @@
-/obj/item/gun/ballistic/automatic/m16
-	name = "\improper XM-2537 rifle"
-	desc = "A relatively new infantry rifle chambered for the .277 Aestus round, designed for use by private security and freight crews. \"Armentarium Centrale\" is printed on the side of the receiver, right next to a yellow sun."
-	icon = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_guns40x32.dmi'
-	icon_state = "m16"
-	lefthand_file = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_lefthand.dmi'
-	righthand_file = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_righthand.dmi'
-	inhand_icon_state = "m16"
-	worn_icon = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_back.dmi'
-	worn_icon_state = "m16"
-	slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK
-	w_class = WEIGHT_CLASS_BULKY
-	weapon_weight = WEAPON_HEAVY
-	accepted_magazine_type = /obj/item/ammo_box/magazine/m16
-	can_suppress = FALSE
-	burst_size = 3
-	fire_delay = 2
-	fire_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/fire/m16_fire.ogg'
-	fire_sound_volume = 50
-	rack_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/interact/sfrifle_cock.ogg'
-	load_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/interact/sfrifle_magin.ogg'
-	load_empty_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/interact/sfrifle_magin.ogg'
-	eject_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/interact/sfrifle_magout.ogg'
-	alt_icons = TRUE
-
-/obj/item/ammo_box/magazine/m16
-	name = "\improper XM-2537 magazine"
-	desc = "A double-stack translucent polymer magazine for use with the XM-2537 rifles. Holds 30 rounds of .277 Aestus."
-	icon = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_items.dmi'
-	icon_state = "m16e"
-	ammo_type = /obj/item/ammo_casing/a223
-	caliber = CALIBER_A223
-	max_ammo = 30
-	multiple_sprites = AMMO_BOX_FULL_EMPTY
-
-/obj/item/ammo_box/magazine/m16/vintage
-	name = "outdated .277 magazine"
-	desc = "A double-stack solid magazine that looks rather dated. Holds 20 rounds of .277 Aestus."
-	icon = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_items.dmi'
-	icon_state = "m16"
-	max_ammo = 20
-	multiple_sprites = AMMO_BOX_FULL_EMPTY
-
-/obj/item/gun/ballistic/automatic/m16/modern
-	name = "\improper XM-2537 SOPMOD rifle"
-	desc = "A heavily tweaked carbine version of the XM-2537 rifle made for tactically operating in tactical environments. This doesn't smell \"authentic military hardware\" to you."
-	icon_state = "m16_modern"
-	inhand_icon_state = "m16"
-	worn_icon_state = "m16"
-	spread = 0.5
-	burst_size = 3
-	fire_delay = 1.90
-
-/obj/item/gun/ballistic/automatic/m16/modern/Initialize(mapload)
-	. = ..()
-
-	AddComponent(/datum/component/automatic_fire, fire_delay)
-
-/obj/item/gun/ballistic/automatic/m16/modern/v2
-	name = "\improper XM-2537 'Amans Patriae' rifle"
-	desc = "An expertly modified, super-compact XM-2537 rifle designed for operating in tight corridors and fields full of Bethlehem flowers. You're a soldier, finish your mission!"
-	icon_state = "m16_modern2"
-	inhand_icon_state = "m16"
-	worn_icon_state = "m16"
-	accepted_magazine_type = /obj/item/ammo_box/magazine/m16/patriot
-	burst_size = 4
-	fire_delay = 0.5
-
-/obj/item/ammo_box/magazine/m16/patriot
-	name = "\improper XM-2537 drum magazine"
-	desc = "A double-stack solid polymer drum made for use with the Amans Patriae rifle. Holds 50 rounds of .277 ammo."
-	icon = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_items.dmi'
-	icon_state = "m16"
-	max_ammo = 50
-	multiple_sprites = AMMO_BOX_FULL_EMPTY
@@ -1,214 +0,0 @@
-/obj/item/gun/ballistic/automatic/mg34
-	name = "\improper MG-4T"
-	desc = "A reproduction of the German MG-34 general purpose machine gun, this one is a revision from the 2200's and was one of several thousand distributed to SolFed expedition teams. It has been rechambered to fire 7.92mm Mauser instead of 7.62mm NATO."
-	icon = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_guns40x32.dmi'
-	lefthand_file = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_lefthand.dmi'
-	righthand_file = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_righthand.dmi'
-	worn_icon = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_back.dmi'
-	icon_state = "mg34"
-	base_icon_state = "mg34"
-	worn_icon_state = "mg34"
-	inhand_icon_state = "mg34"
-	fire_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/fire/mg34_fire.ogg'
-	rack_sound = 'sound/weapons/gun/l6/l6_rack.ogg'
-	suppressed_sound = 'sound/weapons/gun/general/heavy_shot_suppressed.ogg'
-	fire_sound_volume = 70
-	weapon_weight = WEAPON_HEAVY
-	slot_flags = ITEM_SLOT_BACK
-	w_class = WEIGHT_CLASS_HUGE
-	spread = 15
-	accepted_magazine_type = /obj/item/ammo_box/magazine/mg34
-	can_suppress = FALSE
-	fire_delay = 1
-	bolt_type = BOLT_TYPE_OPEN
-	show_bolt_icon = FALSE
-	tac_reloads = FALSE
-	var/cover_open = FALSE
-
-/obj/item/gun/ballistic/automatic/mg34/Initialize(mapload)
-	. = ..()
-
-	AddComponent(/datum/component/automatic_fire, fire_delay)
-
-	AddElement(/datum/element/update_icon_updates_onmob)
-
-/obj/item/gun/ballistic/automatic/mg34/examine(mob/user)
-	. = ..()
-	. += "<b>RMB with an empty hand</b> to [cover_open ? "close" : "open"] the dust cover."
-	if(cover_open && magazine)
-		. += span_notice("It seems like you could use an <b>empty hand</b> to remove the magazine.")
-
-/obj/item/gun/ballistic/automatic/mg34/attack_hand_secondary(mob/user, list/modifiers)
-	if(!user.can_perform_action(src))
-		return
-	cover_open = !cover_open
-	to_chat(user, span_notice("You [cover_open ? "open" : "close"] [src]'s cover."))
-	playsound(src, 'sound/weapons/gun/l6/l6_door.ogg', 60, TRUE)
-	update_appearance()
-	return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
-
-/obj/item/gun/ballistic/automatic/mg34/update_overlays()
-	. = ..()
-	. += "[base_icon_state]_door_[cover_open ? "open" : "closed"]"
-
-/obj/item/gun/ballistic/automatic/mg34/can_shoot()
-	if(cover_open)
-		balloon_alert_to_viewers("cover open!")
-		return FALSE
-	return chambered
-
-/obj/item/gun/ballistic/automatic/mg34/eject_magazine(mob/user, display_message = TRUE, obj/item/ammo_box/magazine/tac_load = null)
-	if(!cover_open)
-		to_chat(user, span_warning("The cover is closed! Open it before ejecting the magazine!"))
-		return
-	return ..()
-
-/obj/item/gun/ballistic/automatic/mg34/attackby(obj/item/A, mob/user, params)
-	if(!cover_open && istype(A, accepted_magazine_type))
-		to_chat(user, span_warning("[src]'s dust cover prevents a magazine from being fit."))
-		return
-	..()
-
-/obj/item/ammo_box/magazine/mg34
-	name = "mg34 drum (7.92x57mm)"
-	icon = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_items.dmi'
-	icon_state = "mg34_drum"
-	ammo_type = /obj/item/ammo_casing/realistic/a792x57
-	caliber = "a792x57"
-	max_ammo = 75
-	multiple_sprites = AMMO_BOX_FULL_EMPTY
-
-/obj/item/gun/ballistic/automatic/mg34/packapunch //INFINITY GUNNNNNNNN
-	name = "\improper MG-34 UBER"
-	desc = "Here, there, seems like everywhere. Nasty things are happening, now everyone is scared. Old Jeb Brown the Blacksmith, he saw his mother die. A critter took a bite from her and now she's in the sky. "
-	fire_delay = 0.04
-	burst_size = 5
-	spread = 5
-	accepted_magazine_type = /obj/item/ammo_box/magazine/mg34/packapunch
-
-/obj/item/ammo_box/magazine/mg34/packapunch
-	max_ammo = 999
-	multiple_sprites = AMMO_BOX_ONE_SPRITE
-
-/obj/item/gun/ballistic/automatic/mg34/packapunch/process_chamber(empty_chamber, from_firing, chamber_next_round)
-	. = ..()
-	magazine.top_off()
-
-/// BIGGER BROTHER
-#define SPREAD_UNDEPLOYED 17
-#define SPREAD_DEPLOYED 6
-#define HEAT_PER_SHOT 1.5
-#define TIME_TO_COOLDOWN (20 SECONDS)
-#define BARREL_COOLDOWN_RATE 2
-
-/obj/item/gun/ballistic/automatic/mg34/mg42
-	name = "\improper MG-9V GPMG"
-	desc = "An updated version of the German Maschinengewehr 42 machine gun chambered in 7.92 Mauser, it has a bipod for better stability when deployed. It is a reproduction manufactured by the Oldarms division of the Armadyne Corporation."
-	icon_state = "mg42"
-	base_icon_state = "mg42"
-	worn_icon_state = "mg42"
-	inhand_icon_state = "mg42"
-	fire_sound_volume = 100
-	fire_delay = 0.5
-	fire_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/fire/mg42_fire.ogg'
-	accepted_magazine_type = /obj/item/ammo_box/magazine/mg42
-	spread = SPREAD_UNDEPLOYED
-	/// If we are resting, the bipod is deployed.
-	var/bipod_deployed = FALSE
-	/// How hot the barrel is, 0 - 100
-	var/barrel_heat = 0
-	/// Have we overheated?
-	var/overheated = FALSE
-
-/obj/item/gun/ballistic/automatic/mg34/mg42/Initialize(mapload)
-	. = ..()
-	RegisterSignal(src, COMSIG_GUN_FIRED, PROC_REF(process_heat))
-	START_PROCESSING(SSobj, src)
-
-/obj/item/gun/ballistic/automatic/mg34/mg42/process(seconds_per_tick)
-	if(barrel_heat > 0)
-		barrel_heat -= BARREL_COOLDOWN_RATE * seconds_per_tick
-		update_appearance()
-
-/obj/item/gun/ballistic/automatic/mg34/mg42/examine(mob/user)
-	. = ..()
-	switch(barrel_heat)
-		if(50 to 75)
-			. += span_warning("The barrel looks hot.")
-		if(75 to INFINITY)
-			. += span_warning("The barrel looks moulten!")
-	if(overheated)
-		. += span_danger("It is heatlocked!")
-
-/obj/item/gun/ballistic/automatic/mg34/mg42/can_shoot()
-	if(cover_open)
-		balloon_alert_to_viewers("cover open!")
-		return FALSE
-	if(overheated)
-		balloon_alert_to_viewers("overheated!")
-		shoot_with_empty_chamber()
-		return FALSE
-	return chambered
-
-/obj/item/gun/ballistic/automatic/mg34/mg42/pickup(mob/user)
-	. = ..()
-	RegisterSignal(user, COMSIG_LIVING_UPDATED_RESTING, PROC_REF(deploy_bipod))
-
-/obj/item/gun/ballistic/automatic/mg34/mg42/dropped(mob/user)
-	. = ..()
-	UnregisterSignal(user, COMSIG_LIVING_UPDATED_RESTING)
-	bipod_deployed = FALSE
-	spread = SPREAD_UNDEPLOYED
-	update_appearance()
-
-/obj/item/gun/ballistic/automatic/mg34/mg42/proc/deploy_bipod(datum/datum_source, resting)
-	SIGNAL_HANDLER
-	if(resting)
-		bipod_deployed = TRUE
-		spread = SPREAD_DEPLOYED
-	else
-		bipod_deployed = FALSE
-		spread = SPREAD_UNDEPLOYED
-	playsound(src, 'modular_skyrat/modules/gunsgalore/sound/guns/fire/mg42_bipod.ogg', 100)
-	balloon_alert_to_viewers("bipod [bipod_deployed ? "deployed" : "undeployed"]!")
-	update_appearance()
-
-/obj/item/gun/ballistic/automatic/mg34/mg42/proc/process_heat()
-	SIGNAL_HANDLER
-	if(overheated)
-		return
-	barrel_heat += HEAT_PER_SHOT
-	if(barrel_heat >= 100)
-		overheated = TRUE
-		playsound(src, 'modular_skyrat/modules/gunsgalore/sound/guns/fire/mg_overheat.ogg', 100)
-		addtimer(CALLBACK(src, PROC_REF(reset_overheat)), TIME_TO_COOLDOWN)
-	update_appearance()
-
-/obj/item/gun/ballistic/automatic/mg34/mg42/proc/reset_overheat()
-	overheated = FALSE
-	update_appearance()
-
-/obj/item/gun/ballistic/automatic/mg34/mg42/update_overlays()
-	. = ..()
-	. += "[base_icon_state]_[bipod_deployed ? "bipod_deployed" : "bipod"]"
-
-	switch(barrel_heat)
-		if(50 to 75)
-			. += "[base_icon_state]_barrel_hot"
-		if(75 to INFINITY)
-			. += "[base_icon_state]_barrel_overheat"
-
-#undef SPREAD_UNDEPLOYED
-#undef SPREAD_DEPLOYED
-#undef HEAT_PER_SHOT
-#undef TIME_TO_COOLDOWN
-#undef BARREL_COOLDOWN_RATE
-
-/obj/item/ammo_box/magazine/mg42
-	name = "mg42 drum (7.92x57mm)"
-	icon = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_items.dmi'
-	icon_state = "mg42_drum"
-	ammo_type = /obj/item/ammo_casing/realistic/a792x57
-	caliber = "a792x57"
-	max_ammo = 150 // It's a lot, but the gun overheats.
-	multiple_sprites = AMMO_BOX_FULL_EMPTY
@@ -1,45 +0,0 @@
-/obj/item/gun/ballistic/automatic/mp40
-	name = "\improper MP-40"
-	desc = "The instantly recognizable 'kraut gun'. Extremely outdated SMG that has only seen service during Sol-3's second World War. This one's a poor, unlicensed reproduction."
-	icon = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_guns40x32.dmi'
-	icon_state = "mp40"
-	lefthand_file = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_lefthand.dmi'
-	righthand_file = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_righthand.dmi'
-	inhand_icon_state = "mp40"
-	worn_icon = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_back.dmi'
-	worn_icon_state = "mp40"
-	slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK
-	accepted_magazine_type = /obj/item/ammo_box/magazine/mp40
-	can_suppress = FALSE
-	burst_size = 1
-	fire_delay = 1.7
-	fire_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/fire/mp40_fire.ogg'
-	fire_sound_volume = 100
-	rack_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/interact/smg_cock.ogg'
-	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'
-	alt_icons = TRUE
-
-/obj/item/gun/ballistic/automatic/mp40/Initialize(mapload)
-	. = ..()
-
-	AddComponent(/datum/component/automatic_fire, fire_delay)
-
-/obj/item/ammo_box/magazine/mp40
-	name = "mp40 magazine (9mmx19)"
-	icon = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_items.dmi'
-	icon_state = "mp40"
-	ammo_type = /obj/item/ammo_casing/c9mm
-	caliber = CALIBER_9MM
-	max_ammo = 32
-	multiple_sprites = AMMO_BOX_FULL_EMPTY
-
-/obj/item/gun/ballistic/automatic/mp40/modern
-	name = "\improper MP-40k"
-	desc = "An extremely outdated German SMG that has been modified extensively with aftermarket parts. It looks like it came straight out of the videogame Return to Fortress Dogenstein."
-	icon_state = "mp40_modern"
-	inhand_icon_state = "mp40"
-	worn_icon_state = "mp40"
-	burst_size = 4
-	fire_delay = 1.5
@@ -1,35 +0,0 @@
-/obj/item/gun/ballistic/automatic/p90
-	name = "\improper P90-02"
-	desc = "A compact, top-loaded bullpup PDW chambered in .32 ammo."
-	icon = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_guns40x32.dmi'
-	icon_state = "p90"
-	lefthand_file = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_lefthand.dmi'
-	righthand_file = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_righthand.dmi'
-	inhand_icon_state = "p90"
-	worn_icon = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_back.dmi'
-	worn_icon_state = "p90"
-	slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK
-	accepted_magazine_type = /obj/item/ammo_box/magazine/p90
-	can_suppress = FALSE
-	fire_delay = 1
-	fire_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/fire/p90_fire.ogg'
-	fire_sound_volume = 100
-	rack_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/interact/p90_cock.ogg'
-	load_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/interact/p90_magin.ogg'
-	load_empty_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/interact/p90_magin.ogg'
-	eject_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/interact/p90_magout.ogg'
-	alt_icons = TRUE
-
-/obj/item/gun/ballistic/automatic/p90/Initialize(mapload)
-	. = ..()
-
-	AddComponent(/datum/component/automatic_fire, fire_delay)
-
-/obj/item/ammo_box/magazine/p90
-	name = "\improper P90-02 magazine"
-	icon = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_items.dmi'
-	icon_state = "p90"
-	ammo_type = /obj/item/ammo_casing/c34
-	caliber = "c34acp"
-	max_ammo = 50
-	multiple_sprites = AMMO_BOX_FULL_EMPTY
@@ -1,35 +0,0 @@
-/obj/item/gun/ballistic/automatic/pps
-	name = "\improper PPS-43"
-	desc = "A very cheap, barely reliable reproduction of a personal defense weapon based on the original Soviet model. Not nearly as infamous as the Mosin."
-	icon = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_guns40x32.dmi'
-	icon_state = "pps"
-	lefthand_file = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_lefthand.dmi'
-	righthand_file = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_righthand.dmi'
-	inhand_icon_state = "pps"
-	slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK
-	accepted_magazine_type = /obj/item/ammo_box/magazine/pps
-	can_suppress = FALSE
-	fire_delay = 3
-	worn_icon = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_back.dmi'
-	worn_icon_state = "pps"
-	fire_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/fire/pps_fire.ogg'
-	fire_sound_volume = 100
-	alt_icons = TRUE
-	rack_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/interact/smg_cock.ogg'
-	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'
-
-/obj/item/gun/ballistic/automatic/pps/Initialize(mapload)
-	. = ..()
-
-	AddComponent(/datum/component/automatic_fire, fire_delay)
-
-/obj/item/ammo_box/magazine/pps
-	name = "pps magazine (7.62x25mm)"
-	icon = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_items.dmi'
-	icon_state = "pps"
-	ammo_type = /obj/item/ammo_casing/realistic/a762x25
-	caliber = "a762x25"
-	max_ammo = 35
-	multiple_sprites = AMMO_BOX_FULL_EMPTY
@@ -1,46 +0,0 @@
-/obj/item/gun/ballistic/automatic/ppsh
-	name = "\improper Asha 76"
-	desc = "A reproduction of a simple Soviet SMG chambered in 7.62x25 Tokarev rounds. Its heavy wooden stock and leather breech buffer help absorb the bolt’s heavy recoil, making it great for spraying and praying. Uraaaa!"
-	icon = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_guns40x32.dmi'
-	icon_state = "ppsh"
-	lefthand_file = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_lefthand.dmi'
-	righthand_file = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_righthand.dmi'
-	inhand_icon_state = "ppsh"
-	worn_icon = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_back.dmi'
-	worn_icon_state = "ppsh"
-	slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK
-	w_class = WEIGHT_CLASS_BULKY
-	accepted_magazine_type = /obj/item/ammo_box/magazine/ppsh
-	can_suppress = FALSE
-	spread = 20
-	fire_delay = 0.5
-	fire_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/fire/ppsh_fire.ogg'
-	fire_sound_volume = 80
-	alt_icons = TRUE
-	rack_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/interact/smg_cock.ogg'
-	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'
-
-/obj/item/gun/ballistic/automatic/ppsh/Initialize(mapload)
-	. = ..()
-
-	AddComponent(/datum/component/automatic_fire, fire_delay)
-
-/obj/item/ammo_box/magazine/ppsh
-	name = "Asha 76 magazine (7.62x25mm)"
-	icon = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_items.dmi'
-	icon_state = "ppsh"
-	ammo_type = /obj/item/ammo_casing/realistic/a762x25
-	caliber = "a762x25"
-	max_ammo = 71
-	multiple_sprites = AMMO_BOX_FULL_EMPTY
-
-/obj/item/gun/ballistic/automatic/ppsh/modern
-	name = "\improper PPsh-59"
-	desc = "A modernized reproduction of a simple Soviet SMG with aftermarket parts. Its heavy synthetic stock and composite breech buffer help absorb the bolt’s heavy recoil, a mix of two worlds that should not exist."
-	icon_state = "ppsh_modern"
-	worn_icon_state = "ppsh"
-	inhand_icon_state = "ppsh"
-	spread = 15
-	burst_size = 5
@@ -1,28 +0,0 @@
-/obj/item/gun/ballistic/automatic/scar
-	name = "SCAR-L"
-	desc = "Part of the SCAR family rifles. This one is SCAR-L, which is for 'Light'. Chambered in .277 Aestus."
-	icon = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_guns40x32.dmi'
-	icon_state = "scar"
-	lefthand_file = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_lefthand.dmi'
-	righthand_file = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_righthand.dmi'
-	inhand_icon_state = "scar"
-	worn_icon = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_back.dmi'
-	worn_icon_state = "scar"
-	slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK
-	w_class = WEIGHT_CLASS_BULKY
-	weapon_weight = WEAPON_HEAVY
-	accepted_magazine_type = /obj/item/ammo_box/magazine/m16
-	can_suppress = FALSE
-	fire_delay = 1.90
-	fire_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/fire/scar_fire.ogg'
-	fire_sound_volume = 50
-	rack_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/interact/scar_cock.ogg'
-	load_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/interact/scar_mag_out.ogg'
-	load_empty_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/interact/scar_mag_in.ogg'
-	eject_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/interact/scar_mag_out.ogg'
-	alt_icons = TRUE
-
-/obj/item/gun/ballistic/automatic/scar/Initialize(mapload)
-	. = ..()
-
-	AddComponent(/datum/component/automatic_fire, fire_delay)
@@ -1,40 +0,0 @@
-/obj/item/gun/ballistic/automatic/stg
-	name = "\improper StG-99"
-	desc = "A reproduction of the Sturmgewehr 44 German infantry rifle chambered in 7.92mm, manufactured by the Oldarms division of the Armadyne Corporation."
-	icon = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_guns40x32.dmi'
-	icon_state = "stg"
-	lefthand_file = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_lefthand.dmi'
-	righthand_file = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_righthand.dmi'
-	inhand_icon_state = "stg"
-	worn_icon = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_back.dmi'
-	worn_icon_state = "stg"
-	slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK
-	w_class = WEIGHT_CLASS_BULKY
-	weapon_weight = WEAPON_HEAVY
-	accepted_magazine_type = /obj/item/ammo_box/magazine/stg
-	can_suppress = FALSE
-	fire_delay = 1.5
-	burst_size = 1
-	actions_types = list()
-	fire_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/fire/stg_fire.ogg'
-	fire_sound_volume = 70
-	alt_icons = TRUE
-	rack_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/interact/ltrifle_cock.ogg'
-	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'
-
-/obj/item/gun/ballistic/automatic/stg/Initialize(mapload)
-	. = ..()
-
-	AddComponent(/datum/component/automatic_fire, fire_delay)
-
-/obj/item/ammo_box/magazine/stg
-	name = "stg magazine (7.92x33mm)"
-	icon = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_items.dmi'
-	icon_state = "stg"
-	ammo_type = /obj/item/ammo_casing/realistic/a792x33
-	caliber = "a792x33"
-	max_ammo = 30
-	multiple_sprites = AMMO_BOX_FULL_EMPTY
-
@@ -9,7 +9,7 @@
 	icon_state = "smartgun"
 	worn_icon_state = "module_smartgun_off" // just in case. You shouldn't be able to do this, though
 	inhand_icon_state = "smartgun"
-	fire_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/fire/mg34_fire.ogg'
+	fire_sound = 'modular_skyrat/modules/modular_weapons/sounds/rifle_heavy.ogg'
 	rack_sound = 'sound/weapons/gun/l6/l6_rack.ogg'
 	suppressed_sound = 'sound/weapons/gun/general/heavy_shot_suppressed.ogg'
 	fire_sound_volume = 70
@@ -103,7 +103,6 @@
 // Smart ammo casings

 /obj/item/ammo_casing/smart
-	icon = 'modular_skyrat/modules/gunsgalore/icons/ammo/ammo.dmi'

 /obj/item/ammo_casing/smart/Initialize(mapload)
 	. = ..()
@@ -140,7 +139,7 @@
 /obj/item/ammo_casing/smart/a10x28
 	name = "10x28mm bullet"
 	desc = "A 10x28m caseless bullet."
-	icon_state = "792x57-casing"
+	icon_state = "762-casing"
 	caliber = "a10x28"
 	projectile_type = /obj/projectile/bullet/smart/a10x28

@@ -70,33 +70,6 @@
 		balloon_alert(user, "reload encumbered!")
 	to_chat(user, span_notice("You load [num_loaded] [cartridge_wording]\s into [src][box_load ?  ", but it takes some extra effort" : ""]."))

-//CRATES
-
-//all that shit
-/obj/structure/closet/crate/secure/weapon/ww2
-	name = "ww2 weapons crate"
-	desc = "A secure weapons crate. Looks like it's from the old-era world war 2."
-	icon_state = "weaponcrate"
-
-/obj/structure/closet/crate/secure/weapon/ww2/PopulateContents()
-	. = ..()
-	new /obj/item/gun/ballistic/automatic/fg42(src)
-	new /obj/item/ammo_box/magazine/fg42(src)
-	new /obj/item/gun/ballistic/automatic/mg34(src)
-	new /obj/item/ammo_box/magazine/mg34(src)
-	new /obj/item/gun/ballistic/automatic/mp40(src)
-	new /obj/item/ammo_box/magazine/mp40(src)
-	new /obj/item/gun/ballistic/automatic/stg(src)
-	new /obj/item/ammo_box/magazine/stg(src)
-	new /obj/item/gun/ballistic/automatic/ppsh(src)
-	new /obj/item/ammo_box/magazine/ppsh(src)
-	new /obj/item/gun/ballistic/automatic/pps(src)
-	new /obj/item/ammo_box/magazine/pps(src)
-	new /obj/item/gun/ballistic/automatic/mg34/mg42(src)
-	new /obj/item/ammo_box/magazine/mg42(src)
-	new /obj/item/gun/ballistic/automatic/pistol/luger(src)
-	new /obj/item/ammo_box/magazine/m9mm(src)
-
 /obj/effect/temp_visual/dir_setting/firing_effect
 	light_system = MOVABLE_LIGHT
 	light_range = 2
@@ -10,8 +10,7 @@

 /obj/item/ammo_casing/b50cal
 	name = ".50 BMG bullet casing"
-	icon = 'modular_skyrat/modules/gunsgalore/icons/ammo/ammo.dmi'
-	icon_state = "792x57-casing"
+	icon_state = ".50"
 	caliber = CALIBER_50BMG
 	projectile_type = /obj/projectile/bullet/c50cal

@@ -19,7 +19,7 @@
 	/// The extra range that this turret gives regarding viewrange.
 	var/view_range = 2.5
 	/// Sound to play when overheated
-	var/overheatsound = 'modular_skyrat/modules/gunsgalore/sound/guns/fire/mg_overheat.ogg'
+	var/overheatsound = 'sound/effects/wounds/sizzle2.ogg'
 	/// Sound to play when firing
 	var/firesound = 'modular_skyrat/modules/mounted_machine_gun/sound/50cal_box_01.ogg'
 	/// How long it takes for a wrench user to undeploy the object
@@ -6627,7 +6627,6 @@
 #include "modular_skyrat\modules\black_mesa\code\guns.dm"
 #include "modular_skyrat\modules\black_mesa\code\healing_puddle.dm"
 #include "modular_skyrat\modules\black_mesa\code\lambda_teleporter.dm"
-#include "modular_skyrat\modules\black_mesa\code\m16_variations.dm"
 #include "modular_skyrat\modules\black_mesa\code\mapping_fluff.dm"
 #include "modular_skyrat\modules\black_mesa\code\objects.dm"
 #include "modular_skyrat\modules\black_mesa\code\projectiles.dm"
@@ -7205,20 +7204,6 @@
 #include "modular_skyrat\modules\gunhud\code\gun_hud_component.dm"
 #include "modular_skyrat\modules\gunpoint\code\gunpoint.dm"
 #include "modular_skyrat\modules\gunpoint\code\gunpoint_datum.dm"
-#include "modular_skyrat\modules\gunsgalore\code\ammo\ammo.dm"
-#include "modular_skyrat\modules\gunsgalore\code\guns\ballistic_master.dm"
-#include "modular_skyrat\modules\gunsgalore\code\guns\energy.dm"
-#include "modular_skyrat\modules\gunsgalore\code\guns\fg42.dm"
-#include "modular_skyrat\modules\gunsgalore\code\guns\luger.dm"
-#include "modular_skyrat\modules\gunsgalore\code\guns\m16.dm"
-#include "modular_skyrat\modules\gunsgalore\code\guns\mg34.dm"
-#include "modular_skyrat\modules\gunsgalore\code\guns\mp40.dm"
-#include "modular_skyrat\modules\gunsgalore\code\guns\p90.dm"
-#include "modular_skyrat\modules\gunsgalore\code\guns\pps.dm"
-#include "modular_skyrat\modules\gunsgalore\code\guns\ppsh.dm"
-#include "modular_skyrat\modules\gunsgalore\code\guns\scar.dm"
-#include "modular_skyrat\modules\gunsgalore\code\guns\skillchip.dm"
-#include "modular_skyrat\modules\gunsgalore\code\guns\stg.dm"
 #include "modular_skyrat\modules\hairbrush\code\hairbrush.dm"
 #include "modular_skyrat\modules\hairbrush\code\mood_events.dm"
 #include "modular_skyrat\modules\hev_suit\code\hev_suit.dm"
@@ -7611,11 +7596,14 @@
 #include "modular_skyrat\modules\modular_vending\code\vending.dm"
 #include "modular_skyrat\modules\modular_vending\code\wardrobes.dm"
 #include "modular_skyrat\modules\modular_weapons\code\autolathe_designs.dm"
+#include "modular_skyrat\modules\modular_weapons\code\ballistic_master.dm"
 #include "modular_skyrat\modules\modular_weapons\code\conversion_kits.dm"
+#include "modular_skyrat\modules\modular_weapons\code\energy.dm"
 #include "modular_skyrat\modules\modular_weapons\code\gunsets.dm"
 #include "modular_skyrat\modules\modular_weapons\code\melee.dm"
 #include "modular_skyrat\modules\modular_weapons\code\modular_projectiles.dm"
 #include "modular_skyrat\modules\modular_weapons\code\pepperball_gun.dm"
+#include "modular_skyrat\modules\modular_weapons\code\skillchip.dm"
 #include "modular_skyrat\modules\modular_weapons\code\suppressor_size_change_override.dm"
 #include "modular_skyrat\modules\modular_weapons\code\company_and_or_faction_based\carwo_defense_systems\advert.dm"
 #include "modular_skyrat\modules\modular_weapons\code\company_and_or_faction_based\carwo_defense_systems\grenade_launcher.dm"