All the relevant examine changes.

This commit is contained in:
PsiOmega
2014-11-05 12:44:23 +01:00
parent e19a79a340
commit bc438e21ad
135 changed files with 665 additions and 876 deletions
+6 -5
View File
@@ -106,15 +106,16 @@ LINEN BINS
var/obj/item/hidden = null
/obj/structure/bedsheetbin/examine()
usr << desc
/obj/structure/bedsheetbin/examine(mob/user)
..(user)
if(amount < 1)
usr << "There are no bed sheets in the bin."
user << "There are no bed sheets in the bin."
return
if(amount == 1)
usr << "There is one bed sheet in the bin."
user << "There is one bed sheet in the bin."
return
usr << "There are [amount] bed sheets in the bin."
user << "There are [amount] bed sheets in the bin."
/obj/structure/bedsheetbin/update_icon()
+9 -8
View File
@@ -19,10 +19,9 @@
create_reagents(100)
/obj/structure/janitorialcart/examine()
set src in usr
usr << "[src] \icon[src] contains [reagents.total_volume] unit\s of liquid!"
..()
/obj/structure/janitorialcart/examine(mob/user)
if(..(user, 1))
user << "[src] \icon[src] contains [reagents.total_volume] unit\s of liquid!"
//everything else is visible, so doesn't need to be mentioned
@@ -175,11 +174,13 @@
create_reagents(100)
/obj/structure/stool/bed/chair/janicart/examine()
set src in usr
usr << "\icon[src] This [callme] contains [reagents.total_volume] unit\s of water!"
/obj/structure/stool/bed/chair/janicart/examine(mob/user)
if(!..(user, 1))
return
user << "\icon[src] This [callme] contains [reagents.total_volume] unit\s of water!"
if(mybag)
usr << "\A [mybag] is hanging on the [callme]."
user << "\A [mybag] is hanging on the [callme]."
/obj/structure/stool/bed/chair/janicart/attackby(obj/item/I, mob/user)
+3 -4
View File
@@ -13,10 +13,9 @@
create_reagents(100)
/obj/structure/mopbucket/examine()
set src in usr
usr << "[src] \icon[src] contains [reagents.total_volume] unit\s of water!"
..()
/obj/structure/mopbucket/examine(mob/user)
if(..(user, 1))
user << "[src] \icon[src] contains [reagents.total_volume] unit\s of water!"
/obj/structure/mopbucket/attackby(obj/item/I, mob/user)
if(istype(I, /obj/item/weapon/mop))
@@ -9,8 +9,6 @@
return
/obj/structure/stool/bed/chair/New()
if(anchored)
src.verbs -= /atom/movable/verb/pull
..()
spawn(3) //sorry. i don't think there's a better way to do this.
handle_rotation()
@@ -153,7 +151,7 @@
if(propelled)
var/mob/living/occupant = buckled_mob
unbuckle()
var/def_zone = ran_zone()
var/blocked = occupant.run_armor_check(def_zone, "melee")
occupant.throw_at(A, 3, propelled)