From 4d163d29bf1fdc668a2f04cb72dae36cf0de7559 Mon Sep 17 00:00:00 2001
From: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Sat, 12 Sep 2020 03:09:44 +0200
Subject: [PATCH] [MIRROR] fixes xenobio camera runtimes (#767)
* fixes xenobio camera runtimes (#53618)
code was trying to bitwise & with an area instance instead of the flags of said instance
* fixes xenobio camera runtimes
Co-authored-by: silicons <2003111+silicons@users.noreply.github.com>
---
code/modules/research/xenobiology/xenobio_camera.dm | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/code/modules/research/xenobiology/xenobio_camera.dm b/code/modules/research/xenobiology/xenobio_camera.dm
index c54540d24a2..3586beefdc3 100644
--- a/code/modules/research/xenobiology/xenobio_camera.dm
+++ b/code/modules/research/xenobiology/xenobio_camera.dm
@@ -397,7 +397,7 @@
var/mob/living/C = user
var/mob/camera/ai_eye/remote/xenobio/E = C.remote_control
var/area/mobarea = get_area(S.loc)
- if(mobarea.name == E.allowed_area || (mobarea & XENOBIOLOGY_COMPATIBLE))
+ if(mobarea.name == E.allowed_area || (mobarea.area_flags & XENOBIOLOGY_COMPATIBLE))
slime_scan(S, C)
//Feeds a potion to slime
@@ -412,7 +412,7 @@
if(QDELETED(X.current_potion))
to_chat(C, "No potion loaded.")
return
- if(mobarea.name == E.allowed_area ||(mobarea & XENOBIOLOGY_COMPATIBLE))
+ if(mobarea.name == E.allowed_area || (mobarea.area_flags & XENOBIOLOGY_COMPATIBLE))
X.current_potion.attack(S, C)
//Picks up slime
@@ -424,7 +424,7 @@
var/mob/camera/ai_eye/remote/xenobio/E = C.remote_control
var/obj/machinery/computer/camera_advanced/xenobio/X = E.origin
var/area/mobarea = get_area(S.loc)
- if(mobarea.name == E.allowed_area || (mobarea & XENOBIOLOGY_COMPATIBLE))
+ if(mobarea.name == E.allowed_area || (mobarea.area_flags & XENOBIOLOGY_COMPATIBLE))
if(X.stored_slimes.len >= X.max_slimes)
to_chat(C, "Slime storage is full.")
return
@@ -446,7 +446,7 @@
var/mob/camera/ai_eye/remote/xenobio/E = C.remote_control
var/obj/machinery/computer/camera_advanced/xenobio/X = E.origin
var/area/turfarea = get_area(T)
- if(turfarea.name == E.allowed_area || (turfarea & XENOBIOLOGY_COMPATIBLE))
+ if(turfarea.name == E.allowed_area || (turfarea.area_flags & XENOBIOLOGY_COMPATIBLE))
for(var/mob/living/simple_animal/slime/S in X.stored_slimes)
S.forceMove(T)
S.visible_message("[S] warps in!")
@@ -461,7 +461,7 @@
var/mob/camera/ai_eye/remote/xenobio/E = C.remote_control
var/obj/machinery/computer/camera_advanced/xenobio/X = E.origin
var/area/turfarea = get_area(T)
- if(turfarea.name == E.allowed_area || (turfarea & XENOBIOLOGY_COMPATIBLE))
+ if(turfarea.name == E.allowed_area || (turfarea.area_flags & XENOBIOLOGY_COMPATIBLE))
if(X.monkeys >= 1)
var/mob/living/carbon/monkey/food = new /mob/living/carbon/monkey(T, TRUE, C)
if (!QDELETED(food))
@@ -484,7 +484,7 @@
if(!X.connected_recycler)
to_chat(C, "There is no connected monkey recycler. Use a multitool to link one.")
return
- if(mobarea.name == E.allowed_area || (mobarea & XENOBIOLOGY_COMPATIBLE))
+ if(mobarea.name == E.allowed_area || (mobarea.area_flags & XENOBIOLOGY_COMPATIBLE))
if(!M.stat)
return
M.visible_message("[M] vanishes as [p_theyre()] reclaimed for recycling!")