cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-21 13:05:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14084 from MrStonedOne/GOOOOOF

Browse Source 
Upgrades do_after and progress bars.
This commit is contained in:
tkdrg
2015-12-28 14:35:34 -03:00
parent 555fc6671a 695afcc94e
commit e88bf4e2b5
14 changed files with 140 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/carbon.dm
+3 -3
View File
@@ -388,7 +388,7 @@ var/const/GALOSHES_DONT_HELP = 4
last_special = world.time + CLICK_CD_BREAKOUT
visible_message("<span class='warning'>[src] attempts to unbuckle themself!</span>", \
"<span class='notice'>You attempt to unbuckle yourself... (This will take around one minute and you need to stay still.)</span>")
if(do_after(src, 600, needhand = 0, target = src))
if(do_after(src, 600, 0, target = src))
if(!buckled)
return
buckled.user_unbuckle_mob(src,src)
@@ -431,7 +431,7 @@ var/const/GALOSHES_DONT_HELP = 4
if(!cuff_break)
visible_message("<span class='warning'>[src] attempts to remove [I]!</span>")
src << "<span class='notice'>You attempt to remove [I]... (This will take around [displaytime] minutes and you need to stand still.)</span>"
if(do_after(src, breakouttime, 10, 0, target = src))
if(do_after(src, breakouttime, 0, target = src))
if(I.loc != src || buckled)
return
visible_message("<span class='danger'>[src] manages to remove [I]!</span>")
@@ -457,7 +457,7 @@ var/const/GALOSHES_DONT_HELP = 4
breakouttime = 50
visible_message("<span class='warning'>[src] is trying to break [I]!</span>")
src << "<span class='notice'>You attempt to break [I]... (This will take around 5 seconds and you need to stand still.)</span>"
if(do_after(src, breakouttime, needhand = 0, target = src))
if(do_after(src, breakouttime, 0, target = src))
if(!I.loc || buckled)
return
visible_message("<span class='danger'>[src] manages to break [I]!</span>")
code/modules/mob/living/simple_animal/friendly/drone/interaction.dm
+2 -2
View File
@@ -33,7 +33,7 @@
D << "<span class='warning'>You can't seem to find the [pick(faux_gadgets)]! Without it, [src] [pick(faux_problems)].</span>"
return
D.visible_message("<span class='notice'>[D] begins to reactivate [src].</span>", "<span class='notice'>You begin to reactivate [src]...</span>")
if(do_after(user,30,needhand = 1, target = src))
if(do_after(user,30, 1, target = src))
adjustBruteLoss(-getBruteLoss()) //Heal all brute damage
stat = CONSCIOUS
icon_state = icon_living
@@ -49,7 +49,7 @@
if("Cannibalize")
if(D.health < D.maxHealth)
D.visible_message("<span class='notice'>[D] begins to cannibalize parts from [src].</span>", "<span class='notice'>You begin to cannibalize parts from [src]...</span>")
if(do_after(D, 60,5,0, target = src))
if(do_after(D, 60, 0, target = src))
D.visible_message("<span class='notice'>[D] repairs itself using [src]'s remains!</span>", "<span class='notice'>You repair yourself using [src]'s remains.</span>")
D.adjustBruteLoss(-src.maxHealth)
new /obj/effect/decal/cleanable/oil/streak(get_turf(src))