From 62f72163c70823da10f992f22fa3945dbf7ddc8a Mon Sep 17 00:00:00 2001 From: Tigercat2000 Date: Thu, 26 Mar 2015 19:00:25 +0100 Subject: [PATCH] Compileerrorfix, update items.dmi --- code/game/objects/items/blueprints.dm | 3 ++- icons/obj/items.dmi | Bin 82096 -> 82496 bytes 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/blueprints.dm b/code/game/objects/items/blueprints.dm index 514ac336ea7..2fc52a71ef2 100644 --- a/code/game/objects/items/blueprints.dm +++ b/code/game/objects/items/blueprints.dm @@ -107,7 +107,7 @@ /obj/item/areaeditor/proc/get_area_type(var/area/A = get_area()) - if (istype(A,/area/space)) + if (A.name == "Space") return AREA_SPACE var/list/SPECIALS = list( /area/shuttle, @@ -119,6 +119,7 @@ /area/syndicate_station, /area/wizard_station, /area/prison + // /area/derelict //commented out, all hail derelict-rebuilders! ) for (var/type in SPECIALS) if ( istype(A,type) ) diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi index f4b435f9ed181ceaea0602b0a26e7e60d9d8c52f..18b76b545582fb09b8f5e41daf03c0610f4fe92b 100644 GIT binary patch delta 4972 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 a*e_)JNhtFRbGaBmSbM6hrBtP05%NE+qt9;u