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
@@ -136,11 +136,11 @@
|
||||
to_chat(user, span_danger("The gibber is locked and running, wait for it to finish."))
|
||||
return
|
||||
|
||||
if(!(istype(victim, /mob/living/carbon)) && !(istype(victim, /mob/living/simple_mob)) )
|
||||
if(!(iscarbon(victim)) && !(isanimal(victim)) )
|
||||
to_chat(user, span_danger("This is not suitable for the gibber!"))
|
||||
return
|
||||
|
||||
if(istype(victim,/mob/living/carbon/human) && !emagged)
|
||||
if(ishuman(victim) && !emagged)
|
||||
to_chat(user, span_danger("The gibber safety guard is engaged!"))
|
||||
return
|
||||
|
||||
@@ -204,7 +204,7 @@
|
||||
|
||||
var/list/byproducts = occupant?.butchery_loot?.Copy()
|
||||
|
||||
if(istype(src.occupant,/mob/living/carbon/human))
|
||||
if(ishuman(src.occupant))
|
||||
var/mob/living/carbon/human/H = occupant
|
||||
slab_name = src.occupant.real_name
|
||||
slab_type = H.isSynthetic() ? /obj/item/stack/material/steel : H.species.meat_type
|
||||
|
||||
Reference in New Issue
Block a user