Merge with dev-freeze.

This commit is contained in:
Zuhayr
2015-06-21 20:45:47 +09:30
62 changed files with 706 additions and 600 deletions
@@ -214,8 +214,10 @@
name = "captain's satchel"
desc = "An exclusive satchel for Nanotrasen officers."
icon_state = "satchel-cap"
item_state = "captainpack"
item_state_slots = null
item_state_slots = list(
slot_l_hand_str = "satchel-cap",
slot_r_hand_str = "satchel-cap",
)
//ERT backpacks.
/obj/item/weapon/storage/backpack/ert