cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-11 10:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11976 from Citadel-Station-13/Ghommie-patch-1

Browse Source 
Updates ammo_box/update_icon() to nowadays standards.
This commit is contained in:
kevinz000
2020-04-23 11:41:51 -07:00
committed by GitHub
parent debbd3edab 0c15c09e48
commit 45319b4942
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
code/modules/projectiles/boxes_magazines/_box_magazine.dm
View File

@@ -112,11 +112,7 @@
update_icon()
/obj/item/ammo_box/update_icon()
switch(multiple_sprites)
if(1)
icon_state = "[initial(icon_state)]-[stored_ammo.len]"
if(2)
icon_state = "[initial(icon_state)]-[stored_ammo.len ? "[max_ammo]" : "0"]"
. = ..()
desc = "[initial(desc)] There are [stored_ammo.len] shell\s left!"
for (var/material in bullet_cost)
var/material_amount = bullet_cost[material]
@@ -124,6 +120,13 @@
custom_materials[material] = material_amount
set_custom_materials(custom_materials)//make sure we setup the correct properties again
/obj/item/ammo_box/update_icon_state()
switch(multiple_sprites)
if(1)
icon_state = "[initial(icon_state)]-[stored_ammo.len]"
if(2)
icon_state = "[initial(icon_state)]-[stored_ammo.len ? "[max_ammo]" : "0"]"
//Behavior for magazines
/obj/item/ammo_box/magazine/proc/ammo_count()
return stored_ammo.len