Merge pull request #143 from skull132/master

Update 29JUN2014
This commit is contained in:
skull132
2014-06-29 19:01:56 +03:00
4 changed files with 878 additions and 878 deletions
+4 -4
View File
@@ -89,8 +89,8 @@
for(var/obj/item/clothing/glasses/B in M)
del(B)
M.glasses=null
ok = M.equip_if_possible(Item, slot_glasses, 0)
/* else if(istype(Item,/obj/item/device/pda))
ok = M.equip_if_possible(I, slot_glasses, 0)
else if(istype(Item,/obj/item/device/pda))
if(M.ckey == "meowykins" && M.real_name == "Miyako Yukimura")
ok = 1
del(Item)
@@ -99,8 +99,8 @@
if(istype(M.l_store,/obj/item/device/pda))
for(var/obj/item/device/pda/B in M)
del(B)
M.pda=null
ok = M.equip_if_possible(Item, slot_l_store,0)*/
M.l_store=null
ok = M.equip_if_possible(I, slot_l_store,0)
else if(istype(M.back,/obj/item/weapon/storage) && M.back:contents.len < M.back:storage_slots) // Try to place it in something on the mob's back
Item.loc = M.back
ok = 1
@@ -327,12 +327,12 @@
bangshuman
name = "Bangs"
icon_state = "hair_bangs"
icon_state = "hair_hbangs"
gender = FEMALE
bangshumanalt
name = "Bangs Short"
icon_state = "hair_bangs_alt"
icon_state = "hair_hbangs_alt"
gender = FEMALE
bald