Merge pull request #121 from SkyMarshal/882fb96574109859b6e503804190390b27e1c738

Yet again, check the description.
This commit is contained in:
MlocMcMloc
2011-12-19 08:09:25 -08:00
31 changed files with 367 additions and 66 deletions
+1 -1
View File
@@ -302,7 +302,7 @@ THERMAL GLASSES
else
usr << "Sorry! The suit you're wearing doesn't have buttons!"
/obj/item/clothing/suit/labcoat/verb/toggle()
/obj/item/clothing/suit/storage/labcoat/verb/toggle()
set name = "Toggle Labcoat Buttons"
set category = "Object"
if(src.icon_state == "labcoat_open")
@@ -0,0 +1,54 @@
//CONTAINS:
//Evidence bags and stuff
///////////
//Shamelessly ripped from Mini's old code.
/obj/item/weapon/evidencebag
name = "evidence bag"
desc = "An empty evidence bag."
icon = 'storage.dmi'
icon_state = "evidenceobj"
/* buggy and stuff
/obj/item/weapon/evidencebag/attackby(obj/item/weapon/O, mob/user as mob)
return src.afterattack(O, user)
*/
/obj/item/weapon/evidencebag/afterattack(obj/item/O, mob/user as mob)
//Now you can put it into a briefcase, if it is in your hand. Otherwise, if it is evidence on the ground, it picks it up.
if(istype(O, /obj/item/weapon/storage) && O in user)
user << "You put the evidence bag into the [O]."
return ..()
if(!(O && istype(O)) || O.anchored == 1)
user << "You can't put that inside the [src]!"
return ..()
if(src.contents.len > 0)
user << "The [src] already has something inside it."
return ..()
user << "You put the [O] inside the [src]."
O.loc = src
icon_state = "evidence"
src.underlays += O
desc = "An evidence bag containing \a [O]. [O.desc]"
/obj/item/weapon/evidencebag/attack_self(mob/user as mob)
var/obj/item/I = src.contents[1]
user << "You take the [I] out of the [src]."
I.loc = user.loc
src.underlays -= I
icon_state = "evidenceobj"
/obj/item/weapon/storage/box/evidence
name = "evidence bag box"
desc = "A box claiming to contain evidence bags."
New()
new /obj/item/weapon/evidencebag(src)
new /obj/item/weapon/evidencebag(src)
new /obj/item/weapon/evidencebag(src)
new /obj/item/weapon/evidencebag(src)
new /obj/item/weapon/evidencebag(src)
new /obj/item/weapon/evidencebag(src)
new /obj/item/weapon/evidencebag(src)
..()
return