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

2
code/modules/blob2/overmind/types/reactive_spines.dm
View File

@@ -38,7 +38,7 @@
var/atom/movable/A = extra_data[1]
if(istype(A, /mob/living) && world.time > (B.last_passive_use + B.passive_ability_cooldown) && B.should_tick)
if(isliving(A) && world.time > (B.last_passive_use + B.passive_ability_cooldown) && B.should_tick)
B.last_passive_use = world.time
var/mob/living/L = A

2
code/modules/blob2/overmind/types/volatile_alluvium.dm
View File

@@ -29,7 +29,7 @@
chunk_active_ability_cooldown = 2 MINUTES
/datum/blob_type/volatile_alluvium/on_received_damage(var/obj/structure/blob/B, damage, damage_type, mob/living/attacker)
if(damage > 0 && attacker && get_dist(B, attacker) <= 2 && prob(min(damage, 70)) && istype(attacker, /mob/living/carbon/human)) // Melee weapons of any type carried by a human will have a high chance of being stolen.
if(damage > 0 && attacker && get_dist(B, attacker) <= 2 && prob(min(damage, 70)) && ishuman(attacker)) // Melee weapons of any type carried by a human will have a high chance of being stolen.
var/mob/living/carbon/human/H = attacker
var/obj/item/I = H.get_active_hand()
H.drop_item()