mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-23 12:08:28 +01:00
Changes existing do_afters to new exclusive flags.
This commit is contained in:
@@ -145,7 +145,7 @@
|
|||||||
return FALSE
|
return FALSE
|
||||||
if(!target.mind)
|
if(!target.mind)
|
||||||
user.visible_message("[user] gently presses [src] to [target]...", runemessage = "presses [src] to [target]")
|
user.visible_message("[user] gently presses [src] to [target]...", runemessage = "presses [src] to [target]")
|
||||||
if(do_after(user, revive_time, exclusive = 1, target = target))
|
if(do_after(user, revive_time, exclusive = TASK_USER_EXCLUSIVE, target = target))
|
||||||
target.faction = user.faction
|
target.faction = user.faction
|
||||||
target.revivedby = user.name
|
target.revivedby = user.name
|
||||||
target.ghostjoin = 1
|
target.ghostjoin = 1
|
||||||
@@ -166,7 +166,7 @@
|
|||||||
|
|
||||||
/obj/item/device/denecrotizer/proc/ghostjoin_rez(mob/living/simple_mob/target, mob/living/user)
|
/obj/item/device/denecrotizer/proc/ghostjoin_rez(mob/living/simple_mob/target, mob/living/user)
|
||||||
user.visible_message("[user] gently presses [src] to [target]...", runemessage = "presses [src] to [target]")
|
user.visible_message("[user] gently presses [src] to [target]...", runemessage = "presses [src] to [target]")
|
||||||
if(do_after(user, revive_time, exclusive = 1, target = target))
|
if(do_after(user, revive_time, exclusive = TASK_ALL_EXCLUSIVE, target = target))
|
||||||
target.faction = user.faction
|
target.faction = user.faction
|
||||||
target.revivedby = user.name
|
target.revivedby = user.name
|
||||||
target.ai_holder.returns_home = FALSE
|
target.ai_holder.returns_home = FALSE
|
||||||
@@ -190,7 +190,7 @@
|
|||||||
|
|
||||||
/obj/item/device/denecrotizer/proc/basic_rez(mob/living/simple_mob/target, mob/living/user) //so medical can have a way to bring back people's pets or whatever, does not change any settings about the mob or offer it to ghosts.
|
/obj/item/device/denecrotizer/proc/basic_rez(mob/living/simple_mob/target, mob/living/user) //so medical can have a way to bring back people's pets or whatever, does not change any settings about the mob or offer it to ghosts.
|
||||||
user.visible_message("[user] presses [src] to [target]...", runemessage = "presses [src] to [target]")
|
user.visible_message("[user] presses [src] to [target]...", runemessage = "presses [src] to [target]")
|
||||||
if(do_after(user, revive_time, exclusive = 1, target = target))
|
if(do_after(user, revive_time, exclusive = TASK_ALL_EXCLUSIVE, target = target))
|
||||||
target.revive()
|
target.revive()
|
||||||
target.sight = initial(target.sight)
|
target.sight = initial(target.sight)
|
||||||
target.see_in_dark = initial(target.see_in_dark)
|
target.see_in_dark = initial(target.see_in_dark)
|
||||||
|
|||||||
@@ -408,7 +408,7 @@
|
|||||||
to_chat(user, "<span class='danger'>You can't apply a splint to the arm you're using!</span>")
|
to_chat(user, "<span class='danger'>You can't apply a splint to the arm you're using!</span>")
|
||||||
return
|
return
|
||||||
user.visible_message("<span class='danger'>[user] starts to apply \the [src] to their [limb].</span>", "<span class='danger'>You start to apply \the [src] to your [limb].</span>", "<span class='danger'>You hear something being wrapped.</span>")
|
user.visible_message("<span class='danger'>[user] starts to apply \the [src] to their [limb].</span>", "<span class='danger'>You start to apply \the [src] to your [limb].</span>", "<span class='danger'>You hear something being wrapped.</span>")
|
||||||
if(do_after(user, 50, M, exclusive = TRUE))
|
if(do_after(user, 50, M, exclusive = TASK_USER_EXCLUSIVE))
|
||||||
if(affecting.splinted)
|
if(affecting.splinted)
|
||||||
to_chat(user, "<span class='danger'>[M]'s [limb] is already splinted!</span>")
|
to_chat(user, "<span class='danger'>[M]'s [limb] is already splinted!</span>")
|
||||||
return
|
return
|
||||||
|
|||||||
@@ -16,7 +16,7 @@
|
|||||||
if (istype(M,/mob/living/silicon/robot)) //Repairing cyborgs
|
if (istype(M,/mob/living/silicon/robot)) //Repairing cyborgs
|
||||||
var/mob/living/silicon/robot/R = M
|
var/mob/living/silicon/robot/R = M
|
||||||
if (R.getBruteLoss() || R.getFireLoss())
|
if (R.getBruteLoss() || R.getFireLoss())
|
||||||
if(do_after(user, 7 * toolspeed, exclusive = TRUE))
|
if(do_after(user, 7 * toolspeed, R, exclusive = TASK_ALL_EXCLUSIVE))
|
||||||
R.adjustBruteLoss(-15)
|
R.adjustBruteLoss(-15)
|
||||||
R.adjustFireLoss(-15)
|
R.adjustFireLoss(-15)
|
||||||
R.updatehealth()
|
R.updatehealth()
|
||||||
@@ -51,9 +51,9 @@
|
|||||||
else if(can_use(1))
|
else if(can_use(1))
|
||||||
user.setClickCooldown(user.get_attack_speed(src))
|
user.setClickCooldown(user.get_attack_speed(src))
|
||||||
if(S.open >= 2)
|
if(S.open >= 2)
|
||||||
if(do_after(user, 5 * toolspeed, exclusive = TRUE))
|
if(do_after(user, 5 * toolspeed, S, exclusive = TASK_ALL_EXCLUSIVE))
|
||||||
S.heal_damage(restoration_internal, restoration_internal, robo_repair = 1)
|
S.heal_damage(restoration_internal, restoration_internal, robo_repair = 1)
|
||||||
else if(do_after(user, 5 * toolspeed, exclusive = TRUE))
|
else if(do_after(user, 5 * toolspeed, S, exclusive = TASK_ALL_EXCLUSIVE))
|
||||||
S.heal_damage(restoration_external,restoration_external, robo_repair =1)
|
S.heal_damage(restoration_external,restoration_external, robo_repair =1)
|
||||||
H.updatehealth()
|
H.updatehealth()
|
||||||
use(1)
|
use(1)
|
||||||
|
|||||||
@@ -23,7 +23,7 @@
|
|||||||
if(user.get_active_hand() == src || user.get_inactive_hand() == src)
|
if(user.get_active_hand() == src || user.get_inactive_hand() == src)
|
||||||
return TRUE // Skip delay
|
return TRUE // Skip delay
|
||||||
|
|
||||||
if(insert_delay && !do_after(user, 2 SECONDS, src, needhand = TRUE, exclusive = TRUE))
|
if(insert_delay && !do_after(user, 2 SECONDS, src, needhand = TRUE, exclusive = TASK_USER_EXCLUSIVE))
|
||||||
return FALSE // Moved or whatever
|
return FALSE // Moved or whatever
|
||||||
|
|
||||||
if(W in src)
|
if(W in src)
|
||||||
@@ -36,7 +36,7 @@
|
|||||||
if(user.get_active_hand() == src || user.get_inactive_hand() == src)
|
if(user.get_active_hand() == src || user.get_inactive_hand() == src)
|
||||||
return TRUE // Skip delay
|
return TRUE // Skip delay
|
||||||
|
|
||||||
if(remove_delay && !do_after(user, 2 SECONDS, src, needhand = TRUE, exclusive = TRUE))
|
if(remove_delay && !do_after(user, 2 SECONDS, src, needhand = TRUE, exclusive = TASK_USER_EXCLUSIVE))
|
||||||
return FALSE // Moved or whatever
|
return FALSE // Moved or whatever
|
||||||
|
|
||||||
if(W in src)
|
if(W in src)
|
||||||
|
|||||||
+2
-2
@@ -910,7 +910,7 @@
|
|||||||
to_chat(src, "<span class='warning'>You can't weave here!</span>")
|
to_chat(src, "<span class='warning'>You can't weave here!</span>")
|
||||||
return
|
return
|
||||||
|
|
||||||
if(do_after(src, desired_result.time, exclusive = TRUE))
|
if(do_after(src, desired_result.time, exclusive = TASK_USER_EXCLUSIVE))
|
||||||
if(desired_result.cost > species.silk_reserve)
|
if(desired_result.cost > species.silk_reserve)
|
||||||
to_chat(src, "<span class='warning'>You don't have enough silk to weave that!</span>")
|
to_chat(src, "<span class='warning'>You don't have enough silk to weave that!</span>")
|
||||||
return
|
return
|
||||||
@@ -969,7 +969,7 @@
|
|||||||
to_chat(src, "<span class='warning'>You can't weave here!</span>")
|
to_chat(src, "<span class='warning'>You can't weave here!</span>")
|
||||||
return
|
return
|
||||||
|
|
||||||
if(do_after(src, desired_result.time, exclusive = TRUE))
|
if(do_after(src, desired_result.time, exclusive = TASK_USER_EXCLUSIVE))
|
||||||
if(desired_result.cost > species.silk_reserve)
|
if(desired_result.cost > species.silk_reserve)
|
||||||
to_chat(src, "<span class='warning'>You don't have enough silk to weave that!</span>")
|
to_chat(src, "<span class='warning'>You don't have enough silk to weave that!</span>")
|
||||||
return
|
return
|
||||||
|
|||||||
@@ -252,7 +252,7 @@
|
|||||||
return ..()
|
return ..()
|
||||||
if(M.a_intent == I_HELP)
|
if(M.a_intent == I_HELP)
|
||||||
M.visible_message("[M] pets [src].", runemessage = "pets [src]")
|
M.visible_message("[M] pets [src].", runemessage = "pets [src]")
|
||||||
if(do_after(M, 30 SECONDS, exclusive = 1, target = src))
|
if(do_after(M, 30 SECONDS, exclusive = TASK_USER_EXCLUSIVE, target = src))
|
||||||
faction = M.faction
|
faction = M.faction
|
||||||
revive()
|
revive()
|
||||||
sight = initial(sight)
|
sight = initial(sight)
|
||||||
|
|||||||
@@ -521,7 +521,7 @@
|
|||||||
prey.ai_holder?.react_to_attack(user)
|
prey.ai_holder?.react_to_attack(user)
|
||||||
|
|
||||||
//Timer and progress bar
|
//Timer and progress bar
|
||||||
if(!do_after(user, swallow_time, prey, exclusive = TRUE))
|
if(!do_after(user, swallow_time, prey, exclusive = TASK_USER_EXCLUSIVE))
|
||||||
return FALSE // Prey escpaed (or user disabled) before timer expired.
|
return FALSE // Prey escpaed (or user disabled) before timer expired.
|
||||||
|
|
||||||
// If we got this far, nom successful! Announce it!
|
// If we got this far, nom successful! Announce it!
|
||||||
@@ -798,7 +798,7 @@
|
|||||||
playsound(src, 'sound/items/eatfood.ogg', rand(10,50), 1)
|
playsound(src, 'sound/items/eatfood.ogg', rand(10,50), 1)
|
||||||
var/T = (istype(M) ? M.hardness/40 : 1) SECONDS //1.5 seconds to eat a sheet of metal. 2.5 for durasteel and diamond & 1 by default (applies to some ores like raw carbon, slag, etc.
|
var/T = (istype(M) ? M.hardness/40 : 1) SECONDS //1.5 seconds to eat a sheet of metal. 2.5 for durasteel and diamond & 1 by default (applies to some ores like raw carbon, slag, etc.
|
||||||
to_chat(src, "<span class='notice'>You start crunching on [I] with your powerful jaws, attempting to tear it apart...</span>")
|
to_chat(src, "<span class='notice'>You start crunching on [I] with your powerful jaws, attempting to tear it apart...</span>")
|
||||||
if(do_after(feeder, T, ignore_movement = TRUE, exclusive = TRUE)) //Eat on the move, but not multiple things at once.
|
if(do_after(feeder, T, ignore_movement = TRUE, exclusive = TASK_ALL_EXCLUSIVE)) //Eat on the move, but not multiple things at once.
|
||||||
if(feeder != src)
|
if(feeder != src)
|
||||||
to_chat(feeder, "<span class='notice'>You feed [I] to [src].</span>")
|
to_chat(feeder, "<span class='notice'>You feed [I] to [src].</span>")
|
||||||
log_admin("VORE: [feeder] fed [src] [I].")
|
log_admin("VORE: [feeder] fed [src] [I].")
|
||||||
|
|||||||
Reference in New Issue
Block a user