mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-17 11:05:16 +01:00
More istypes replaced with helpers (#20767)
* shouldn't you be merging these by now * my oh my do we have a lot of these * a fellow pedantic shit
This commit is contained in:
@@ -294,7 +294,7 @@
|
||||
if(M.stat == DEAD)
|
||||
M.faction = list("neutral")
|
||||
M.revive(full_heal = 1, admin_revive = 1)
|
||||
if(istype(target, /mob/living/simple_animal/hostile))
|
||||
if(ishostile(target))
|
||||
var/mob/living/simple_animal/hostile/H = M
|
||||
if(malfunctioning)
|
||||
H.faction |= list("lazarus", "\ref[user]")
|
||||
|
||||
@@ -440,7 +440,7 @@
|
||||
if(I)
|
||||
attackby(I,H)
|
||||
return
|
||||
else if(istype(AM,/mob/living/silicon/robot))
|
||||
else if(iscyborg(AM))
|
||||
var/mob/living/silicon/robot/R = AM
|
||||
if(istype(R.module_active,/obj/item/weapon/pickaxe))
|
||||
src.attackby(R.module_active,R)
|
||||
|
||||
Reference in New Issue
Block a user