compile compile compile
This commit is contained in:
@@ -203,7 +203,7 @@
|
||||
/obj/item/assembly/flash/cyborg/attack(mob/living/M, mob/user)
|
||||
. = ..()
|
||||
new /obj/effect/temp_visual/borgflash(get_turf(src))
|
||||
if(. && !CONFIG_GET(flag/disable_borg_flash_knockdown) && iscarbon(M) && !M.resting && !M.get_eye_protection())
|
||||
if(. && !CONFIG_GET(flag/disable_borg_flash_knockdown) && iscarbon(M) && CHECK_BITFIELD(M.mobility_flags, MOBILITY_STAND) && !M.get_eye_protection())
|
||||
M.DefaultCombatKnockdown(80)
|
||||
|
||||
/obj/item/assembly/flash/cyborg/attack_self(mob/user)
|
||||
|
||||
@@ -282,7 +282,7 @@
|
||||
if(target.get_item_by_slot(SLOT_HEAD) != src)
|
||||
return
|
||||
QDEL_NULL(paranoia)
|
||||
if(!target.IsUnconscious())
|
||||
if(!target._MOBILITYFLAGTEMPORARY_IsUnconscious())
|
||||
to_chat(target, "<span class='warning'>Your zealous conspirationism rapidly dissipates as the donned hat warps up into a ruined mess. All those theories starting to sound like nothing but a ridicolous fanfare.</span>")
|
||||
|
||||
/obj/item/clothing/head/foilhat/attack_hand(mob/user)
|
||||
|
||||
@@ -261,21 +261,21 @@
|
||||
else
|
||||
visible_message("<span class='danger'>[user] has grabbed [src] aggressively!</span>", \
|
||||
"<span class='userdanger'>[user] has grabbed you aggressively!</span>")
|
||||
drop_all_held_items()
|
||||
update_mobility()
|
||||
stop_pulling()
|
||||
log_combat(user, src, "grabbed", addition="aggressive grab[add_log]")
|
||||
if(GRAB_NECK)
|
||||
log_combat(user, src, "grabbed", addition="neck grab")
|
||||
visible_message("<span class='danger'>[user] has grabbed [src] by the neck!</span>",\
|
||||
"<span class='userdanger'>[user] has grabbed you by the neck!</span>")
|
||||
update_canmove() //we fall down
|
||||
update_mobility() //we fall down
|
||||
if(!buckled && !density)
|
||||
Move(user.loc)
|
||||
if(GRAB_KILL)
|
||||
log_combat(user, src, "strangled", addition="kill grab")
|
||||
visible_message("<span class='danger'>[user] is strangling [src]!</span>", \
|
||||
"<span class='userdanger'>[user] is strangling you!</span>")
|
||||
update_canmove() //we fall down
|
||||
update_mobility() //we fall down
|
||||
if(!buckled && !density)
|
||||
Move(user.loc)
|
||||
return 1
|
||||
|
||||
@@ -95,7 +95,6 @@
|
||||
var/immobilize = IsImmobilized()
|
||||
|
||||
|
||||
|
||||
/*
|
||||
var/ko = IsKnockdown() || IsUnconscious() || (stat && (stat != SOFT_CRIT || pulledby)) || (HAS_TRAIT(src, TRAIT_DEATHCOMA))
|
||||
var/move_and_fall = stat == SOFT_CRIT && !pulledby
|
||||
|
||||
@@ -418,13 +418,13 @@
|
||||
..()
|
||||
|
||||
/mob/living/simple_animal/update_mobility(value_otherwise = MOBILITY_FLAGS_DEFAULT)
|
||||
if(_MOBILITYFLAGTEMPORARY_IsUnconscious() || _MOBILITYFLAGTEMPORARY_IsStun() || IsParalyzed() || stat || resting)
|
||||
if(_MOBILITYFLAGTEMPORARY_IsUnconscious() || _MOBILITYFLAGTEMPORARY_IsStun() || IsParalyzed() || stat || _MOBILITYFLAGTEMPORARY_resting)
|
||||
drop_all_held_items()
|
||||
mobility_flags = NONE
|
||||
else if(buckled)
|
||||
mobility_flags = ~MOBILITY_MOVE
|
||||
else
|
||||
mobility_flags = MOBILITY_FLAGS_DEFAUTL
|
||||
mobility_flags = MOBILITY_FLAGS_DEFAULT
|
||||
update_transform()
|
||||
update_action_buttons_icon()
|
||||
return mobility_flags
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
return has_status_effect(STATUS_EFFECT_STUN)
|
||||
|
||||
/mob/living/proc/_MOBILITYFLAGTEMPORARY_AmountStun() //How many deciseconds remain in our stun
|
||||
var/datum/status_effect/incapacitating/stun/S = IsStun()
|
||||
var/datum/status_effect/incapacitating/stun/S = _MOBILITYFLAGTEMPORARY_IsStun()
|
||||
if(S)
|
||||
return S.duration - world.time
|
||||
return 0
|
||||
@@ -260,7 +260,7 @@
|
||||
update_mobility()
|
||||
|
||||
/// Makes sure all 4 of the non-knockout immobilizing status effects are lower or equal to amount.
|
||||
/mob/living/proc/HealAllImmobilityupto(amount, updating, ignore_canstun = FALSE)
|
||||
/mob/living/proc/HealAllImmobilityUpTo(amount, updating, ignore_canstun = FALSE)
|
||||
if(_MOBILITYFLAGTEMPORARY_AmountStun() > amount)
|
||||
_MOBILITYFLAGTEMPORARY_SetStun(amount, FALSE, ignore_canstun)
|
||||
if(_MOBILITYFLAGTEMPORARY_AmountKnockdown() > amount)
|
||||
|
||||
Reference in New Issue
Block a user