cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] some istype to macros (#9802)

Browse Source 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-01-05 15:01:49 -07:00
committed by GitHub
parent 73486c399b
commit ed79946ade
409 changed files with 750 additions and 751 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/awaymissions/gateway.dm
View File

@@ -156,7 +156,7 @@ GLOBAL_DATUM(gateway_station, /obj/machinery/gateway/centerstation)
if(istype(M, /obj/item/uav))
var/obj/item/uav/L = M
L.power_down()
if(istype(M, /mob/living))
if(isliving(M))
var/mob/living/L = M
if(LAZYLEN(L.buckled_mobs))
var/datum/riding/R = L.riding_datum
@@ -175,7 +175,7 @@ GLOBAL_DATUM(gateway_station, /obj/machinery/gateway/centerstation)
//VOREStation Addition End: Mcguffin time!
//VOREStation Addition Start: Abduction!
if(istype(M, /mob/living) && dest.abductor)
if(isliving(M) && dest.abductor)
var/mob/living/L = M
if(L.nutrition > 500)
L.nutrition = 500 //If the aim is to negate people overpreparing, then they shouldn't be able to stuff themselves full of food either.

4
code/modules/awaymissions/redgate.dm
View File

@@ -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)