cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update rustcore_monitor.dm

Browse Source
This commit is contained in:
Razgriz
2021-03-25 19:07:47 -07:00
committed by GitHub
parent b905c60242
commit a5135abd5a
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/modules/tgui/modules/rustcore_monitor.dm
View File

@@ -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,