cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +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/gamemodes/objective.dm
View File

@@ -142,7 +142,7 @@ var/global/list/all_objectives = list()
return target
/datum/objective/anti_revolution/demote/check_completion()
if(target && target.current && istype(target,/mob/living/carbon/human))
if(target && target.current && ishuman(target))
var/obj/item/card/id/I = target.current:wear_id
if(istype(I, /obj/item/pda))
var/obj/item/pda/P = I
@@ -389,7 +389,7 @@ var/global/list/all_objectives = list()
if(already_completed)
return 1
if(target && target.current && istype(target.current, /mob/living/carbon/human))
if(target && target.current && ishuman(target.current))
if(target.current.stat == DEAD)
return 0
@@ -518,7 +518,7 @@ var/global/list/all_objectives = list()
for(var/obj/item/aicard/C in all_items) //Check for ai card
for(var/mob/living/silicon/ai/M in C)
if(istype(M, /mob/living/silicon/ai) && M.stat != 2) //See if any AI's are alive inside that card.
if(isAI(M) && M.stat != 2) //See if any AI's are alive inside that card.
return 1
for(var/mob/living/silicon/ai/ai in mob_list)
@@ -558,7 +558,7 @@ var/global/list/all_objectives = list()
var/current_amount
var/obj/item/rig/S
if(istype(owner.current,/mob/living/carbon/human))
if(ishuman(owner.current))
var/mob/living/carbon/human/H = owner.current
S = H.back