From a5135abd5a17e24d1a1f43ab3ad4e57ddd3efcd6 Mon Sep 17 00:00:00 2001 From: Razgriz Date: Thu, 25 Mar 2021 19:07:47 -0700 Subject: [PATCH] Update rustcore_monitor.dm --- code/modules/tgui/modules/rustcore_monitor.dm | 9 --------- 1 file changed, 9 deletions(-) diff --git a/code/modules/tgui/modules/rustcore_monitor.dm b/code/modules/tgui/modules/rustcore_monitor.dm index d8eba3955b..69ccc1bf4e 100644 --- a/code/modules/tgui/modules/rustcore_monitor.dm +++ b/code/modules/tgui/modules/rustcore_monitor.dm @@ -50,19 +50,10 @@ "name" = reagent, "amount" = C.owned_field.dormant_reactant_quantities[reagent] ))) -<<<<<<< HEAD -/*CHOMP Removal brainlet. - for(var/list/reactant in reactants) - to_world("[reactant[1]] [reactant[2]]") -*/ -||||||| parent of 9d3f910ef7... Merge pull request #10022 from VOREStation/upstream-merge-8007 for(var/list/reactant in reactants) to_world("[reactant[1]] [reactant[2]]") -======= - ->>>>>>> 9d3f910ef7... Merge pull request #10022 from VOREStation/upstream-merge-8007 cores.Add(list(list( "name" = C.name, "has_field" = C.owned_field ? TRUE : FALSE,