mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-07-19 19:15:11 +01:00
intent cleanup (#16825)
This commit is contained in:
@@ -14,14 +14,14 @@
|
||||
/mob/living/Bump(atom/movable/AM)
|
||||
//. = ..()
|
||||
if(istype(AM, /mob/living))
|
||||
if(buckled != AM && (((confused || is_blind()) && stat == CONSCIOUS && prob(50) && m_intent=="run") || flying && flight_vore))
|
||||
if(buckled != AM && (((confused || is_blind()) && stat == CONSCIOUS && prob(50) && m_intent==I_RUN) || flying && flight_vore))
|
||||
AM.stumble_into(src)
|
||||
return ..()
|
||||
// Because flips toggle density
|
||||
/mob/living/Crossed(var/atom/movable/AM)
|
||||
if(istype(AM, /mob/living) && 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=="run") || AMV.flying && AMV.flight_vore))
|
||||
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)
|
||||
..()
|
||||
|
||||
|
||||
@@ -357,7 +357,7 @@
|
||||
equip_to_slot_if_possible(prey.get_scooped(pred), slot_shoes, 0, 1)
|
||||
add_attack_logs(pred, prey, "Grabbed underfoot ([tail ? "taur" : "nontaur"], no shoes)")
|
||||
|
||||
if(m_intent == "run")
|
||||
if(m_intent == I_RUN)
|
||||
switch(a_intent)
|
||||
if(I_DISARM)
|
||||
message_pred = "You quickly push [prey] to the ground with your foot!"
|
||||
|
||||
Reference in New Issue
Block a user