Merge pull request #20186 from phil235/InsertFix2

Fixes issues with packagewrap, trashbag, handlabeler,
This commit is contained in:
oranges
2016-09-01 10:13:30 +12:00
committed by GitHub
10 changed files with 90 additions and 86 deletions
+3 -1
View File
@@ -14,6 +14,8 @@
evidencebagEquip(I, user)
/obj/item/weapon/evidencebag/attackby(obj/item/I, mob/user, params)
if(I.no_direct_insertion)
return ..()
if(evidencebagEquip(I, user))
return 1
@@ -60,7 +62,7 @@
add_overlay("evidence") //should look nicer for transparent stuff. not really that important, but hey.
desc = "An evidence bag containing [I]. [I.desc]"
I.loc = src
I.forceMove(src)
w_class = I.w_class
return 1
+3
View File
@@ -4,6 +4,8 @@
icon = 'icons/obj/bureaucracy.dmi'
icon_state = "labeler0"
item_state = "flight"
no_direct_insertion = 0
flags = NOBLUDGEON
var/label = null
var/labels_left = 30
var/mode = 0
@@ -68,6 +70,7 @@
user << "<span class='warning'>You don't have the dexterity to use [src]!</span>"
return
mode = !mode
no_direct_insertion = !no_direct_insertion
icon_state = "labeler[mode]"
if(mode)
user << "<span class='notice'>You turn on [src].</span>"