Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
This commit is contained in:
@@ -48,6 +48,9 @@
|
||||
. += "<span class='warning'>It doesn't seem to be responding.</span>"
|
||||
if(DEAD)
|
||||
. += "<span class='deadsay'>It looks like its system is corrupted and requires a reset.</span>"
|
||||
|
||||
SEND_SIGNAL(src, COMSIG_PARENT_EXAMINE, usr, .)
|
||||
|
||||
. += "*---------*</span>"
|
||||
|
||||
. += ..()
|
||||
|
||||
@@ -1352,3 +1352,18 @@
|
||||
var/datum/computer_file/program/robotact/program = modularInterface.get_robotact()
|
||||
if(program)
|
||||
program.force_full_update()
|
||||
|
||||
/mob/living/silicon/robot/get_tooltip_data()
|
||||
var/t_He = p_they(TRUE)
|
||||
var/t_is = p_are()
|
||||
. = list()
|
||||
var/borg_type = module ? module : "Default"
|
||||
//This isn't even used normally, but if that ever changes, just uncomment this
|
||||
/* var/obj/item/borg_chameleon/chameleon = locate() in src
|
||||
if(!chameleon)
|
||||
chameleon = locate() in src.module
|
||||
if(chameleon?.active)
|
||||
borg_type = "Engineering"
|
||||
*/
|
||||
. += "[t_He] [t_is] a [borg_type] unit"
|
||||
SEND_SIGNAL(src, COMSIG_PARENT_EXAMINE, usr, .)
|
||||
|
||||
@@ -125,3 +125,5 @@
|
||||
var/sleeper_g
|
||||
var/sleeper_r
|
||||
var/sleeper_nv
|
||||
|
||||
tooltips = TRUE
|
||||
|
||||
Reference in New Issue
Block a user