Merge branch 'master' into upstream-merge-11508

code/modules/research/circuitprinter.dm

@@ -100,8 +100,7 @@ using metal and glass, it uses glass and reagents (usually sulphuric acid).
 		if(materials[f] >= SHEET_MATERIAL_AMOUNT)
 			var/path = getMaterialType(f)
 			if(path)
-				var/obj/item/stack/S = new path(loc)
-				S.amount = round(materials[f] / SHEET_MATERIAL_AMOUNT)
+				new path(loc, round(materials[f] / SHEET_MATERIAL_AMOUNT))
 	..()
 
 /obj/machinery/r_n_d/circuit_imprinter/attackby(var/obj/item/O as obj, var/mob/user as mob)

code/modules/research/protolathe.dm

@@ -233,20 +233,8 @@
 					new_item.matter[i] = new_item.matter[i] * mat_efficiency
 
 /obj/machinery/r_n_d/protolathe/proc/eject_materials(var/material, var/amount) // 0 amount = 0 means ejecting a full stack; -1 means eject everything
-<<<<<<< HEAD
-	var/recursive = amount == -1 ? 1 : 0
-	material = lowertext(material)
-	var/obj/item/stack/material/mattype
-	var/datum/material/MAT = get_material_by_name(material)
-||||||| parent of dbb9fb762a... Merge pull request #11508 from VOREStation/Arokha/exoruntime
 	var/recursive = amount == -1 ? TRUE : FALSE
-	material = lowertext(material)
-	var/obj/item/stack/material/mattype
-	var/datum/material/MAT = get_material_by_name(material)
-=======
-	var/recursive = amount == -1 ? TRUE : FALSE
-	var/matstring = lowertext(material)
->>>>>>> dbb9fb762a... Merge pull request #11508 from VOREStation/Arokha/exoruntime
+  var/matstring = lowertext(material)
 
 	// 0 or null, nothing to eject
 	if(!materials[matstring])
@@ -270,17 +258,6 @@
 
 	// If we were passed -1, then it's recursive ejection and we should eject all we can
 	if(amount <= 0)
-<<<<<<< HEAD
-		amount = S.max_amount
-	var/ejected = min(round(materials[material] / S.perunit), amount)
-	S.amount = min(ejected, amount)
-	if(S.amount <= 0)
-		qdel(S)
-||||||| parent of dbb9fb762a... Merge pull request #11508 from VOREStation/Arokha/exoruntime
-		amount = S.max_amount
-	var/ejected = min(round(materials[material] / S.perunit), amount)
-	if(!S.set_amount(ejected, amount))
-=======
 		amount = initial(S.max_amount)
 	// Smaller of what we have left, or the desired amount (note the amount is in sheets, but the array stores perunit values)
 	var/ejected = min(round(materials[matstring] / initial(S.perunit)), amount)
@@ -289,7 +266,6 @@
 	S = M.place_sheet(get_turf(src), ejected)
 	if(!istype(S))
 		warning("[src] tried to eject material '[material]', which didn't generate a proper stack when asked!")
->>>>>>> dbb9fb762a... Merge pull request #11508 from VOREStation/Arokha/exoruntime
 		return
 
 	// Reduce our amount stored

code/modules/research/rdmachines.dm

@@ -38,6 +38,5 @@
 	eject = amount == -1 ? eject : min(eject, amount)
 	if(eject < 1)
 		return
-	var/obj/item/stack/material/S = new sheetType(loc)
-	S.amount = eject
+	new sheetType(loc, eject)
 	materials[material] -= eject * perUnit

code/modules/research/research.dm

@@ -181,8 +181,8 @@ GLOBAL_LIST_INIT(design_datums, list())
 	id = TECH_DATA
 
 /datum/tech/syndicate
-	name = "Illegal Technologies Research"
-	desc = "The study of technologies that violate standard government regulations."
+	name = "Transgressive Technologies Research"
+	desc = "The study of technologies that sit on the very boundaries of legality and ethics."
 	id = TECH_ILLEGAL
 	level = 0