cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +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/projectiles/guns/energy/bsharpoon_vr.dm
View File

@@ -115,7 +115,7 @@
var/recievefailchance = failure_chance
var/sendfailchance = failure_chance
if(istype(user, /mob/living))
if(isliving(user))
var/mob/living/L = user
if(LAZYLEN(L.buckled_mobs))
for(var/rider in L.buckled_mobs)

42
code/modules/projectiles/guns/energy/cell_loaded_vr/ml3m_cells.dm
View File

@@ -33,7 +33,7 @@
projectile_type = /obj/item/projectile/beam/medical_cell/brute
/obj/item/projectile/beam/medical_cell/brute/on_hit(var/mob/living/carbon/human/target)
if(istype(target, /mob/living/carbon/human))
if(ishuman(target))
if(target.stat != DEAD)
target.adjustBruteLoss(-10)
else
@@ -46,7 +46,7 @@
projectile_type = /obj/item/projectile/beam/medical_cell/burn
/obj/item/projectile/beam/medical_cell/burn/on_hit(var/mob/living/carbon/human/target)
if(istype(target, /mob/living/carbon/human))
if(ishuman(target))
if(target.stat != DEAD)
target.adjustFireLoss(-10)
else
@@ -59,7 +59,7 @@
projectile_type = /obj/item/projectile/beam/medical_cell/stabilize
/obj/item/projectile/beam/medical_cell/stabilize/on_hit(var/mob/living/carbon/human/target)
if(istype(target, /mob/living/carbon/human))
if(ishuman(target))
target.adjustOxyLoss(-30)
for(var/name in list(BP_HEAD, BP_L_HAND, BP_R_HAND, BP_L_ARM, BP_R_ARM, BP_L_FOOT, BP_R_FOOT, BP_L_LEG, BP_R_LEG, BP_GROIN, BP_TORSO))
var/obj/item/organ/external/O = target.organs_by_name[name]
@@ -87,7 +87,7 @@
projectile_type = /obj/item/projectile/beam/medical_cell/toxin
/obj/item/projectile/beam/medical_cell/toxin/on_hit(var/mob/living/carbon/human/target)
if(istype(target, /mob/living/carbon/human))
if(ishuman(target))
if(target.stat != DEAD)
target.adjustToxLoss(-10)
else
@@ -100,7 +100,7 @@
projectile_type = /obj/item/projectile/beam/medical_cell/omni
/obj/item/projectile/beam/medical_cell/omni/on_hit(var/mob/living/carbon/human/target)
if(istype(target, /mob/living/carbon/human))
if(ishuman(target))
if(target.stat != DEAD)
target.adjustBruteLoss(-5)
target.adjustFireLoss(-5)
@@ -116,7 +116,7 @@
projectile_type = /obj/item/projectile/beam/medical_cell/antirad
/obj/item/projectile/beam/medical_cell/antirad/on_hit(var/mob/living/carbon/human/target)
if(istype(target, /mob/living/carbon/human))
if(ishuman(target))
if(target.stat != DEAD)
target.adjustToxLoss(-5)
target.radiation = max(target.radiation - 350, 0) //same as 5 units of arithrazine, sans the brute damage
@@ -130,7 +130,7 @@
projectile_type = /obj/item/projectile/beam/medical_cell/brute2
/obj/item/projectile/beam/medical_cell/brute2/on_hit(var/mob/living/carbon/human/target)
if(istype(target, /mob/living/carbon/human))
if(ishuman(target))
if(target.stat != DEAD)
target.adjustBruteLoss(-20)
else
@@ -143,7 +143,7 @@
projectile_type = /obj/item/projectile/beam/medical_cell/burn2
/obj/item/projectile/beam/medical_cell/burn2/on_hit(var/mob/living/carbon/human/target)
if(istype(target, /mob/living/carbon/human))
if(ishuman(target))
if(target.stat != DEAD)
target.adjustFireLoss(-20)
else
@@ -156,7 +156,7 @@
projectile_type = /obj/item/projectile/beam/medical_cell/stabilize2
/obj/item/projectile/beam/medical_cell/stabilize2/on_hit(var/mob/living/carbon/human/target)
if(istype(target, /mob/living/carbon/human))
if(ishuman(target))
target.adjustOxyLoss(-200)
for(var/name in list(BP_HEAD, BP_L_HAND, BP_R_HAND, BP_L_ARM, BP_R_ARM, BP_L_FOOT, BP_R_FOOT, BP_L_LEG, BP_R_LEG, BP_GROIN, BP_TORSO))
var/obj/item/organ/external/O = target.organs_by_name[name]
@@ -179,7 +179,7 @@
projectile_type = /obj/item/projectile/beam/medical_cell/omni2
/obj/item/projectile/beam/medical_cell/omni2/on_hit(var/mob/living/carbon/human/target)
if(istype(target, /mob/living/carbon/human))
if(ishuman(target))
if(target.stat != DEAD)
target.adjustBruteLoss(-10)
target.adjustFireLoss(-10)
@@ -195,7 +195,7 @@
projectile_type = /obj/item/projectile/beam/medical_cell/toxin2
/obj/item/projectile/beam/medical_cell/toxin2/on_hit(var/mob/living/carbon/human/target)
if(istype(target, /mob/living/carbon/human))
if(ishuman(target))
if(target.stat != DEAD)
target.adjustToxLoss(-20)
else
@@ -208,7 +208,7 @@
projectile_type = /obj/item/projectile/beam/medical_cell/haste
/obj/item/projectile/beam/medical_cell/haste/on_hit(var/mob/living/carbon/human/target)
if(istype(target, /mob/living/carbon/human))
if(ishuman(target))
target.add_modifier(/datum/modifier/ml3mhaste, 20 SECONDS)
else
return 1
@@ -228,7 +228,7 @@
projectile_type = /obj/item/projectile/beam/medical_cell/resist
/obj/item/projectile/beam/medical_cell/resist/on_hit(var/mob/living/carbon/human/target)
if(istype(target, /mob/living/carbon/human))
if(ishuman(target))
target.add_modifier(/datum/modifier/resistance, 20 SECONDS)
else
return 1
@@ -248,7 +248,7 @@
projectile_type = /obj/item/projectile/beam/medical_cell/corpse_mend
/obj/item/projectile/beam/medical_cell/corpse_mend/on_hit(var/mob/living/carbon/human/target)
if(istype(target, /mob/living/carbon/human))
if(ishuman(target))
if(target.stat == DEAD)
target.adjustBruteLoss(-50)
target.adjustFireLoss(-50)
@@ -264,7 +264,7 @@
projectile_type = /obj/item/projectile/beam/medical_cell/brute3
/obj/item/projectile/beam/medical_cell/brute3/on_hit(var/mob/living/carbon/human/target)
if(istype(target, /mob/living/carbon/human))
if(ishuman(target))
if(target.stat != DEAD)
target.adjustBruteLoss(-40)
else
@@ -277,7 +277,7 @@
projectile_type = /obj/item/projectile/beam/medical_cell/burn3
/obj/item/projectile/beam/medical_cell/burn3/on_hit(var/mob/living/carbon/human/target)
if(istype(target, /mob/living/carbon/human))
if(ishuman(target))
if(target.stat != DEAD)
target.adjustFireLoss(-40)
else
@@ -290,7 +290,7 @@
projectile_type = /obj/item/projectile/beam/medical_cell/toxin3
/obj/item/projectile/beam/medical_cell/toxin3/on_hit(var/mob/living/carbon/human/target)
if(istype(target, /mob/living/carbon/human))
if(ishuman(target))
if(target.stat != DEAD)
target.adjustToxLoss(-40)
else
@@ -303,7 +303,7 @@
projectile_type = /obj/item/projectile/beam/medical_cell/omni3
/obj/item/projectile/beam/medical_cell/omni3/on_hit(var/mob/living/carbon/human/target)
if(istype(target, /mob/living/carbon/human))
if(ishuman(target))
if(target.stat != DEAD)
target.adjustBruteLoss(-20)
target.adjustFireLoss(-20)
@@ -320,7 +320,7 @@
projectile_type = /obj/item/projectile/beam/medical_cell/shrink
/obj/item/projectile/beam/medical_cell/shrink/on_hit(var/mob/living/carbon/human/target)
if(istype(target, /mob/living/carbon/human))
if(ishuman(target))
target.resize(0.5)
target.show_message(span_blue("The beam fires into your body, changing your size!"))
target.update_icon()
@@ -334,7 +334,7 @@
projectile_type = /obj/item/projectile/beam/medical_cell/grow
/obj/item/projectile/beam/medical_cell/grow/on_hit(var/mob/living/carbon/human/target)
if(istype(target, /mob/living/carbon/human))
if(ishuman(target))
target.resize(2.0)
target.show_message(span_blue("The beam fires into your body, changing your size!"))
target.update_icon()
@@ -348,7 +348,7 @@
projectile_type = /obj/item/projectile/beam/medical_cell/normalsize
/obj/item/projectile/beam/medical_cell/normalsize/on_hit(var/mob/living/carbon/human/target)
if(istype(target, /mob/living/carbon/human))
if(ishuman(target))
target.resize(1)
target.show_message(span_blue("The beam fires into your body, changing your size!"))
target.update_icon()

