cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-28 06:28:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

some istype to macros (#16826)

Browse Source
This commit is contained in:
Kashargul
2025-01-06 06:45:02 +10:00
committed by GitHub
parent c2c248d3b9
commit 59b9802628
409 changed files with 760 additions and 763 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/_modifiers/cloning.dm
+1 -1
View File
@@ -95,7 +95,7 @@
/datum/modifier/franken_sickness/tick()
if(holder.stat != DEAD)
if(istype(holder, /mob/living/carbon/human))
if(ishuman(holder))
var/mob/living/carbon/human/F = holder
if(F.can_defib)
F.can_defib = 0
code/modules/mob/_modifiers/traits_phobias.dm
+3 -3
View File
@@ -125,7 +125,7 @@
if(L.alpha <= FAKE_INVIS_ALPHA_THRESHOLD) // Can't fear something you can't (easily) see.
continue
if(istype(thing, /mob/living/carbon/human))
if(ishuman(thing))
var/mob/living/carbon/human/H = thing
var/self_multiplier = H == holder ? 2 : 1
var/human_blood_fear_amount = 0
@@ -456,7 +456,7 @@
else
fear_amount += 10 // It's huge and feral.
if(istype(L, /mob/living/carbon/human))
if(ishuman(L))
var/mob/living/carbon/human/S = L
if(istype(S.species, /datum/species/skrell)) //Skrell ARE slimey.
fear_amount += 1
@@ -547,7 +547,7 @@
var/mob/living/L = thing
if(L.alpha <= FAKE_INVIS_ALPHA_THRESHOLD) // Can't fear something you can't (easily) see.
continue
if(istype(L, /mob/living/carbon/human))
if(ishuman(L))
var/mob/living/carbon/human/H = L
if(H.l_hand && istype(H.l_hand, /obj/item/reagent_containers/syringe) || H.r_hand && istype(H.r_hand, /obj/item/reagent_containers/syringe))
fear_amount += 10