diff --git a/code/modules/projectiles/boxes_magazines/external/shotgun.dm b/code/modules/projectiles/boxes_magazines/external/shotgun.dm index dbf071f6aee..6d90c54fc69 100644 --- a/code/modules/projectiles/boxes_magazines/external/shotgun.dm +++ b/code/modules/projectiles/boxes_magazines/external/shotgun.dm @@ -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 diff --git a/code/modules/projectiles/guns/ballistic/shotgun.dm b/code/modules/projectiles/guns/ballistic/shotgun.dm index 07d702d3412..9f854926dbd 100644 --- a/code/modules/projectiles/guns/ballistic/shotgun.dm +++ b/code/modules/projectiles/guns/ballistic/shotgun.dm @@ -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) diff --git a/code/modules/unit_tests/screenshots/cardboard_cutouts_nukie_cutout.png b/code/modules/unit_tests/screenshots/cardboard_cutouts_nukie_cutout.png index 6af26b48f78..47061552e62 100644 Binary files a/code/modules/unit_tests/screenshots/cardboard_cutouts_nukie_cutout.png and b/code/modules/unit_tests/screenshots/cardboard_cutouts_nukie_cutout.png differ diff --git a/code/modules/uplink/uplink_items/nukeops.dm b/code/modules/uplink/uplink_items/nukeops.dm index fa42be0d54d..2a939769922 100644 --- a/code/modules/uplink/uplink_items/nukeops.dm +++ b/code/modules/uplink/uplink_items/nukeops.dm @@ -394,6 +394,7 @@ cost = 15 surplus = 35 purchasable_from = UPLINK_ALL_SYNDIE_OPS + /datum/uplink_item/explosives/grenades/buzzkill name = "Buzzkill Grenade Box" desc = "A box with three grenades that release a swarm of angry bees upon activation. These bees indiscriminately attack friend or foe \ diff --git a/icons/mob/clothing/back.dmi b/icons/mob/clothing/back.dmi index 4902c65d870..0f07c3fe080 100644 Binary files a/icons/mob/clothing/back.dmi and b/icons/mob/clothing/back.dmi differ diff --git a/icons/mob/inhands/weapons/guns_lefthand.dmi b/icons/mob/inhands/weapons/guns_lefthand.dmi index 0418990a4dc..9c8d8eec107 100644 Binary files a/icons/mob/inhands/weapons/guns_lefthand.dmi and b/icons/mob/inhands/weapons/guns_lefthand.dmi differ diff --git a/icons/mob/inhands/weapons/guns_righthand.dmi b/icons/mob/inhands/weapons/guns_righthand.dmi index b68be97c99b..1525f403312 100644 Binary files a/icons/mob/inhands/weapons/guns_righthand.dmi and b/icons/mob/inhands/weapons/guns_righthand.dmi differ diff --git a/icons/obj/weapons/guns/ballistic.dmi b/icons/obj/weapons/guns/ballistic.dmi index 56e7810c887..98d92ff716a 100644 Binary files a/icons/obj/weapons/guns/ballistic.dmi and b/icons/obj/weapons/guns/ballistic.dmi differ