mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-13 19:52:40 +00:00
Merge pull request #5011 from CHOMPStation2/upstream-merge-12899
[MIRROR] [MIRROR] Adds Sjorgen Inertial Shotgun (by H-H) (ABLE TO BE MERGED)
This commit is contained in:
@@ -75,6 +75,19 @@
|
|||||||
containername = "Shotgun crate"
|
containername = "Shotgun crate"
|
||||||
access = access_armory
|
access = access_armory
|
||||||
/* VOREStation edit -- This is a bad idea. -- So is this.
|
/* 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
|
/datum/supply_pack/munitions/erifle
|
||||||
name = "Weapons - Energy marksman"
|
name = "Weapons - Energy marksman"
|
||||||
contains = list(/obj/item/weapon/gun/energy/sniperrifle = 2)
|
contains = list(/obj/item/weapon/gun/energy/sniperrifle = 2)
|
||||||
|
|||||||
@@ -139,6 +139,11 @@
|
|||||||
item_cost = 75
|
item_cost = 75
|
||||||
path = /obj/item/weapon/gun/projectile/shotgun/pump/combat
|
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
|
/datum/uplink_item/item/visible_weapons/leveraction
|
||||||
name = "Lever Action Rifle"
|
name = "Lever Action Rifle"
|
||||||
item_cost = 50
|
item_cost = 50
|
||||||
|
|||||||
@@ -98,6 +98,7 @@
|
|||||||
prob(2);/obj/item/weapon/gun/projectile/shotgun/pump/combat,
|
prob(2);/obj/item/weapon/gun/projectile/shotgun/pump/combat,
|
||||||
prob(4);/obj/item/weapon/gun/projectile/shotgun/pump/rifle,
|
prob(4);/obj/item/weapon/gun/projectile/shotgun/pump/rifle,
|
||||||
prob(3);/obj/item/weapon/gun/projectile/shotgun/pump/rifle/lever,
|
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)
|
prob(2);/obj/item/weapon/gun/projectile/silenced)
|
||||||
|
|
||||||
/obj/random/projectile/sec
|
/obj/random/projectile/sec
|
||||||
@@ -119,7 +120,8 @@
|
|||||||
return pick(prob(4);/obj/item/weapon/gun/projectile/shotgun/doublebarrel,
|
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/doublebarrel/sawn,
|
||||||
prob(3);/obj/item/weapon/gun/projectile/shotgun/pump,
|
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
|
/obj/random/handgun
|
||||||
name = "Random Handgun"
|
name = "Random Handgun"
|
||||||
@@ -494,6 +496,10 @@
|
|||||||
prob(1);list(
|
prob(1);list(
|
||||||
/obj/item/weapon/gun/projectile/shotgun/pump/combat,
|
/obj/item/weapon/gun/projectile/shotgun/pump/combat,
|
||||||
/obj/item/ammo_magazine/ammo_box/b12g
|
/obj/item/ammo_magazine/ammo_box/b12g
|
||||||
|
),
|
||||||
|
prob(1);list(
|
||||||
|
/obj/item/weapon/gun/projectile/shotgun/semi,
|
||||||
|
/obj/item/ammo_magazine/ammo_box/b12g
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -226,3 +226,18 @@
|
|||||||
w_class = ITEMSIZE_NORMAL
|
w_class = ITEMSIZE_NORMAL
|
||||||
force = 5
|
force = 5
|
||||||
sawn_off = TRUE
|
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
|
||||||
|
|||||||
Reference in New Issue
Block a user