misc RnD fixes

code/game/machinery/rechargestation.dm

@@ -48,10 +48,12 @@
 		return
 
 	// If we have repair capabilities, repair any damage.
-	if(weld_rate && occupant.getBruteLoss())
+	//if(weld_rate && occupant.getBruteLoss()) //SIERRA-REMOVE
+	if(weld_rate) //SIERRA-ADD
 		var/repair = weld_rate - use_power_oneoff(weld_power_use * weld_rate, LOCAL) / weld_power_use
 		occupant.adjustBruteLoss(-repair)
-	if(wire_rate && occupant.getFireLoss())
+	//if(wire_rate && occupant.getFireLoss()) //SIERRA-REMOVE
+	if(wire_rate) //SIERRA-ADD
 		var/repair = wire_rate - use_power_oneoff(wire_power_use * wire_rate, LOCAL) / wire_power_use
 		occupant.adjustFireLoss(-repair)
 

code/modules/detectivework/microscope/dnascanner.dm

@@ -1,5 +1,6 @@
 //DNA machine
-/obj/machinery/dnaforensics
+//[SIERRA-EDIT] - Complete path refactoring /obj/machinery/dnaforensics originally
+/obj/machinery/computer/dnaforensics
 	name = "DNA analyzer"
 	desc = "A high tech machine that is designed to read DNA samples properly."
 	icon = 'icons/obj/machines/forensics/dna_scanner.dmi'
@@ -15,7 +16,7 @@
 	var/last_process_worldtime = 0
 	var/report_num = 0
 
-/obj/machinery/dnaforensics/use_tool(obj/item/W, mob/living/user, list/click_params)
+/obj/machinery/computer/dnaforensics/use_tool(obj/item/W, mob/living/user, list/click_params)
 	if(!istype(W, /obj/item/forensics/swab))
 		return .. ()
 
@@ -38,7 +39,7 @@
 		to_chat(user, SPAN_WARNING("\The [src] only accepts used swabs."))
 		return TRUE
 
-/obj/machinery/dnaforensics/ui_interact(mob/user, ui_key = "main",datum/nanoui/ui = null)
+/obj/machinery/computer/dnaforensics/ui_interact(mob/user, ui_key = "main",datum/nanoui/ui = null)
 	if(!is_powered()) return
 	if(user.stat || user.restrained()) return
 	var/list/data = list()
@@ -55,7 +56,7 @@
 		ui.open()
 		ui.set_auto_update(1)
 
-/obj/machinery/dnaforensics/Topic(href, href_list)
+/obj/machinery/computer/dnaforensics/Topic(href, href_list)
 
 	if(..()) return 1
 
@@ -87,7 +88,7 @@
 
 	return 1
 
-/obj/machinery/dnaforensics/Process()
+/obj/machinery/computer/dnaforensics/Process()
 	if(scanning)
 		if(!bloodsamp || bloodsamp.loc != src)
 			bloodsamp = null
@@ -101,7 +102,7 @@
 			scanner_progress = min(100, scanner_progress + scanner_rate * deltaT)
 	last_process_worldtime = world.time
 
-/obj/machinery/dnaforensics/proc/complete_scan()
+/obj/machinery/computer/dnaforensics/proc/complete_scan()
 	src.visible_message(SPAN_NOTICE("[icon2html(src, viewers(get_turf(src)))] makes an insistent chime."), 2)
 	update_icon()
 	if(bloodsamp)
@@ -125,11 +126,11 @@
 		update_icon()
 	return
 
-/obj/machinery/dnaforensics/interface_interact(mob/user)
+/obj/machinery/computer/dnaforensics/interface_interact(mob/user)
 	ui_interact(user)
 	return TRUE
 
-/obj/machinery/dnaforensics/verb/toggle_lid()
+/obj/machinery/computer/dnaforensics/verb/toggle_lid()
 	set category = "Object"
 	set name = "Toggle Lid"
 	set src in oview(1)
