mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-29 06:57:42 +01:00
Merge pull request #497 from SkyMarshal/master
Fixed some bugs, Antiqua update.
This commit is contained in:
@@ -17,7 +17,6 @@
|
||||
|
||||
/obj/item/weapon/evidencebag/afterattack(obj/item/O, mob/user as mob)
|
||||
if(istype(O, /obj/item/weapon/storage) && O in user)
|
||||
user << "You put the evidence bag into the [O]."
|
||||
return ..()
|
||||
if(!(O && istype(O)) || O.anchored == 1)
|
||||
user << "You can't put that inside the [src]!"
|
||||
|
||||
@@ -221,8 +221,7 @@
|
||||
/obj/item/proc/wrap(obj/item/I as obj, mob/user as mob)
|
||||
if(istype(I, /obj/item/weapon/packageWrap))
|
||||
var/obj/item/weapon/packageWrap/C = I
|
||||
if(!istype(src.loc,/turf))
|
||||
user << "\red You need to place the item on the ground or a table before wrapping it!"
|
||||
if(anchored)
|
||||
return
|
||||
else if (C.amount > 1)
|
||||
var/obj/item/smallDelivery/P = new /obj/item/smallDelivery(get_turf(src.loc))
|
||||
|
||||
Reference in New Issue
Block a user