From 246faa3c67ef68a59e748865b9f009b0c15dfaeb Mon Sep 17 00:00:00 2001 From: Seris02 Date: Sun, 26 Feb 2023 10:21:42 +0800 Subject: [PATCH 1/2] gun sprite chomp check --- code/modules/projectiles/guns/energy.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm index 6424f90b44..ea956a00d2 100644 --- a/code/modules/projectiles/guns/energy.dm +++ b/code/modules/projectiles/guns/energy.dm @@ -28,6 +28,9 @@ /obj/item/weapon/gun/energy/New() ..() + var/static/list/gun_icons = icon_states('icons/obj/gun_ch.dmi') + if (!(icon_state in gun_icons)) + icon = 'icons/obj/gun.dmi' if(self_recharge) power_supply = new /obj/item/weapon/cell/device/weapon(src) START_PROCESSING(SSobj, src) From 2200cd9c103f66e8fbbbe76355e2aa4308ab0ac2 Mon Sep 17 00:00:00 2001 From: Seris02 <49109742+Seris02@users.noreply.github.com> Date: Sun, 26 Feb 2023 12:38:24 +0800 Subject: [PATCH 2/2] almost made a big woops there weh --- code/modules/projectiles/guns/energy.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm index ea956a00d2..c4e3372524 100644 --- a/code/modules/projectiles/guns/energy.dm +++ b/code/modules/projectiles/guns/energy.dm @@ -29,7 +29,7 @@ /obj/item/weapon/gun/energy/New() ..() var/static/list/gun_icons = icon_states('icons/obj/gun_ch.dmi') - if (!(icon_state in gun_icons)) + if (icon == 'icons/obj/gun_ch.dmi' && !(icon_state in gun_icons)) icon = 'icons/obj/gun.dmi' if(self_recharge) power_supply = new /obj/item/weapon/cell/device/weapon(src) @@ -262,4 +262,4 @@ if(!power_supply) return 0 else - return FLOOR(power_supply.charge / max(charge_cost, 1), 1) \ No newline at end of file + return FLOOR(power_supply.charge / max(charge_cost, 1), 1)