diff --git a/code/modules/projectiles/boxes_magazines/_box_magazine.dm b/code/modules/projectiles/boxes_magazines/_box_magazine.dm index 2ab54aaa908d..b7eec15d104d 100644 --- a/code/modules/projectiles/boxes_magazines/_box_magazine.dm +++ b/code/modules/projectiles/boxes_magazines/_box_magazine.dm @@ -35,6 +35,8 @@ var/list/bullet_cost ///cost of the materials in the magazine/box itself var/list/base_cost + ///Whether the sprite updates if it has ammunition, monke var + var/spriteshift = TRUE /obj/item/ammo_box/Initialize(mapload) . = ..() @@ -173,12 +175,13 @@ desc = "[initial(desc)] There [(shells_left == 1) ? "is" : "are"] [shells_left] shell\s left!" /obj/item/ammo_box/update_icon_state() - var/shells_left = LAZYLEN(stored_ammo) - switch(multiple_sprites) - if(AMMO_BOX_PER_BULLET) - icon_state = "[multiple_sprite_use_base ? base_icon_state : initial(icon_state)]-[shells_left]" - if(AMMO_BOX_FULL_EMPTY) - icon_state = "[multiple_sprite_use_base ? base_icon_state : initial(icon_state)]-[shells_left ? "full" : "empty"]" + if(spriteshift == TRUE) ///this if loop is monke edit + var/shells_left = LAZYLEN(stored_ammo) + switch(multiple_sprites) + if(AMMO_BOX_PER_BULLET) + icon_state = "[multiple_sprite_use_base ? base_icon_state : initial(icon_state)]-[shells_left]" + if(AMMO_BOX_FULL_EMPTY) + icon_state = "[multiple_sprite_use_base ? base_icon_state : initial(icon_state)]-[shells_left ? "full" : "empty"]" return ..() /// Updates the amount of material in this ammo box according to how many bullets are left in it. diff --git a/monkestation/code/game/objects/items/tactical_shields.dm b/monkestation/code/game/objects/items/tactical_shields.dm index 2de9b7ef0ba8..fde82ab8c1c9 100644 --- a/monkestation/code/game/objects/items/tactical_shields.dm +++ b/monkestation/code/game/objects/items/tactical_shields.dm @@ -25,11 +25,9 @@ armor_type = /datum/armor/item_shield block_sound = 'sound/weapons/block_shield.ogg' start_empty = TRUE + spriteshift = FALSE var/tutel_break_leftover = /obj/item/broken_shield -/obj/item/ammo_box/tacshield/tutel/update_icon_state() - return ..() - /obj/item/ammo_box/tacshield/tutel/examine(mob/user) . = ..() var/healthpercent = round((atom_integrity/max_integrity) * 100, 1)