Merge pull request #497 from SkyMarshal/master

Fixed some bugs, Antiqua update.
This commit is contained in:
Albert Iordache
2012-02-22 23:32:37 -08:00
8 changed files with 1417 additions and 1201 deletions
-1
View File
@@ -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]!"
+1 -2
View File
@@ -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))