cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5796 from Seris02/gunsprites2

Browse Source 
gun sprite chomp check
This commit is contained in:
Razgriz
2023-03-04 16:25:54 -07:00
committed by GitHub
parent 9109673bc9 2200cd9c10
commit af42aaa152
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/modules/projectiles/guns/energy.dm
View File

@@ -28,6 +28,9 @@
/obj/item/weapon/gun/energy/New()
..()
var/static/list/gun_icons = icon_states('icons/obj/gun_ch.dmi')
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)
START_PROCESSING(SSobj, src)
@@ -259,4 +262,4 @@
if(!power_supply)
return 0
else
return FLOOR(power_supply.charge / max(charge_cost, 1), 1)
return FLOOR(power_supply.charge / max(charge_cost, 1), 1)