Bay12 examine overhaul.

This commit overhauls the examine system to baystation's latest system,
including a more efficient verb approach, and a new status panel tab,
which shows more information for pre-defined objects.
This commit is contained in:
Tigercat2000
2015-09-14 11:51:40 -07:00
parent cfbbf104ac
commit 0603f73232
146 changed files with 1381 additions and 1090 deletions
+8 -9
View File
@@ -52,12 +52,11 @@
return
icon_state = "paper"
/obj/item/weapon/paper/examine()
if(in_range(usr, src) || istype(usr, /mob/dead/observer))
show_content(usr)
/obj/item/weapon/paper/examine(mob/user)
if(in_range(user, src) || istype(user, /mob/dead/observer))
show_content(user)
else
usr << "<span class='notice'>You have to go closer if you want to read it.</span>"
return
user << "<span class='notice'>You have to go closer if you want to read it.</span>"
/obj/item/weapon/paper/proc/show_content(var/mob/user, var/forceshow = 0, var/forcestars = 0, var/infolinks = 0, var/view = 1)
set src in oview(1)
@@ -95,7 +94,7 @@
return
/obj/item/weapon/paper/attack_self(mob/living/user as mob)
src.examine(user)
user.examinate(src)
if(rigged && (holiday_master.holidays && holiday_master.holidays[APRIL_FOOLS]))
if(spam_flag == 0)
spam_flag = 1
@@ -120,7 +119,7 @@
if(user.zone_sel.selecting == "eyes")
user.visible_message("<span class='notice'>You show the paper to [M]. </span>", \
"<span class='notice'> [user] holds up a paper and shows it to [M]. </span>")
src.examine(user)
M.examinate(src)
else if(user.zone_sel.selecting == "mouth")
if(!istype(M, /mob)) return
@@ -444,7 +443,7 @@
add_fingerprint(user)
return
/obj/item/weapon/paper/proc/stamp(var/obj/item/weapon/stamp/S)
stamps += (!stamps || stamps == "" ? "<HR>" : "") + "<img src=large_[S.icon_state].png>"
@@ -460,7 +459,7 @@
offset_y += y
stampoverlay.pixel_x = x
stampoverlay.pixel_y = y
if(!ico)
ico = new
ico += "paper_[S.icon_state]"
+3 -4
View File
@@ -97,11 +97,10 @@
user << "\red You must hold \the [P] steady to burn \the [src]."
/obj/item/weapon/paper_bundle/examine(mob/user)
if(in_range(usr, src) || istype(usr, /mob/dead/observer))
src.show_content(usr)
if(..(user, 1))
src.show_content(user)
else
usr << "<span class='notice'>It is too far away.</span>"
return
user << "<span class='notice'>It is too far away.</span>"
/obj/item/weapon/paper_bundle/proc/show_content(mob/user as mob)
var/dat
+6 -8
View File
@@ -94,14 +94,12 @@
amount++
/obj/item/weapon/paper_bin/examine()
set src in oview(1)
if(amount)
usr << "<span class='notice'>There " + (amount > 1 ? "are [amount] papers" : "is one paper") + " in the bin.</span>"
else
usr << "<span class='notice'>There are no papers in the bin.</span>"
return
/obj/item/weapon/paper_bin/examine(mob/user)
if(..(user, 1))
if(amount)
usr << "<span class='notice'>There " + (amount > 1 ? "are [amount] papers" : "is one paper") + " in the bin.</span>"
else
usr << "<span class='notice'>There are no papers in the bin.</span>"
/obj/item/weapon/paper_bin/update_icon()
+7 -8
View File
@@ -33,7 +33,7 @@
var/photo_size = 3
/obj/item/weapon/photo/attack_self(mob/user as mob)
src.examine(user)
user.examinate(src)
/obj/item/weapon/photo/attackby(obj/item/weapon/P as obj, mob/user as mob, params)
if(istype(P, /obj/item/weapon/pen) || istype(P, /obj/item/toy/crayon))
@@ -70,10 +70,10 @@
user << "\red You must hold \the [P] steady to burn \the [src]."
/obj/item/weapon/photo/examine(mob/user)
if(in_range(usr, src) || istype(usr, /mob/dead/observer))
show(usr)
if(..(user, 1))
show(user)
else
usr << "<span class='notice'>It is too far away.</span>"
user << "<span class='notice'>It is too far away.</span>"
/obj/item/weapon/photo/proc/show(mob/user as mob)
usr << browse_rsc(img, "tmp_photo.png")
@@ -472,10 +472,9 @@
camera.c_tag = user.name
user << "You switch the camera [on ? "on" : "off"]."
/obj/item/device/videocam/examine()
..()
if(get_dist(usr,src) <= 1)
usr << "This video camera can send live feeds to the entertainment network. It's [camera ? "" : "in"]active."
/obj/item/device/videocam/examine(mob/user)
if(..(user, 1))
user << "This video camera can send live feeds to the entertainment network. It's [camera ? "" : "in"]active."
/obj/item/device/videocam/hear_talk(mob/M as mob, msg)