Merge with dev.

This commit is contained in:
Zuhayr
2015-02-21 20:11:35 +10:30
@@ -396,7 +396,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
user.update_inv_l_hand(0)
user.update_inv_r_hand(1)
/obj/item/clothing/mask/cigarette/pipe/cobpipe
/obj/item/clothing/mask/smokable/pipe/cobpipe
name = "corn cob pipe"
desc = "A nicotine delivery system popularized by folksy backwoodsmen, kept popular in the modern age and beyond by space hipsters."
icon_state = "cobpipeoff"