Merge pull request #11739 from PsiOmegaDelta/151214-ObserveThis

Qdel() tweaking and a bonus
This commit is contained in:
Ccomp5950
2016-01-01 23:58:29 -05:00
56 changed files with 180 additions and 462 deletions

View File

@@ -88,6 +88,7 @@
var/list/ammo_states = list() //values
/obj/item/ammo_magazine/New()
..()
if(multiple_sprites)
initialize_magazine_icondata(src)