diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm index 4746e199ffc..246be32b073 100644 --- a/code/modules/mob/living/silicon/pai/pai.dm +++ b/code/modules/mob/living/silicon/pai/pai.dm @@ -8,7 +8,7 @@ small = 1 pass_flags = 1 density = 0 - var/holder_type = /obj/item/weapon/holder/pai + //var/holder_type = /obj/item/weapon/holder/pai var/network = "SS13" var/obj/machinery/camera/current = null @@ -539,10 +539,10 @@ pie << "You scoop up [src]." src << "[held] scoops you up." //pie.status_flags |= PASSEMOTES - held.put_in_active_hand(pie) pie.icon_state = "pai-[icon_state]" + held.put_in_active_hand(pie) + pie.icon_override = 'icons/mob/head.dmi' pie.item_state = "pai-[icon_state]" - pie.icon_override = 'icons/mob/in-hand/paiheld.dmi' return ..() \ No newline at end of file diff --git a/code/modules/mob/living/silicon/pai/software_modules.dm b/code/modules/mob/living/silicon/pai/software_modules.dm index bb196117d4c..fcb6077f575 100644 --- a/code/modules/mob/living/silicon/pai/software_modules.dm +++ b/code/modules/mob/living/silicon/pai/software_modules.dm @@ -565,11 +565,11 @@ while(!istype(held, /mob/living)) if(!held || !held.loc || count > 6) //For a runtime where M ends up in nullspace (similar to bluespace but less colourful) - //src << "You are not being carried by anyone!" + src << "You are not being carried by anyone!" return 0 held = held.loc count++ - user << "held" + user << "[held]" if(istype(held, /mob/living)) data["holder"] = held data["health"] = "[held.stat > 1 ? "dead" : "[held.health]% healthy"]" @@ -577,7 +577,7 @@ data["tox"] = "[held.getToxLoss() > 50 ? "" : ""][held.getToxLoss()]" data["burn"] = "[held.getFireLoss() > 50 ? "" : ""][held.getFireLoss()]" data["temp"] = "[held.bodytemperature-T0C]°C ([held.bodytemperature*1.8-459.67]°F)" - data["infected"] = 0 + data["infected"] = null if (held.viruses) data["infected"] = 1 var/virus[0] diff --git a/icons/obj/objects.dmi b/icons/obj/objects.dmi index 7ec5af32d3c..bfa62c611e7 100644 Binary files a/icons/obj/objects.dmi and b/icons/obj/objects.dmi differ diff --git a/nano/templates/pai_bioscan.tmpl b/nano/templates/pai_bioscan.tmpl index c68aafd9040..d6eb900a5f5 100644 --- a/nano/templates/pai_bioscan.tmpl +++ b/nano/templates/pai_bioscan.tmpl @@ -9,14 +9,21 @@ code/modules/mob/living/silicon/pai/software_modules.dm
Health Status : {{:data.health}} +
+
Oxygen Content : {{:data.oxy}} +
Toxin Cotnet : {{:data.tox}} +
+
Burn Status : {{:data.burn}} +
+
User Temprature : {{:data.temp}}
{{if data.infected}} - Alert:Viral pathogen detected, Attempting to find information... + Alert:Viral pathogen detected, Attempting to find information... {{for data.infectionDat}}
@@ -24,7 +31,10 @@ code/modules/mob/living/silicon/pai/software_modules.dm
Type : {{:value.type}} +
+
Stage: {{:value.stage}} / {{:value.stagemax}} +
Possible Cure or Antigen: {{:value.cure}}