Serene Sporting

_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm

@@ -1367,7 +1367,7 @@
 /obj/effect/turf_decal/industrial/warning{
 	dir = 10
 	},
-/obj/item/gun/ballistic/shotgun/automatic/combat{
+/obj/item/gun/ballistic/shotgun/automatic/m11{
 	pixel_y = 5
 	},
 /obj/item/gun/ballistic/revolver/ashhand{

_maps/shuttles/nanotrasen/nanotrasen_heron.dmm

@@ -1037,7 +1037,7 @@
 /obj/item/gun/energy/e_gun/smg{
 	pixel_y = 2
 	},
-/obj/item/gun/ballistic/shotgun/automatic/combat{
+/obj/item/gun/ballistic/shotgun/automatic/m11{
 	pixel_y = -3
 	},
 /obj/structure/rack,

code/__DEFINES/guns.dm

@@ -69,6 +69,7 @@
 #define MANUFACTURER_DONKCO "the Donk! Co. logo"
 #define MANUFACTURER_PGF "the Etherbor Industries emblem"
 #define MANUFACTURER_IMPORT "Lanchester Import Co."
+#define MANUFACTURER_SERENE "the Serene Outdoors logo"
 
 // Misfire chances if the gun's safety is off
 #define GUN_NO_SAFETY_MALFUNCTION_CHANCE_LOW 5

code/game/objects/effects/spawners/lootdrop.dm

@@ -51,21 +51,21 @@
 
 	loot = list(
 				/obj/item/gun/ballistic/automatic/pistol/ringneck = 8,
-				/obj/item/gun/ballistic/shotgun/automatic/combat = 5,
+				/obj/item/gun/ballistic/shotgun/automatic/m11 = 5,
 				/obj/item/gun/ballistic/automatic/pistol/deagle,
 				/obj/item/gun/ballistic/revolver/mateba
 				)
 
 /obj/effect/spawner/lootdrop/armory_contraband/metastation
 	loot = list(/obj/item/gun/ballistic/automatic/pistol/ringneck = 5,
-				/obj/item/gun/ballistic/shotgun/automatic/combat = 5,
+				/obj/item/gun/ballistic/shotgun/automatic/m11 = 5,
 				/obj/item/gun/ballistic/automatic/pistol/deagle,
 				/obj/item/storage/box/syndie_kit/throwing_weapons = 3,
 				/obj/item/gun/ballistic/revolver/mateba)
 
 /obj/effect/spawner/lootdrop/armory_contraband/donutstation
 	loot = list(/obj/item/grenade/clusterbuster/teargas = 5,
-				/obj/item/gun/ballistic/shotgun/automatic/combat = 5,
+				/obj/item/gun/ballistic/shotgun/automatic/m11 = 5,
 				/obj/item/bikehorn/golden,
 				/obj/item/grenade/clusterbuster,
 				/obj/item/storage/box/syndie_kit/throwing_weapons = 3,

code/game/objects/items/attachments/bayonet.dm

@@ -9,6 +9,7 @@
 	hitsound = 'sound/weapons/bladeslice.ogg'
 	attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
 	sharpness = IS_SHARP_ACCURATE
+	slot = ATTACHMENT_SLOT_MUZZLE
 
 	pixel_shift_x = 1
 	pixel_shift_y = 4

code/game/objects/items/attachments/m17_barrel.dm

@@ -0,0 +1,10 @@
+/obj/item/attachment/m17_barrel
+	name = "Model 17 barrel"
+	desc = "The barrel of an M17 'Micro Target'."
+	icon_state = "m17_barrel"
+
+	slot = ATTACHMENT_SLOT_MUZZLE
+	spread_mod = -40
+	size_mod = 1
+	pixel_shift_x = 1
+	pixel_shift_y = 1

code/game/objects/items/storage/filled_guncases.dm

@@ -0,0 +1,213 @@
+//Erika here. I did this because guncase.dm was annoying me. It needs better organization at some point.
+
+/* Hunter's Pride */
+
+/obj/item/storage/pistolcase/firebrand
+/obj/item/storage/pistolcase/firebrand/PopulateContents()
+	new /obj/item/gun/ballistic/revolver/firebrand/no_mag(src)
+
+/obj/item/storage/pistolcase/derringer
+/obj/item/storage/pistolcase/derringer/PopulateContents()
+	new /obj/item/gun/ballistic/derringer/no_mag(src)
+
+/obj/item/storage/pistolcase/montagne
+/obj/item/storage/pistolcase/montagne/PopulateContents()
+	new /obj/item/gun/ballistic/revolver/montagne/no_mag(src)
+	new /obj/item/ammo_box/a44roum_speedloader/empty(src)
+	new /obj/item/ammo_box/a44roum_speedloader/empty(src)
+
+/obj/item/storage/pistolcase/candor
+/obj/item/storage/pistolcase/candor/PopulateContents()
+	new /obj/item/gun/ballistic/automatic/pistol/candor/no_mag(src)
+	new /obj/item/ammo_box/magazine/m45/empty(src)
+	new /obj/item/ammo_box/magazine/m45/empty(src)
+
+/obj/item/storage/pistolcase/detective
+/obj/item/storage/pistolcase/detective/PopulateContents()
+	new /obj/item/gun/ballistic/revolver/detective/no_mag(src)
+	new /obj/item/ammo_box/c38/empty(src)
+	new /obj/item/ammo_box/c38/empty(src)
+
+/obj/item/storage/pistolcase/shadow
+/obj/item/storage/pistolcase/shadow/PopulateContents()
+	new /obj/item/gun/ballistic/revolver/shadow/no_mag(src)
+
+/obj/item/storage/guncase/beacon
+/obj/item/storage/guncase/beacon/PopulateContents()
+	new /obj/item/gun/ballistic/shotgun/doublebarrel/beacon/no_mag(src)
+
+/obj/item/storage/guncase/hellfire
+/obj/item/storage/guncase/hellfire/PopulateContents()
+	new /obj/item/gun/ballistic/shotgun/hellfire/no_mag(src)
+
+/obj/item/storage/guncase/doublebarrel
+/obj/item/storage/guncase/doublebarrel/PopulateContents()
+	new /obj/item/gun/ballistic/shotgun/doublebarrel/no_mag(src)
+
+/obj/item/storage/guncase/brimstone
+/obj/item/storage/guncase/brimstone/PopulateContents()
+	new /obj/item/gun/ballistic/shotgun/brimstone/no_mag(src)
+
+/obj/item/storage/guncase/illestren
+/obj/item/storage/guncase/illestren/PopulateContents()
+	new /obj/item/gun/ballistic/rifle/illestren/empty(src)
+	new /obj/item/ammo_box/magazine/illestren_a850r/empty(src)
+	new /obj/item/ammo_box/magazine/illestren_a850r/empty(src)
+
+/obj/item/storage/guncase/scout
+/obj/item/storage/guncase/scout/PopulateContents()
+	new /obj/item/gun/ballistic/rifle/scout/no_mag(src)
+	new /obj/item/ammo_box/a300/empty(src)
+	new /obj/item/ammo_box/a300/empty(src)
+
+/obj/item/storage/guncase/winchester
+/obj/item/storage/guncase/winchester/PopulateContents()
+	new /obj/item/gun/ballistic/shotgun/flamingarrow/no_mag(src)
+
+/obj/item/storage/guncase/conflagration
+/obj/item/storage/guncase/conflagration/PopulateContents()
+	new /obj/item/gun/ballistic/shotgun/flamingarrow/conflagration/no_mag(src)
+
+/obj/item/storage/guncase/absolution
+/obj/item/storage/guncase/absolution/PopulateContents()
+	new /obj/item/gun/ballistic/shotgun/flamingarrow/absolution/no_mag(src)
+
+/* Scarbourough */
+
+/obj/item/storage/pistolcase/a357
+/obj/item/storage/pistolcase/a357/PopulateContents()
+	new /obj/item/gun/ballistic/revolver/viper/no_mag(src)
+	new /obj/item/ammo_box/a357/empty(src)
+	new /obj/item/ammo_box/a357/empty(src)
+
+/obj/item/storage/pistolcase/ringneck
+/obj/item/storage/pistolcase/ringneck/PopulateContents()
+	new /obj/item/gun/ballistic/automatic/pistol/ringneck/indie/no_mag(src)
+	new /obj/item/ammo_box/magazine/m10mm_ringneck/empty(src)
+	new /obj/item/ammo_box/magazine/m10mm_ringneck/empty(src)
+
+/obj/item/storage/pistolcase/viper
+/obj/item/storage/pistolcase/viper/PopulateContents()
+	new /obj/item/gun/ballistic/revolver/viper/indie/no_mag(src)
+
+/obj/item/storage/guncase/boomslang
+/obj/item/storage/guncase/boomslang/PopulateContents()
+	new /obj/item/gun/ballistic/automatic/marksman/boomslang/indie/no_mag(src)
+	new /obj/item/ammo_box/magazine/boomslang/short/empty(src)
+	new /obj/item/ammo_box/magazine/boomslang/short/empty(src)
+
+/obj/item/storage/guncase/cobra
+/obj/item/storage/guncase/cobra/PopulateContents()
+	new /obj/item/gun/ballistic/automatic/smg/cobra/indie/no_mag(src)
+	new /obj/item/ammo_box/magazine/m45_cobra/empty(src)
+	new /obj/item/ammo_box/magazine/m45_cobra/empty(src)
+
+/* Etherbor */
+
+/obj/item/storage/pistolcase/kalixpistol
+/obj/item/storage/pistolcase/kalixpistol/PopulateContents()
+	new /obj/item/gun/energy/kalix/pistol/empty_cell(src)
+	new /obj/item/stock_parts/cell/gun/kalix(src)
+
+/obj/item/storage/guncase/kalixrifle
+/obj/item/storage/guncase/kalixrifle/PopulateContents()
+	new /obj/item/gun/energy/kalix/empty_cell(src)
+	new /obj/item/stock_parts/cell/gun/kalix(src)
+
+/* Serene Outdoors Guns */
+
+
+/obj/item/storage/pistolcase/m17
+/obj/item/storage/pistolcase/m17/PopulateContents()
+	new /obj/item/gun/ballistic/automatic/pistol/m17/no_mag(src)
+	new /obj/item/ammo_box/magazine/m17/empty(src)
+	new /obj/item/ammo_box/magazine/m17/empty(src)
+
+/obj/item/storage/guncase/m12
+/obj/item/storage/guncase/m12/PopulateContents()
+	new /obj/item/gun/ballistic/automatic/m12_sporter/no_mag(src)
+	new /obj/item/ammo_box/magazine/m12_sporter/empty(src)
+	new /obj/item/ammo_box/magazine/m12_sporter/empty(src)
+
+/obj/item/storage/guncase/m13
+/obj/item/storage/guncase/m13/PopulateContents()
+	new /obj/item/gun/ballistic/automatic/m12_sporter/mod/no_mag(src)
+	new /obj/item/ammo_box/magazine/m12_sporter/empty(src)
+	new /obj/item/ammo_box/magazine/m12_sporter/empty(src)
+	new /obj/item/ammo_box/magazine/m12_sporter/empty(src)
+
+/obj/item/storage/guncase/m15
+/obj/item/storage/guncase/m15/PopulateContents()
+	new /obj/item/gun/ballistic/automatic/m15/no_mag(src)
+	new /obj/item/ammo_box/magazine/m15/empty(src)
+	new /obj/item/ammo_box/magazine/m15/empty(src)
+
+/obj/item/storage/guncase/buckmaster
+/obj/item/storage/guncase/buckmaster/PopulateContents()
+	new /obj/item/gun/ballistic/shotgun/automatic/m11(src)
+
+/* idk */
+
+/obj/item/storage/guncase/p16
+/obj/item/storage/guncase/p16/PopulateContents()
+	new /obj/item/gun/ballistic/automatic/assault/p16/no_mag(src)
+	new /obj/item/ammo_box/magazine/p16/empty(src)
+	new /obj/item/ammo_box/magazine/p16/empty(src)
+
+/obj/item/storage/guncase/skm
+/obj/item/storage/guncase/skm/PopulateContents()
+	new /obj/item/gun/ballistic/automatic/assault/skm/no_mag(src)
+	new /obj/item/ammo_box/magazine/skm_762_40/empty(src)
+	new /obj/item/ammo_box/magazine/skm_762_40/empty(src)
+
+/obj/item/storage/pistolcase/modelh
+/obj/item/storage/pistolcase/modelh/PopulateContents()
+	new /obj/item/gun/ballistic/automatic/powered/gauss/modelh/no_mag(src)
+	new /obj/item/ammo_box/magazine/modelh/empty(src)
+	new /obj/item/ammo_box/magazine/modelh/empty(src)
+
+
+
+/obj/item/storage/pistolcase/commander
+/obj/item/storage/pistolcase/commander/PopulateContents()
+	new /obj/item/gun/ballistic/automatic/pistol/commander/no_mag(src)
+	new /obj/item/ammo_box/magazine/co9mm/empty(src)
+	new /obj/item/ammo_box/magazine/co9mm/empty(src)
+
+/obj/item/storage/pistolcase/disposable
+/obj/item/storage/pistolcase/disposable/PopulateContents()
+	new /obj/item/gun/ballistic/automatic/pistol/disposable(src)
+	new /obj/item/gun/ballistic/automatic/pistol/disposable(src)
+
+/obj/item/storage/pistolcase/laser
+/obj/item/storage/pistolcase/laser/PopulateContents()
+	new /obj/item/gun/energy/laser/empty_cell(src)
+	new /obj/item/stock_parts/cell/gun(src)
+
+/obj/item/storage/pistolcase/egun
+/obj/item/storage/pistolcase/egun/PopulateContents()
+	new /obj/item/gun/energy/e_gun/empty_cell(src)
+	new /obj/item/stock_parts/cell/gun(src)
+
+
+/obj/item/storage/pistolcase/miniegun
+/obj/item/storage/pistolcase/miniegun/PopulateContents()
+	new /obj/item/gun/energy/e_gun/mini/empty_cell(src)
+	new /obj/item/stock_parts/cell/gun/mini(src)
+
+/obj/item/storage/pistolcase/iongun
+/obj/item/storage/pistolcase/iongun/PopulateContents()
+	new /obj/item/gun/energy/ionrifle/empty_cell(src)
+	new /obj/item/stock_parts/cell/gun(src)
+
+/obj/item/storage/pistolcase/cm23/PopulateContents()
+	. = ..()
+	new /obj/item/gun/ballistic/automatic/pistol/cm23/no_mag(src)
+	new /obj/item/ammo_box/magazine/cm23/empty(src)
+	new /obj/item/ammo_box/magazine/cm23/empty(src)
+
+/obj/item/storage/guncase/wt550
+/obj/item/storage/guncase/wt550/PopulateContents()
+	new /obj/item/gun/ballistic/automatic/smg/wt550/no_mag(src)
+	new /obj/item/ammo_box/magazine/wt550m9/empty(src)
+	new /obj/item/ammo_box/magazine/wt550m9/empty(src)