mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 18:53:06 +00:00
[MIRROR] some istype to macros (#9802)
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
73486c399b
commit
ed79946ade
@@ -362,16 +362,16 @@
|
||||
|
||||
/obj/belly/proc/steal_nutrition(mob/living/L)
|
||||
if(L.nutrition <= 110)
|
||||
if(drainmode == DR_SLEEP && istype(L,/mob/living/carbon/human)) //Slowly put prey to sleep
|
||||
if(drainmode == DR_SLEEP && ishuman(L)) //Slowly put prey to sleep
|
||||
if(L.tiredness <= 105)
|
||||
L.tiredness = (L.tiredness + 6)
|
||||
if(L.tiredness <= 90 && L.tiredness >= 75)
|
||||
to_chat(L, span_warning("You are about to fall unconscious!"))
|
||||
to_chat(owner, span_warning("[L] is about to fall unconscious!"))
|
||||
if(drainmode == DR_FAKE && istype(L,/mob/living/carbon/human)) //Slowly bring prey to the edge of sleep without crossing it
|
||||
if(drainmode == DR_FAKE && ishuman(L)) //Slowly bring prey to the edge of sleep without crossing it
|
||||
if(L.tiredness <= 93)
|
||||
L.tiredness = (L.tiredness + 6)
|
||||
if(drainmode == DR_WEIGHT && istype(L,/mob/living/carbon/human)) //Slowly drain your prey's weight and add it to your own
|
||||
if(drainmode == DR_WEIGHT && ishuman(L)) //Slowly drain your prey's weight and add it to your own
|
||||
if(L.weight > 70)
|
||||
L.weight -= (0.01 * L.weight_loss)
|
||||
owner.weight += (0.01 * L.weight_loss) //intentionally dependant on the prey's weight loss ratio rather than the preds weight gain to keep them in pace with one another.
|
||||
|
||||
@@ -39,7 +39,7 @@ Please do not abuse this ability.
|
||||
continue
|
||||
eligible_targets += S
|
||||
continue
|
||||
if(istype(pred, /mob/living/simple_mob))
|
||||
if(isanimal(pred))
|
||||
var/mob/living/simple_mob/SM = pred
|
||||
if(!SM.vore_active) // No vore, no bellies, no inbelly spawning
|
||||
continue
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
for(var/obj/belly/B as anything in vore_organs)
|
||||
if(DM_FLAG_VORESPRITE_BELLY & B.vore_sprite_flags)
|
||||
new_fullness[B.belly_sprite_to_affect] += B.GetFullnessFromBelly()
|
||||
if(istype(src, /mob/living/carbon/human) && DM_FLAG_VORESPRITE_ARTICLE & B.vore_sprite_flags)
|
||||
if(ishuman(src) && DM_FLAG_VORESPRITE_ARTICLE & B.vore_sprite_flags)
|
||||
if(!new_fullness[B.undergarment_chosen])
|
||||
new_fullness[B.undergarment_chosen] = 1
|
||||
new_fullness[B.undergarment_chosen] += B.GetFullnessFromBelly()
|
||||
|
||||
@@ -660,7 +660,7 @@
|
||||
log_and_message_admins("[key_name(src)] used the OOC escape button to get out of [crystal] owned by [crystal.owner]. [ADMIN_FLW(src)]")
|
||||
|
||||
//You've been turned into an item!
|
||||
else if(tf_mob_holder && istype(src, /mob/living/voice) && istype(src.loc, /obj/item))
|
||||
else if(tf_mob_holder && isvoice(src) && istype(src.loc, /obj/item))
|
||||
var/obj/item/item_to_destroy = src.loc //If so, let's destroy the item they just TF'd out of.
|
||||
//CHOMPEdit Start - If tf_mob_holder is not located in src, then it's a Mind Binder OOC Escape
|
||||
var/mob/living/ourmob = tf_mob_holder
|
||||
@@ -828,7 +828,7 @@
|
||||
if(delay)
|
||||
swallow_time = delay
|
||||
else
|
||||
swallow_time = istype(prey, /mob/living/carbon/human) ? belly.human_prey_swallow_time : belly.nonhuman_prey_swallow_time
|
||||
swallow_time = ishuman(prey) ? belly.human_prey_swallow_time : belly.nonhuman_prey_swallow_time
|
||||
|
||||
// Their AI should get notified so they can stab us
|
||||
prey.ai_holder?.react_to_attack(user)
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
/mob/living/Bump(atom/movable/AM)
|
||||
//. = ..()
|
||||
if(istype(AM, /mob/living))
|
||||
if(isliving(AM))
|
||||
// CHOMPEdit Start
|
||||
var/mob/living/L = AM
|
||||
if(!L.is_incorporeal())
|
||||
@@ -27,7 +27,7 @@
|
||||
return ..()
|
||||
// Because flips toggle density
|
||||
/mob/living/Crossed(var/atom/movable/AM)
|
||||
if(istype(AM, /mob/living) && isturf(loc) && AM != src)
|
||||
if(isliving(AM) && isturf(loc) && AM != src)
|
||||
var/mob/living/AMV = AM
|
||||
if(AMV.buckled != src && (((AMV.confused || AMV.is_blind()) && AMV.stat == CONSCIOUS && prob(50) && AMV.m_intent==I_RUN) || AMV.flying && AMV.flight_vore))
|
||||
stumble_into(AMV)
|
||||
|
||||
@@ -141,8 +141,8 @@ V::::::V V::::::VO:::::::OOO:::::::ORR:::::R R:::::REE::::::EEEEEE
|
||||
// Check if an object is capable of eating things, based on vore_organs
|
||||
//
|
||||
/proc/is_vore_predator(mob/living/O)
|
||||
if(istype(O,/mob/living))
|
||||
if(istype(O,/mob/living/simple_mob)) //On-demand belly loading.
|
||||
if(isliving(O))
|
||||
if(isanimal(O)) //On-demand belly loading.
|
||||
var/mob/living/simple_mob/SM = O
|
||||
if(SM.vore_active && !SM.voremob_loaded)
|
||||
SM.voremob_loaded = TRUE
|
||||
|
||||
@@ -278,7 +278,7 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono",
|
||||
"voresprite_size_factor" = selected.size_factor_for_sprite,
|
||||
"belly_sprite_to_affect" = selected.belly_sprite_to_affect,
|
||||
"belly_sprite_option_shown" = LAZYLEN(host.vore_icon_bellies) >= 1 ? TRUE : FALSE,
|
||||
"tail_option_shown" = istype(host, /mob/living/carbon/human),
|
||||
"tail_option_shown" = ishuman(host),
|
||||
"tail_to_change_to" = selected.tail_to_change_to,
|
||||
"tail_colouration" = selected.tail_colouration,
|
||||
"tail_extra_overlay" = selected.tail_extra_overlay,
|
||||
|
||||
@@ -1880,7 +1880,7 @@ Departamental Swimsuits, for general use
|
||||
if(!..())
|
||||
return 0
|
||||
|
||||
if(istype(M,/mob/living/carbon/human))
|
||||
if(ishuman(M))
|
||||
var/mob/living/carbon/human/H = M
|
||||
if(!(H.get_species() == SPECIES_PROMETHEAN)) //Only wearable by slimes, since species_restricted actually checks bodytype, not species
|
||||
return 0
|
||||
@@ -2303,7 +2303,7 @@ Departamental Swimsuits, for general use
|
||||
set name = "Swap color"
|
||||
set category = "Object"
|
||||
set src in usr
|
||||
if(!istype(usr, /mob/living)) return
|
||||
if(!isliving(usr)) return
|
||||
if(usr.stat) return
|
||||
|
||||
colorswap(usr)
|
||||
|
||||
@@ -1046,7 +1046,7 @@
|
||||
else
|
||||
activate(user)
|
||||
|
||||
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()
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
if(!Player.mind || isnewplayer(Player))
|
||||
continue // No mind we can do nothing, new players we care not for
|
||||
else if(Player.stat == DEAD)
|
||||
if(istype(Player,/mob/observer/dead))
|
||||
if(isobserver(Player))
|
||||
var/mob/observer/dead/O = Player
|
||||
if(O.started_as_observer)
|
||||
continue // They are just a pure observer, ignore
|
||||
|
||||
@@ -300,7 +300,7 @@
|
||||
for (var/atom/movable/M in prey.loc)
|
||||
if (prey == M || pred == M)
|
||||
continue
|
||||
if (istype(M, /mob/living))
|
||||
if (isliving(M))
|
||||
var/mob/living/L = M
|
||||
if (!M.CanPass(src, prey.loc) && !(get_effective_size(FALSE) - L.get_effective_size(TRUE) >= size_ratio_needed || L.lying))
|
||||
can_pass = FALSE
|
||||
|
||||
Reference in New Issue
Block a user