[SEMI-MODULAR] [TEST MERGE] COMBAT REWORK PART ONE

_maps/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm

@@ -330,7 +330,7 @@
 /obj/effect/decal/cleanable/cobweb,
 /obj/item/ammo_casing/shotgun/dart,
 /obj/item/ammo_casing/shotgun/dart,
-/obj/item/gun/ballistic/revolver/doublebarrel{
+/obj/item/gun/ballistic/shotgun/doublebarrel{
 	desc = "For putting critters out to pasture."
 	},
 /obj/item/ammo_casing/shotgun/buckshot,

_maps/RandomRuins/SpaceRuins/caravanambush.dmm

@@ -421,7 +421,7 @@
 "gt" = (
 /obj/effect/turf_decal/bot_white,
 /obj/structure/closet/crate/secure/weapon,
-/obj/item/gun/ballistic/revolver/grenadelauncher/unrestricted,
+/obj/item/gun/ballistic/launcher/grenade_launcher/unrestricted,
 /turf/open/floor/plasteel/airless/dark,
 /area/shuttle/caravan/freighter3)
 "gv" = (

_maps/RandomRuins/SpaceRuins/listeningstation.dmm

@@ -1361,7 +1361,7 @@
 	pixel_y = 24
 	},
 /obj/structure/table,
-/obj/item/gun/ballistic/shotgun/boltaction,
+/obj/item/gun/ballistic/rifle/boltaction,
 /obj/item/ammo_box/a762,
 /turf/open/floor/plasteel/dark,
 /area/ruin/space/has_grav/listeningstation)
@@ -1818,7 +1818,7 @@
 /area/ruin/space/has_grav/listeningstation)
 "Jc" = (
 /obj/structure/table,
-/obj/item/gun/ballistic/shotgun/boltaction,
+/obj/item/gun/ballistic/rifle/boltaction,
 /obj/item/ammo_box/a762,
 /turf/open/floor/plasteel/dark,
 /area/ruin/space/has_grav/listeningstation)

_maps/RandomZLevels/VR/murderdome.dmm

