Merge branch 'master' of github.com:Tastyfish/Baystation12

This commit is contained in:
Tastyfish
2011-12-06 20:36:20 -05:00
15 changed files with 5395 additions and 5379 deletions

View File

@@ -146,9 +146,6 @@
src.inventory_head = item_to_add
update_clothing()
if(inventory_head && inventory_head.type == /obj/item/clothing/head/caphat)
name = "Captain "+real_name
if("back")
if(inventory_back)
usr << "\red The [inventory_back] is already in this slot."