diff --git a/code/datums/supplypacks/munitions.dm b/code/datums/supplypacks/munitions.dm index 73d150fd03..64567176a0 100644 --- a/code/datums/supplypacks/munitions.dm +++ b/code/datums/supplypacks/munitions.dm @@ -75,6 +75,19 @@ containername = "Shotgun crate" access = access_armory /* VOREStation edit -- This is a bad idea. -- So is this. + +/datum/supply_pack/munitions/shotgunsemi + name = "Weapons - Semi-Automatic Shotgun crate" + contains = list( + /obj/item/ammo_magazine/ammo_box/b12g, + /obj/item/ammo_magazine/ammo_box/b12g/pellet, + /obj/item/weapon/gun/projectile/shotgun/semi = 2 + ) + cost = 100 + containertype = /obj/structure/closet/crate/secure/weapon + containername = "Semi-Auto Shotgun crate" + access = access_armory + /datum/supply_pack/munitions/erifle name = "Weapons - Energy marksman" contains = list(/obj/item/weapon/gun/energy/sniperrifle = 2) @@ -307,4 +320,4 @@ cost = 500 containertype = /obj/structure/closet/crate/secure containername = "Light machine gun crate" - access = access_armory \ No newline at end of file + access = access_armory diff --git a/code/datums/uplink/visible_weapons.dm b/code/datums/uplink/visible_weapons.dm index b939e953de..f8526c022a 100644 --- a/code/datums/uplink/visible_weapons.dm +++ b/code/datums/uplink/visible_weapons.dm @@ -139,6 +139,11 @@ item_cost = 75 path = /obj/item/weapon/gun/projectile/shotgun/pump/combat +/datum/uplink_item/item/visible_weapons/semishotgun + name = "Semi-Automatic Shotgun" + item_cost = 100 + path = /obj/item/weapon/gun/projectile/shotgun/semi + /datum/uplink_item/item/visible_weapons/leveraction name = "Lever Action Rifle" item_cost = 50 diff --git a/code/game/objects/random/guns_and_ammo.dm b/code/game/objects/random/guns_and_ammo.dm index 1e94a8b2c9..9d6053336d 100644 --- a/code/game/objects/random/guns_and_ammo.dm +++ b/code/game/objects/random/guns_and_ammo.dm @@ -98,6 +98,7 @@ prob(2);/obj/item/weapon/gun/projectile/shotgun/pump/combat, prob(4);/obj/item/weapon/gun/projectile/shotgun/pump/rifle, prob(3);/obj/item/weapon/gun/projectile/shotgun/pump/rifle/lever, + prob(2);/obj/item/weapon/gun/projectile/shotgun/semi, prob(2);/obj/item/weapon/gun/projectile/silenced) /obj/random/projectile/sec @@ -119,7 +120,8 @@ return pick(prob(4);/obj/item/weapon/gun/projectile/shotgun/doublebarrel, prob(3);/obj/item/weapon/gun/projectile/shotgun/doublebarrel/sawn, prob(3);/obj/item/weapon/gun/projectile/shotgun/pump, - prob(1);/obj/item/weapon/gun/projectile/shotgun/pump/combat) + prob(1);/obj/item/weapon/gun/projectile/shotgun/pump/combat, + prob(1);/obj/item/weapon/gun/projectile/shotgun/semi) /obj/random/handgun name = "Random Handgun" @@ -494,6 +496,10 @@ prob(1);list( /obj/item/weapon/gun/projectile/shotgun/pump/combat, /obj/item/ammo_magazine/ammo_box/b12g + ), + prob(1);list( + /obj/item/weapon/gun/projectile/shotgun/semi, + /obj/item/ammo_magazine/ammo_box/b12g ) ) diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm index 5e87e05cfc..51e7827721 100644 --- a/code/modules/projectiles/guns/projectile/shotgun.dm +++ b/code/modules/projectiles/guns/projectile/shotgun.dm @@ -226,3 +226,18 @@ w_class = ITEMSIZE_NORMAL force = 5 sawn_off = TRUE + +//Sjorgen Inertial Shotgun +/obj/item/weapon/gun/projectile/shotgun/semi + name = "semi-automatic shotgun" + desc = "A shotgun with a simple, yet effective recoil inertia loading mechanism for semi-automatic fire. This gun uses 12 gauge ammunition." + description_fluff = "Looking back on yet another venerable design, Hedberg-Hammarstrom settled on a pattern of shotgun that both had the reliability of a well proven semi-automatic loading system in addition to a striking visual aesthetic that would be appealing to even the most discerning of firearm collectors." + icon_state = "sjorgen" + item_state = "shotgun" + w_class = ITEMSIZE_LARGE + caliber = "12g" + origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 2) + slot_flags = SLOT_BACK + load_method = SINGLE_CASING + max_shells = 5 + ammo_type = /obj/item/ammo_casing/a12g/beanbag