@@ -144,10 +144,10 @@
 /area/awaymission/vr/murderdome)
 "r" = (
 /obj/structure/rack,
-/obj/item/gun/ballistic/shotgun/boltaction,
-/obj/item/gun/ballistic/shotgun/boltaction,
-/obj/item/gun/ballistic/shotgun/boltaction,
-/obj/item/gun/ballistic/shotgun/boltaction,
+/obj/item/gun/ballistic/rifle/boltaction,
+/obj/item/gun/ballistic/rifle/boltaction,
+/obj/item/gun/ballistic/rifle/boltaction,
+/obj/item/gun/ballistic/rifle/boltaction,
 /turf/open/indestructible,
 /area/awaymission/vr/murderdome)
 "s" = (
@@ -177,12 +177,12 @@
 /area/awaymission/vr/murderdome)
 "v" = (
 /obj/structure/rack,
-/obj/item/gun/ballistic/automatic/shotgun/bulldog/unrestricted,
-/obj/item/gun/ballistic/automatic/shotgun/bulldog/unrestricted,
-/obj/item/gun/ballistic/automatic/shotgun/bulldog/unrestricted,
-/obj/item/gun/ballistic/automatic/shotgun/bulldog/unrestricted,
-/obj/item/gun/ballistic/automatic/shotgun/bulldog/unrestricted,
-/obj/item/gun/ballistic/automatic/shotgun/bulldog/unrestricted,
+/obj/item/gun/ballistic/shotgun/bulldog/unrestricted,
+/obj/item/gun/ballistic/shotgun/bulldog/unrestricted,
+/obj/item/gun/ballistic/shotgun/bulldog/unrestricted,
+/obj/item/gun/ballistic/shotgun/bulldog/unrestricted,
+/obj/item/gun/ballistic/shotgun/bulldog/unrestricted,
+/obj/item/gun/ballistic/shotgun/bulldog/unrestricted,
 /turf/open/indestructible,
 /area/awaymission/vr/murderdome)
 "w" = (

_maps/RandomZLevels/VR/snowdin_VR.dmm

@@ -6526,7 +6526,7 @@
 /turf/closed/wall,
 /area/awaymission/snowdin/post/secpost)
 "od" = (
-/obj/item/gun/ballistic/shotgun/boltaction,
+/obj/item/gun/ballistic/rifle/boltaction,
 /obj/item/ammo_box/a762,
 /obj/item/ammo_box/a762,
 /obj/structure/closet/secure_closet{

_maps/RandomZLevels/away_mission/Academy.dmm

@@ -2312,7 +2312,7 @@
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
 	},
-/obj/item/gun/ballistic/revolver/doublebarrel/improvised,
+/obj/item/gun/ballistic/shotgun/doublebarrel/improvised,
 /turf/open/floor/plasteel/dark,
 /area/awaymission/academy/classrooms)
 "gI" = (

_maps/RandomZLevels/away_mission/challenge.dmm

@@ -658,7 +658,7 @@
 /area/awaymission/challenge/end)
 "ck" = (
 /obj/structure/rack,
-/obj/item/gun/ballistic/revolver/doublebarrel/improvised,
+/obj/item/gun/ballistic/shotgun/doublebarrel/improvised,
 /turf/open/floor/wood,
 /area/awaymission/challenge/end)
 "cl" = (
@@ -730,7 +730,7 @@
 /area/awaymission/challenge/end)
 "cw" = (
 /obj/structure/rack,
-/obj/item/gun/ballistic/revolver/doublebarrel,
+/obj/item/gun/ballistic/shotgun/doublebarrel,
 /turf/open/floor/wood,
 /area/awaymission/challenge/end)
 "cx" = (

_maps/RandomZLevels/away_mission/snowdin.dmm

@@ -6526,7 +6526,7 @@
 /turf/closed/wall,
 /area/awaymission/snowdin/post/secpost)
 "od" = (
-/obj/item/gun/ballistic/shotgun/boltaction,
+/obj/item/gun/ballistic/rifle/boltaction,
 /obj/item/ammo_box/a762,
 /obj/item/ammo_box/a762,
 /obj/structure/closet/secure_closet{

_maps/map_files/BoxStation/BoxStation.dmm

@@ -2732,7 +2732,7 @@
 /obj/item/clothing/under/suit/waiter,
 /obj/item/clothing/under/suit/waiter,
 /obj/item/clothing/under/suit/waiter,
-/obj/item/gun/ballistic/revolver/doublebarrel,
+/obj/item/gun/ballistic/shotgun/doublebarrel,
 /obj/item/stack/sheet/metal/fifty,
 /obj/item/stack/sheet/glass/fifty,
 /turf/open/floor/wood,

_maps/map_files/BoxedInStation/BoxedInStation.dmm

@@ -6026,7 +6026,7 @@
 /obj/structure/closet/secure_closet/bar{
 	req_access_txt = "25"
 	},
-/obj/item/gun/ballistic/revolver/doublebarrel,
+/obj/item/gun/ballistic/shotgun/doublebarrel,
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/wood,
 /area/service/bar)
@@ -31141,7 +31141,7 @@
 /obj/item/gun/ballistic/automatic/toy/pistol/riot,
 /obj/item/gun/ballistic/automatic/toy/pistol/riot,
 /obj/item/gun/ballistic/automatic/toy/pistol/riot,
-/obj/item/gun/ballistic/revolver/grenadelauncher,
+/obj/item/gun/ballistic/launcher/grenade_launcher,
 /obj/item/gun/ballistic/shotgun/shorty,
 /obj/item/gun/ballistic/revolver/russian/soul,
 /turf/open/floor/plasteel,

_maps/map_files/CogStation/CogStation.dmm

@@ -52548,7 +52548,7 @@
 "cwZ" = (
 /obj/structure/table,
 /obj/item/storage/box/beanbag,
-/obj/item/gun/ballistic/revolver/doublebarrel,
+/obj/item/gun/ballistic/shotgun/doublebarrel,
 /obj/item/storage/hypospraykit/toxin,
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on{
 	dir = 1

_maps/map_files/Deltastation/DeltaStation2.dmm

@@ -86263,7 +86263,7 @@
 	pixel_y = 32
 	},
 /obj/item/storage/box/beanbag,
-/obj/item/gun/ballistic/revolver/doublebarrel,
+/obj/item/gun/ballistic/shotgun/doublebarrel,
 /turf/open/floor/plasteel/dark,
 /area/service/bar)
 "jvb" = (

_maps/map_files/FestiveBall/FestiveStation.dmm

@@ -20753,7 +20753,7 @@
 /obj/structure/closet/secure_closet/bar,
 /obj/item/storage/box/drinkingglasses,
 /obj/item/storage/box/cups,
-/obj/item/gun/ballistic/revolver/doublebarrel,
+/obj/item/gun/ballistic/shotgun/doublebarrel,
 /turf/open/floor/carpet/monochrome,
 /area/commons/storage/tools)
 "bci" = (
@@ -34075,7 +34075,7 @@
 /obj/structure/closet/secure_closet/bar,
 /obj/item/storage/box/drinkingglasses,
 /obj/item/storage/box/cups,
-/obj/item/gun/ballistic/revolver/doublebarrel,
+/obj/item/gun/ballistic/shotgun/doublebarrel,
 /turf/open/floor/carpet/monochrome,
 /area/hallway/secondary/service)
 "bHB" = (

_maps/map_files/KiloStation/KiloStation.dmm

@@ -45030,7 +45030,7 @@
 	},
 /obj/structure/table/wood,
 /obj/item/clipboard,
-/obj/item/gun/ballistic/revolver/doublebarrel{
+/obj/item/gun/ballistic/shotgun/doublebarrel{
 	pixel_y = 5
 	},
 /obj/item/radio/intercom{

_maps/map_files/LambdaStation/dorms.dmm

@@ -15367,7 +15367,7 @@
 /obj/structure/table/wood,
 /obj/item/stack/spacecash/c10,
 /obj/item/stack/spacecash/c100,
-/obj/item/gun/ballistic/revolver/doublebarrel,
+/obj/item/gun/ballistic/shotgun/doublebarrel,
 /turf/open/floor/wood,
 /area/service/bar)
 "Nr" = (

_maps/map_files/MetaStation/MetaStation.dmm

@@ -54853,7 +54853,7 @@
 /obj/structure/table/wood,
 /obj/item/stack/packageWrap,
 /obj/item/stack/packageWrap,
-/obj/item/gun/ballistic/revolver/doublebarrel,
+/obj/item/gun/ballistic/shotgun/doublebarrel,
 /obj/machinery/camera{
 	c_tag = "Bar - Backroom"
 	},

_maps/map_files/OmegaStation/OmegaStation.dmm

@@ -11723,7 +11723,7 @@
 "avo" = (
 /obj/structure/table/wood,
 /obj/item/storage/box/beanbag,
-/obj/item/gun/ballistic/revolver/doublebarrel,
+/obj/item/gun/ballistic/shotgun/doublebarrel,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},

_maps/map_files/PubbyStation/PubbyStation.dmm

@@ -17097,7 +17097,7 @@
 	},
 /area/maintenance/department/crew_quarters/bar)
 "aRQ" = (
-/obj/item/gun/ballistic/revolver/doublebarrel{
+/obj/item/gun/ballistic/shotgun/doublebarrel{
 	pixel_y = 11
 	},
 /obj/structure/table/wood,

_maps/map_files/SmolStation/SmolStation.dmm

@@ -1082,7 +1082,7 @@
 /obj/structure/closet/secure_closet/bar{
 	req_access_txt = "25"
 	},
-/obj/item/gun/ballistic/revolver/doublebarrel,
+/obj/item/gun/ballistic/shotgun/doublebarrel,
 /obj/effect/turf_decal/tile/bar,
 /obj/effect/turf_decal/tile/bar{
 	dir = 1

_maps/map_files/Snaxi/Snaxi.dmm

@@ -46732,7 +46732,7 @@
 /obj/structure/closet/secure_closet/bar{
 	req_access_txt = "25"
 	},
-/obj/item/gun/ballistic/revolver/doublebarrel,
+/obj/item/gun/ballistic/shotgun/doublebarrel,
 /obj/item/stack/sheet/glass/fifty,
 /obj/item/stack/sheet/metal/fifty,
 /obj/item/clothing/under/suit/waiter,

_maps/map_files/SpookyStation/SpookyStation.dmm

@@ -12219,7 +12219,7 @@
 /area/eventmap/mountain)
 "aJs" = (
 /obj/structure/rack,
-/obj/item/gun/ballistic/automatic/shotgun/bulldog/unrestricted,
+/obj/item/gun/ballistic/shotgun/bulldog/unrestricted,
 /obj/structure/cable/white{
 	icon_state = "4-8"
 	},
@@ -12758,15 +12758,15 @@
 /area/eventmap/outside)
 "aKT" = (
 /obj/structure/rack,
-/obj/item/gun/ballistic/shotgun/boltaction{
+/obj/item/gun/ballistic/rifle/boltaction{
 	pixel_x = -4;
 	pixel_y = 4
 	},
-/obj/item/gun/ballistic/shotgun/boltaction{
+/obj/item/gun/ballistic/rifle/boltaction{
 	pixel_x = 4;
 	pixel_y = -4
 	},
-/obj/item/gun/ballistic/shotgun/boltaction,
+/obj/item/gun/ballistic/rifle/boltaction,
 /turf/open/floor/wood,
 /area/eventmap/inside)
 "aKU" = (

_maps/map_files/SyndicateStation/SyndicateBoxStation.dmm

@@ -4574,7 +4574,7 @@
 /obj/item/clothing/under/suit/waiter,
 /obj/item/clothing/under/suit/waiter,
 /obj/item/clothing/under/suit/waiter,
-/obj/item/gun/ballistic/revolver/doublebarrel,
+/obj/item/gun/ballistic/shotgun/doublebarrel,
 /obj/item/stack/sheet/metal/fifty,
 /obj/item/stack/sheet/glass/fifty,
 /turf/open/floor/carpet/black,

_maps/map_files/TauStation/TauStation.dmm

@@ -31689,7 +31689,7 @@
 /obj/item/reagent_containers/food/drinks/dwarf_mug,
 /obj/item/reagent_containers/food/drinks/dwarf_mug,
 /obj/item/skub,
-/obj/item/gun/ballistic/automatic/gyropistol,
+/obj/item/gun/ballistic/launcher/gyropistol,
 /turf/open/floor/plasteel/dark,
 /area/ai_monitored/command/nuke_storage)
 "lab" = (
@@ -44655,7 +44655,7 @@
 	pixel_y = 3
 	},
 /obj/item/stack/spacecash/c100,
-/obj/item/gun/ballistic/revolver/doublebarrel,
+/obj/item/gun/ballistic/shotgun/doublebarrel,
 /obj/effect/decal/cleanable/cobweb/cobweb2,
 /obj/item/reagent_containers/glass/beaker/cryoxadone{
 	pixel_x = 7;

_maps/map_files/generic/CentCom.dmm

@@ -14882,7 +14882,7 @@
 "GR" = (
 /obj/structure/table/wood,
 /obj/item/storage/box/beanbag,
-/obj/item/gun/ballistic/revolver/doublebarrel,
+/obj/item/gun/ballistic/shotgun/doublebarrel,
 /obj/effect/turf_decal/tile/neutral{
 	dir = 1
 	},

_maps/splurt_maps/map_files/Smexistation/Snaxi_Splurt.dmm

@@ -55893,7 +55893,7 @@
 /obj/structure/closet/secure_closet/bar{
 	req_access_txt = "25"
 	},
-/obj/item/gun/ballistic/revolver/doublebarrel,
+/obj/item/gun/ballistic/shotgun/doublebarrel,
 /obj/item/stack/sheet/glass/fifty,
 /obj/item/stack/sheet/metal/fifty,
 /obj/item/clothing/under/suit/waiter,

_maps/splurt_maps/map_files/Smexistation_OLD/Snaxi_Splurt.dmm

@@ -54255,7 +54255,7 @@
 /obj/structure/closet/secure_closet/bar{
 	req_access_txt = "25"
 	},
-/obj/item/gun/ballistic/revolver/doublebarrel,
+/obj/item/gun/ballistic/shotgun/doublebarrel,
 /obj/item/stack/sheet/glass/fifty,
 /obj/item/stack/sheet/metal/fifty,
 /obj/item/clothing/under/suit/waiter,

code/__DEFINES/combat.dm

@@ -190,11 +190,36 @@
 #define TRIGGER_GUARD_ALLOW_ALL -1
 #define TRIGGER_GUARD_NONE 0
 #define TRIGGER_GUARD_NORMAL 1
+//Gun bolt types
+///Gun has a bolt, it stays closed while not cycling. The gun must be racked to have a bullet chambered when a mag is inserted.
+///  Example: c20, shotguns, m90
+#define BOLT_TYPE_STANDARD 1
+///Gun has a bolt, it is open when ready to fire. The gun can never have a chambered bullet with no magazine, but the bolt stays ready when a mag is removed.
+///  Example: Some SMGs, the L6
+#define BOLT_TYPE_OPEN 2
+///Gun has no moving bolt mechanism, it cannot be racked. Also dumps the entire contents when emptied instead of a magazine.
+///  Example: Break action shotguns, revolvers
+#define BOLT_TYPE_NO_BOLT 3
+///Gun has a bolt, it locks back when empty. It can be released to chamber a round if a magazine is in.
+///  Example: Pistols with a slide lock, some SMGs
+#define BOLT_TYPE_LOCKING 4
+//Sawn off nerfs
+#define SAWN_OFF_ACC_PENALTY 25
+#define SAWN_OFF_RECOIL 1
 //E-gun self-recharge values
 #define EGUN_NO_SELFCHARGE 0
 #define EGUN_SELFCHARGE 1
 #define EGUN_SELFCHARGE_BORG 2
 
+//ammo box sprite defines
+///ammo box will always use provided icon state
+#define AMMO_BOX_ONE_SPRITE 0
+///ammo box will have a different state for each bullet; <icon_state>-<bullets left>
+#define AMMO_BOX_PER_BULLET 1
+///ammo box will have a different state for full and empty; <icon_state>-max_ammo and <icon_state>-0
+#define AMMO_BOX_FULL_EMPTY 2
+
+
 //Gun suppression
 #define SUPPRESSED_NONE 0
 #define SUPPRESSED_QUIET 1 ///standard suppressed

code/controllers/subsystem/traumas.dm

@@ -167,7 +167,7 @@ SUBSYSTEM_DEF(traumas)
 					"syndicate" = typecacheof(list(/obj/item/stack/tile/mineral/plastitanium, /obj/machinery/computer/shuttle/syndicate, /obj/machinery/computer/shuttle/syndicate/recall, /obj/machinery/computer/shuttle/syndicate/drop_pod, /obj/machinery/computer/camera_advanced/shuttle_docker/syndicate, /obj/machinery/recharge_station,
 						/obj/machinery/porta_turret/syndicate, /obj/structure/closet/syndicate, /obj/machinery/suit_storage_unit/syndicate, /obj/item/clothing/under/syndicate, /obj/item/folder/syndicate, /obj/item/documents/syndicate, /obj/item/clothing/glasses/phantomthief/syndicate, /obj/item/antag_spawner/nuke_ops, /obj/item/storage/box/syndicate,
 						/obj/structure/fluff/empty_sleeper/syndicate, /obj/item/implant/radio/syndicate, /obj/item/clothing/head/helmet/space/syndicate, /obj/machinery/nuclearbomb/syndicate, /obj/item/grenade/syndieminibomb, /obj/item/storage/backpack/duffelbag/syndie, /obj/item/gun/ballistic/automatic/pistol, /obj/item/gun/ballistic/revolver,
-						/obj/item/gun/ballistic/automatic/shotgun/bulldog, /obj/item/gun/ballistic/automatic/c20r, /obj/item/gun/ballistic/automatic/m90, /obj/item/gun/ballistic/automatic/l6_saw, /obj/item/storage/belt/grenade/full, /obj/item/gun/ballistic/automatic/sniper_rifle/syndicate, /obj/item/gun/energy/kinetic_accelerator/crossbow,
+						/obj/item/gun/ballistic/shotgun/bulldog, /obj/item/gun/ballistic/automatic/c20r, /obj/item/gun/ballistic/automatic/m90, /obj/item/gun/ballistic/automatic/l6_saw, /obj/item/storage/belt/grenade/full, /obj/item/gun/ballistic/rifle/sniper_rifle/syndicate, /obj/item/gun/energy/kinetic_accelerator/crossbow,
 						/obj/item/melee/transforming/energy/sword/saber, /obj/item/dualsaber, /obj/item/melee/powerfist, /obj/item/storage/box/syndie_kit, /obj/item/grenade/spawnergrenade/manhacks, /obj/item/grenade/chem_grenade/bioterrorfoam, /obj/item/reagent_containers/spray/chemsprayer/bioterror, /obj/item/ammo_box/magazine/m10mm,
 						/obj/item/ammo_box/magazine/pistolm9mm, /obj/item/ammo_box/a357, /obj/item/ammo_box/magazine/m12g, /obj/item/ammo_box/magazine/mm712x82, /obj/item/antag_spawner/nuke_ops, /obj/vehicle/sealed/mecha/combat/gygax/dark, /obj/vehicle/sealed/mecha/combat/marauder/mauler, /obj/item/soap/syndie, /obj/item/gun/syringe/syndicate, /obj/item/cartridge/virus/syndicate,
 						/obj/item/cartridge/virus/frame, /obj/item/chameleon, /obj/item/storage/box/syndie_kit/cutouts, /obj/item/clothing/suit/space/hardsuit/syndi, /obj/item/card/emag, /obj/item/storage/toolbox/syndicate, /obj/item/storage/book/bible/syndicate, /obj/item/encryptionkey/binary, /obj/item/encryptionkey/syndicate, /obj/item/aiModule/syndicate,

code/datums/beepsky_fashion.dm

@@ -76,10 +76,7 @@
 	patrol_emote = "Engaging bounty hunting protocols."
 	patrol_fail_emote = "Unable to find any bounties due to error. Rebooting."
 	arrest_emote = "ARREST_TYPE outlaw CRIMINAL with a bounty of THREAT_LEVEL000 in LOCATION."
-	stun_sounds = list('sound/weapons/Gunshot.ogg',
-		'sound/weapons/Gunshot2.ogg',
-		'sound/weapons/Gunshot3.ogg',
-		'sound/weapons/Gunshot4.ogg')
+	stun_sounds = list('sound/weapons/gun/pistol/shot.ogg',)
 
 /datum/beepsky_fashion/chef
 	obj_icon_state = "chef"

code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm

@@ -290,7 +290,7 @@
 
 /datum/crafting_recipe/ishotgun
 	name = "Improvised Shotgun"
-	result = /obj/item/gun/ballistic/revolver/doublebarrel/improvised
+	result = /obj/item/gun/ballistic/shotgun/doublebarrel/improvised
 	reqs = list(/obj/item/pipe = 1,
 				/obj/item/weaponcrafting/receiver = 1,
 				/obj/item/weaponcrafting/stock = 1,

code/game/gamemodes/clown_ops/clown_weapons.dm

@@ -254,7 +254,7 @@
 	desc = "A weapon for combat exosuits. Launches primed tear-stache grenades."
 	icon_state = "mecha_grenadelnchr"
 	projectile = /obj/item/grenade/chem_grenade/teargas/moustache
-	fire_sound = 'sound/weapons/grenadelaunch.ogg'
+	fire_sound = 'sound/weapons/gun/general/grenade_launch.ogg'
 	projectiles = 6
 	missile_speed = 1.5
 	projectile_energy_cost = 800