From a0a8b2865cdf7e47e92ed4aa78b48e2e12d1408a Mon Sep 17 00:00:00 2001 From: Peliia Date: Wed, 26 Aug 2015 16:11:01 +0200 Subject: [PATCH 1/5] Pathogenic Isolator Fixes the Isolator saying "unidentified" for every entry on the List screen. --- nano/templates/pathogenic_isolator.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nano/templates/pathogenic_isolator.tmpl b/nano/templates/pathogenic_isolator.tmpl index 4c46f9b131..69411d858f 100644 --- a/nano/templates/pathogenic_isolator.tmpl +++ b/nano/templates/pathogenic_isolator.tmpl @@ -81,7 +81,7 @@ {{if data.database}} {{for data.database}}
-
{{:data.name}}
+
{{:value.name}}
{{:helper.link('Details', 'circle-arrow-s', { 'entry' : 1, 'view' : value.record }, null, 'fixedLeft')}}
{{/for}} From 89629b686fb411af798bb450ef6b47875e3954b1 Mon Sep 17 00:00:00 2001 From: Peliia Date: Wed, 26 Aug 2015 16:18:36 +0200 Subject: [PATCH 2/5] Dish Incubator Now the Incubator should stop magically conjuring food whenever there is a beaker without food inside. --- code/modules/virus2/dishincubator.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/virus2/dishincubator.dm b/code/modules/virus2/dishincubator.dm index b176dd3d5e..81e1b85eca 100644 --- a/code/modules/virus2/dishincubator.dm +++ b/code/modules/virus2/dishincubator.dm @@ -128,7 +128,7 @@ nanomanager.update_uis(src) if(beaker) - if(!beaker.reagents.remove_reagent("virusfood",5)) + if(beaker.reagents.remove_reagent("virusfood",5)) foodsupply += 10 nanomanager.update_uis(src) From d9e940c3a616c9678849ad6c704a67531a9f14aa Mon Sep 17 00:00:00 2001 From: Peliia Date: Wed, 26 Aug 2015 17:12:30 +0200 Subject: [PATCH 3/5] Dish Incubator Limits Imposes limits on the Dish Incubator, it shall no longer have values above the meters on the display. --- code/modules/virus2/dishincubator.dm | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/code/modules/virus2/dishincubator.dm b/code/modules/virus2/dishincubator.dm index 81e1b85eca..1648caf639 100644 --- a/code/modules/virus2/dishincubator.dm +++ b/code/modules/virus2/dishincubator.dm @@ -128,14 +128,21 @@ nanomanager.update_uis(src) if(beaker) - if(beaker.reagents.remove_reagent("virusfood",5)) - foodsupply += 10 + if(beaker.reagents.remove_reagent("virusfood",5) && foodsupply < 100) + if(foodsupply + 10 <= 100) + foodsupply += 10 + else + beaker.reagents.add_reagent("virusfood",(100 - foodsupply)/2) + foodsupply = 100 nanomanager.update_uis(src) - if (locate(/datum/reagent/toxin) in beaker.reagents.reagent_list) + if (locate(/datum/reagent/toxin) in beaker.reagents.reagent_list && toxins < 100) for(var/datum/reagent/toxin/T in beaker.reagents.reagent_list) toxins += max(T.strength,1) beaker.reagents.remove_reagent(T.id,1) + if(toxins > 100) + toxins = 100 + break nanomanager.update_uis(src) /obj/machinery/disease2/incubator/Topic(href, href_list) @@ -170,7 +177,10 @@ return 1 if (href_list["rad"]) - radiation += 10 + if(radiation + 10 > 100) + radiation = 100 + else + radiation += 10 return 1 if (href_list["flush"]) From 8743cd89a4a533620dbfa0dd43534b29ffba403d Mon Sep 17 00:00:00 2001 From: Peliia Date: Thu, 27 Aug 2015 18:59:16 +0200 Subject: [PATCH 4/5] Dish Incubator v2 Adheres to pointers laid out by Ginja. --- code/modules/virus2/dishincubator.dm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/code/modules/virus2/dishincubator.dm b/code/modules/virus2/dishincubator.dm index 1648caf639..ed6810980c 100644 --- a/code/modules/virus2/dishincubator.dm +++ b/code/modules/virus2/dishincubator.dm @@ -128,7 +128,7 @@ nanomanager.update_uis(src) if(beaker) - if(beaker.reagents.remove_reagent("virusfood",5) && foodsupply < 100) + if(foodsupply < 100 && beaker.reagents.remove_reagent("virusfood",5)) if(foodsupply + 10 <= 100) foodsupply += 10 else @@ -177,10 +177,7 @@ return 1 if (href_list["rad"]) - if(radiation + 10 > 100) - radiation = 100 - else - radiation += 10 + radiation = min(100, radiation + 10) return 1 if (href_list["flush"]) From 22262507b9a5c3712f3ea16458ea71e23562895a Mon Sep 17 00:00:00 2001 From: PsiOmega Date: Sat, 29 Aug 2015 10:03:58 +0200 Subject: [PATCH 5/5] Only living mobs now trigger shrapnel. Fixes issue with manually moving ghosts would step on shrapnel, with glass noise and all. On dev this issue is expanded further as all known movements means use forceMove. --- code/game/objects/items/weapons/material/shards.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/weapons/material/shards.dm b/code/game/objects/items/weapons/material/shards.dm index 2f395f2ed0..b4c12f5ad1 100644 --- a/code/game/objects/items/weapons/material/shards.dm +++ b/code/game/objects/items/weapons/material/shards.dm @@ -61,9 +61,9 @@ return ..() /obj/item/weapon/material/shard/Crossed(AM as mob|obj) - if(ismob(AM)) + if(isliving(AM)) var/mob/M = AM - M << "\red You step on \the [src]!" + M << "You step on \the [src]!" playsound(src.loc, 'sound/effects/glass_step.ogg', 50, 1) // not sure how to handle metal shards with sounds if(ishuman(M)) var/mob/living/carbon/human/H = M