Merge pull request #9867 from Ghommie/Ghommie-cit375

Ports "examine-code refactor"
2019-11-25 11:31:03 +13:00
parent 315082fc91 6a0bd7c925
commit c81d1fe7a3
332 changed files with 1296 additions and 1350 deletions
@@ -138,6 +138,7 @@
 			name = "valentine - To: [recipient] From: [sender]"

 /obj/item/valentine/examine(mob/user)
+	. = ..()
 	if(in_range(user, src) || isobserver(user))
 		if( !(ishuman(user) || isobserver(user) || issilicon(user)) )
 			user << browse("<HTML><HEAD><TITLE>[name]</TITLE></HEAD><BODY>[stars(message)]</BODY></HTML>", "window=[name]")
@@ -146,7 +147,7 @@
 			user << browse("<HTML><HEAD><TITLE>[name]</TITLE></HEAD><BODY>[message]</BODY></HTML>", "window=[name]")
 			onclose(user, "[name]")
 	else
-		to_chat(user, "<span class='notice'>It is too far away.</span>")
+		. += "<span class='notice'>It is too far away.</span>"

 /obj/item/valentine/attack_self(mob/user)
 	user.examinate(src)
@@ -292,7 +292,7 @@
 	add_atom_colour("#ffffff", FIXED_COLOUR_PRIORITY)

 /obj/structure/spacevine/examine(mob/user)
-	..()
+	. = ..()
 	var/text = "This one is a"
 	if(mutations.len)
 		for(var/A in mutations)
@@ -301,7 +301,7 @@
 	else
 		text += " normal"
 	text += " vine."
-	to_chat(user, text)
+	. += text

 /obj/structure/spacevine/Destroy()
 	for(var/datum/spacevine_mutation/SM in mutations)