Merge pull request #2386 from Fox-McCloud/reagents-seeing

Reagent Scanner/Seeing
This commit is contained in:
TheDZD
2015-10-19 18:53:45 -04:00
11 changed files with 43 additions and 25 deletions
@@ -18,15 +18,6 @@
src.pixel_y = rand(-10.0, 10)
base_name = name
examine(mob/user)
if(..(user, 2))
user << "\blue It contains:"
if(reagents && reagents.reagent_list.len)
user << "\blue [src.reagents.total_volume] units of powder."
else
user << "\blue Nothing."
afterattack(obj/target, mob/user, proximity)
if(!proximity) return
@@ -156,7 +156,7 @@
else if (reagents.total_volume<=src.volume/4)
user << "\blue \The [src] is almost empty!"
else if (reagents.total_volume<=src.volume*0.66)
user << "\blue \The [src] is half full!"
user << "\blue \The [src] is half empty!" // Pessimism is the real order of the day.
else if (reagents.total_volume<=src.volume*0.90)
user << "\blue \The [src] is almost full!"
else
@@ -49,11 +49,6 @@
examine(mob/user)
if(!..(user, 2))
return
user << "\blue It contains:"
if(reagents && reagents.reagent_list.len)
user << "\blue [src.reagents.total_volume] units of liquid."
else
user << "\blue Nothing."
if (!is_open_container())
user << "\blue Airtight lid seals it completely."