@@ -144,7 +145,7 @@
 	closed = !closed
 	src.update_icon()
 
-/obj/machinery/dnaforensics/on_update_icon()
+/obj/machinery/computer/dnaforensics/on_update_icon()
 	ClearOverlays()
 	if(panel_open)
 		AddOverlays("[icon_state]_panel")

code/modules/detectivework/microscope/microscope.dm

@@ -1,5 +1,6 @@
 //microscope code itself
-/obj/machinery/microscope
+//[SIERRA-EDIT] - Complete path refactoring /obj/machinery/microscope originally
+/obj/machinery/computer/microscope
 	name = "high powered electron microscope"
 	desc = "A highly advanced microscope capable of zooming up to 3000x."
 	icon = 'icons/obj/machines/forensics/microscope.dmi'
@@ -10,12 +11,17 @@
 	var/obj/item/sample = null
 	var/report_num = 0
 
-/obj/machinery/microscope/Destroy()
+/obj/machinery/computer/microscope/Destroy()
 	if(sample)
 		sample.dropInto(loc)
 	..()
 
-/obj/machinery/microscope/use_tool(obj/item/W, mob/living/user, list/click_params)
+/obj/machinery/computer/microscope/use_tool(obj/item/W, mob/living/user, list/click_params)
+	if(isScrewdriver(W) || isCrowbar(W))
+		var/choice = alert("Do you want to use \the [W] on \the [src]?", "Use Tool ", "Yes", "No")
+		if(choice == "Yes")
+			return .=..()
+
 	if(sample)
 		if (istype(W, /obj/item/evidencebag))
 			var/obj/item/evidencebag/bag = W
@@ -61,7 +67,7 @@
 	update_icon()
 	return TRUE
 
-/obj/machinery/microscope/physical_attack_hand(mob/user)
+/obj/machinery/computer/microscope/physical_attack_hand(mob/user)
 	. = TRUE
 	if(!sample)
 		to_chat(user, SPAN_WARNING("The microscope has no sample to examine."))
@@ -141,7 +147,7 @@
 			to_chat(user, report.info)
 	return
 
-/obj/machinery/microscope/proc/remove_sample(mob/living/remover)
+/obj/machinery/computer/microscope/proc/remove_sample(mob/living/remover)
 	if(!istype(remover) || remover.incapacitated() || !Adjacent(remover))
 		return
 	if(!sample)
@@ -152,17 +158,17 @@
 	sample = null
 	update_icon()
 
-/obj/machinery/microscope/AltClick()
+/obj/machinery/computer/microscope/AltClick()
 	remove_sample(usr)
 	return TRUE
 
-/obj/machinery/microscope/MouseDrop(atom/other)
+/obj/machinery/computer/microscope/MouseDrop(atom/other)
 	if(usr == other)
 		remove_sample(usr)
 	else
 		return ..()
 
-/obj/machinery/microscope/on_update_icon()
+/obj/machinery/computer/microscope/on_update_icon()
 	ClearOverlays()
 	if(panel_open)
 		AddOverlays("[icon_state]_panel")

code/modules/item_worth/worths_list.dm

