diff --git a/code/modules/hydroponics/plant_genes.dm b/code/modules/hydroponics/plant_genes.dm index c1c9b23d5da..76892cd2870 100644 --- a/code/modules/hydroponics/plant_genes.dm +++ b/code/modules/hydroponics/plant_genes.dm @@ -354,7 +354,7 @@ to_chat(eater, span_notice("You feel energized as you bite into [our_plant].")) var/batteries_recharged = FALSE var/obj/item/seeds/our_seed = our_plant.get_plant_seed() - for(var/obj/item/stock_parts/power_store/found_cell in eater.get_all_cells()) + for(var/obj/item/stock_parts/power_store/found_cell in assoc_to_values(eater.get_all_cells())) var/newcharge = min(our_seed.potency * 0.01 * found_cell.maxcharge, found_cell.maxcharge) if(found_cell.charge < newcharge) found_cell.charge = newcharge diff --git a/code/modules/research/xenobiology/crossbreeding/_status_effects.dm b/code/modules/research/xenobiology/crossbreeding/_status_effects.dm index 7d0bd98bbd5..f3b4801f54b 100644 --- a/code/modules/research/xenobiology/crossbreeding/_status_effects.dm +++ b/code/modules/research/xenobiology/crossbreeding/_status_effects.dm @@ -598,7 +598,7 @@ return ..() cooldown = max_cooldown var/list/batteries = list() - for(var/obj/item/stock_parts/power_store/C in owner.get_all_cells()) + for(var/obj/item/stock_parts/power_store/C in assoc_to_values(owner.get_all_cells())) if(C.charge < C.maxcharge) batteries += C if(batteries.len) diff --git a/code/modules/research/xenobiology/crossbreeding/regenerative.dm b/code/modules/research/xenobiology/crossbreeding/regenerative.dm index 7077b7a7b36..f90fc7ed6f6 100644 --- a/code/modules/research/xenobiology/crossbreeding/regenerative.dm +++ b/code/modules/research/xenobiology/crossbreeding/regenerative.dm @@ -87,9 +87,9 @@ Regenerative extracts: /obj/item/slimecross/regenerative/yellow/core_effect(mob/living/target, mob/user) var/list/batteries = list() - for(var/obj/item/stock_parts/power_store/C in target.get_all_cells()) - if(C.charge < C.maxcharge) - batteries += C + for(var/obj/item/stock_parts/power_store/cell in assoc_to_values(target.get_all_cells())) + if(cell.charge < cell.maxcharge) + batteries += cell if(batteries.len) var/obj/item/stock_parts/power_store/ToCharge = pick(batteries) ToCharge.charge = ToCharge.maxcharge diff --git a/code/modules/surgery/organs/internal/heart/heart_anomalock.dm b/code/modules/surgery/organs/internal/heart/heart_anomalock.dm index 7352fe853d5..c0ee87e50c0 100644 --- a/code/modules/surgery/organs/internal/heart/heart_anomalock.dm +++ b/code/modules/surgery/organs/internal/heart/heart_anomalock.dm @@ -108,7 +108,7 @@ return var/list/batteries = list() - for(var/obj/item/stock_parts/power_store/cell in owner.get_all_cells()) + for(var/obj/item/stock_parts/power_store/cell in assoc_to_values(owner.get_all_cells())) if(cell.used_charge()) batteries += cell