shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #12205 from Ghommie/Ghommie-cit741

Browse Source 
A few runtimes, fixed.
This commit is contained in:
kevinz000
2020-05-12 12:27:45 -07:00
committed by GitHub
parent afbbde610a 615db74a46
commit 40d2d35ffa
4 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/datums/components/crafting/craft.dm
View File

@@ -209,10 +209,9 @@
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/food/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

7
code/datums/dna.dm
View File

@@ -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()

5
code/modules/mob/living/simple_animal/hostile/mining_mobs/ice_demon.dm
View File

@@ -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 ..()

2
code/modules/mob/living/simple_animal/hostile/mining_mobs/mining_mobs.dm
View File

@@ -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)