Merge pull request #3218 from Citadel-Station-13/upstream-merge-31306

[MIRROR] Fixes being able to sell camera mobs to CentCom
This commit is contained in:
LetterJay
2017-10-08 16:20:11 -04:00
committed by GitHub
4 changed files with 5 additions and 3 deletions
+2
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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()
+1 -1
View File
@@ -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)