From 045d4dca2dbc125d0be1dff47b0bc3ccc65449b6 Mon Sep 17 00:00:00 2001 From: ShizCalev Date: Sat, 7 Oct 2017 20:12:53 -0400 Subject: [PATCH] Fixes being able to sell camera mobs to CentCom (#31306) * Fixes being able to sell camera mobs to CENTCOM * Did it Ninja's way. --- code/__DEFINES/is_helpers.dm | 2 ++ code/__HELPERS/unsorted.dm | 2 +- code/modules/holodeck/area_copy.dm | 2 +- code/modules/shuttle/supply.dm | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm index a77e26d5415..af9003398eb 100644 --- a/code/__DEFINES/is_helpers.dm +++ b/code/__DEFINES/is_helpers.dm @@ -131,6 +131,8 @@ #define isovermind(A) (istype(A, /mob/camera/blob)) +#define iscameramob(A) (istype(A, /mob/camera)) + //Objects #define isobj(A) istype(A, /obj) //override the byond proc because it returns true on children of /atom/movable that aren't objs diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm index 93741f43b2c..de9f4e1d1c8 100644 --- a/code/__HELPERS/unsorted.dm +++ b/code/__HELPERS/unsorted.dm @@ -290,7 +290,7 @@ Turf and target are separate in case you want to teleport some distance from a t var/list/pois = list() for(var/mob/M in mobs) if(skip_mindless && (!M.mind && !M.ckey)) - if(!isbot(M) && !istype(M, /mob/camera) && !ismegafauna(M)) + if(!isbot(M) && !iscameramob(M) && !ismegafauna(M)) continue if(M.client && M.client.holder && M.client.holder.fakekey) //stealthmins continue diff --git a/code/modules/holodeck/area_copy.dm b/code/modules/holodeck/area_copy.dm index b199d4ad923..bc2c92e3fb5 100644 --- a/code/modules/holodeck/area_copy.dm +++ b/code/modules/holodeck/area_copy.dm @@ -104,7 +104,7 @@ GLOBAL_LIST_INIT(duplicate_forbidden_vars,list("tag","area","type","loc","locs", copiedobjs += O2.GetAllContents() for(var/mob/M in T) - if(istype(M, /mob/camera)) + if(iscameramob(M)) continue // If we need to check for more mobs, I'll add a variable var/mob/SM = DuplicateObject(M , perfectcopy=TRUE, newloc = B, holoitem=TRUE) copiedobjs += SM.GetAllContents() diff --git a/code/modules/shuttle/supply.dm b/code/modules/shuttle/supply.dm index 56c7b85410a..7e1dee155dd 100644 --- a/code/modules/shuttle/supply.dm +++ b/code/modules/shuttle/supply.dm @@ -120,7 +120,7 @@ GLOBAL_LIST_INIT(blacklisted_cargo_types, typecacheof(list( for(var/place in shuttle_areas) var/area/shuttle/shuttle_area = place for(var/atom/movable/AM in shuttle_area) - if(AM.anchored) + if(AM.anchored || iscameramob(AM)) continue sold_atoms += export_item_and_contents(AM, contraband, emagged, dry_run = FALSE)