cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-23 03:57:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Changes existing do_afters to new exclusive flags.

Browse Source
This commit is contained in:
MarinaGryphon
2021-07-08 12:45:55 -05:00
parent 6471c9debd
commit caee8d45b4
7 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm
+2 -2
View File
@@ -910,7 +910,7 @@
to_chat(src, "<span class='warning'>You can't weave here!</span>")
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)
to_chat(src, "<span class='warning'>You don't have enough silk to weave that!</span>")
return
@@ -969,7 +969,7 @@
to_chat(src, "<span class='warning'>You can't weave here!</span>")
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)
to_chat(src, "<span class='warning'>You don't have enough silk to weave that!</span>")
return
code/modules/mob/living/simple_mob/subtypes/vore/softdog.dm
+1 -1
View File
@@ -252,7 +252,7 @@
return ..()
if(M.a_intent == I_HELP)
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
revive()
sight = initial(sight)
code/modules/vore/eating/living_vr.dm
+2 -2
View File
@@ -521,7 +521,7 @@
prey.ai_holder?.react_to_attack(user)
//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.
// If we got this far, nom successful! Announce it!
@@ -798,7 +798,7 @@
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.
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)
to_chat(feeder, "<span class='notice'>You feed [I] to [src].</span>")
log_admin("VORE: [feeder] fed [src] [I].")