Merge pull request #4345 from RKF45/misc

Fixes for my earliest commits
This commit is contained in:
Zuhayr
2014-01-26 09:16:07 -08:00
4 changed files with 9 additions and 10 deletions

View File

@@ -891,8 +891,9 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/obj/item/clothing/suit/hastur,
/obj/item/clothing/suit/imperium_monk,
/obj/item/clothing/suit/ianshirt,
/obj/item/clothing/suit/leathercoat,
/obj/item/clothing/suit/browncoat,
/obj/item/clothing/under/gimmick/rank/captain/suit,
/obj/item/clothing/under/gimmick/rank/head_of_personnel/suit,
/obj/item/clothing/under/lawyer/purpsuit,
/obj/item/clothing/suit/suspenders,
/obj/item/clothing/suit/storage/labcoat/mad,
/obj/item/clothing/suit/bio_suit/plaguedoctorsuit)

View File

@@ -312,22 +312,22 @@
if(slot_l_ear)
if(H.l_ear)
return 0
if( w_class < 2 )
return 1
if( !(slot_flags & SLOT_EARS) )
return 0
if( (slot_flags & SLOT_TWOEARS) && H.r_ear )
return 0
if( w_class < 2 )
return 1
return 1
if(slot_r_ear)
if(H.r_ear)
return 0
if( w_class < 2 )
return 1
if( !(slot_flags & SLOT_EARS) )
return 0
if( (slot_flags & SLOT_TWOEARS) && H.l_ear )
return 0
if( w_class < 2 )
return 1
return 1
if(slot_w_uniform)
if(H.w_uniform)

View File

@@ -47,11 +47,10 @@
set src in view()
..()
if (!(usr in view(2)) && usr!=src.loc) return
usr << "\blue It contains "
if(reagents && reagents.reagent_list.len)
usr << "\blue [src.reagents.total_volume] units of liquid."
usr << "\blue It contains [src.reagents.total_volume] units of liquid."
else
usr << "\blue nothing."
usr << "\blue It is empty."
if (!is_open_container())
usr << "\blue Airtight lid seals it completely."