From dcc1c41b2b54e2ff6964444ccffd982b2d438d94 Mon Sep 17 00:00:00 2001 From: Cadyn Date: Tue, 13 Oct 2020 13:44:32 -0700 Subject: [PATCH 1/3] Resleeving fix --- code/game/dna/dna2.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/dna/dna2.dm b/code/game/dna/dna2.dm index 3ed52d317c..0df42f0919 100644 --- a/code/game/dna/dna2.dm +++ b/code/game/dna/dna2.dm @@ -298,7 +298,7 @@ var/global/list/datum/dna/gene/dna_genes[0] if (block<=0) return ASSERT(maxvalue<=4095) var/range = (4095 / maxvalue) - if(value) + if(value!=null) //CHOMPEdit DO NOT PORT VIRGO'S FIX FOR RESLEEVING. IT IS BAD. SetUIValue(block,round(value * range),defer) // Getter version of above. From 0935ab854e6d5f4a45a325a46f10f1be8dc4cdb8 Mon Sep 17 00:00:00 2001 From: Cadyn Date: Tue, 13 Oct 2020 14:33:47 -0700 Subject: [PATCH 2/3] Travis is mean --- code/game/dna/dna2.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/dna/dna2.dm b/code/game/dna/dna2.dm index 0df42f0919..de2ea0f536 100644 --- a/code/game/dna/dna2.dm +++ b/code/game/dna/dna2.dm @@ -298,7 +298,7 @@ var/global/list/datum/dna/gene/dna_genes[0] if (block<=0) return ASSERT(maxvalue<=4095) var/range = (4095 / maxvalue) - if(value!=null) //CHOMPEdit DO NOT PORT VIRGO'S FIX FOR RESLEEVING. IT IS BAD. + if(value!=null) //CHOMPEdit DO NOT PORT VIRGO'S FIX FOR RESLEEVING. IT IS BAD. Also fuck travis SetUIValue(block,round(value * range),defer) // Getter version of above. From 3019393860603acd3ce9935b382b537b4f4a0d39 Mon Sep 17 00:00:00 2001 From: Cadyn Date: Wed, 14 Oct 2020 06:57:47 -0700 Subject: [PATCH 3/3] TGUI fix --- code/game/machinery/computer/medical.dm | 2 +- code/game/machinery/computer/security.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm index f3c930fe78..adf53c80a8 100644 --- a/code/game/machinery/computer/medical.dm +++ b/code/game/machinery/computer/medical.dm @@ -137,7 +137,7 @@ fields[++fields.len] = FIELD("Name", active1.fields["name"], null) fields[++fields.len] = FIELD("ID", active1.fields["id"], null) fields[++fields.len] = FIELD("Sex", active1.fields["sex"], "sex") - fields[++fields.len] = FIELD("Age", active1.fields["age"], "age") + fields[++fields.len] = FIELD("Age", "[active1.fields["age"]]", "age") fields[++fields.len] = FIELD("Fingerprint", active1.fields["fingerprint"], "fingerprint") fields[++fields.len] = FIELD("Physical Status", active1.fields["p_stat"], "p_stat") fields[++fields.len] = FIELD("Mental Status", active1.fields["m_stat"], "m_stat") diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index b7c8ecc45b..0b6ab77d7a 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -148,7 +148,7 @@ fields[++fields.len] = FIELD("ID", active1.fields["id"], "id") fields[++fields.len] = FIELD("Entity Classification", active1.fields["brain_type"], "brain_type") fields[++fields.len] = FIELD("Sex", active1.fields["sex"], "sex") - fields[++fields.len] = FIELD("Age", active1.fields["age"], "age") + fields[++fields.len] = FIELD("Age", "[active1.fields["age"]]", "age") fields[++fields.len] = FIELD("Rank", active1.fields["rank"], "rank") fields[++fields.len] = FIELD("Fingerprint", active1.fields["fingerprint"], "fingerprint") fields[++fields.len] = FIELD("Physical Status", active1.fields["p_stat"], null)