diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm index 1de917d5e1..c3da908ee1 100644 --- a/code/__DEFINES/is_helpers.dm +++ b/code/__DEFINES/is_helpers.dm @@ -133,6 +133,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 5e190ab709..6c7bb0cda6 100644 --- a/code/__HELPERS/unsorted.dm +++ b/code/__HELPERS/unsorted.dm @@ -289,7 +289,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 9da772eaee..295441b04e 100644 --- a/code/modules/holodeck/area_copy.dm +++ b/code/modules/holodeck/area_copy.dm @@ -103,7 +103,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 56c7b85410..7e1dee155d 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)