shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update files (#15597)

Browse Source
This commit is contained in:
SandPoot
2022-04-15 11:31:50 -03:00
committed by GitHub
parent 697e2ca80a
commit 13fb647b9e
8 changed files with 27 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/antagonists/clockcult/clock_scripture.dm
View File

@@ -310,7 +310,7 @@ Judgement 80k power or nine converts
var/datum/progressbar/progbar
/datum/clockwork_scripture/ranged_ability/Destroy()
qdel(progbar)
progbar.end_progress()
return ..()
/datum/clockwork_scripture/ranged_ability/scripture_effects()
@@ -333,7 +333,7 @@ Judgement 80k power or nine converts
(allow_mobility || (can_recite() && T == get_turf(invoker))))
if(progbar)
if(slab.slab_ability.in_progress)
qdel(progbar)
progbar.end_progress()
else
progbar.update(end_time - world.time)
stoplag(1)

9
code/modules/vehicles/secway.dm
View File

@@ -43,7 +43,8 @@
. = ..(M, force, check_loc)
if(.)
if(progressbars_by_rider[M])
qdel(progressbars_by_rider[M])
var/datum/progressbar/to_delete = progressbars_by_rider[M]
to_delete.end_progress()
var/datum/progressbar/D = new(M, chargemax, src)
D.update(charge)
progressbars_by_rider[M] = D
@@ -51,12 +52,14 @@
/obj/vehicle/ridden/secway/unbuckle_mob(mob/living/M, force)
. = ..(M, force)
if(.)
qdel(progressbars_by_rider[M])
var/datum/progressbar/to_delete = progressbars_by_rider[M]
to_delete.end_progress()
progressbars_by_rider -= M
/obj/vehicle/ridden/secway/Destroy()
for(var/i in progressbars_by_rider)
qdel(progressbars_by_rider[i])
var/datum/progressbar/to_delete = progressbars_by_rider[i]
to_delete.end_progress()
progressbars_by_rider.Cut()
STOP_PROCESSING(SSfastprocess, src)
return ..()