@@ -708,8 +708,8 @@ var/global/list/worths = list(
 					/obj/machinery/telecomms/broadcaster = -10000,
 					/obj/machinery/telecomms = -7000,
 					/obj/machinery/acting/changer = -3000,
-					/obj/machinery/dnaforensics = -1200,
-					/obj/machinery/microscope = -550,
+					/obj/machinery/computer/dnaforensics = -1200, //[SIERRA-EDIT] /obj/machinery/microscope,
+					/obj/machinery/computer/microscope = -550,//[SIERRA-EDIT] /obj/machinery/microscope,
 					/obj/machinery/computer/account_database = -3000,
 					/obj/machinery/atm = -4500,
 					/obj/machinery/readybutton = -0,

code/modules/mob/living/carbon/human/human_damage.dm

@@ -325,8 +325,13 @@ In most cases it makes more sense to use apply_damage() instead! And make sure t
 
 		var/brute_was = picked.brute_dam
 		var/burn_was = picked.burn_dam
-
-		picked.heal_damage(brute,burn)
+//[SIERRA-ADD] to heal damaged robotic organs
+		var/organ_type = 0
+		if(picked.status & ORGAN_ROBOTIC)
+			organ_type = 1
+//[/SIERRA-ADD]
+		//picked.heal_damage(brute,burn)//[/SIERRA-REMOVE]
+		picked.heal_damage(brute,burn,0, organ_type)//[/SIERRA-ADD]
 
 		brute -= (brute_was-picked.brute_dam)
 		burn -= (burn_was-picked.burn_dam)

code/modules/research/designs/designs_tool.dm

@@ -87,7 +87,7 @@
 	id = "oxycandle"
 	req_tech = list(TECH_ENGINEERING = 2)
 	materials = list(MATERIAL_STEEL = 3000)
-	chemicals = list(/datum/reagent/sodiumchloride = 20, /datum/reagent/acetone = 20)
+	//chemicals = list(/datum/reagent/sodiumchloride = 20, /datum/reagent/acetone = 20) [SIERRA-REMOVE]
 	build_path = /obj/item/device/oxycandle
 	sort_string = "VAGAJ"
 

code/modules/research/designs/designs_weapon.dm

@@ -115,7 +115,7 @@
 	id = "decloner"
 	req_tech = list(TECH_COMBAT = 8, TECH_MATERIAL = 7, TECH_BIO = 5, TECH_POWER = 6)
 	materials = list(MATERIAL_GOLD = 5000,MATERIAL_URANIUM = 10000)
-	chemicals = list(/datum/reagent/mutagen = 40)
+	//chemicals = list(/datum/reagent/mutagen = 40) [SIERRA-REMOVE]
 	build_path = /obj/item/gun/energy/decloner
 	sort_string = "TAJAB"
 

code/modules/research/protolathe.dm

@@ -100,7 +100,7 @@
 
 	T = clamp(total_component_rating_of_type(/obj/item/stock_parts/manipulator), 0, 6)
 	mat_efficiency = 1 - (T - 2) / 8
-	speed = T / 2
+	speed = T
 	..()
 
 /obj/machinery/r_n_d/protolathe/proc/queue_design(datum/design/D, amount = 1)

maps/away/meatstation/meatstation.dmm

@@ -1995,7 +1995,7 @@
 /area/meatstation/medical)
 "eG" = (
 /obj/structure/table/glass,
-/obj/machinery/microscope,
+/obj/machinery/computer/microscope,
 /obj/floor_decal/corner/red/border{
 	dir = 4
 	},
@@ -5951,7 +5951,7 @@
 "oz" = (
 /obj/structure/table/glass,
 /obj/decal/cleanable/blood/drip,
-/obj/machinery/dnaforensics,
+/obj/machinery/computer/dnaforensics,
 /turf/simulated/floor/tiled/white,
 /area/meatstation/lab)
 "oA" = (

maps/random_ruins/exoplanet_ruins/oldlab2/oldlab2.dmm

@@ -136,7 +136,7 @@
 	dir = 4
 	},
 /obj/structure/table/standard,
-/obj/machinery/microscope{
+/obj/machinery/computer/microscope{
 	pixel_x = -8
 	},
 /turf/simulated/floor/tiled/white,
@@ -8345,7 +8345,7 @@
 /turf/simulated/floor/tiled/dark,
 /area/map_template/oldlab2/recandlockers)
 "Sg" = (
-/obj/machinery/dnaforensics,
+/obj/machinery/computer/dnaforensics,
 /obj/structure/table/steel_reinforced,
 /turf/simulated/floor/tiled/dark,
 /area/map_template/oldlab2/lab)
@@ -9401,7 +9401,7 @@
 /obj/floor_decal/industrial/warning{
 	dir = 4
 	},
-/obj/machinery/microscope,
+/obj/machinery/computer/microscope,
 /obj/structure/table/steel_reinforced,
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
 /turf/simulated/floor/tiled/dark,

maps/sierra/_references/z1-3_sierra.dmm

@@ -16242,7 +16242,7 @@
 /area/crew_quarters/heads/office/cmo)
 "dAo" = (
 /obj/structure/table/glass,
-/obj/machinery/microscope,
+/obj/machinery/computer/microscope,
 /obj/item/device/radio/intercom{
 	pixel_y = 26
 	},
@@ -22595,7 +22595,7 @@
 	},
 /turf/simulated/floor/tiled/dark)
 "eTl" = (
-/obj/machinery/dnaforensics,
+/obj/machinery/computer/dnaforensics,
 /obj/machinery/light{
 	dir = 1
 	},

maps/sierra/z1-z5_sierra.dmm

@@ -21853,7 +21853,7 @@
 /area/crew_quarters/heads/office/ce/cobed)
 "diN" = (
 /obj/structure/table/glass,
-/obj/machinery/microscope,
+/obj/machinery/computer/microscope,
 /obj/floor_decal/borderfloorwhite{
 	dir = 1
 	},
@@ -128293,7 +128293,7 @@
 /area/crew_quarters/sleep/cryo/south)
 "sOJ" = (
 /obj/structure/table/glass,
-/obj/machinery/dnaforensics,
+/obj/machinery/computer/dnaforensics,
 /obj/machinery/recharger/wallcharger{
 	dir = 4;
 	pixel_x = -22

maps/torch/torch5_deck1.dmm

@@ -5703,7 +5703,7 @@
 /turf/simulated/floor/tiled/dark,
 /area/security/evidence)
 "alX" = (
-/obj/machinery/dnaforensics,
+/obj/machinery/computer/dnaforensics,
 /obj/structure/table/glass,
 /turf/simulated/floor/tiled/white,
 /area/security/detectives_office)
@@ -21639,7 +21639,7 @@
 /obj/machinery/light{
 	dir = 1
 	},
-/obj/machinery/microscope,
+/obj/machinery/computer/microscope,
 /turf/simulated/floor/tiled/white,
 /area/security/detectives_office)
 "lAb" = (

mods/RnD/code/design.dm

@@ -75,3 +75,31 @@
 	req_tech = list(TECH_DATA = 2)
 	build_path = /obj/item/stock_parts/circuitboard/area_atmos
 	sort_string = "KCAAR"
+
+
+/datum/design/circuit/dnaforensics
+
+	name = "DNA analyzer"
+	desc = "A high tech machine that is designed to read DNA samples properly."
+	id = "dnaforensics"
+	req_tech = list(TECH_ENGINEERING = 4, TECH_MATERIAL = 4)
+	build_path = /obj/item/stock_parts/circuitboard/dnaforensics
+	sort_string = "VBGAM"
+
+/obj/item/stock_parts/circuitboard/dnaforensics
+	name = "circuit board (DNA analyzer)"
+	build_path = /obj/machinery/computer/dnaforensics
+	origin_tech = list(TECH_ENGINEERING = 4, TECH_MATERIAL = 4)
+
+/datum/design/circuit/microscope
+	name = "high powered electron microscope"
+	desc = "A highly advanced microscope capable of zooming up to 3000x."
+	id = "microscope"
+	req_tech = list(TECH_ENGINEERING = 4, TECH_MATERIAL = 4)
+	build_path = /obj/item/stock_parts/circuitboard/microscope
+	sort_string = "VBGAN"
+
+/obj/item/stock_parts/circuitboard/microscope
+	name = "circuit board (microscope)"
+	build_path = /obj/machinery/computer/microscope
+	origin_tech = list(TECH_ENGINEERING = 4, TECH_MATERIAL = 4)