From 159a12bc648c70f6b9d2c725e6f1427291a5e2c9 Mon Sep 17 00:00:00 2001 From: Krausus Date: Tue, 12 May 2015 03:37:37 -0400 Subject: [PATCH] Fixes mech and pod fabricators I have no idea how this code ever worked in the past. --- code/game/area/areas.dm | 10 ---------- code/game/mecha/mech_fabricator.dm | 3 ++- code/game/vehicles/spacepods/pod_fabricator.dm | 3 ++- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index 5c0f20f3cd9..b6ecfad7baf 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -1,15 +1,5 @@ // Areas.dm -// Added to fix mech fabs 05/2013 ~Sayu -// This is necessary due to lighting subareas. If you were to go in assuming that things in -// the same logical /area have the parent /area object... well, you would be mistaken. If you -// want to find machines, mobs, etc, in the same logical area, you will need to check all the -// related areas. This returns a master contents list to assist in that. -/proc/area_contents(var/area/A) - if(!istype(A)) return null - var/list/contents = list() - return contents - // === /area var/global/global_uid = 0 diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm index b463106b593..04eb680bc8e 100644 --- a/code/game/mecha/mech_fabricator.dm +++ b/code/game/mecha/mech_fabricator.dm @@ -280,8 +280,9 @@ temp = "Updating local R&D database..." updateUsrDialog() sleep(30) //only sleep if called by user + var/area/localarea = get_area(src) - for(var/obj/machinery/computer/rdconsole/RDC in area_contents(get_area(src))) + for(var/obj/machinery/computer/rdconsole/RDC in localarea.contents) if(!RDC.sync) continue for(var/datum/tech/T in RDC.files.known_tech) diff --git a/code/game/vehicles/spacepods/pod_fabricator.dm b/code/game/vehicles/spacepods/pod_fabricator.dm index 010008e3c54..8fa79baaa27 100644 --- a/code/game/vehicles/spacepods/pod_fabricator.dm +++ b/code/game/vehicles/spacepods/pod_fabricator.dm @@ -291,8 +291,9 @@ temp = "Updating local R&D database..." updateUsrDialog() sleep(30) //only sleep if called by user + var/area/localarea = get_area(src) - for(var/obj/machinery/computer/rdconsole/RDC in area_contents(get_area(src))) + for(var/obj/machinery/computer/rdconsole/RDC in localarea.contents) if(!RDC.sync) continue for(var/datum/tech/T in RDC.files.known_tech)