Merge pull request #3330 from tigercat2000/i_blame_the_french_for_this

Fixes #3303, legit implants for adv_med

code/game/machinery/adv_med.dm

@@ -208,6 +208,7 @@
 	active_power_usage = 500
 	var/printing = null
 	var/printing_text = null
+	var/known_implants = list(/obj/item/weapon/implant/chem, /obj/item/weapon/implant/death_alarm, /obj/item/weapon/implant/loyalty, /obj/item/weapon/implant/tracking)
 
 /obj/machinery/body_scanconsole/power_change()
 	if(stat & BROKEN)
@@ -345,6 +346,15 @@
 				bloodData["bloodMax"] = H.max_blood
 			occupantData["blood"] = bloodData
 
+			var/implantData[0]
+			for(var/obj/item/weapon/implant/I in H)
+				if(I.implanted && is_type_in_list(I, known_implants))
+					var/implantSubData[0]
+					implantSubData["name"] = sanitize(I.name)
+					implantData.Add(list(implantSubData))
+			occupantData["implant"] = implantData
+			occupantData["implant_len"] = implantData.len
+
 			var/extOrganData[0]
 			for(var/obj/item/organ/external/E in H.organs)
 				var/organData[0]
@@ -358,15 +368,15 @@
 				organData["bruised"] = E.min_bruised_damage
 				organData["broken"] = E.min_broken_damage
 
-				var/implantData[0]
+				var/shrapnelData[0]
 				for(var/obj/I in E.implants)
-					var/implantSubData[0]
-					implantSubData["name"] = I.name
+					var/shrapnelSubData[0]
+					shrapnelSubData["name"] = I.name
 
-					implantData.Add(list(implantSubData))
+					shrapnelData.Add(list(shrapnelSubData))
 
-				organData["implants"] = implantData
-				organData["implants_len"] = implantData.len
+				organData["shrapnel"] = shrapnelData
+				organData["shrapnel_len"] = shrapnelData.len
 
 				var/organStatus[0]
 				if(E.status & ORGAN_DESTROYED)

nano/templates/adv_med.tmpl

@@ -99,7 +99,6 @@ Used In File(s): \code\game\machinery\adv_med.dm
 			</tr>
 		</tbody>
 	</table>
-
 	{{if data.occupant.blood.hasBlood}}
 		<br>
 		<b>Blood:</b>
@@ -111,7 +110,6 @@ Used In File(s): \code\game\machinery\adv_med.dm
 			{{:helper.displayBar(data.occupant.blood.bloodLevel, 0, data.occupant.blood.bloodMax, (data.occupant.blood.percent <= 60) ? 'bad' : (data.occupant.blood.percent <= 90) ? 'average' : 'good' )}}
 			<div class="statusValue"> {{:data.occupant.blood.percent}}%, {{:data.occupant.blood.bloodLevel}}cl </div>
 		</div>
-
 	{{/if}}
 	<br>
 	{{if data.occupant.hasVirus}}
@@ -119,6 +117,18 @@ Used In File(s): \code\game\machinery\adv_med.dm
 			Viral pathogen detected in blood stream.
 		</span> <br>
 	{{/if}}
+	{{if data.occupant.implant_len}}
+		<br>
+		<b>Implants</b>
+		<table style="width: 30%">
+		<tbody class="striped">
+			{{for data.occupant.implant}}
+				<tr><td>{{:value.name}}</td></tr>
+			{{/for}}
+		</tbody>
+		</table>
+		<br>
+	{{/if}}
 	<b>External Organs</b>
 	<table> <thead>
 			<tr>
@@ -164,9 +174,9 @@ Used In File(s): \code\game\machinery\adv_med.dm
 						</span>
 						{{if value.status.splinted}} splinted <br> {{/if}}
 						{{if value.status.robotic}} robotic <br> {{/if}}
-						{{if value.implants_len}}
-							{{for value.implants : impValue:impindex}}
-								{{:impValue.known ? impValue.name : "unknown object"}} <br>
+						{{if value.shrapnel_len}}
+							{{for value.shrapnel : shrapValue:shrapindex}}
+								{{:shrapValue.known ? shrapValue.name : "unknown object"}} <br>
 							{{/for}}
 						{{/if}}
 					</td>