Merge branch 'refs/heads/master' into Bleeding-Edge

This commit is contained in:
d3athrow
2013-06-02 23:17:12 -05:00
parent 2ec026a2bd
commit 734090d65f
21 changed files with 130 additions and 115 deletions

View File

@@ -95,7 +95,7 @@
//is_blocked_turf(var/turf/T)
usr << "\blue You finish placing the [src]." //Git Test
/obj/item/taperoll/police/afterattack(var/atom/A, mob/user as mob)
/obj/item/taperoll/afterattack(var/atom/A, mob/user as mob)
if (istype(A, /obj/machinery/door/airlock))
var/turf/T = get_turf(A)
var/obj/item/tape/P = new tape_type(T.x,T.y,T.z)