- Fixed issue 814. Added a obj/screen/inventory object type, which is for screen objects that can hold other ones. This will stop clicks on other UI slots from attempting to equip whatever is in your active hand to them.

- Fixed an issue where the monkey's slot_l_hand and slot_r_hand slot identifiers were being assigned to the two pieces of the 'swap hand' button instead of the actual hand screen items. Not tomention them being the wrong way around...

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4482 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
baloh.matevz
2012-08-18 00:26:47 +00:00
parent 96645c8726
commit ca02f37a6e
4 changed files with 251 additions and 246 deletions
+4 -2
View File
@@ -5,6 +5,8 @@
unacidable = 1
var/id = 0.0
var/obj/master
/obj/screen/inventory
var/slot_id
/obj/screen/close
@@ -538,11 +540,11 @@
DblClick()
return
/obj/screen/attack_hand(mob/user as mob)
/obj/screen/inventory/attack_hand(mob/user as mob)
user.attack_ui(slot_id)
return
/obj/screen/attack_paw(mob/user as mob)
/obj/screen/inventory/attack_paw(mob/user as mob)
user.attack_ui(slot_id)
return