mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-26 06:29:23 +01:00
Replaces a bunch of istypes with their proper macros (#20739)
* Replaces a bunch of istypes with their proper macros * i'm not sure doing a 100+ file changed pr on a whim is something you do when bored especially if you do it by hand because you never actually learned the regex that would let you automate it * i'm just... gonna do this, because that check was true a lot and it shouldn't matter
This commit is contained in:
@@ -285,7 +285,7 @@
|
||||
/obj/item/weapon/lazarus_injector/afterattack(atom/target, mob/user, proximity_flag)
|
||||
if(!loaded)
|
||||
return
|
||||
if(istype(target, /mob/living) && proximity_flag)
|
||||
if(isliving(target) && proximity_flag)
|
||||
if(istype(target, /mob/living/simple_animal))
|
||||
var/mob/living/simple_animal/M = target
|
||||
if(M.sentience_type != revive_type)
|
||||
|
||||
@@ -71,7 +71,7 @@ var/list/total_extraction_beacons = list()
|
||||
var/image/balloon
|
||||
var/image/balloon2
|
||||
var/image/balloon3
|
||||
if(istype(A, /mob/living))
|
||||
if(isliving(A))
|
||||
var/mob/living/M = A
|
||||
M.Weaken(16) // Keep them from moving during the duration of the extraction
|
||||
M.buckled = 0 // Unbuckle them to prevent anchoring problems
|
||||
@@ -104,7 +104,7 @@ var/list/total_extraction_beacons = list()
|
||||
sleep(10)
|
||||
playsound(holder_obj.loc, 'sound/items/fultext_launch.wav', 50, 1, -3)
|
||||
animate(holder_obj, pixel_z = 1000, time = 30)
|
||||
if(istype(A, /mob/living/carbon/human))
|
||||
if(ishuman(A))
|
||||
var/mob/living/carbon/human/L = A
|
||||
L.SetParalysis(0)
|
||||
L.drowsyness = 0
|
||||
@@ -173,12 +173,12 @@ var/list/total_extraction_beacons = list()
|
||||
var/atom/movable/stored_obj
|
||||
|
||||
/obj/item/weapon/extraction_pack/proc/check_for_living_mobs(atom/A)
|
||||
if(istype(A, /mob/living))
|
||||
if(isliving(A))
|
||||
var/mob/living/L = A
|
||||
if(L.stat != DEAD)
|
||||
return 1
|
||||
for(var/thing in A.GetAllContents())
|
||||
if(istype(A, /mob/living))
|
||||
if(isliving(A))
|
||||
var/mob/living/L = A
|
||||
if(L.stat != DEAD)
|
||||
return 1
|
||||
|
||||
@@ -96,7 +96,7 @@
|
||||
|
||||
if(wisp.orbiting)
|
||||
var/atom/A = wisp.orbiting.orbiting
|
||||
if(istype(A, /mob/living))
|
||||
if(isliving(A))
|
||||
var/mob/living/M = A
|
||||
M.sight &= ~SEE_MOBS
|
||||
M << "<span class='notice'>Your vision returns to \
|
||||
|
||||
@@ -434,7 +434,7 @@
|
||||
|
||||
/turf/closed/mineral/Bumped(AM as mob|obj)
|
||||
..()
|
||||
if(istype(AM,/mob/living/carbon/human))
|
||||
if(ishuman(AM))
|
||||
var/mob/living/carbon/human/H = AM
|
||||
var/obj/item/I = H.is_holding_item_of_type(/obj/item/weapon/pickaxe)
|
||||
if(I)
|
||||
|
||||
Reference in New Issue
Block a user