From 382cb28b15e716a67c95bfdb383f4e095f7029ae Mon Sep 17 00:00:00 2001 From: Elizabeth Lavenza Date: Sat, 30 Mar 2024 21:12:48 -0400 Subject: [PATCH] Fix a number of reported runtimes --- _maps/layeniastation.json | 2 +- code/datums/elements/photosynthesis.dm | 5 +++-- code/modules/mob/living/carbon/carbon.dm | 2 +- code/modules/recycling/disposal/holder.dm | 3 ++- code/modules/surgery/bodyparts/_bodyparts.dm | 1 - 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/_maps/layeniastation.json b/_maps/layeniastation.json index 8b1ea69047..99a22bbf66 100644 --- a/_maps/layeniastation.json +++ b/_maps/layeniastation.json @@ -12,7 +12,7 @@ "traits": [ { "Up": 1, - "Baseturf": "/area/space", + "Baseturf": "/turf/space", "Linkage": "Cross" }, { diff --git a/code/datums/elements/photosynthesis.dm b/code/datums/elements/photosynthesis.dm index a88a5d108c..1efe1d3597 100644 --- a/code/datums/elements/photosynthesis.dm +++ b/code/datums/elements/photosynthesis.dm @@ -49,8 +49,9 @@ return ..() /datum/element/photosynthesis/process() - for(var/A in attached_atoms) - var/atom/movable/AM = A + for(var/atom/movable/AM as anything in attached_atoms) + if(isnull(AM)) + continue var/light_amount = 0 //how much light there is in the place, affects receiving nutrition and healing if(isturf(AM.loc)) //else, there's considered to be no light var/turf/T = AM.loc diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index a8f43a5159..4e191b0819 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -103,7 +103,7 @@ . = ..() var/hurt = TRUE var/extra_speed = 0 - if(throwingdatum.thrower != src) + if(throwingdatum?.thrower != src) extra_speed = min(max(0, throwingdatum.speed - initial(throw_speed)), 3) if(GetComponent(/datum/component/tackler)) return diff --git a/code/modules/recycling/disposal/holder.dm b/code/modules/recycling/disposal/holder.dm index bce1b3d98d..4c6e79f6a2 100644 --- a/code/modules/recycling/disposal/holder.dm +++ b/code/modules/recycling/disposal/holder.dm @@ -22,7 +22,8 @@ // initialize a holder from the contents of a disposal unit /obj/structure/disposalholder/proc/init(obj/machinery/disposal/D) - gas = D.air_contents// transfer gas resv. into holder object + if(istype(D)) // This is sometimes called on non-machinery disposals system types. + gas = D.air_contents// transfer gas resv. into holder object //Check for any living mobs trigger hasmob. //hasmob effects whether the package goes to cargo or its tagged destination. diff --git a/code/modules/surgery/bodyparts/_bodyparts.dm b/code/modules/surgery/bodyparts/_bodyparts.dm index fc165c4fb0..17ab237b9f 100644 --- a/code/modules/surgery/bodyparts/_bodyparts.dm +++ b/code/modules/surgery/bodyparts/_bodyparts.dm @@ -636,7 +636,6 @@ /obj/item/bodypart/proc/update_limb(dropping_limb, mob/living/carbon/source) body_markings_list = list() var/mob/living/carbon/C - owner.create_weakref() if(source) C = source if(!original_owner)