diff --git a/code/modules/projectiles/guns/special/blastcannon.dm b/code/modules/projectiles/guns/special/blastcannon.dm index d12d0a3984a..bd49eee7199 100644 --- a/code/modules/projectiles/guns/special/blastcannon.dm +++ b/code/modules/projectiles/guns/special/blastcannon.dm @@ -15,8 +15,14 @@ */ /obj/item/gun/blastcannon name = "blast cannon" - desc = "A makeshift device used to concentrate a bomb's blast energy to a narrow wave. Small enough to stow in a bag." - icon_state = "empty_blastcannon" + desc = "A surprisingly portable device used to concentrate a bomb's blast energy to a narrow wave. Small enough to stow in a bag." + icon = 'icons/obj/guns/wide_guns.dmi' + icon_state = "blastcannon_empty" + lefthand_file = 'icons/mob/inhands/weapons/64x_guns_left.dmi' + righthand_file = 'icons/mob/inhands/weapons/64x_guns_right.dmi' + inhand_x_dimension = 64 + base_pixel_x = -2 + pixel_x = -2 inhand_icon_state = "blastcannon_empty" base_icon_state = "blastcannon" w_class = WEIGHT_CLASS_NORMAL @@ -50,6 +56,7 @@ if(!pin) pin = new RegisterSignal(src, COMSIG_ATOM_INTERNAL_EXPLOSION, .proc/channel_blastwave) + AddElement(/datum/element/update_icon_updates_onmob) /obj/item/gun/blastcannon/Destroy() if(bomb) @@ -84,7 +91,8 @@ return ..() /obj/item/gun/blastcannon/update_icon_state() - icon_state = "[bomb ? "loaded" : "empty"]_[base_icon_state]" + icon_state = "[base_icon_state]_[bomb ? "loaded" : "empty"]" + inhand_icon_state = icon_state return ..() /obj/item/gun/blastcannon/attackby(obj/item/transfer_valve/bomb_to_attach, mob/user) @@ -134,6 +142,7 @@ message_admins("Blastcannon transfer valve opened by [ADMIN_LOOKUPFLW(user)] at [ADMIN_VERBOSEJMP(current_turf)] while aiming at [ADMIN_VERBOSEJMP(target_turf)] (target).") log_game("Blastcannon transfer valve opened by [key_name(user)] at [AREACOORD(current_turf)] while aiming at [AREACOORD(target_turf)] (target).") bomb.toggle_valve() + update_appearance() return diff --git a/icons/mob/inhands/weapons/64x_guns_left.dmi b/icons/mob/inhands/weapons/64x_guns_left.dmi index 6bc3e5e0dd6..83f9b02b572 100644 Binary files a/icons/mob/inhands/weapons/64x_guns_left.dmi and b/icons/mob/inhands/weapons/64x_guns_left.dmi differ diff --git a/icons/mob/inhands/weapons/64x_guns_right.dmi b/icons/mob/inhands/weapons/64x_guns_right.dmi index fc4cf8413c4..4e804c53d72 100644 Binary files a/icons/mob/inhands/weapons/64x_guns_right.dmi and b/icons/mob/inhands/weapons/64x_guns_right.dmi differ diff --git a/icons/obj/guns/ballistic.dmi b/icons/obj/guns/ballistic.dmi index 62479e6c25b..4b6b09120f5 100644 Binary files a/icons/obj/guns/ballistic.dmi and b/icons/obj/guns/ballistic.dmi differ diff --git a/icons/obj/guns/projectiles.dmi b/icons/obj/guns/projectiles.dmi index da455fd4dae..5f2ff87b865 100644 Binary files a/icons/obj/guns/projectiles.dmi and b/icons/obj/guns/projectiles.dmi differ diff --git a/icons/obj/guns/wide_guns.dmi b/icons/obj/guns/wide_guns.dmi new file mode 100644 index 00000000000..0894128677e Binary files /dev/null and b/icons/obj/guns/wide_guns.dmi differ