From 46ba884965beaeb9dadd1b7333d5cc2cdf4f68b8 Mon Sep 17 00:00:00 2001 From: Ghommie <42542238+Ghommie@users.noreply.github.com> Date: Sun, 10 May 2020 23:47:30 +0200 Subject: [PATCH 1/4] A few runtimes, fixed. --- code/datums/components/crafting/craft.dm | 3 +-- code/datums/dna.dm | 7 ++++--- .../living/simple_animal/hostile/mining_mobs/ice_demon.dm | 5 +++-- .../simple_animal/hostile/mining_mobs/mining_mobs.dm | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/code/datums/components/crafting/craft.dm b/code/datums/components/crafting/craft.dm index 8ebd52522a..485298b4a6 100644 --- a/code/datums/components/crafting/craft.dm +++ b/code/datums/components/crafting/craft.dm @@ -209,8 +209,7 @@ var/obj/item/reagent_containers/food/food_result = I var/total_quality = 0 var/total_items = 0 - for(var/obj/item/ingredient in parts) - var/obj/item/reagent_containers/food/food_ingredient = ingredient + for(var/obj/item/reagent_containers/ingredient in parts) total_items += 1 total_quality += food_ingredient.food_quality if(total_items == 0) diff --git a/code/datums/dna.dm b/code/datums/dna.dm index e0df2a8f1b..958bb03e2d 100644 --- a/code/datums/dna.dm +++ b/code/datums/dna.dm @@ -152,10 +152,11 @@ return . /datum/dna/proc/generate_dna_blocks() - var/bonus + var/list/mutations_temp = GLOB.good_mutations + GLOB.bad_mutations + GLOB.not_good_mutations if(species && species.inert_mutation) - bonus = GET_INITIALIZED_MUTATION(species.inert_mutation) - var/list/mutations_temp = GLOB.good_mutations + GLOB.bad_mutations + GLOB.not_good_mutations + bonus + var/bonus = GET_INITIALIZED_MUTATION(species.inert_mutation) + if(bonus) + mutations_temp += bonus if(!LAZYLEN(mutations_temp)) return mutation_index.Cut() diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/ice_demon.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/ice_demon.dm index 7b9abd2b13..d0002943f5 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/ice_demon.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/ice_demon.dm @@ -55,8 +55,9 @@ if(isclosedturf(T)) continue possible_ends |= T - var/turf/end = pick(possible_ends) - do_teleport(src, end, 0, channel=TELEPORT_CHANNEL_BLUESPACE, forced = TRUE) + if(!length(possible_ends)) + var/turf/end = pick(possible_ends) + do_teleport(src, end, 0, channel=TELEPORT_CHANNEL_BLUESPACE, forced = TRUE) SLEEP_CHECK_DEATH(8) return ..() diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/mining_mobs.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/mining_mobs.dm index 71c6d61d5d..6ad869afe6 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/mining_mobs.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/mining_mobs.dm @@ -63,7 +63,7 @@ ..(gibbed) /mob/living/simple_animal/hostile/asteroid/proc/spawn_crusher_loot() - butcher_results[crusher_loot] = 1 + LAZYSET(butcher_results, crusher_loot, 1) /mob/living/simple_animal/hostile/asteroid/handle_temperature_damage() if(bodytemperature < minbodytemp) From 9b68a036af04665332ca5528e4199d3a03f9df5d Mon Sep 17 00:00:00 2001 From: Ghom <42542238+Ghommie@users.noreply.github.com> Date: Sun, 10 May 2020 23:53:37 +0200 Subject: [PATCH 2/4] Update ice_demon.dm --- .../mob/living/simple_animal/hostile/mining_mobs/ice_demon.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/ice_demon.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/ice_demon.dm index d0002943f5..88ee27fcc9 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/ice_demon.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/ice_demon.dm @@ -55,7 +55,7 @@ if(isclosedturf(T)) continue possible_ends |= T - if(!length(possible_ends)) + if(length(possible_ends)) var/turf/end = pick(possible_ends) do_teleport(src, end, 0, channel=TELEPORT_CHANNEL_BLUESPACE, forced = TRUE) SLEEP_CHECK_DEATH(8) From a3e60364afca86779f4c38227d74391e3d1133a5 Mon Sep 17 00:00:00 2001 From: Ghom <42542238+Ghommie@users.noreply.github.com> Date: Mon, 11 May 2020 00:35:28 +0200 Subject: [PATCH 3/4] Update craft.dm --- code/datums/components/crafting/craft.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/components/crafting/craft.dm b/code/datums/components/crafting/craft.dm index 485298b4a6..b99cba5f41 100644 --- a/code/datums/components/crafting/craft.dm +++ b/code/datums/components/crafting/craft.dm @@ -211,7 +211,7 @@ var/total_items = 0 for(var/obj/item/reagent_containers/ingredient in parts) total_items += 1 - total_quality += food_ingredient.food_quality + total_quality += ingredient.food_quality if(total_items == 0) food_result.adjust_food_quality(50) else From 615db74a464d2ee0e28ced6a60ec600690a649ca Mon Sep 17 00:00:00 2001 From: Ghom <42542238+Ghommie@users.noreply.github.com> Date: Mon, 11 May 2020 00:51:49 +0200 Subject: [PATCH 4/4] THIS TIME FOR REAL! --- code/datums/components/crafting/craft.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/components/crafting/craft.dm b/code/datums/components/crafting/craft.dm index b99cba5f41..3283c514b8 100644 --- a/code/datums/components/crafting/craft.dm +++ b/code/datums/components/crafting/craft.dm @@ -209,7 +209,7 @@ var/obj/item/reagent_containers/food/food_result = I var/total_quality = 0 var/total_items = 0 - for(var/obj/item/reagent_containers/ingredient in parts) + for(var/obj/item/reagent_containers/food/ingredient in parts) total_items += 1 total_quality += ingredient.food_quality if(total_items == 0)