Fixes buckle-scoop jank

-Fixes clicking on buckled mobs giving out the scoop failure error message regardless of the scoopability (such as same-size folks and such who wouldn't be able to scoop the target anyway)
-Also fixes the said error message putting the scooper's name where the target's name ought to be.
This commit is contained in:
Verkister
2021-04-05 20:14:45 +03:00
committed by GitHub
parent 208795ec75
commit 80c153ddbe
+3 -3
View File
@@ -175,10 +175,10 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2
var/mob/living/simple_mob/SA = M
if(!SA.has_hands)
return 0
if(buckled)
to_chat(usr,"<span class='notice'>You have to unbuckle \the [M] before you pick them up.</span>")
return 0
if(size_diff >= 0.50 || mob_size < MOB_SMALL)
if(buckled)
to_chat(usr,"<span class='notice'>You have to unbuckle \the [src] before you pick them up.</span>")
return 0
holder_type = /obj/item/weapon/holder/micro
var/obj/item/weapon/holder/m_holder = get_scooped(M, G)
holder_type = holder_default