mirror of
https://github.com/yogstation13/Yogstation.git
synced 2025-02-26 09:04:50 +00:00
True semi-auto shotguns + racking medium/heavy ballistics requires both hands + removes outdated stechkin animations (#17784)
* shotguns actually semi-auto now * updates desc * removes stechkin animations * fixes rack sound * Update code/modules/projectiles/guns/ballistic.dm Co-authored-by: tattax <71668564+tattax@users.noreply.github.com> * slight fixes --------- Co-authored-by: tattax <71668564+tattax@users.noreply.github.com>
This commit is contained in:
@@ -257,6 +257,10 @@
|
||||
/obj/item/gun/ballistic/proc/rack(mob/user = null)
|
||||
if (bolt_type == BOLT_TYPE_NO_BOLT) //If there's no bolt, nothing to rack
|
||||
return
|
||||
if (weapon_weight != WEAPON_LIGHT) //Can't rack it if the weapon doesn't permit dual-wielding and your off-hand is full
|
||||
if (user.get_inactive_held_item())
|
||||
to_chat(user, span_warning("You cannot rack the [bolt_wording] of \the [src] while your other hand is full!"))
|
||||
return
|
||||
if (bolt_type == BOLT_TYPE_OPEN)
|
||||
if(!bolt_locked) //If it's an open bolt, racking again would do nothing
|
||||
if (user)
|
||||
|
||||
@@ -21,6 +21,16 @@
|
||||
cartridge_wording = "shell"
|
||||
tac_reloads = FALSE
|
||||
|
||||
/obj/item/gun/ballistic/shotgun/automatic
|
||||
name = "semi-auto shotgun"
|
||||
desc = "A shotgun that automatically chambers a new round after firing."
|
||||
rack_sound = "sound/weapons/gun_slide_lock_5.ogg"
|
||||
rack_sound_vary = FALSE
|
||||
bolt_type = BOLT_TYPE_LOCKING
|
||||
semi_auto = TRUE
|
||||
casing_ejector = TRUE
|
||||
bolt_wording = "charging handle"
|
||||
|
||||
/obj/item/gun/ballistic/shotgun/blow_up(mob/user)
|
||||
. = 0
|
||||
if(chambered && chambered.BB)
|
||||
@@ -40,7 +50,6 @@
|
||||
mag_type = /obj/item/ammo_box/magazine/internal/shot/riot
|
||||
sawn_desc = "Come with me if you want to live."
|
||||
can_be_sawn_off = TRUE
|
||||
weapon_weight = WEAPON_HEAVY
|
||||
|
||||
// Breaching Shotgun //
|
||||
|
||||
@@ -55,13 +64,9 @@
|
||||
|
||||
// Automatic Shotguns//
|
||||
|
||||
/obj/item/gun/ballistic/shotgun/automatic/shoot_live_shot(mob/living/user)
|
||||
..()
|
||||
rack()
|
||||
|
||||
/obj/item/gun/ballistic/shotgun/automatic/combat
|
||||
name = "combat shotgun"
|
||||
desc = "A semi automatic shotgun with tactical furniture and a six-shell capacity underneath."
|
||||
desc = "A semi-automatic shotgun with tactical furniture and a six-shell capacity underneath."
|
||||
fire_delay = 5
|
||||
icon_state = "cshotgun"
|
||||
mag_type = /obj/item/ammo_box/magazine/internal/shot/com
|
||||
@@ -69,7 +74,7 @@
|
||||
|
||||
/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."
|
||||
desc = "A compact version of the semi-automatic combat shotgun. For close encounters."
|
||||
icon_state = "cshotgunc"
|
||||
mag_type = /obj/item/ammo_box/magazine/internal/shot/com/compact
|
||||
w_class = WEIGHT_CLASS_BULKY
|
||||
@@ -84,7 +89,6 @@
|
||||
w_class = WEIGHT_CLASS_HUGE
|
||||
var/toggled = FALSE
|
||||
var/obj/item/ammo_box/magazine/internal/shot/alternate_magazine
|
||||
semi_auto = TRUE
|
||||
|
||||
/obj/item/gun/ballistic/shotgun/automatic/dual_tube/examine(mob/user)
|
||||
. = ..()
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 46 KiB After Width: | Height: | Size: 48 KiB |
Reference in New Issue
Block a user