Merge pull request #14165 from SabreML/Plant-wrap

Fixes package wrapper exploit
This commit is contained in:
AffectedArc07
2020-08-28 13:06:56 +01:00
committed by GitHub
+2 -2
View File
@@ -161,13 +161,13 @@
amount = 25
max_amount = 25
resistance_flags = FLAMMABLE
var/static/list/no_wrap = list(/obj/item/smallDelivery, /obj/structure/bigDelivery, /obj/item/evidencebag, /obj/structure/closet/body_bag, /obj/item/twohanded/required)
/obj/item/stack/packageWrap/afterattack(var/obj/target as obj, mob/user as mob, proximity)
if(!proximity) return
if(!istype(target)) //this really shouldn't be necessary (but it is). -Pete
return
if(istype(target, /obj/item/smallDelivery) || istype(target,/obj/structure/bigDelivery) \
|| istype(target, /obj/item/evidencebag) || istype(target, /obj/structure/closet/body_bag))
if(is_type_in_list(target, no_wrap))
return
if(target.anchored)
return