cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-29 08:08:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4516 from MrPerson/examinate_the_doctor

Browse Source 
Change examine() from an atom verb to a mob verb
This commit is contained in:
Cheridan
2014-10-05 23:37:34 -05:00
parent 3d868fe56c 651c3e6db5
commit f5b5ead3ef
92 changed files with 368 additions and 662 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/paperwork/clipboard.dm
+1 -1
View File
@@ -103,7 +103,7 @@
if(href_list["read"])
var/obj/item/weapon/paper/P = locate(href_list["read"])
if(istype(P) && P.loc == src)
P.examine()
usr.examinate(P)
if(href_list["top"])
var/obj/item/P = locate(href_list["top"])
code/modules/paperwork/folders.dm
+1 -1
View File
@@ -67,7 +67,7 @@
if(href_list["read"])
var/obj/item/I = locate(href_list["read"])
if(istype(I) && I.loc == src)
I.examine()
usr.examinate(I)
//Update everything
attack_self(usr)
code/modules/paperwork/paper.dm
+10 -13
View File
@@ -48,20 +48,17 @@
icon_state = "paper"
/obj/item/weapon/paper/examine()
set src in oview(1)
if(is_blind(usr))
return
if(in_range(usr, src))
if( !(ishuman(usr) || isobserver(usr) || issilicon(usr)) )
usr << browse("<HTML><HEAD><TITLE>[name]</TITLE></HEAD><BODY>[stars(info)]<HR>[stamps]</BODY></HTML>", "window=[name]")
onclose(usr, "[name]")
/obj/item/weapon/paper/examine(mob/user)
..()
if(in_range(user, src))
if( !(ishuman(user) || isobserver(user) || issilicon(user)) )
user << browse("<HTML><HEAD><TITLE>[name]</TITLE></HEAD><BODY>[stars(info)]<HR>[stamps]</BODY></HTML>", "window=[name]")
onclose(user, "[name]")
else
usr << browse("<HTML><HEAD><TITLE>[name]</TITLE></HEAD><BODY>[info]<HR>[stamps]</BODY></HTML>", "window=[name]")
onclose(usr, "[name]")
user << browse("<HTML><HEAD><TITLE>[name]</TITLE></HEAD><BODY>[info]<HR>[stamps]</BODY></HTML>", "window=[name]")
onclose(user, "[name]")
else
usr << "<span class='notice'>It is too far away.</span>"
user << "<span class='notice'>It is too far away.</span>"
/obj/item/weapon/paper/verb/rename()
@@ -80,7 +77,7 @@
/obj/item/weapon/paper/attack_self(mob/user)
examine()
user.examinate(src)
if(rigged && (events.holiday == "April Fool's Day"))
if(spam_flag == 0)
spam_flag = 1
code/modules/paperwork/paperbin.dm
+3 -4
View File
@@ -74,13 +74,12 @@
update_icon()
/obj/item/weapon/paper_bin/examine()
set src in oview(1)
/obj/item/weapon/paper_bin/examine(mob/user)
..()
if(amount)
usr << "It contains " + (amount > 1 ? "[amount] papers" : " one paper")+"."
user << "It contains " + (amount > 1 ? "[amount] papers" : " one paper")+"."
else
usr << "It doesn't contain anything."
user << "It doesn't contain anything."
/obj/item/weapon/paper_bin/update_icon()
code/modules/paperwork/photography.dm
+8 -10
View File
@@ -35,7 +35,7 @@
/obj/item/weapon/photo/attack_self(mob/user)
examine()
user.examinate(src)
/obj/item/weapon/photo/attackby(obj/item/weapon/P, mob/user)
@@ -47,15 +47,13 @@
..()
/obj/item/weapon/photo/examine()
set src in oview(1)
if(is_blind(usr)) return
/obj/item/weapon/photo/examine(mob/user)
..()
if(in_range(usr, src))
show(usr)
usr << desc
if(in_range(user, src))
show(user)
else
usr << "<span class='notice'>It is too far away.</span>"
user << "You need to get closer to get a good look at this photo."
/obj/item/weapon/photo/proc/show(mob/user)
@@ -150,9 +148,9 @@
..()
/obj/item/device/camera/examine()
/obj/item/device/camera/examine(mob/user)
..()
usr << "It has [pictures_left] photos left."
user << "It has [pictures_left] photos left."
/obj/item/device/camera/proc/camera_get_icon(list/turfs, turf/center)