diff --git a/code/modules/projectiles/guns/energy/modular.dm b/code/modules/projectiles/guns/energy/modular.dm index 71fc45f9d06..937c5ca31d7 100644 --- a/code/modules/projectiles/guns/energy/modular.dm +++ b/code/modules/projectiles/guns/energy/modular.dm @@ -44,6 +44,15 @@ to_chat(user, "You disassemble \the [src].") disassemble(user) +/obj/item/weapon/gun/energy/laser/prototype/update_icon() + ..() + if(origin_chassis == CHASSIS_LARGE) + if(wielded) + item_state = "heavyprotogun_wielded" + else + item_state = "heavyprotogun" + update_held_icon() + /obj/item/weapon/gun/energy/laser/prototype/proc/reset_vars() burst = initial(burst) reliability = initial(reliability) @@ -70,10 +79,12 @@ gun_type = CHASSIS_MEDIUM slot_flags = SLOT_BELT | SLOT_BACK item_state = "energystun" + action_button_name = "Wield rifle" if(CHASSIS_LARGE) gun_type = CHASSIS_LARGE slot_flags = SLOT_BACK - item_state = "lasercannon" + item_state = "heavyprotogun" + action_button_name = "Wield rifle" if(capacitor.reliability - capacitor.condition <= 0) if(prob(66)) diff --git a/html/changelogs/Alberyk-prototype.yml b/html/changelogs/Alberyk-prototype.yml new file mode 100644 index 00000000000..c8ad974966f --- /dev/null +++ b/html/changelogs/Alberyk-prototype.yml @@ -0,0 +1,7 @@ +author: Alberyk, Kyres1 + +delete-after: True + +changes: + - rscadd: "Medium and heavy prototype laser guns should have a wielding action icon now." + - imageadd: "Heavy prototype laser guns now have an unique wielded icon." diff --git a/icons/mob/back.dmi b/icons/mob/back.dmi index b4e35feaf65..020916a3a1c 100644 Binary files a/icons/mob/back.dmi and b/icons/mob/back.dmi differ diff --git a/icons/mob/belt_mirror.dmi b/icons/mob/belt_mirror.dmi index eba2153fc5b..b72b6af845a 100644 Binary files a/icons/mob/belt_mirror.dmi and b/icons/mob/belt_mirror.dmi differ diff --git a/icons/mob/items/lefthand_guns.dmi b/icons/mob/items/lefthand_guns.dmi index 8cb76e637c9..5d227980c8c 100644 Binary files a/icons/mob/items/lefthand_guns.dmi and b/icons/mob/items/lefthand_guns.dmi differ diff --git a/icons/mob/items/righthand_guns.dmi b/icons/mob/items/righthand_guns.dmi index 938b7f73a45..d9d279c6b02 100644 Binary files a/icons/mob/items/righthand_guns.dmi and b/icons/mob/items/righthand_guns.dmi differ