From 742939859c42e473e35b831ba36e77e15f3df346 Mon Sep 17 00:00:00 2001 From: skull132 Date: Mon, 18 Jul 2016 19:16:04 +0300 Subject: [PATCH] Post Update Fixes - 18JUL2016 (#601) * Fixes AOOC hyperlinks * Fixes the dish incubator not storing more than 10 units of food --- code/modules/admin/verbs/antag-ooc.dm | 2 +- code/modules/virus2/dishincubator.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/admin/verbs/antag-ooc.dm b/code/modules/admin/verbs/antag-ooc.dm index baf5d2e0c8f..02a47ea56e5 100644 --- a/code/modules/admin/verbs/antag-ooc.dm +++ b/code/modules/admin/verbs/antag-ooc.dm @@ -23,7 +23,7 @@ for(var/mob/M in mob_list) if (check_rights(R_ADMIN|R_MOD, 0, M)) - M << "" + create_text_tag("aooc", "Antag-OOC:", M.client) + " [get_options_bar(src, 0, 1, 1)](A HREF='?_src_=holder;adminplayerobservejump=[src.mob]>JMP): [msg]" + M << "" + create_text_tag("aooc", "Antag-OOC:", M.client) + " [get_options_bar(src, 0, 1, 1)](JMP): [msg]" else if (M.mind && M.mind.special_role && M.client) M << "" + create_text_tag("aooc", "Antag-OOC:", M.client) + " [display_name]: [msg]" diff --git a/code/modules/virus2/dishincubator.dm b/code/modules/virus2/dishincubator.dm index 7e892c57e2d..ee2657b0a4e 100644 --- a/code/modules/virus2/dishincubator.dm +++ b/code/modules/virus2/dishincubator.dm @@ -133,7 +133,7 @@ var/food_taken = min(food_needed, beaker.reagents.get_reagent_amount("virusfood")) beaker.reagents.remove_reagent("virusfood", food_taken) - foodsupply = min(100, food_taken * 2) + foodsupply = min(100, foodsupply + (food_taken * 2)) nanomanager.update_uis(src)