Bug fixes:

- Fixed all known issues regarding storage items including photo albums being able to carry any item with w_class = 1 and the double messages that were generated when you or someone placed an item into a storage item. Same for bible, briefcase, etc. etc.
- A side effect of this is that storage items are no longer able to be wrapped with wrapping paper.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1175 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
baloh.matevz
2011-03-11 21:34:32 +00:00
parent 041d2d9aaf
commit d08130082b
7 changed files with 7 additions and 7 deletions

View File

@@ -32,7 +32,7 @@
return
/obj/item/weapon/storage/photo_album/attackby(obj/item/weapon/W as obj, mob/user as mob)
..()
//..()
if (src.contents.len >= 7)
return

View File

@@ -210,7 +210,7 @@
item_state = "syringe_kit"
/obj/item/weapon/storage/trashcan/attackby(obj/item/weapon/W as obj, mob/user as mob)
..()
//..()
if (src.contents.len >= 7)
user << "The trashcan is full!"

View File

@@ -527,7 +527,7 @@
*/
/obj/item/weapon/storage/firstaid/attackby(var/obj/item/robot_parts/S, mob/user as mob)
..()
//..()
if ((!istype(S, /obj/item/robot_parts/l_arm)) && (!istype(S, /obj/item/robot_parts/r_arm)))
if (src.contents.len >= 7)
return

View File

@@ -34,7 +34,7 @@
return
/obj/item/weapon/storage/backpack/attackby(obj/item/weapon/W as obj, mob/user as mob)
..()
//..()
if (src.contents.len >= 7)
return

View File

@@ -75,7 +75,7 @@
call(/obj/rune/proc/revealrunes)(src)
/obj/item/weapon/storage/bible/attackby(obj/item/weapon/W as obj, mob/user as mob)
..()
//..()
if (istype(W, /obj/item/weapon/storage/bible))
return
if (src.contents.len >= 7)

View File

@@ -9,7 +9,7 @@
new /obj/item/weapon/pen(src)
/obj/item/weapon/storage/briefcase/attack(mob/M as mob, mob/user as mob)
..()
//..()
if ((usr.mutations & 16) && prob(50))
usr << "\red The [src] slips out of your hand and hits your head."

View File

@@ -250,7 +250,7 @@
src.add_fingerprint(user)
/obj/item/weapon/storage/utilitybelt/attackby(obj/item/weapon/W as obj, mob/user as mob)
..()
//..() //This will make it impossible to wrap the belt in wrapping paper, but will enable them to work as intended once more.
if(!can_use())
user << "\red I need to wear the belt for that."
return