mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-23 05:00:55 +01:00
Updates the sprite of the bulldog shotgun and fixes some related code (#85121)
Fixes bulldog shotgun unique mag display not working on the sprite, resprites the bulldog shotgun along with inhands and new worn sprites and cleans up a little of the code surrounding the bulldog.
This commit is contained in:
@@ -14,25 +14,30 @@
|
||||
|
||||
/obj/item/ammo_box/magazine/m12g/stun
|
||||
name = "shotgun magazine (12g taser slugs)"
|
||||
icon_state = "m12gs"
|
||||
base_icon_state = "m12gs"
|
||||
ammo_type = /obj/item/ammo_casing/shotgun/stunslug
|
||||
|
||||
/obj/item/ammo_box/magazine/m12g/slug
|
||||
name = "shotgun magazine (12g slugs)"
|
||||
icon_state = "m12gsl"
|
||||
base_icon_state = "m12gsl"
|
||||
ammo_type = /obj/item/ammo_casing/shotgun
|
||||
|
||||
/obj/item/ammo_box/magazine/m12g/dragon
|
||||
name = "shotgun magazine (12g dragon's breath)"
|
||||
icon_state = "m12gf"
|
||||
base_icon_state = "m12gf"
|
||||
ammo_type = /obj/item/ammo_casing/shotgun/dragonsbreath
|
||||
|
||||
/obj/item/ammo_box/magazine/m12g/bioterror
|
||||
name = "shotgun magazine (12g bioterror)"
|
||||
icon_state = "m12gt"
|
||||
base_icon_state = "m12gt"
|
||||
ammo_type = /obj/item/ammo_casing/shotgun/dart/bioterror
|
||||
|
||||
/obj/item/ammo_box/magazine/m12g/meteor
|
||||
name = "shotgun magazine (12g meteor slugs)"
|
||||
icon_state = "m12gbc"
|
||||
base_icon_state = "m12gbc"
|
||||
ammo_type = /obj/item/ammo_casing/shotgun/meteorslug
|
||||
|
||||
@@ -140,12 +140,15 @@
|
||||
|
||||
/obj/item/gun/ballistic/shotgun/bulldog
|
||||
name = "\improper Bulldog Shotgun"
|
||||
desc = "A 2-round burst fire, mag-fed shotgun for combat in narrow corridors, nicknamed 'Bulldog' by boarding parties. Compatible only with specialized 8-round drum magazines. Can have a secondary magazine attached to quickly swap between ammo types, or just to keep shooting."
|
||||
desc = "A 2-round burst fire, mag-fed shotgun for combat in narrow corridors, \
|
||||
nicknamed 'Bulldog' by boarding parties. Compatible only with specialized 8-round drum magazines. \
|
||||
Can have a secondary magazine attached to quickly swap between ammo types, or just to keep shooting."
|
||||
icon_state = "bulldog"
|
||||
inhand_icon_state = "bulldog"
|
||||
worn_icon_state = "cshotgun"
|
||||
lefthand_file = 'icons/mob/inhands/weapons/guns_lefthand.dmi'
|
||||
righthand_file = 'icons/mob/inhands/weapons/guns_righthand.dmi'
|
||||
inhand_icon_state = "bulldog"
|
||||
worn_icon = 'icons/mob/clothing/back.dmi'
|
||||
worn_icon_state = "bulldog"
|
||||
inhand_x_dimension = 32
|
||||
inhand_y_dimension = 32
|
||||
projectile_damage_multiplier = 1.2
|
||||
@@ -166,9 +169,9 @@
|
||||
internal_magazine = FALSE
|
||||
tac_reloads = TRUE
|
||||
burst_fire_selection = TRUE
|
||||
///the type of secondary magazine for the bulldog
|
||||
/// The type of secondary magazine for the bulldog
|
||||
var/secondary_magazine_type
|
||||
///the secondary magazine
|
||||
/// The secondary magazine
|
||||
var/obj/item/ammo_box/magazine/secondary_magazine
|
||||
|
||||
/obj/item/gun/ballistic/shotgun/bulldog/Initialize(mapload)
|
||||
@@ -199,8 +202,6 @@
|
||||
. += "[icon_state]_secondary_mag_[initial(secondary_magazine.icon_state)]"
|
||||
if(!secondary_magazine.ammo_count())
|
||||
. += "[icon_state]_secondary_mag_empty"
|
||||
else
|
||||
. += "[icon_state]_no_secondary_mag"
|
||||
|
||||
/obj/item/gun/ballistic/shotgun/bulldog/handle_chamber(empty_chamber = TRUE, from_firing = TRUE, chamber_next_round = TRUE)
|
||||
if(!secondary_magazine)
|
||||
|
||||
Reference in New Issue
Block a user