Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum

code/modules/mob/living/silicon/examine.dm

@@ -1,5 +1,4 @@
 /mob/living/silicon/examine(mob/user) //Displays a silicon's laws to ghosts
-	. = ..()
 	if(laws && isobserver(user))
 		. += "<b>[src] has the following laws:</b>"
 		for(var/law in laws.get_law_list(include_zeroth = TRUE))

code/modules/mob/living/silicon/robot/examine.dm

@@ -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>"
 
 	. += ..()

code/modules/mob/living/silicon/robot/robot.dm

@@ -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, .)

code/modules/mob/living/silicon/robot/robot_defines.dm

@@ -125,3 +125,5 @@
 	var/sleeper_g
 	var/sleeper_r
 	var/sleeper_nv
+
+	tooltips = TRUE

code/modules/mob/living/silicon/silicon.dm

@@ -59,8 +59,8 @@
 
 /mob/living/silicon/ComponentInitialize()
 	. = ..()
-	AddElement(/datum/element/flavor_text, _name = "Silicon Flavor Text", _save_key = "silicon_flavor_text")
-	AddElement(/datum/element/flavor_text, "", "Temporary Flavor Text", "This should be used only for things pertaining to the current round!")
+	AddElement(/datum/element/flavor_text, _name = "Silicon Flavor Text", _always_show = TRUE, _save_key = "silicon_flavor_text")
+	AddElement(/datum/element/flavor_text, "", "Temporary Flavor Text", "This should be used only for things pertaining to the current round!", _always_show = TRUE)
 	AddElement(/datum/element/flavor_text, _name = "OOC Notes", _addendum = "Put information on ERP/vore/lewd-related preferences here. THIS SHOULD NOT CONTAIN REGULAR FLAVORTEXT!!", _always_show = TRUE, _save_key = "ooc_notes", _examine_no_preview = TRUE)
 
 /mob/living/silicon/med_hud_set_health()