From b109c2803dc9d86d391ed3696e0daf7cbc882916 Mon Sep 17 00:00:00 2001 From: Mira <42539014+MiraHell@users.noreply.github.com> Date: Sat, 18 Jan 2025 21:01:28 +0300 Subject: [PATCH] Fix cyborg arm sprite (#27997) * fix sprite * turned off sprite * no rewind animation --- code/game/objects/items/robot/robot_items.dm | 2 +- code/game/objects/items/weapons/stunbaton.dm | 3 +++ icons/mob/robot_items.dmi | Bin 1512 -> 3230 bytes 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm index 53818352433..f334ed4641d 100644 --- a/code/game/objects/items/robot/robot_items.dm +++ b/code/game/objects/items/robot/robot_items.dm @@ -11,7 +11,7 @@ Keeping it in for adminabuse but the malf one is /obj/item/melee/baton/borg_stun */ /obj/item/borg/stun name = "electrically-charged arm" - icon_state = "elecarm" + icon_state = "elecarm_active" var/charge_cost = 30 /obj/item/borg/stun/attack__legacy__attackchain(mob/living/M, mob/living/silicon/robot/user) diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm index 33733f7e25d..e877bb94694 100644 --- a/code/game/objects/items/weapons/stunbaton.dm +++ b/code/game/objects/items/weapons/stunbaton.dm @@ -332,6 +332,9 @@ /obj/item/melee/baton/loaded/borg_stun_arm name = "electrically-charged arm" desc = "A piece of scrap metal wired directly to your power cell." + icon = 'icons/mob/robot_items.dmi' + base_icon = "elecarm" + icon_state = "elecarm" hitcost = 100 /obj/item/melee/baton/loaded/borg_stun_arm/screwdriver_act(mob/living/user, obj/item/I) diff --git a/icons/mob/robot_items.dmi b/icons/mob/robot_items.dmi index 7e9553d5fc6d48a4f6813b2a0c7d3fd7ef19de91..95e835789f5599dddcb6857f0afd24decbd0a42c 100644 GIT binary patch literal 3230 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 Hu0mjf_PWRy