4
code/modules/projectiles/guns/energy/cell_loaded_vr/multi_cannon_cells.dm
View File

@@ -115,14 +115,14 @@
projectile_type = /obj/item/projectile/beam/medical_cell/phys_heal
/obj/item/projectile/beam/medical_cell/phys_heal/on_hit(var/mob/living/carbon/human/target)
if(istype(target, /mob/living/carbon/human))
if(ishuman(target))
target.adjustBruteLoss(-20)
target.adjustFireLoss(-20)
else
return 1
/obj/item/projectile/beam/medical_cell/detox/on_hit(var/mob/living/carbon/human/target)
if(istype(target, /mob/living/carbon/human))
if(ishuman(target))
target.adjustToxLoss(-15)
target.radiation = max(target.radiation - 75, 0) //worse than mlem for rad, better for tox.
else

2
code/modules/projectiles/guns/energy/gunsword_vr.dm
View File

@@ -110,7 +110,7 @@
update_icon()
update_held_icon()
if(istype(user,/mob/living/carbon/human))
if(ishuman(user))
var/mob/living/carbon/human/H = user
H.update_inv_l_hand()
H.update_inv_r_hand()

2
code/modules/projectiles/guns/projectile/shotgun_vr.dm
View File

@@ -63,7 +63,7 @@
one_handed_penalty = 30
recoil = 5
if(istype(user,/mob/living/carbon/human))
if(ishuman(user))
var/mob/living/carbon/human/H = user
H.update_inv_l_hand()
H.update_inv_r_hand()

2
code/modules/projectiles/guns/projectile/sniper/collapsible_sniper.dm
View File

@@ -163,7 +163,7 @@
if(3)
var/obj/item/gun/projectile/heavysniper/collapsible/gun = new (get_turf(src), 0)
if(usr && istype(usr, /mob/living/carbon/human))
if(usr && ishuman(usr))
var/mob/living/carbon/human/user = usr
user.unEquip(src, force=1)
user.put_in_any_hand_if_possible(gun) || gun.dropInto(loc)