cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-03 22:13:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing some infinite loops in gun update_icon() calls.

Browse Source
This commit is contained in:
Zuhayr
2016-01-22 04:22:49 +10:30
parent 8f3b545b10
commit ab9574ee06
4 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -86,7 +86,7 @@
user << "Has [shots_remaining] shot\s remaining."
return
/obj/item/weapon/gun/energy/update_icon()
/obj/item/weapon/gun/energy/update_icon(var/ignore_inhands)
if(charge_meter)
var/ratio = power_supply.charge / power_supply.maxcharge
@@ -100,4 +100,4 @@
icon_state = "[modifystate][ratio]"
else
icon_state = "[initial(icon_state)][ratio]"
update_held_icon()
if(!ignore_inhands) update_held_icon()

4
code/modules/projectiles/guns/projectile/automatic.dm
View File

@@ -71,10 +71,10 @@
// list(mode_name="short bursts", burst=5, fire_delay=null, move_delay=6, burst_accuracy=list(0,-1,-2,-2,-3), dispersion=list(0.6, 1.0, 1.0, 1.0, 1.2)),
)
/obj/item/weapon/gun/projectile/automatic/sts35/update_icon()
/obj/item/weapon/gun/projectile/automatic/sts35/update_icon(var/ignore_inhands)
..()
icon_state = (ammo_magazine)? "arifle" : "arifle-empty"
update_held_icon()
if(!ignore_inhands) update_held_icon()
/obj/item/weapon/gun/projectile/automatic/wt550
name = "machine pistol"