Merge pull request #4516 from MrPerson/examinate_the_doctor

Change examine() from an atom verb to a mob verb
This commit is contained in:
Cheridan
2014-10-05 23:37:34 -05:00
92 changed files with 368 additions and 662 deletions
+6 -7
View File
@@ -163,15 +163,14 @@ LINEN BINS
var/obj/item/hidden = null
/obj/structure/bedsheetbin/examine()
/obj/structure/bedsheetbin/examine(mob/user)
..()
if(amount < 1)
usr << "There are no bed sheets in the bin."
return
if(amount == 1)
usr << "There is one bed sheet in the bin."
return
usr << "There are [amount] bed sheets in the bin."
user << "There are no bed sheets in the bin."
else if(amount == 1)
user << "There is one bed sheet in the bin."
else
user << "There are [amount] bed sheets in the bin."
/obj/structure/bedsheetbin/update_icon()
+2 -10
View File
@@ -20,12 +20,6 @@
create_reagents(100)
/obj/structure/janitorialcart/examine()
set src in usr
..()
usr << "It contains [reagents.total_volume] unit\s of liquid!"
//everything else is visible, so doesn't need to be mentioned
/obj/structure/janitorialcart/proc/wet_mop(obj/item/weapon/mop, mob/user)
if(reagents.total_volume < 1)
user << "[src] is out of water!</span>"
@@ -176,12 +170,10 @@
create_reagents(100)
/obj/structure/stool/bed/chair/janicart/examine()
set src in usr
/obj/structure/stool/bed/chair/janicart/examine(mob/user)
..()
usr << "It 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)
@@ -12,12 +12,6 @@
/obj/structure/mopbucket/New()
create_reagents(100)
/obj/structure/mopbucket/examine()
set src in usr
..()
usr << "It contains [reagents.total_volume] unit\s of water!"
/obj/structure/mopbucket/attackby(obj/item/I, mob/user)
if(istype(I, /obj/item/weapon/mop))
if(reagents.total_volume < 1)