mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 10:43:20 +00:00
[MIRROR] some istype to macros (#9802)
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
73486c399b
commit
ed79946ade
@@ -30,7 +30,7 @@
|
||||
|
||||
/obj/structure/redgate/proc/teleport(var/mob/M as mob)
|
||||
var/keycheck = TRUE
|
||||
if (!istype(M,/mob/living)) //We only want mob/living, no bullets or mechs or AI eyes or items
|
||||
if (!isliving(M)) //We only want mob/living, no bullets or mechs or AI eyes or items
|
||||
if(is_type_in_list(M, exceptions))
|
||||
keycheck = FALSE //we'll allow it
|
||||
else
|
||||
@@ -54,7 +54,7 @@
|
||||
var/turf/ourturf = find_our_turf(M) //Find the turf on the opposite side of the target
|
||||
if(!ourturf.check_density(TRUE,TRUE)) //Make sure there isn't a wall there
|
||||
M.unbuckle_all_mobs(TRUE)
|
||||
if(istype(M,/mob/living) && M.pulling)
|
||||
if(isliving(M) && M.pulling)
|
||||
var/atom/movable/pulled = M.pulling
|
||||
M.stop_pulling()
|
||||
playsound(src,'sound/effects/ominous-hum-2.ogg', 100,1)
|
||||
|
||||
Reference in New Issue
Block a user