diff --git a/code/WorkInProgress/computer3/computers/medical.dm b/code/WorkInProgress/computer3/computers/medical.dm
index 5cb984ee36..f7e6167e1d 100644
--- a/code/WorkInProgress/computer3/computers/medical.dm
+++ b/code/WorkInProgress/computer3/computers/medical.dm
@@ -377,6 +377,8 @@
src.active1.fields["p_stat"] = "Physically Unfit"
if("disabled")
src.active1.fields["p_stat"] = "Disabled"
+ if(PDA_Manifest.len)
+ PDA_Manifest.Cut()
if (href_list["m_stat"])
if (src.active1)
@@ -525,4 +527,4 @@
src.printing = null
interact()
- return
+ return
\ No newline at end of file
diff --git a/code/WorkInProgress/computer3/computers/security.dm b/code/WorkInProgress/computer3/computers/security.dm
index f3a3d3ae2b..1c409da853 100644
--- a/code/WorkInProgress/computer3/computers/security.dm
+++ b/code/WorkInProgress/computer3/computers/security.dm
@@ -594,6 +594,8 @@ What a mess.*/
R.fields["criminal"] = pick("None", "*Arrest*", "Incarcerated", "Parolled", "Released")
if(5)
R.fields["p_stat"] = pick("*Unconcious*", "Active", "Physically Unfit")
+ if(PDA_Manifest.len)
+ PDA_Manifest.Cut()
if(6)
R.fields["m_stat"] = pick("*Insane*", "*Unstable*", "*Watch*", "Stable")
continue
@@ -606,4 +608,4 @@ What a mess.*/
/obj/machinery/computer3/secure_data/detective_computer
icon = 'icons/obj/computer.dmi'
- icon_state = "messyfiles"
+ icon_state = "messyfiles"
\ No newline at end of file
diff --git a/code/__HELPERS/type2type.dm b/code/__HELPERS/type2type.dm
index 1612f1ce7b..cfac858e25 100644
--- a/code/__HELPERS/type2type.dm
+++ b/code/__HELPERS/type2type.dm
@@ -50,8 +50,10 @@
placeholder = 2
if (!( isnum(num) ))
return
- if (!( num ))
- return "0"
+ if (num == 0)
+ var/final = ""
+ for(var/i=1 to placeholder) final = "[final]0"
+ return final
var/hex = ""
var/i = 0
while(16 ** i < num)
diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm
index 97e61e5707..98ebc5a626 100644
--- a/code/game/machinery/adv_med.dm
+++ b/code/game/machinery/adv_med.dm
@@ -330,9 +330,9 @@
dat += text("Inaprovaline: [] units
", occ["inaprovaline_amount"])
dat += text("Soporific: [] units
", occ["stoxin_amount"])
- dat += text("[]\tDermaline: [] units
", (occ["dermaline"] < 30 ? "" : ""), occ["dermaline"])
- dat += text("[]\tBicaridine: [] units
", (occ["bicaridine"] < 30 ? "" : ""), occ["bicaridine"])
- dat += text("[]\tDexalin: [] units
", (occ["dexalin"] < 30 ? "" : ""), occ["dexalin"])
+ dat += text("[]\tDermaline: [] units
", (occ["dermaline_amount"] < 30 ? "" : ""), occ["dermaline_amount"])
+ dat += text("[]\tBicaridine: [] units
", (occ["bicaridine_amount"] < 30 ? "" : ""), occ["bicaridine_amount"])
+ dat += text("[]\tDexalin: [] units
", (occ["dexalin_amount"] < 30 ? "" : ""), occ["dexalin_amount"])
for(var/datum/disease/D in occ["tg_diseases_list"])
if(!D.hidden[SCANNER])
diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm
index f21322a3e2..a03edba52a 100644
--- a/code/game/machinery/computer/medical.dm
+++ b/code/game/machinery/computer/medical.dm
@@ -364,6 +364,8 @@
src.active1.fields["p_stat"] = "Physically Unfit"
if("disabled")
src.active1.fields["p_stat"] = "Disabled"
+ if(PDA_Manifest.len)
+ PDA_Manifest.Cut()
if (href_list["m_stat"])
if (src.active1)
@@ -533,6 +535,8 @@
R.fields["b_type"] = pick("A-", "B-", "AB-", "O-", "A+", "B+", "AB+", "O+")
if(5)
R.fields["p_stat"] = pick("*SSD*", "Active", "Physically Unfit", "Disabled")
+ if(PDA_Manifest.len)
+ PDA_Manifest.Cut()
if(6)
R.fields["m_stat"] = pick("*Insane*", "*Unstable*", "*Watch*", "Stable")
continue
@@ -547,4 +551,4 @@
/obj/machinery/computer/med_data/laptop
name = "Medical Laptop"
desc = "Cheap Nanotrasen Laptop."
- icon_state = "medlaptop"
+ icon_state = "medlaptop"
\ No newline at end of file
diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm
index f1f866864a..e97d9f6865 100644
--- a/code/game/machinery/computer/security.dm
+++ b/code/game/machinery/computer/security.dm
@@ -598,6 +598,8 @@ What a mess.*/
R.fields["criminal"] = pick("None", "*Arrest*", "Incarcerated", "Parolled", "Released")
if(5)
R.fields["p_stat"] = pick("*Unconcious*", "Active", "Physically Unfit")
+ if(PDA_Manifest.len)
+ PDA_Manifest.Cut()
if(6)
R.fields["m_stat"] = pick("*Insane*", "*Unstable*", "*Watch*", "Stable")
continue
@@ -610,4 +612,4 @@ What a mess.*/
/obj/machinery/computer/secure_data/detective_computer
icon = 'icons/obj/computer.dmi'
- icon_state = "messyfiles"
+ icon_state = "messyfiles"
\ No newline at end of file
diff --git a/code/game/machinery/computer/skills.dm b/code/game/machinery/computer/skills.dm
index 21d584fe8b..98c75daf57 100644
--- a/code/game/machinery/computer/skills.dm
+++ b/code/game/machinery/computer/skills.dm
@@ -401,6 +401,8 @@ What a mess.*/
R.fields["criminal"] = pick("None", "*Arrest*", "Incarcerated", "Parolled", "Released")
if(5)
R.fields["p_stat"] = pick("*Unconcious*", "Active", "Physically Unfit")
+ if(PDA_Manifest.len)
+ PDA_Manifest.Cut()
if(6)
R.fields["m_stat"] = pick("*Insane*", "*Unstable*", "*Watch*", "Stable")
continue
@@ -409,4 +411,4 @@ What a mess.*/
del(R)
continue
- ..(severity)
+ ..(severity)
\ No newline at end of file