mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-23 03:57:48 +01:00
Merge examine refactor for vorestation
This commit is contained in:
@@ -764,10 +764,10 @@
|
||||
set desc = "Switch sharp/fuzzy scaling for current mob."
|
||||
appearance_flags ^= PIXEL_SCALE
|
||||
|
||||
/mob/living/examine(mob/user, distance, infix, suffix)
|
||||
. = ..(user, distance, infix, suffix)
|
||||
/mob/living/examine(mob/user, infix, suffix)
|
||||
. = ..()
|
||||
if(showvoreprefs)
|
||||
to_chat(user, "<span class='deptradio'><a href='?src=\ref[src];vore_prefs=1'>\[Mechanical Vore Preferences\]</a></span>")
|
||||
. += "<span class='deptradio'><a href='?src=\ref[src];vore_prefs=1'>\[Mechanical Vore Preferences\]</a></span>"
|
||||
|
||||
/mob/living/Topic(href, href_list) //Can't find any instances of Topic() being overridden by /mob/living in polaris' base code, even though /mob/living/carbon/human's Topic() has a ..() call
|
||||
if(href_list["vore_prefs"])
|
||||
|
||||
@@ -98,13 +98,9 @@
|
||||
|
||||
//This can go here with all the references.
|
||||
/obj/effect/overlay/aiholo/examine(mob/user)
|
||||
. = ..(user)
|
||||
|
||||
var/msg = "\n"
|
||||
. = ..()
|
||||
|
||||
//If you need an ooc_notes copy paste, this is NOT the one to use.
|
||||
var/ooc_notes = master.ooc_notes
|
||||
if(ooc_notes)
|
||||
msg += "<span class = 'deptradio'>OOC Notes:</span> <a href='?src=\ref[master];ooc_notes=1'>\[View\]</a>\n"
|
||||
|
||||
to_chat(user,msg)
|
||||
. += "<span class = 'deptradio'>OOC Notes:</span> <a href='?src=\ref[master];ooc_notes=1'>\[View\]</a>"
|
||||
|
||||
@@ -11,8 +11,9 @@
|
||||
pixel_y = 0 // Override value from parent.
|
||||
|
||||
/obj/item/weapon/holder/micro/examine(mob/user)
|
||||
. = list()
|
||||
for(var/mob/living/M in contents)
|
||||
M.examine(user)
|
||||
. += M.examine(user)
|
||||
|
||||
/obj/item/weapon/holder/MouseDrop(mob/M)
|
||||
..()
|
||||
|
||||
@@ -49,9 +49,8 @@
|
||||
to_chat(usr, "<span class='notice'>You set the size to [size_select]%</span>")
|
||||
|
||||
/obj/item/weapon/gun/energy/sizegun/examine(mob/user)
|
||||
..()
|
||||
var/size_examine = (size_set_to*100)
|
||||
to_chat(user, "<span class='info'>It is currently set at [size_examine]%</span>")
|
||||
. = ..()
|
||||
. += "<span class='info'>It is currently set at [size_set_to*100]%</span>"
|
||||
|
||||
//
|
||||
// Beams for size gun
|
||||
|
||||
Reference in New Issue
Block a user