Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Tastyfish
2011-12-26 11:24:39 -05:00
23 changed files with 502 additions and 45 deletions
+2 -2
View File
@@ -116,7 +116,6 @@
"/obj/item/ammo_magazine",
"/obj/item/weapon/reagent_containers/food/snacks/donut",
"/obj/item/weapon/reagent_containers/food/snacks/jellydonut",
"/obj/item/device/radio",
"/obj/item/device/detective_scanner",
"/obj/item/device/pda",
@@ -131,5 +130,6 @@
"/obj/item/weapon/camera_test",
"/obj/item/weapon/cigpacket",
"/obj/item/weapon/zippo",
"/obj/item/device/taperecorder"
"/obj/item/device/taperecorder",
"/obj/item/weapon/evidencebag"
)