Makes code compile again

Fixing merge conflicts had the sideffect of adding one instance of
canremove, and one of drop_from_inventory.
This commit is contained in:
DZD
2015-02-18 13:50:36 -05:00
parent 4bcdb94a99
commit a299793ab8
2 changed files with 46 additions and 46 deletions
+2 -2
View File
@@ -402,7 +402,7 @@
else
user << "<span class='notice'>You need to target your patient's chest with [src].</span>"
return
/obj/item/weapon/borg_defib
name = "defibrillator paddles"
desc = "A pair of mounted paddles with flat metal surfaces that are used to deliver powerful electric shocks."
@@ -411,10 +411,10 @@
item_state = "defibpaddles0"
force = 0
w_class = 4
canremove = 0
var/revivecost = 1000
var/cooldown = 0
var/busy = 0
flags = NODROP
/obj/item/weapon/borg_defib/attack(mob/M, mob/user)
var/tobehealed