mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-27 15:18:09 +01:00
[MIRROR] fix a bunch of runtimes (#12455)
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
co-authored by
Kashargul
parent
3a66f10491
commit
ef8c71e96a
@@ -215,9 +215,9 @@
|
||||
affecting.update_damages()
|
||||
if(used == amount)
|
||||
if(affecting.is_bandaged())
|
||||
balloon_alert(user, "\the [src] is used up.")
|
||||
user.balloon_alert(user, "\the [src] is used up.")
|
||||
else
|
||||
balloon_alert(user, "\the [src] is used up, but there are more wounds to treat on \the [affecting.name].")
|
||||
user.balloon_alert(user, "\the [src] is used up, but there are more wounds to treat on \the [affecting.name].")
|
||||
use(used)
|
||||
|
||||
/obj/item/stack/medical/ointment
|
||||
|
||||
@@ -442,16 +442,19 @@
|
||||
if(istype(W, /obj/item/gripper))
|
||||
var/obj/item/gripper/G = W
|
||||
G.consolidate_stacks(src)
|
||||
if(QDELETED(src))
|
||||
return
|
||||
|
||||
else if(istype(W, /obj/item/stack))
|
||||
var/obj/item/stack/S = W
|
||||
src.transfer_to(S)
|
||||
if(QDELETED(src))
|
||||
return
|
||||
|
||||
spawn(0) //give the stacks a chance to delete themselves if necessary
|
||||
if (S && user.check_current_machine(S))
|
||||
S.interact(user)
|
||||
if (src && user.check_current_machine(src))
|
||||
src.interact(user)
|
||||
if (S && user.check_current_machine(S))
|
||||
S.interact(user)
|
||||
if (src && user.check_current_machine(src))
|
||||
src.interact(user)
|
||||
else
|
||||
return ..()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user