Merged money, ATMs, bible changes, nullrod changes, policetape.

This commit is contained in:
Erthilo
2012-09-03 01:29:53 +01:00
parent f645a9c5a9
commit 3aa8982a81
11 changed files with 220 additions and 44 deletions

View File

@@ -1,3 +1,21 @@
//Define all tape types in policetape.dm
/obj/item/taperoll
name = "tape roll"
icon = 'policetape.dmi'
icon_state = "rollstart"
flags = FPRINT
w_class = 1.0
var/turf/start
var/turf/end
var/tape_type = /obj/item/tape
var/icon_base
/obj/item/tape
name = "tape"
icon = 'policetape.dmi'
anchored = 1
density = 1
var/icon_base
/obj/item/taperoll/police
name = "police tape"
@@ -116,7 +134,7 @@
breaktape(/obj/item/weapon/wirecutters,user)
/obj/item/tape/proc/breaktape(obj/item/weapon/W as obj, mob/user as mob)
if(user.a_intent == "help" && ((!is_sharp(W) && src.allowed(user)) ||(!is_cut(W) && !src.allowed(user))))
if(user.a_intent == "help" && ((!is_sharp(W) && src.allowed(user))))
user << "You can't break the [src] with that!"
return
user.show_viewers("\blue [user] breaks the [src]!")