From 58baf8a48742180d86d4ba1f9a7bc3ababcc3838 Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Sat, 2 Dec 2017 20:08:30 -0500 Subject: [PATCH] Slime Blueprint Change --- code/game/area/Space Station 13 areas.dm | 2 ++ code/modules/research/xenobiology/xenobio_camera.dm | 2 +- code/modules/research/xenobiology/xenobiology.dm | 12 ++++++------ 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/code/game/area/Space Station 13 areas.dm b/code/game/area/Space Station 13 areas.dm index 1f02aaf121a..72c0d0444ed 100644 --- a/code/game/area/Space Station 13 areas.dm +++ b/code/game/area/Space Station 13 areas.dm @@ -61,6 +61,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station var/no_teleportlocs = 0 var/outdoors = 0 //For space, the asteroid, lavaland, etc. Used with blueprints to determine if we are adding a new area (vs editing a station room) + var/xenobiology_compatible = FALSE //Can the Xenobio management console transverse this area by default? /*Adding a wizard area teleport list because motherfucking lag -- Urist*/ /*I am far too lazy to make it a proper list of areas so I'll just make it run the usual telepot routine at the start of the game*/ @@ -1868,6 +1869,7 @@ area/security/podbay /area/toxins/xenobiology name = "\improper Xenobiology Lab" icon_state = "toxmix" + xenobiology_compatible = TRUE /area/toxins/xenobiology/xenoflora_storage name = "\improper Xenoflora Storage" diff --git a/code/modules/research/xenobiology/xenobio_camera.dm b/code/modules/research/xenobiology/xenobio_camera.dm index 40f20ea4dde..a001d5e7cd6 100644 --- a/code/modules/research/xenobiology/xenobio_camera.dm +++ b/code/modules/research/xenobiology/xenobio_camera.dm @@ -12,7 +12,7 @@ /mob/camera/aiEye/remote/xenobio/setLoc(t) var/area/new_area = get_area(t) - if(new_area && new_area.name == allowed_area || istype(new_area, /area/toxins/xenobiology )) + if(new_area && new_area.name == allowed_area || new_area && new_area.xenobiology_compatible) return ..() else return diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm index c3a0c1a030a..093ed6c69ea 100644 --- a/code/modules/research/xenobiology/xenobiology.dm +++ b/code/modules/research/xenobiology/xenobiology.dm @@ -589,16 +589,16 @@ /obj/item/areaeditor/blueprints/slime name = "cerulean prints" - desc = "A one use set of blueprints made of jelly like organic material. Renaming an area to 'Xenobiology Lab' will extend the reach of the management console." + desc = "A one use set of blueprints made of jelly like organic material. Extends the reach of the management console." color = "#2956B2" /obj/item/areaeditor/blueprints/slime/edit_area() - . = ..() + ..() var/area/A = get_area(src) - if(.) - for(var/turf/T in A) - T.color = "#2956B2" - qdel(src) + for(var/turf/T in A) + T.color = "#2956B2" + A.xenobiology_compatible = TRUE + qdel(src) /turf/simulated/floor/sepia slowdown = 2