cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +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

8
code/game/objects/structures/crates_lockers/__closets.dm
View File

@@ -53,7 +53,7 @@
starts_with = null
if(!opened) // if closed, any item at the crate's loc is put in the contents
if(istype(loc, /mob/living)) return
if(isliving(loc)) return
var/obj/item/I
for(I in loc)
if(I.density || I.anchored || I == src) continue
@@ -554,7 +554,7 @@
set category = "Object"
set name = "Devour Occupants" //ChompEDIT vore as a verb is cronge
if(!istype(usr, /mob/living)) //no ghosts
if(!isliving(usr)) //no ghosts
return
if(!(usr in src.contents))
@@ -564,7 +564,7 @@
var/list/targets = list() //IF IT IS NOT BROKEN. DO NOT FIX IT.
for(var/mob/living/L in src.contents)
if(!istype(L, /mob/living)) //Don't eat anything that isn't mob/living. Failsafe.
if(!isliving(L)) //Don't eat anything that isn't mob/living. Failsafe.
continue
if(L == usr) //no eating yourself. 1984.
continue
@@ -580,7 +580,7 @@
if(!target)
return
if(!istype(target, /mob/living)) //Safety.
if(!isliving(target)) //Safety.
to_chat(src, span_warning("You need to select a living target!"))
return

2
code/game/objects/structures/crates_lockers/closets/walllocker.dm
View File

@@ -31,7 +31,7 @@
return
/obj/structure/closet/walllocker/emerglocker/attack_hand(mob/user as mob)
if (istype(user, /mob/living/silicon/ai)) //Added by Strumpetplaya - AI shouldn't be able to
if (isAI(user)) //Added by Strumpetplaya - AI shouldn't be able to
return //activate emergency lockers. This fixes that. (Does this make sense, the AI can't call attack_hand, can it? --Mloc)
if(!amount)
to_chat(user, "<spawn class='notice'>It's empty..")