From 139800d6f2ecdb53dab6de16d69b9b5a4bc323ec Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Tue, 9 Mar 2021 15:52:26 -0500
Subject: [PATCH] Update autolathe.dm

---
 code/game/machinery/autolathe.dm | 41 --------------------------------
 1 file changed, 41 deletions(-)

diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm
index c5396da4b64..80ff6aee29a 100644
--- a/code/game/machinery/autolathe.dm
+++ b/code/game/machinery/autolathe.dm
@@ -75,7 +75,6 @@
 				continue
 			if(M.man_rating > man_rating)
 				continue
-<<<<<<< HEAD
 			recipes.Add(list(list(
 				"category" = A.name,
 				"name" = M.name,
@@ -115,46 +114,6 @@
 /obj/machinery/autolathe/interact(mob/user)
 	if(panel_open)
 		return wires.Interact(user)
-=======
-
-			var/can_make = 1
-			var/list/material_string = list()
-			var/list/multiplier_string = list()
-			var/max_sheets
-			var/comma
-			if(!R.resources || !R.resources.len)
-				material_string += "No resources required.</td>"
-			else
-				//Make sure it's buildable and list requires resources.
-				for(var/material in R.resources)
-					var/coeff = (R.no_scale ? 1 : mat_efficiency) //stacks are unaffected by production coefficient
-					var/sheets = round(stored_material[material]/round(R.resources[material]*coeff))
-					if(isnull(max_sheets) || max_sheets > sheets)
-						max_sheets = sheets
-					if(!isnull(stored_material[material]) && stored_material[material] < round(R.resources[material]*coeff))
-						can_make = 0
-					if(!comma)
-						comma = 1
-					else
-						material_string += ", "
-					material_string += "[round(R.resources[material] * coeff)] [material]"
-
-				if(!can_make && istype(R, /datum/category_item/autolathe/materials))	// Don't show material sheets unless we can make them. It gets cluttered, and weird.
-					material_string = null
-					continue
-
-				material_string += ".<br></td>"
-				//Build list of multipliers for sheets.
-				if(R.is_stack)
-					if(max_sheets && max_sheets > 0)
-						max_sheets = min(max_sheets, R.max_stack) // Limit to the max allowed by stack type.
-						multiplier_string += "<br>"
-						for(var/i = 5;i<max_sheets;i*=2) //5,10,20,40...
-							multiplier_string  += "<a href='?src=\ref[src];make=\ref[R];multiplier=[i]'>\[x[i]\]</a>"
-						multiplier_string += "<a href='?src=\ref[src];make=\ref[R];multiplier=[max_sheets]'>\[x[max_sheets]\]</a>"
-
-			dat += "<tr><td width = 180>[R.hidden ? "<font color = 'red'>*</font>" : ""]<b>[can_make ? "<a href='?src=\ref[src];make=\ref[R];multiplier=1'>" : "<span class='linkOff'>"][R.name][can_make ? "</a>" : "</span>"]</b>[R.hidden ? "<font color = 'red'>*</font>" : ""][multiplier_string.Join()]</td><td align = right>[material_string.Join()]</tr>"
->>>>>>> 1de8bc1... Industrial Expansion (#7811)
 
 	if(disabled)
 		to_chat(user, "<span class='danger'>\The [src] is disabled!</span>")