diff --git a/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm b/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm index 1159123d30f1..72e946c220a7 100644 --- a/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm +++ b/_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{ diff --git a/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm b/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm index 1a07763671e5..006d42ca7915 100644 --- a/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm +++ b/_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, diff --git a/code/__DEFINES/guns.dm b/code/__DEFINES/guns.dm index 2804ecab6bfd..29805d3e4e3c 100644 --- a/code/__DEFINES/guns.dm +++ b/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 diff --git a/code/game/objects/effects/spawners/random.dm/exotic.dm b/code/game/objects/effects/spawners/random.dm/exotic.dm index 9d55fa9b69ff..84e4a0616c78 100644 --- a/code/game/objects/effects/spawners/random.dm/exotic.dm +++ b/code/game/objects/effects/spawners/random.dm/exotic.dm @@ -62,7 +62,7 @@ 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 ) diff --git a/code/game/objects/items/attachments/bayonet.dm b/code/game/objects/items/attachments/bayonet.dm index 6b1961f4b693..9e9deb969750 100644 --- a/code/game/objects/items/attachments/bayonet.dm +++ b/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 diff --git a/code/game/objects/items/attachments/m17_barrel.dm b/code/game/objects/items/attachments/m17_barrel.dm new file mode 100644 index 000000000000..9d857b56183f --- /dev/null +++ b/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 = 2 + pixel_shift_x = 1 + pixel_shift_y = 1 diff --git a/code/game/objects/items/storage/filled_guncases.dm b/code/game/objects/items/storage/filled_guncases.dm new file mode 100644 index 000000000000..91c5d9d7f02c --- /dev/null +++ b/code/game/objects/items/storage/filled_guncases.dm @@ -0,0 +1,163 @@ +//Erika here. I did this because guncase.dm was annoying me. It needs better organization at some point. + +/* Hunter's Pride */ + +/obj/item/storage/guncase/pistol/firebrand + gun_type = /obj/item/gun/ballistic/revolver/firebrand + +/obj/item/storage/guncase/pistol/derringer + gun_type = /obj/item/gun/ballistic/derringer + +/obj/item/storage/guncase/pistol/montagne + gun_type = /obj/item/gun/ballistic/revolver/montagne + mag_type = /obj/item/ammo_box/a44roum_speedloader + +/obj/item/storage/guncase/pistol/candor + gun_type = /obj/item/gun/ballistic/automatic/pistol/candor + mag_type = /obj/item/ammo_box/magazine/m45 + +/obj/item/storage/guncase/pistol/detective + gun_type = /obj/item/gun/ballistic/revolver/detective + mag_type = /obj/item/ammo_box/c38 + +/obj/item/storage/guncase/pistol/shadow + gun_type = /obj/item/gun/ballistic/revolver/shadow + +/obj/item/storage/guncase/hellfire + gun_type = /obj/item/gun/ballistic/shotgun/hellfire + +/obj/item/storage/guncase/doublebarrel + gun_type = /obj/item/gun/ballistic/shotgun/doublebarrel + +/obj/item/storage/guncase/brimstone + gun_type = /obj/item/gun/ballistic/shotgun/brimstone + +/obj/item/storage/guncase/illestren + gun_type = /obj/item/gun/ballistic/rifle/illestren + mag_type = /obj/item/ammo_box/magazine/illestren_a850r + +/obj/item/storage/guncase/beacon + gun_type = /obj/item/gun/ballistic/shotgun/doublebarrel/beacon + +/obj/item/storage/guncase/scout + gun_type = /obj/item/gun/ballistic/rifle/scout + mag_type = /obj/item/ammo_box/a300 + +/obj/item/storage/guncase/winchester + gun_type = /obj/item/gun/ballistic/shotgun/flamingarrow + +/obj/item/storage/guncase/conflagration + gun_type = /obj/item/gun/ballistic/shotgun/flamingarrow/conflagration + +/obj/item/storage/guncase/absolution + gun_type = /obj/item/gun/ballistic/shotgun/flamingarrow/absolution + +/* Scarbourough */ + +/obj/item/storage/guncase/pistol/a357 + gun_type = /obj/item/gun/ballistic/revolver/viper + mag_type = /obj/item/ammo_box/a357/empty + +/obj/item/storage/guncase/pistol/viper + gun_type = /obj/item/gun/ballistic/revolver/viper/indie + +/obj/item/storage/guncase/pistol/ringneck + gun_type = /obj/item/gun/ballistic/automatic/pistol/ringneck/indie + mag_type = /obj/item/ammo_box/magazine/m10mm_ringneck + +/obj/item/storage/guncase/cobra + gun_type = /obj/item/gun/ballistic/automatic/smg/cobra/indie + mag_type = /obj/item/ammo_box/magazine/m45_cobra + +/obj/item/storage/guncase/boomslang + gun_type = /obj/item/gun/ballistic/automatic/marksman/boomslang/indie + mag_type = /obj/item/ammo_box/magazine/boomslang/short + +/* Etherbor */ + +/obj/item/storage/guncase/pistol/kalixpistol + gun_type = /obj/item/gun/energy/kalix/pistol + mag_type = /obj/item/stock_parts/cell/gun/kalix + +/obj/item/storage/guncase/energy/kalixrifle + gun_type = /obj/item/gun/energy/kalix + mag_type = /obj/item/stock_parts/cell/gun/kalix + +/* Serene Outdoors Guns */ + +/obj/item/storage/guncase/pistol/m17 + gun_type = /obj/item/gun/ballistic/automatic/pistol/m17 + mag_type = /obj/item/ammo_box/magazine/m17 + +/obj/item/storage/guncase/m12 + gun_type = /obj/item/gun/ballistic/automatic/m12_sporter + mag_type = /obj/item/ammo_box/magazine/m12_sporter + +/obj/item/storage/guncase/m13 + gun_type = /obj/item/gun/ballistic/automatic/m12_sporter/mod + mag_type = /obj/item/ammo_box/magazine/m12_sporter + mag_count = 3 + +/obj/item/storage/guncase/m15 + gun_type = /obj/item/gun/ballistic/automatic/m15 + mag_type = /obj/item/ammo_box/magazine/m15 + +/obj/item/storage/guncase/buckmaster + gun_type = /obj/item/gun/ballistic/shotgun/automatic/m11 + +/* Solar Armories */ + +/obj/item/storage/guncase/pistol/modelh + gun_type = /obj/item/gun/ballistic/automatic/powered/gauss/modelh + mag_type = /obj/item/ammo_box/magazine/modelh + +/* VI */ + +/obj/item/storage/guncase/pistol/commander + gun_type = /obj/item/gun/ballistic/automatic/pistol/commander + mag_type = /obj/item/ammo_box/magazine/co9mm + +/* Sharplite */ + +/obj/item/storage/guncase/pistol/miniegun + gun_type = /obj/item/gun/energy/e_gun/mini + mag_type = /obj/item/stock_parts/cell/gun/mini + +/obj/item/storage/guncase/energy + mag_type = /obj/item/stock_parts/cell/gun + +/obj/item/storage/guncase/energy/laser + gun_type = /obj/item/gun/energy/laser + +/obj/item/storage/guncase/energy/egun + gun_type = /obj/item/gun/energy/e_gun + +/obj/item/storage/guncase/energy/iongun + gun_type = /obj/item/gun/energy/ionrifle + +/* Old NT */ +/obj/item/storage/guncase/wt550 + gun_type = /obj/item/gun/ballistic/automatic/smg/wt550 + mag_type = /obj/item/ammo_box/magazine/wt550m9 + +/* Minutemen */ + +/obj/item/storage/guncase/pistol/cm23 + gun_type = /obj/item/gun/ballistic/automatic/pistol/cm23 + mag_type = /obj/item/ammo_box/magazine/cm23 + +/* idk */ + +/obj/item/storage/guncase/pistol/disposable +/obj/item/storage/guncase/pistol/disposable/PopulateContents() + new /obj/item/gun/ballistic/automatic/pistol/disposable(src) + new /obj/item/gun/ballistic/automatic/pistol/disposable(src) + +/obj/item/storage/guncase/p16 + gun_type = /obj/item/gun/ballistic/automatic/assault/p16 + mag_type = /obj/item/ammo_box/magazine/p16 + + +/obj/item/storage/guncase/skm + gun_type = /obj/item/gun/ballistic/automatic/assault/skm + mag_type = /obj/item/ammo_box/magazine/skm_762_40 diff --git a/code/game/objects/items/storage/guncases.dm b/code/game/objects/items/storage/guncases.dm index 760a84f4e3aa..27b8c1f08e21 100644 --- a/code/game/objects/items/storage/guncases.dm +++ b/code/game/objects/items/storage/guncases.dm @@ -63,55 +63,6 @@ /obj/item/storage/guncase/inherit grab_loc = TRUE -/obj/item/storage/guncase/winchester - gun_type = /obj/item/gun/ballistic/shotgun/flamingarrow - -/obj/item/storage/guncase/conflagration - gun_type = /obj/item/gun/ballistic/shotgun/flamingarrow/conflagration - -/obj/item/storage/guncase/absolution - gun_type = /obj/item/gun/ballistic/shotgun/flamingarrow/absolution - -/obj/item/storage/guncase/skm - gun_type = /obj/item/gun/ballistic/automatic/assault/skm - mag_type = /obj/item/ammo_box/magazine/skm_762_40 - -/obj/item/storage/guncase/p16 - gun_type = /obj/item/gun/ballistic/automatic/assault/p16 - mag_type = /obj/item/ammo_box/magazine/p16 - -/obj/item/storage/guncase/beacon - gun_type = /obj/item/gun/ballistic/shotgun/doublebarrel/beacon - -/obj/item/storage/guncase/scout - gun_type = /obj/item/gun/ballistic/rifle/scout - mag_type = /obj/item/ammo_box/a300 - -/obj/item/storage/guncase/boomslang - gun_type = /obj/item/gun/ballistic/automatic/marksman/boomslang/indie - mag_type = /obj/item/ammo_box/magazine/boomslang/short - -/obj/item/storage/guncase/cobra - gun_type = /obj/item/gun/ballistic/automatic/smg/cobra/indie - mag_type = /obj/item/ammo_box/magazine/m45_cobra - -/obj/item/storage/guncase/hellfire - gun_type = /obj/item/gun/ballistic/shotgun/hellfire - -/obj/item/storage/guncase/doublebarrel - gun_type = /obj/item/gun/ballistic/shotgun/doublebarrel - -/obj/item/storage/guncase/brimstone - gun_type = /obj/item/gun/ballistic/shotgun/brimstone - -/obj/item/storage/guncase/illestren - gun_type = /obj/item/gun/ballistic/rifle/illestren - mag_type = /obj/item/ammo_box/magazine/illestren_a850r - -/obj/item/storage/guncase/wt550 - gun_type = /obj/item/gun/ballistic/automatic/smg/wt550 - mag_type = /obj/item/ammo_box/magazine/wt550m9 - /obj/item/storage/guncase/pistol name = "pistol case" desc = "A large box designed for holding pistols and magazines safely." @@ -122,76 +73,3 @@ /// Eats the items on its tile /obj/item/storage/guncase/pistol/inherit grab_loc = TRUE - -/obj/item/storage/guncase/pistol/modelh - gun_type = /obj/item/gun/ballistic/automatic/powered/gauss/modelh - mag_type = /obj/item/ammo_box/magazine/modelh - -/obj/item/storage/guncase/pistol/ringneck - gun_type = /obj/item/gun/ballistic/automatic/pistol/ringneck/indie - mag_type = /obj/item/ammo_box/magazine/m10mm_ringneck - -/obj/item/storage/guncase/pistol/candor - gun_type = /obj/item/gun/ballistic/automatic/pistol/candor - mag_type = /obj/item/ammo_box/magazine/m45 - -/obj/item/storage/guncase/pistol/detective - gun_type = /obj/item/gun/ballistic/revolver/detective - mag_type = /obj/item/ammo_box/c38 - -/obj/item/storage/guncase/pistol/shadow - gun_type = /obj/item/gun/ballistic/revolver/shadow - -/obj/item/storage/guncase/pistol/viper - gun_type = /obj/item/gun/ballistic/revolver/viper/indie - -/obj/item/storage/guncase/pistol/commander - gun_type = /obj/item/gun/ballistic/automatic/pistol/commander - mag_type = /obj/item/ammo_box/magazine/co9mm - -/obj/item/storage/guncase/pistol/firebrand - gun_type = /obj/item/gun/ballistic/revolver/firebrand - -/obj/item/storage/guncase/pistol/derringer - gun_type = /obj/item/gun/ballistic/derringer - -/obj/item/storage/guncase/pistol/a357 - gun_type = /obj/item/gun/ballistic/revolver/viper - mag_type = /obj/item/ammo_box/a357/empty - -/obj/item/storage/guncase/pistol/montagne - gun_type = /obj/item/gun/ballistic/revolver/montagne - mag_type = /obj/item/ammo_box/a44roum_speedloader - -/obj/item/storage/guncase/pistol/cm23 - gun_type = /obj/item/gun/ballistic/automatic/pistol/cm23 - mag_type = /obj/item/ammo_box/magazine/cm23 - -/obj/item/storage/guncase/pistol/disposable -/obj/item/storage/guncase/pistol/disposable/PopulateContents() - new /obj/item/gun/ballistic/automatic/pistol/disposable(src) - new /obj/item/gun/ballistic/automatic/pistol/disposable(src) - -/obj/item/storage/guncase/pistol/kalixpistol - gun_type = /obj/item/gun/energy/kalix/pistol - mag_type = /obj/item/stock_parts/cell/gun/kalix - -/obj/item/storage/guncase/pistol/miniegun - gun_type = /obj/item/gun/energy/e_gun/mini - mag_type = /obj/item/stock_parts/cell/gun/mini - -/obj/item/storage/guncase/energy - mag_type = /obj/item/stock_parts/cell/gun - -/obj/item/storage/guncase/energy/laser - gun_type = /obj/item/gun/energy/laser - -/obj/item/storage/guncase/energy/egun - gun_type = /obj/item/gun/energy/e_gun - -/obj/item/storage/guncase/energy/kalixrifle - gun_type = /obj/item/gun/energy/kalix - mag_type = /obj/item/stock_parts/cell/gun/kalix - -/obj/item/storage/guncase/energy/iongun - gun_type = /obj/item/gun/energy/ionrifle diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 77497b671617..9c2e0605de7e 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -131,12 +131,12 @@ new /obj/item/storage/box/flashbangs(src) new /obj/item/storage/belt/security/full(src) new /obj/item/flashlight/seclite(src) - new /obj/item/megaphone/sec(src) //WS edit - Small QoL Brig additions + new /obj/item/megaphone/sec(src) new /obj/item/clothing/gloves/krav_maga/sec(src) new /obj/item/door_remote/head_of_security(src) - new /obj/item/gun/ballistic/shotgun/automatic/combat/compact(src) - new /obj/item/gun/ballistic/automatic/pistol/commander(src) //WS edit - free lethals - new /obj/item/gun_voucher //WS edit - gun gun gun gun gun gun gun + new /obj/item/gun/ballistic/shotgun/automatic/m11(src) + new /obj/item/gun/ballistic/automatic/pistol/commander(src) + new /obj/item/gun_voucher /obj/structure/closet/secure_closet/security name = "security officer's locker" diff --git a/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm b/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm index c3f3116f324b..d3311fdd6e77 100644 --- a/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm +++ b/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm @@ -180,6 +180,17 @@ stock = 2 availability_prob = 20 +/datum/blackmarket_item/weapon/larker + name = "Model 13 \"Larker\"" + desc = "Gotta deal for you broski. We got this mod of those shoddy Sporter Rifles an' you can buy one, or two, orreven three if yer int' that." + item = /obj/item/storage/guncase/m13 + + price_min = 500 + price_max = 1200 + stock_min = 3 + stock_max = 5 + availability_prob = 40 + /datum/blackmarket_item/weapon/sawn_illestren name = "Sawn off Illestren Rifle" desc = "We had to saw down the barrels on these to fit them in the smuggling compartment. They don't aim too good, but it still packs a good punch." @@ -191,16 +202,6 @@ stock_max = 5 availability_prob = 60 -/datum/blackmarket_item/weapon/combat_shotgun - name = "Combat Shotgun" - desc = "Are your arms tired from pumping Hunter's Pride shotguns? This semi-automatic combat shotgun will make killing a breeze." - item = /obj/item/gun/ballistic/shotgun/automatic/combat - - price_min = 1750 - price_max = 3500 - stock_max = 3 - availability_prob = 40 - /datum/blackmarket_item/weapon/mecha_weapon_bay name = "Concealed Weapons Bay" desc = "Ripley with a laser cannon? Odysseus with a missile rack? Sky's the limit with this omni-compatible weapons bay! (Missiles and lasers not included)" diff --git a/code/modules/cargo/exports/weapons.dm b/code/modules/cargo/exports/weapons.dm index c6ee67ed091e..118cfa8a69e2 100644 --- a/code/modules/cargo/exports/weapons.dm +++ b/code/modules/cargo/exports/weapons.dm @@ -41,12 +41,6 @@ unit_name = "WT-550 automatic rifle" export_types = list(/obj/item/gun/ballistic/automatic/smg/wt550) -/datum/export/weapon/shotgun - cost = 300 - unit_name = "combat shotgun" - export_types = list(/obj/item/gun/ballistic/shotgun/automatic/combat) - - /datum/export/weapon/flashbang cost = 5 unit_name = "flashbang grenade" diff --git a/code/modules/cargo/packs/gun.dm b/code/modules/cargo/packs/gun.dm index 9a35b8778e76..da2d70d2e29e 100644 --- a/code/modules/cargo/packs/gun.dm +++ b/code/modules/cargo/packs/gun.dm @@ -22,6 +22,13 @@ crate_name = "derringer crate" faction = FACTION_SRM +/datum/supply_pack/gun/m17 + name = "M17 pistol Crate" + desc = "A cheap target shooting pistol manufactured by Serene Outdoors. Chambered in .22lr" + cost = 200 + contains = list(/obj/item/storage/guncase/pistol/m17) + crate_name = "pistol crate" + /datum/supply_pack/gun/commanders name = "Commander Pistol Crate" desc = "Contains a modified Candor 'Commander' pistol, produced by Nanotrasen and chambered in 9mm." @@ -153,10 +160,31 @@ crate_name = "shotgun crate" faction = FACTION_SRM +/datum/supply_pack/gun/buckmaster + name = "Buckmaster Shotgun Crate" + desc = "For when you need to deal with 8 hooligans and can't be arsed to pump. Contains a semi-auto shotgun with an 8 round tube." + contains = list(/obj/item/storage/guncase/buckmaster) + cost = 3000 + crate_name = "shotgun crate" + /* Rifles */ +/datum/supply_pack/gun/m12 + name = "Sporter Rifle Crate" + desc = "Contains a recently manufactured Model 12 \"Sporter\", Serene Outdoors' premier small game rifle. Chambered in .22lr" + contains = list(/obj/item/storage/guncase/m12) + cost = 500 + crate_name = "rifle crate" + +/datum/supply_pack/gun/m15 + name = "Super Sporter Rifle Crate" + desc = "Contains a recently manufactured Model 15 \"Super Sporter\", Serene Outdoors' premier hunting rifle. Chambered in 5.56 CLIP" + contains = list(/obj/item/storage/guncase/m15) + cost = 2500 + crate_name = "rifle crate" + /datum/supply_pack/gun/winchester name = "Flaming Arrow Lever Action Rifle Crate" desc = "Contains an antiquated lever action rifle intended for hunting wildlife. Chambered in .38 rounds." @@ -235,6 +263,8 @@ crate_name = "auto rifle crate" faction = FACTION_SRM +/* Attachments */ + /datum/supply_pack/gun/attachment/rail_light name = "Tactical Rail Light Crate" desc = "Contains a single rail light to be mounted on a firearm." diff --git a/code/modules/clothing/outfits/ert/inteq_ert.dm b/code/modules/clothing/outfits/ert/inteq_ert.dm index 715a0352e3b1..96555fcf692b 100644 --- a/code/modules/clothing/outfits/ert/inteq_ert.dm +++ b/code/modules/clothing/outfits/ert/inteq_ert.dm @@ -42,7 +42,6 @@ suit = /obj/item/clothing/suit/space/hardsuit/syndi/inteq r_pocket = /obj/item/tank/internals/emergency_oxygen/engi - /datum/outfit/job/inteq/ert/engineer name = "ERT - Inteq Artificer" id_assignment = "Artificer" diff --git a/code/modules/clothing/outfits/factions/independent.dm b/code/modules/clothing/outfits/factions/independent.dm index 1fb5b15006ff..fafe54bbf63b 100644 --- a/code/modules/clothing/outfits/factions/independent.dm +++ b/code/modules/clothing/outfits/factions/independent.dm @@ -419,7 +419,7 @@ courierbag = /obj/item/storage/backpack/messenger/sec box = /obj/item/storage/box/survival/security - chameleon_extras = /obj/item/gun/ballistic/shotgun/automatic/combat/compact + chameleon_extras = /obj/item/gun/ballistic/shotgun/automatic/m11 // Chief Engineer diff --git a/code/modules/clothing/outfits/factions/nanotrasen.dm b/code/modules/clothing/outfits/factions/nanotrasen.dm index 3c9e379e74db..69cd8444b732 100644 --- a/code/modules/clothing/outfits/factions/nanotrasen.dm +++ b/code/modules/clothing/outfits/factions/nanotrasen.dm @@ -188,7 +188,7 @@ courierbag = /obj/item/storage/backpack/messenger/sec box = /obj/item/storage/box/survival/security - chameleon_extras = /obj/item/gun/ballistic/shotgun/automatic/combat/compact + chameleon_extras = /obj/item/gun/ballistic/shotgun/automatic/m11 // Engineering // diff --git a/code/modules/jobs/job_types/warden.dm b/code/modules/jobs/job_types/warden.dm index 4feaed96faf1..ba4150f5a7f2 100644 --- a/code/modules/jobs/job_types/warden.dm +++ b/code/modules/jobs/job_types/warden.dm @@ -47,4 +47,4 @@ implants = list(/obj/item/implant/mindshield) - chameleon_extras = /obj/item/gun/ballistic/shotgun/automatic/combat/compact + chameleon_extras = /obj/item/gun/ballistic/shotgun/automatic/m11 diff --git a/code/modules/projectiles/boxes_magazines/external/rifle.dm b/code/modules/projectiles/boxes_magazines/external/rifle.dm index ad15e7ecea2a..a83b18600946 100644 --- a/code/modules/projectiles/boxes_magazines/external/rifle.dm +++ b/code/modules/projectiles/boxes_magazines/external/rifle.dm @@ -1,16 +1,3 @@ -/obj/item/ammo_box/magazine/m10mm_ringneck/rifle - name = "rifle magazine (10mm)" - desc = "A well-worn, 10-round magazine for the surplus rifle. These rounds do moderate damage, but struggle against armor." - icon_state = "75-8" - base_icon_state = "75" - ammo_type = /obj/item/ammo_casing/c10mm - caliber = "10mm" - max_ammo = 10 - -/obj/item/ammo_box/magazine/m10mm_ringneck/rifle/update_icon_state() - . = ..() - icon_state = "[base_icon_state]-[ammo_count() ? "8" : "0"]" - /obj/item/ammo_box/magazine/m556_42_hydra name = "toploader magazine (5.56x42mm)" desc = "An advanced, 30-round toploading magazine for the M-90gl Carbine. These rounds do moderate damage with good armor penetration." diff --git a/code/modules/projectiles/boxes_magazines/internal/shotgun.dm b/code/modules/projectiles/boxes_magazines/internal/shotgun.dm index 7485c591809d..f797d5b4ee55 100644 --- a/code/modules/projectiles/boxes_magazines/internal/shotgun.dm +++ b/code/modules/projectiles/boxes_magazines/internal/shotgun.dm @@ -12,16 +12,6 @@ /obj/item/ammo_box/magazine/internal/shot/lethal ammo_type = /obj/item/ammo_casing/shotgun/buckshot -/obj/item/ammo_box/magazine/internal/shot/com - name = "combat shotgun internal magazine" - ammo_type = /obj/item/ammo_casing/shotgun/buckshot - max_ammo = 6 - -/obj/item/ammo_box/magazine/internal/shot/com/compact - name = "compact combat shotgun internal magazine" - ammo_type = /obj/item/ammo_casing/shotgun/buckshot - max_ammo = 4 - /obj/item/ammo_box/magazine/internal/shot/dual name = "double-barrel shotgun internal magazine" max_ammo = 2 @@ -71,16 +61,6 @@ max_ammo = 1 multiload = FALSE -/obj/item/ammo_box/magazine/internal/shot/com/compact/compact - name = "compact compact combat shotgun internal magazine" - ammo_type = /obj/item/ammo_casing/shotgun/buckshot - max_ammo = 3 - -/obj/item/ammo_box/magazine/internal/shot/com/compact/compact/compact - name = "compact compact compact combat shotgun internal magazine" - ammo_type = /obj/item/ammo_casing/shotgun/buckshot - max_ammo = 2 - /obj/item/ammo_box/magazine/internal/shot/sex name = "six-barrel shotgun internal magazine" max_ammo = 6 diff --git a/code/modules/projectiles/guns/ballistic/automatic.dm b/code/modules/projectiles/guns/ballistic/automatic.dm index 63c85287cdf8..33486d172948 100644 --- a/code/modules/projectiles/guns/ballistic/automatic.dm +++ b/code/modules/projectiles/guns/ballistic/automatic.dm @@ -21,24 +21,6 @@ recoil_unwielded = 4 wield_slowdown = 0.35 -// Old Semi-Auto Rifle // - -/obj/item/gun/ballistic/automatic/surplus //TODO: NEEDS TO BE REPLACED WITH PISTOL CARBINES OR LOWCAL SEMI-AUTO RIFLES - name = "surplus rifle" - desc = "One of countless cheap, obsolete rifles found throughout the Frontier. Its lack of lethality renders it mostly a deterrent. Chambered in 10mm." - icon_state = "surplus" - item_state = "moistnugget" - weapon_weight = WEAPON_HEAVY - default_ammo_type = /obj/item/ammo_box/magazine/m10mm_ringneck/rifle - allowed_ammo_types = list( - /obj/item/ammo_box/magazine/m10mm_ringneck/rifle, - ) - fire_delay = 0.5 SECONDS - burst_size = 1 - w_class = WEIGHT_CLASS_HUGE - slot_flags = ITEM_SLOT_BACK - show_magazine_on_sprite = TRUE - // Laser rifle (rechargeable magazine) // /obj/item/gun/ballistic/automatic/laser //TODO: REMOVE diff --git a/code/modules/projectiles/guns/ballistic/shotgun.dm b/code/modules/projectiles/guns/ballistic/shotgun.dm index 30ccb528a4e9..567862ca1791 100644 --- a/code/modules/projectiles/guns/ballistic/shotgun.dm +++ b/code/modules/projectiles/guns/ballistic/shotgun.dm @@ -146,33 +146,6 @@ EMPTY_GUN_HELPER(shotgun/hellfire) manufacturer = MANUFACTURER_NANOTRASEN semi_auto = TRUE -//im not sure what to do with the combat shotgun, as it's functionally the same as the semi auto shotguns except it automattically racks instead of being semi-auto - -/obj/item/gun/ballistic/shotgun/automatic/combat - name = "combat shotgun" - desc = "A semi-automatic shotgun with tactical furniture and six-shell capacity underneath." - icon_state = "cshotgun" - item_state = "shotgun_combat" - lefthand_file = 'icons/mob/inhands/weapons/64x_guns_left.dmi' - righthand_file = 'icons/mob/inhands/weapons/64x_guns_right.dmi' - fire_delay = 0.5 SECONDS - default_ammo_type = /obj/item/ammo_box/magazine/internal/shot/com - allowed_ammo_types = list( - /obj/item/ammo_box/magazine/internal/shot/com, - ) - w_class = WEIGHT_CLASS_BULKY - -/obj/item/gun/ballistic/shotgun/automatic/combat/compact - name = "compact combat shotgun" - desc = "A compact version of the semi-automatic combat shotgun. For close encounters." - icon_state = "cshotgunc" - default_ammo_type = /obj/item/ammo_box/magazine/internal/shot/com/compact - allowed_ammo_types = list( - /obj/item/ammo_box/magazine/internal/shot/com/compact, - ) - w_class = WEIGHT_CLASS_NORMAL - weapon_weight = WEAPON_MEDIUM - //Dual Feed Shotgun /obj/item/gun/ballistic/shotgun/automatic/dual_tube @@ -457,59 +430,6 @@ EMPTY_GUN_HELPER(shotgun/doublebarrel) /obj/item/gun/ballistic/shotgun/doublebarrel/improvised/sawn sawn_off = TRUE -/obj/item/gun/ballistic/shotgun/automatic/combat/compact/compact - name = "compact compact combat shotgun" - desc = "A compact version of the compact version of the semi automatic combat shotgun. For when you want a gun the same size as your brain." - icon_state = "cshotguncc" - default_ammo_type = /obj/item/ammo_box/magazine/internal/shot/com/compact/compact - allowed_ammo_types = list( - /obj/item/ammo_box/magazine/internal/shot/com/compact/compact, - ) - w_class = WEIGHT_CLASS_SMALL - sawn_desc = "You know, this isn't funny anymore." - can_be_sawn_off = TRUE - -/obj/item/gun/ballistic/shotgun/automatic/combat/compact/compact/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0) - if(prob(0 + (magazine.ammo_count() * 20))) //minimum probability of 20, maximum of 60 - playsound(user, fire_sound, fire_sound_volume, vary_fire_sound) - to_chat(user, "[src] blows up in your face!") - if(prob(25)) - user.take_bodypart_damage(0,75) - explosion(src, 0, 0, 1, 1) - user.dropItemToGround(src) - else - user.take_bodypart_damage(0,50) - user.dropItemToGround(src) - return 0 - ..() - -/obj/item/gun/ballistic/shotgun/automatic/combat/compact/compact/compact - name = "compact compact compact combat shotgun" - desc = "A compact version of the compact version of the compact version of the semi automatic combat shotgun. It's a miracle it works..." - icon_state = "cshotgunccc" - default_ammo_type = /obj/item/ammo_box/magazine/internal/shot/com/compact/compact/compact - allowed_ammo_types = list( - /obj/item/ammo_box/magazine/internal/shot/com/compact/compact/compact, - ) - w_class = WEIGHT_CLASS_TINY - sawn_desc = "Sigh. This is a trigger attached to a bullet." - can_be_sawn_off = TRUE - -/obj/item/gun/ballistic/shotgun/automatic/combat/compact/compact/compact/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0) - if(prob(50)) //It's going to blow up. - playsound(user, fire_sound, fire_sound_volume, vary_fire_sound) - if(prob(50)) - to_chat(user, "Fu-") - user.take_bodypart_damage(100) - explosion(src, 0, 0, 1, 1) - user.dropItemToGround(src) - else - to_chat(user, "[src] blows up in your face! What a surprise.") - user.take_bodypart_damage(100) - user.dropItemToGround(src) - return 0 - ..() - //god fucking bless brazil /obj/item/gun/ballistic/shotgun/doublebarrel/brazil name = "six-barreled \"TRABUCO\" shotgun" diff --git a/code/modules/projectiles/guns/manufacturer/clip_lanchester/ballistics.dm b/code/modules/projectiles/guns/manufacturer/clip_lanchester/ballistics.dm index ee5d32f0ba46..bb0d6dab18db 100644 --- a/code/modules/projectiles/guns/manufacturer/clip_lanchester/ballistics.dm +++ b/code/modules/projectiles/guns/manufacturer/clip_lanchester/ballistics.dm @@ -403,8 +403,6 @@ NO_MAG_GUN_HELPER(automatic/smg/cm5) icon_state = "cm40" item_state = "cm40" - fire_delay = 0 - fire_sound = 'sound/weapons/gun/hmg/cm40.ogg' rack_sound = 'sound/weapons/gun/hmg/cm40_cocked.ogg' diff --git a/code/modules/projectiles/guns/manufacturer/serene_sporting/ballistics.dm b/code/modules/projectiles/guns/manufacturer/serene_sporting/ballistics.dm new file mode 100644 index 000000000000..ab997c044d01 --- /dev/null +++ b/code/modules/projectiles/guns/manufacturer/serene_sporting/ballistics.dm @@ -0,0 +1,268 @@ +#define SERENE_ATTACHMENTS list(/obj/item/attachment/rail_light, /obj/item/attachment/bayonet) +#define SERENE_ATTACH_SLOTS list(ATTACHMENT_SLOT_MUZZLE = 1, ATTACHMENT_SLOT_RAIL = 1) + +/* Micro Target */ + +/obj/item/gun/ballistic/automatic/pistol/m17 + name = "Model 17 \"Micro Target\"" + desc = "A lightweight and very accurate target pistol produced by Serene Outdoors. The barrel can be unscrewed for storage. Chambered in .22 LR." + + icon = 'icons/obj/guns/manufacturer/serene_outdoors/48x32.dmi' + lefthand_file = 'icons/obj/guns/manufacturer/serene_outdoors/lefthand.dmi' + righthand_file = 'icons/obj/guns/manufacturer/serene_outdoors/righthand.dmi' + mob_overlay_icon = 'icons/obj/guns/manufacturer/serene_outdoors/onmob.dmi' + icon_state = "m17" + item_state = "so_generic" + + default_ammo_type = /obj/item/ammo_box/magazine/m17 + allowed_ammo_types = list( + /obj/item/ammo_box/magazine/m17, + ) + + fire_sound = 'sound/weapons/gun/pistol/himehabu.ogg' + + manufacturer = MANUFACTURER_SERENE + show_magazine_on_sprite = TRUE + bolt_type = BOLT_TYPE_LOCKING + + w_class = WEIGHT_CLASS_SMALL + + spread = 25 + spread_unwielded = 45 + recoil = -2 + recoil_unwielded = -2 + + + valid_attachments = list( + /obj/item/attachment/m17_barrel, + ) + slot_available = list( + ATTACHMENT_SLOT_MUZZLE = 1, + ) + slot_offsets = list( + ATTACHMENT_SLOT_MUZZLE = list( + "x" = 30, + "y" = 23, + ), + ) + + default_attachments = list(/obj/item/attachment/m17_barrel) + +EMPTY_GUN_HELPER(automatic/pistol/m17) + +/obj/item/ammo_box/magazine/m17 + name = "Model 17 magazine (.22lr)" + desc = "A 10-round magazine for the Model 17 \"Micro Target\". These rounds do okay damage with awful performance against armor." + icon_state = "m17_mag-1" + base_icon_state = "m17_mag" + ammo_type = /obj/item/ammo_casing/c22lr + caliber = "22lr" + max_ammo = 10 + multiple_sprites = AMMO_BOX_FULL_EMPTY + +/obj/item/ammo_box/magazine/m17/empty + start_empty = TRUE + +/* Sporter */ + +/obj/item/gun/ballistic/automatic/m12_sporter + name = "Model 12 \"Sporter\"" + desc = "An extremely popular target shooting rifle produced by Serene Outdoors. Inexpensive, widely available, and produced in massive numbers, the Sporter is also popular for hunting small game and ground birds. Chambered in .22 LR." + + icon = 'icons/obj/guns/manufacturer/serene_outdoors/48x32.dmi' + lefthand_file = 'icons/obj/guns/manufacturer/serene_outdoors/lefthand.dmi' + righthand_file = 'icons/obj/guns/manufacturer/serene_outdoors/righthand.dmi' + mob_overlay_icon = 'icons/obj/guns/manufacturer/serene_outdoors/onmob.dmi' + icon_state = "m12" + item_state = "m12" + + weapon_weight = WEAPON_MEDIUM + default_ammo_type = /obj/item/ammo_box/magazine/m12_sporter + allowed_ammo_types = list( + /obj/item/ammo_box/magazine/m12_sporter, + ) + + fire_delay = 0.4 SECONDS + burst_size = 1 + w_class = WEIGHT_CLASS_BULKY + slot_flags = ITEM_SLOT_BACK + show_magazine_on_sprite = TRUE + bolt_type = BOLT_TYPE_LOCKING + + fire_sound = 'sound/weapons/gun/gauss/claris.ogg' + + spread = 0 + spread_unwielded = 25 + recoil = 0 + recoil_unwielded = 2 + wield_slowdown = 0.5 + wield_delay = 1 SECONDS + + manufacturer = MANUFACTURER_SERENE + + valid_attachments = SERENE_ATTACHMENTS + slot_available = SERENE_ATTACH_SLOTS + + slot_offsets = list( + ATTACHMENT_SLOT_MUZZLE = list( + "x" = 44, + "y" = 18, + ), + ATTACHMENT_SLOT_RAIL = list( + "x" = 17, + "y" = 20, + ) + ) + +EMPTY_GUN_HELPER(automatic/m12_sporter) + + +/obj/item/ammo_box/magazine/m12_sporter + name = "Model 12 magazine (.22lr)" + desc = "A 25-round magazine for the Model 12 \"Sporter\". These rounds do okay damage with awful performance against armor." + icon_state = "m12_mag-1" + base_icon_state = "m12_mag" + ammo_type = /obj/item/ammo_casing/c22lr + caliber = "22lr" + max_ammo = 25 + multiple_sprites = AMMO_BOX_FULL_EMPTY + +/obj/item/ammo_box/magazine/m12_sporter/empty + start_empty = TRUE + +/obj/item/gun/ballistic/automatic/m12_sporter/mod + name = "Model 13 \"Larker\"" + desc = "A common after-market modification of the Model 12 \"Sporter\" rifle, keyed to fire a three round burst." + burst_size = 3 + + icon_state = "larker" + item_state = "larker" + + gun_firemodes = list(FIREMODE_SEMIAUTO, FIREMODE_BURST) + gun_firenames = list(FIREMODE_SEMIAUTO = "single", FIREMODE_BURST = "triptych") + default_firemode = FIREMODE_BURST + +EMPTY_GUN_HELPER(automatic/m12_sporter/mod) + +/* super soaker */ + +/obj/item/gun/ballistic/automatic/m15 + name = "Model 15 Super Sporter" + desc = "A popular semi-automatic hunting rifle produced by Serene Outdoors. Solid all-round performance, high accuracy, and ease of access compared to military rifles makes the Super Sporter a popular choice for hunting medium game and occasionally self-defense. Chambered in 5.56mm." + + icon = 'icons/obj/guns/manufacturer/serene_outdoors/48x32.dmi' + lefthand_file = 'icons/obj/guns/manufacturer/serene_outdoors/lefthand.dmi' + righthand_file = 'icons/obj/guns/manufacturer/serene_outdoors/righthand.dmi' + mob_overlay_icon = 'icons/obj/guns/manufacturer/serene_outdoors/onmob.dmi' + icon_state = "m15" + item_state = "m15" + + default_ammo_type = /obj/item/ammo_box/magazine/m15 + allowed_ammo_types = list( + /obj/item/ammo_box/magazine/m15, + ) + + fire_sound = 'sound/weapons/gun/rifle/m16.ogg' + + manufacturer = MANUFACTURER_SERENE + show_magazine_on_sprite = TRUE + + bolt_type = BOLT_TYPE_LOCKING + + w_class = WEIGHT_CLASS_BULKY + weapon_weight = WEAPON_MEDIUM + + spread = 0 + spread_unwielded = 40 + recoil = 1 + recoil_unwielded = 3 + wield_slowdown = 0.5 + wield_delay = 1 SECONDS + + valid_attachments = SERENE_ATTACHMENTS + slot_available = SERENE_ATTACH_SLOTS + + slot_offsets = list( + ATTACHMENT_SLOT_MUZZLE = list( + "x" = 47, + "y" = 21, + ), + ATTACHMENT_SLOT_RAIL = list( + "x" = 13, + "y" = 23, + ) + ) + +EMPTY_GUN_HELPER(automatic/m15) + +/obj/item/ammo_box/magazine/m15 + name = "Model 15 magazine (5.56x42mm CLIP)" + desc = "A 20-round magazine for the Model 15 \"Super Sporter\". These rounds do average damage and perform moderately against armor." + icon_state = "p16_mag-1" + base_icon_state = "p16_mag" + ammo_type = /obj/item/ammo_casing/a556_42 + caliber = "5.56x42mm" + max_ammo = 20 + multiple_sprites = AMMO_BOX_FULL_EMPTY + +/obj/item/ammo_box/magazine/m15/empty + start_empty = TRUE + +/* cuckmaster */ + +/obj/item/gun/ballistic/shotgun/automatic/m11 + name = "Model 11 \"Buckmaster\"" + desc = "A semi-automatic hunting shotgun produced by Serene Outdoors. Much lighter and handier than military combat shotguns, it offers the same fire rate and magazine capacity, making it an excellent choice for hunting birds and large game or for security forces looking to upgrade from pump action guns. Chambered in 12g." + + icon = 'icons/obj/guns/manufacturer/serene_outdoors/48x32.dmi' + lefthand_file = 'icons/obj/guns/manufacturer/serene_outdoors/lefthand.dmi' + righthand_file = 'icons/obj/guns/manufacturer/serene_outdoors/righthand.dmi' + mob_overlay_icon = 'icons/obj/guns/manufacturer/serene_outdoors/onmob.dmi' + icon_state = "buckmaster" + item_state = "buckmaster" + + fire_delay = 0.5 SECONDS + default_ammo_type = /obj/item/ammo_box/magazine/internal/shot/buckmaster + allowed_ammo_types = list( + /obj/item/ammo_box/magazine/internal/shot/buckmaster, + ) + w_class = WEIGHT_CLASS_BULKY + + bolt_type = BOLT_TYPE_LOCKING + + fire_sound = 'sound/weapons/gun/shotgun/bulldog.ogg' + + spread = 4 + spread_unwielded = 16 + recoil = 1 + recoil_unwielded = 4 + wield_slowdown = 0.4 + wield_delay = 0.65 SECONDS + + casing_ejector = TRUE + + manufacturer = MANUFACTURER_SERENE + + valid_attachments = SERENE_ATTACHMENTS + slot_available = SERENE_ATTACH_SLOTS + + slot_offsets = list( + ATTACHMENT_SLOT_MUZZLE = list( + "x" = 45, + "y" = 18, + ), + ATTACHMENT_SLOT_RAIL = list( + "x" = 16, + "y" = 22, + ) + ) + +/obj/item/ammo_box/magazine/internal/shot/buckmaster + name = "Buckmaster internal magazine" + ammo_type = /obj/item/ammo_casing/shotgun/buckshot + max_ammo = 8 + +EMPTY_GUN_HELPER(shotgun/automatic/m11) + +#undef SERENE_ATTACHMENTS +#undef SERENE_ATTACH_SLOTS diff --git a/code/modules/spells/spell_types/rightandwrong.dm b/code/modules/spells/spell_types/rightandwrong.dm index 633aa8dc4f25..a0a4fa6e0695 100644 --- a/code/modules/spells/spell_types/rightandwrong.dm +++ b/code/modules/spells/spell_types/rightandwrong.dm @@ -17,7 +17,7 @@ GLOBAL_LIST_INIT(summoned_guns, list( /obj/item/gun/ballistic/automatic/pistol/ringneck, /obj/item/gun/ballistic/shotgun/doublebarrel, /obj/item/gun/ballistic/shotgun, - /obj/item/gun/ballistic/shotgun/automatic/combat, + /obj/item/gun/ballistic/shotgun/automatic/m11, /obj/item/gun/ballistic/automatic/assault/p16, /obj/item/gun/ballistic/revolver/mateba, /obj/item/gun/ballistic/rifle/illestren, diff --git a/code/modules/vending/security.dm b/code/modules/vending/security.dm index 007b66c193c1..8ffd760c9533 100644 --- a/code/modules/vending/security.dm +++ b/code/modules/vending/security.dm @@ -105,7 +105,7 @@ premium = list() voucher_items = list( "Tactical Energy Gun" = /obj/item/gun/energy/e_gun/hades, - "Combat Shotgun" = /obj/item/gun/ballistic/shotgun/automatic/combat) + "Combat Shotgun" = /obj/item/gun/ballistic/shotgun/automatic/m11) /obj/machinery/vending/security/marine/syndicate icon_state = "syndicate-marine" diff --git a/icons/obj/ammunition/ammo.dmi b/icons/obj/ammunition/ammo.dmi index 85e8e368fac8..26b7fd826793 100644 Binary files a/icons/obj/ammunition/ammo.dmi and b/icons/obj/ammunition/ammo.dmi differ diff --git a/icons/obj/guns/attachments.dmi b/icons/obj/guns/attachments.dmi index c06a2c7e109c..b0b526c2db7f 100644 Binary files a/icons/obj/guns/attachments.dmi and b/icons/obj/guns/attachments.dmi differ diff --git a/icons/obj/guns/manufacturer/serene_outdoors/48x32.dmi b/icons/obj/guns/manufacturer/serene_outdoors/48x32.dmi new file mode 100644 index 000000000000..7425d2544575 Binary files /dev/null and b/icons/obj/guns/manufacturer/serene_outdoors/48x32.dmi differ diff --git a/icons/obj/guns/manufacturer/serene_outdoors/lefthand.dmi b/icons/obj/guns/manufacturer/serene_outdoors/lefthand.dmi new file mode 100644 index 000000000000..1442d4c75a62 Binary files /dev/null and b/icons/obj/guns/manufacturer/serene_outdoors/lefthand.dmi differ diff --git a/icons/obj/guns/manufacturer/serene_outdoors/onmob.dmi b/icons/obj/guns/manufacturer/serene_outdoors/onmob.dmi new file mode 100644 index 000000000000..9b0c1e524f76 Binary files /dev/null and b/icons/obj/guns/manufacturer/serene_outdoors/onmob.dmi differ diff --git a/icons/obj/guns/manufacturer/serene_outdoors/righthand.dmi b/icons/obj/guns/manufacturer/serene_outdoors/righthand.dmi new file mode 100644 index 000000000000..58fd6ab48f2a Binary files /dev/null and b/icons/obj/guns/manufacturer/serene_outdoors/righthand.dmi differ diff --git a/shiptest.dme b/shiptest.dme index 802166bd74c4..5807a678e527 100644 --- a/shiptest.dme +++ b/shiptest.dme @@ -1245,6 +1245,7 @@ #include "code\game\objects\items\attachments\_attachment.dm" #include "code\game\objects\items\attachments\bayonet.dm" #include "code\game\objects\items\attachments\laser_sight.dm" +#include "code\game\objects\items\attachments\m17_barrel.dm" #include "code\game\objects\items\attachments\rail_light.dm" #include "code\game\objects\items\attachments\silencer.dm" #include "code\game\objects\items\attachments\stock.dm" @@ -1377,6 +1378,7 @@ #include "code\game\objects\items\storage\boxes.dm" #include "code\game\objects\items\storage\briefcase.dm" #include "code\game\objects\items\storage\fancy.dm" +#include "code\game\objects\items\storage\filled_guncases.dm" #include "code\game\objects\items\storage\firstaid.dm" #include "code\game\objects\items\storage\guncases.dm" #include "code\game\objects\items\storage\holsters.dm" @@ -3092,6 +3094,7 @@ #include "code\modules\projectiles\guns\manufacturer\frontier_import\ballistics.dm" #include "code\modules\projectiles\guns\manufacturer\nanotrasen_sharplite\ballistics.dm" #include "code\modules\projectiles\guns\manufacturer\scarborough\ballistics.dm" +#include "code\modules\projectiles\guns\manufacturer\serene_sporting\ballistics.dm" #include "code\modules\projectiles\guns\misc\beam_rifle.dm" #include "code\modules\projectiles\guns\misc\blastcannon.dm" #include "code\modules\projectiles\guns\misc\bow.dm"