From 39ed2b704294091d94203b16b28fb1bf8b9fe92f Mon Sep 17 00:00:00 2001 From: Ccomp5950 Date: Tue, 19 Nov 2013 00:49:55 -0600 Subject: [PATCH] Fixed the bug with supply not sending supermatter if only one crate (it was deleting it instead of deleting the process...odd) Also fixed a bug where if the supermatter is ordered off the supply shuttle it wouldn't produce power (process was deleted while in crate) supplypacks.dm is just a spelling fix. --- code/WorkInProgress/Yinadele/Supermatter.dm | 7 +++++-- code/datums/supplypacks.dm | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/code/WorkInProgress/Yinadele/Supermatter.dm b/code/WorkInProgress/Yinadele/Supermatter.dm index 34ec532a50..39759ff494 100644 --- a/code/WorkInProgress/Yinadele/Supermatter.dm +++ b/code/WorkInProgress/Yinadele/Supermatter.dm @@ -85,8 +85,11 @@ var/turf/L = loc - if(!istype(L)) //If we are not on a turf, uh oh. - del src + if(isnull(L)) // We have a null turf...something is wrong, stop processing this entity. + return PROCESS_KILL + + if(!istype(L)) //We are in a crate or somewhere that isn't turf, if we return to turf resume processing but for now. + return //Yeah just stop. //Ok, get the air from the turf var/datum/gas_mixture/env = L.return_air() diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index a67da99e55..9b1ccf64b0 100755 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -958,7 +958,7 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee contains = list(/obj/machinery/power/supermatter) cost = 50 containertype = /obj/structure/closet/crate/secure/plasma - containername = "Supermatter crate (CAUTIION)" + containername = "Supermatter crate (CAUTION)" group = "Engineering" access = access_ce @@ -968,7 +968,7 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee contains = list(/obj/machinery/power/supermatter/shard) cost = 25 containertype = /obj/structure/closet/crate/secure/plasma - containername = "Supermatter shard crate (CAUTIION)" + containername = "Supermatter shard crate (CAUTION)" access = access_ce group = "Engineering" */