cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix two extra robust bugs

Browse Source 
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.
This commit is contained in:
Arokha Sieyes
2017-03-03 16:25:13 -05:00
parent 8d82920e52
commit f7c22dc54d
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/objects/items/weapons/trays.dm
View File

@@ -17,7 +17,7 @@
var/max_carry = 10 var/max_carry = 10
/obj/item/weapon/tray/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) /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. // Drop all the things. All of them.
overlays.Cut() overlays.Cut()
for(var/obj/item/I in carrying) for(var/obj/item/I in carrying)

2
code/game/objects/structures/stool_bed_chair_nest/bed.dm
View File

@@ -133,7 +133,7 @@
user << "<span class='notice'>\The [src] already has someone buckled to it.</span>" user << "<span class='notice'>\The [src] already has someone buckled to it.</span>"
return return
user.visible_message("<span class='notice'>[user] attempts to buckle [affecting] into \the [src]!</span>") user.visible_message("<span class='notice'>[user] attempts to buckle [affecting] into \the [src]!</span>")
if(do_after(user, 20)) if(do_after(user, 20, G.affecting))
affecting.loc = loc affecting.loc = loc
spawn(0) spawn(0)
if(buckle_mob(affecting)) if(buckle_mob(affecting))