Skip to content

Commit

Permalink
Merge pull request #753 from CeladonSS13/upstream-pr-3123
Browse files Browse the repository at this point in the history
[MIRROR] fixes the black market sawn illestren to actually be sawed off
  • Loading branch information
MrCat15352 authored Jun 19, 2024
2 parents ca37879 + 9d42c45 commit 71d397d
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 1 deletion.
3 changes: 2 additions & 1 deletion code/modules/projectiles/guns/ballistic/rifle.dm
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,8 @@
item_state = "illestren_sawn"
sawn_off = TRUE
weapon_weight = WEAPON_MEDIUM

w_class = WEIGHT_CLASS_NORMAL
slot_flags = ITEM_SLOT_BELT

/obj/item/gun/ballistic/rifle/solgov
name = "SSG-669C"
Expand Down
19 changes: 19 additions & 0 deletions code/modules/projectiles/guns/ballistic/shotgun.dm
Original file line number Diff line number Diff line change
Expand Up @@ -363,6 +363,25 @@
item_state = "dshotgun_sawn"
mob_overlay_state = item_state

// sawn off beforehand
/obj/item/gun/ballistic/shotgun/doublebarrel/presawn
name = "sawn-off double-barreled shotgun"
desc = "A break action shotgun cut down to the size of a sidearm. While the recoil is even harsher, it offers a lot of power in a very small package. Chambered in 12g."
sawn_off = TRUE
weapon_weight = WEAPON_MEDIUM
w_class = WEIGHT_CLASS_NORMAL
slot_flags = ITEM_SLOT_BELT

wield_slowdown = 0.25
wield_delay = 0.3 SECONDS //OP? maybe

spread = 8
spread_unwielded = 15
recoil = 3 //or not
recoil_unwielded = 5
item_state = "dshotgun_sawn"
mag_type = /obj/item/ammo_box/magazine/internal/shot/dual/lethal

/obj/item/gun/ballistic/shotgun/doublebarrel/roumain
name = "HP antique double-barreled shotgun"
desc = "A special-edition shotgun hand-made by Hunter's Pride with a high-quality walnut stock inlaid with brass scrollwork. Shotguns like this are very rare outside of the Saint-Roumain Militia's ranks. Otherwise functionally identical to a common double-barreled shotgun. Chambered in 12g."
Expand Down

0 comments on commit 71d397d

Please sign in to comment.