Merge pull request #48 from Markolie/master

Add clothing vendors to cargo, fix syndiborg/dsborg, laptop fix, other minor fixes
This commit is contained in:
Fox-McCloud
2014-12-06 22:59:38 -05:00
10 changed files with 79 additions and 115 deletions
@@ -95,7 +95,8 @@
item_state = "syringe_kit"
w_class = 3
max_w_class = 2
storage_slots = 6
max_combined_w_class = 20
storage_slots = 12
req_access = list(access_captain)
icon_locked = "medalbox+l"
icon_closed = "medalbox"
@@ -57,3 +57,18 @@
machine_name = "AutoDrobe"
icon_state = "refill_costume"
charges = 19// of 58
/obj/item/weapon/vending_refill/hatdispenser
machine_name = "hat"
icon_state = "refill_costume"
charges = 18// of 56
/obj/item/weapon/vending_refill/suitdispenser
machine_name = "suit"
icon_state = "refill_costume"
charges = 68// of 206
/obj/item/weapon/vending_refill/shoedispenser
machine_name = "shoe"
icon_state = "refill_costume"
charges = 30// of 91