From e6941398e133c1bc98b77bf01a637a5f7b8d5497 Mon Sep 17 00:00:00 2001
From: Geeves <ggrobler447@gmail.com>
Date: Fri, 27 Dec 2019 22:28:54 +0200
Subject: [PATCH] suitstore and suit examine fix (#7828)

Fixes suitstore being displayed twice in examine, fixes suit not being displayed.
---
 code/modules/mob/living/carbon/human/examine.dm | 6 +++---
 html/changelogs/geeves - examinefix.yml         | 6 ++++++
 2 files changed, 9 insertions(+), 3 deletions(-)
 create mode 100644 html/changelogs/geeves - examinefix.yml

diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm
index 043f5a310ba..7d3989731b6 100644
--- a/code/modules/mob/living/carbon/human/examine.dm
+++ b/code/modules/mob/living/carbon/human/examine.dm
@@ -98,14 +98,14 @@
 		if(wear_suit.blood_DNA)
 			msg += "<span class='warning'>[T.He] [T.is] wearing \icon[wear_suit] [wear_suit.gender==PLURAL?"some":"a"] [(wear_suit.blood_color != "#030303") ? "blood" : "oil"]-stained <a href='?src=\ref[src];lookitem_desc_only=\ref[wear_suit]'>[wear_suit.name]</a>[tie_msg_warn].</span>\n"
 		else
-			msg += "[T.He] [T.is] carrying \icon[s_store] <a href='?src=\ref[src];lookitem_desc_only=\ref[s_store]'>\a [s_store]</a> on [T.his] [wear_suit.name].\n"
+			msg += "[T.He] [T.is] wearing \icon[wear_suit] <a href='?src=\ref[src];lookitem_desc_only=\ref[wear_suit]'>\a [wear_suit]</a>[tie_msg].\n"
 
 		//suit/armour storage
 		if(s_store && !skipsuitstorage)
 			if(s_store.blood_DNA)
-				msg += "<span class='warning'>[T.He] [T.is] carrying \icon[s_store] [s_store.gender==PLURAL?"some":"a"] [(s_store.blood_color != "#030303") ? "blood" : "oil"]-stained [s_store.name] on [T.his] [wear_suit.name]!</span>\n"
+				msg += "<span class='warning'>[T.He] [T.is] carrying \icon[s_store] [s_store.gender==PLURAL?"some":"a"] [(s_store.blood_color != "#030303") ? "blood" : "oil"]-stained <a href='?src=\ref[src];lookitem_desc_only=\ref[s_store]'>[s_store.name]</a> on [T.his] [wear_suit.name]!</span>\n"
 			else
-				msg += "[T.He] [T.is] carrying \icon[s_store] \a [s_store] on [T.his] [wear_suit.name].\n"
+				msg += "[T.He] [T.is] carrying \icon[s_store] <a href='?src=\ref[src];lookitem_desc_only=\ref[s_store]'>\a [s_store]</a> on [T.his] [wear_suit.name].\n"
 
 	//back
 	if(back)
diff --git a/html/changelogs/geeves - examinefix.yml b/html/changelogs/geeves - examinefix.yml
new file mode 100644
index 00000000000..ecd4e52838e
--- /dev/null
+++ b/html/changelogs/geeves - examinefix.yml	
@@ -0,0 +1,6 @@
+author: Geeves
+
+delete-after: True
+
+changes: 
+  - bugfix: "Fixes suitstore being displayed twice in examine, fixes suit not being displayed."