From f7c22dc54d91aef32c1e738be81da89c0299dfec Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Fri, 3 Mar 2017 16:25:13 -0500 Subject: [PATCH] Fix two extra robust bugs Trays have no attack cooldown because they have this crazy-long snowflake code for attacks. Beds (and children like chairs) don't track target for grab-buckle do_after, letting them run away and get teleported back to the chair and buckled regardless of their efforts. --- code/game/objects/items/weapons/trays.dm | 2 +- code/game/objects/structures/stool_bed_chair_nest/bed.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/weapons/trays.dm b/code/game/objects/items/weapons/trays.dm index ca32d730f3..41bcedbf21 100644 --- a/code/game/objects/items/weapons/trays.dm +++ b/code/game/objects/items/weapons/trays.dm @@ -17,7 +17,7 @@ var/max_carry = 10 /obj/item/weapon/tray/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) - + user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) // Drop all the things. All of them. overlays.Cut() for(var/obj/item/I in carrying) diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm index a2e8e3f21b..17a9c54cb3 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm @@ -133,7 +133,7 @@ user << "\The [src] already has someone buckled to it." return user.visible_message("[user] attempts to buckle [affecting] into \the [src]!") - if(do_after(user, 20)) + if(do_after(user, 20, G.affecting)) affecting.loc = loc spawn(0) if(buckle_mob(affecting))