Merge branch 'master' of https://github.com/tgstation/-tg-station into HoSGun

This commit is contained in:
Steelpoint
2015-02-25 11:50:05 +08:00
+2 -1
View File
@@ -11,6 +11,7 @@
/obj/structure/bigDelivery/attack_hand(mob/user as mob)
playsound(src.loc, 'sound/items/poster_ripped.ogg', 50, 1)
qdel(src)
/obj/structure/bigDelivery/Destroy()
@@ -74,7 +75,7 @@
user.put_in_hands(wrapped)
else
wrapped.loc = get_turf(src)
playsound(src.loc, 'sound/items/poster_ripped.ogg', 50, 1)
qdel(src)