From 4f50c50452c78ac130a2ad51fe504870b03d0e8f Mon Sep 17 00:00:00 2001 From: Atermonera Date: Wed, 1 Apr 2020 19:38:28 -0700 Subject: [PATCH 1/2] Merge pull request #6928 from VOREStation/pol-runtimes Fix 2 runtimes --- code/modules/hydroponics/seed.dm | 6 +++--- code/modules/mob/mob.dm | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/code/modules/hydroponics/seed.dm b/code/modules/hydroponics/seed.dm index 06d8a36dac4..775fc13dfe8 100644 --- a/code/modules/hydroponics/seed.dm +++ b/code/modules/hydroponics/seed.dm @@ -695,11 +695,11 @@ for(var/gas in exude_gasses) exude_gasses[gas] = max(1,round(exude_gasses[gas]*0.8)) - set_trait(TRAIT_BENEFICIAL_REAG, gene.values["[TRAIT_BENEFICIAL_REAG]"].Copy()) + set_trait(TRAIT_BENEFICIAL_REAG, gene.values["[TRAIT_BENEFICIAL_REAG]"]?.Copy() || list()) - set_trait(TRAIT_MUTAGENIC_REAG, gene.values["[TRAIT_MUTAGENIC_REAG]"].Copy()) + set_trait(TRAIT_MUTAGENIC_REAG, gene.values["[TRAIT_MUTAGENIC_REAG]"]?.Copy() || list()) - set_trait(TRAIT_TOXIC_REAG, gene.values["[TRAIT_TOXIC_REAG]"].Copy()) + set_trait(TRAIT_TOXIC_REAG, gene.values["[TRAIT_TOXIC_REAG]"]?.Copy() || list()) gene.values["[TRAIT_EXUDE_GASSES]"] = null gene.values["[TRAIT_CHEMS]"] = null diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index c226d6748c7..4fabf8973d7 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -231,6 +231,10 @@ if((is_blind(src) || usr.stat) && !isobserver(src)) to_chat(src, "Something is there but you can't see it.") return 1 + + //Could be gone by the time they finally pick something + if(!A) + return 1 face_atom(A) A.examine(src)