mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-24 13:47:33 +01:00
[MIRROR] some istype to macros (#9802)
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
co-authored by
Kashargul
parent
73486c399b
commit
ed79946ade
@@ -270,7 +270,7 @@ var/const/CE_STABLE_THRESHOLD = 0.5
|
||||
B.data["blood_type"] = copytext(src.dna.b_type,1,0)
|
||||
|
||||
// Putting this here due to return shenanigans.
|
||||
if(istype(src,/mob/living/carbon/human))
|
||||
if(ishuman(src))
|
||||
var/mob/living/carbon/human/H = src
|
||||
B.data["blood_colour"] = H.species.get_blood_colour(H)
|
||||
B.color = B.data["blood_colour"]
|
||||
@@ -400,7 +400,7 @@ var/const/CE_STABLE_THRESHOLD = 0.5
|
||||
var/turf/T = get_turf(target)
|
||||
var/synth = 0
|
||||
|
||||
if(istype(source,/mob/living/carbon/human))
|
||||
if(ishuman(source))
|
||||
var/mob/living/carbon/human/M = source
|
||||
if(M.isSynthetic()) synth = 1
|
||||
source = M.get_blood(M.vessel)
|
||||
|
||||
@@ -144,7 +144,7 @@
|
||||
else
|
||||
return
|
||||
|
||||
if(istype(owner, /mob/living/carbon/human))
|
||||
if(ishuman(owner))
|
||||
var/mob/living/carbon/human/H = owner
|
||||
H.add_modifier(/datum/modifier/melee_surge, 0.75 MINUTES)
|
||||
|
||||
|
||||
@@ -98,6 +98,6 @@
|
||||
else
|
||||
return
|
||||
|
||||
if(istype(owner, /mob/living/carbon/human))
|
||||
if(ishuman(owner))
|
||||
var/mob/living/carbon/human/H = owner
|
||||
H.add_modifier(/datum/modifier/sprinting, 1 MINUTES)
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
create_reagents(30)
|
||||
|
||||
/obj/item/organ/internal/stomach/handle_organ_proc_special()
|
||||
if(owner && istype(owner, /mob/living/carbon/human))
|
||||
if(owner && ishuman(owner))
|
||||
if(reagents)
|
||||
if(reagents.total_volume + 2 < max_acid_volume && prob(20))
|
||||
reagents.add_reagent(acidtype, rand(1,2))
|
||||
|
||||
@@ -168,7 +168,7 @@
|
||||
|
||||
/obj/item/organ/external/examine()
|
||||
. = ..()
|
||||
if(in_range(usr, src) || istype(usr, /mob/observer/dead))
|
||||
if(in_range(usr, src) || isobserver(usr))
|
||||
for(var/obj/item/I in contents)
|
||||
if(istype(I, /obj/item/organ))
|
||||
continue
|
||||
@@ -845,7 +845,7 @@ Note that amputating the affected organ does in fact remove the infection from t
|
||||
var/clamped = 0
|
||||
|
||||
var/mob/living/carbon/human/H
|
||||
if(istype(owner,/mob/living/carbon/human))
|
||||
if(ishuman(owner))
|
||||
H = owner
|
||||
|
||||
//update damage counts
|
||||
|
||||
@@ -72,7 +72,7 @@
|
||||
if(dam > maxdam && (maxdam == 0 || prob(70)) )
|
||||
damaged_organ = E
|
||||
maxdam = dam
|
||||
if(istype(src, /mob/living/carbon/human)) //VOREStation Edit Start
|
||||
if(ishuman(src)) //VOREStation Edit Start
|
||||
var/mob/living/carbon/human/H = src
|
||||
maxdam *= H.species.trauma_mod //VOREStation edit end
|
||||
if(damaged_organ && chem_effects[CE_PAINKILLER] < maxdam)
|
||||
|
||||
Reference in New Issue
Block a user