Eris Research/Machine Sprite Port

code/game/machinery/autolathe.dm

@@ -1,7 +1,10 @@
 /obj/machinery/autolathe
 	name = "autolathe"
 	desc = "It produces items using metal and glass."
+<<<<<<< HEAD
 	icon = 'icons/obj/stationobjs_vr.dmi'
+=======
+>>>>>>> 5100fa1... Eris Research/Machine Sprite Port (#7127)
 	icon_state = "autolathe"
 	density = 1
 	anchored = 1
@@ -145,7 +148,11 @@
 	if(is_robot_module(O))
 		return 0
 
+<<<<<<< HEAD
 	if(istype(O,/obj/item/ammo_magazine/clip) || istype(O,/obj/item/ammo_magazine/s357) || istype(O,/obj/item/ammo_magazine/s38) || istype (O,/obj/item/ammo_magazine/s44)/* VOREstation Edit*/) // Prevents ammo recycling exploit with speedloaders.
+=======
+	if(istype(O,/obj/item/ammo_magazine/clip) || istype(O,/obj/item/ammo_magazine/s357) || istype(O,/obj/item/ammo_magazine/s38)) // Prevents ammo recycling exploit with speedloaders.
+>>>>>>> 5100fa1... Eris Research/Machine Sprite Port (#7127)
 		to_chat(user, "\The [O] is too hazardous to recycle with the autolathe!")
 		return
 		/*  ToDo: Make this actually check for ammo and change the value of the magazine if it's empty. -Spades
@@ -204,7 +211,11 @@
 	else
 		to_chat(user, "You fill \the [src] with \the [eating].")
 
+<<<<<<< HEAD
 	flick("autolathe_o", src) // Plays metal insertion animation. Work out a good way to work out a fitting animation. ~Z
+=======
+	flick("autolathe_loading", src) // Plays metal insertion animation. Work out a good way to work out a fitting animation. ~Z
+>>>>>>> 5100fa1... Eris Research/Machine Sprite Port (#7127)
 
 	if(istype(eating,/obj/item/stack))
 		var/obj/item/stack/stack = eating
@@ -286,6 +297,10 @@
 
 		//Create the desired item.
 		var/obj/item/I = new making.path(src.loc)
+<<<<<<< HEAD
+=======
+		flick("[initial(icon_state)]_finish", src)
+>>>>>>> 5100fa1... Eris Research/Machine Sprite Port (#7127)
 		if(multiplier > 1)
 			if(istype(I, /obj/item/stack))
 				var/obj/item/stack/S = I
@@ -297,6 +312,7 @@
 	updateUsrDialog()
 
 /obj/machinery/autolathe/update_icon()
+<<<<<<< HEAD
 	if(panel_open)
 		icon_state = "autolathe_t"
 	else if(busy)
@@ -305,6 +321,18 @@
 		if(icon_state == "autolathe_n")
 			flick("autolathe_u", src) // If lid WAS closed, show opening animation
 		icon_state = "autolathe"
+=======
+	overlays.Cut()
+
+	icon_state = initial(icon_state)
+
+	if(panel_open)
+		overlays.Add(image(icon, "[icon_state]_panel"))
+	if(stat & NOPOWER)
+		return
+	if(busy)
+		icon_state = "[icon_state]_work"
+>>>>>>> 5100fa1... Eris Research/Machine Sprite Port (#7127)
 
 //Updates overall lathe storage size.
 /obj/machinery/autolathe/RefreshParts()

code/game/mecha/mech_prosthetics.dm

@@ -1,6 +1,11 @@
 /obj/machinery/pros_fabricator
+<<<<<<< HEAD
 	icon = 'icons/obj/robotics_vr.dmi' //VOREStation Edit - New icon
 	icon_state = "fab-idle"
+=======
+	icon = 'icons/obj/robotics.dmi'
+	icon_state = "prosfab"
+>>>>>>> 5100fa1... Eris Research/Machine Sprite Port (#7127)
 	name = "Prosthetics Fabricator"
 	desc = "A machine used for construction of prosthetics."
 	density = 1
@@ -54,12 +59,14 @@
 
 /obj/machinery/pros_fabricator/update_icon()
 	overlays.Cut()
+	icon_state = initial(icon_state)
+
 	if(panel_open)
-		icon_state = "fab-o"
-	else
-		icon_state = "fab-idle"
+		overlays.Add(image(icon, "[icon_state]_panel"))
+	if(stat & NOPOWER)
+		return
 	if(busy)
-		overlays += "fab-active"
+		icon_state = "[icon_state]_work"
 
 /obj/machinery/pros_fabricator/dismantle()
 	for(var/f in materials)
@@ -198,9 +205,7 @@
 		if(materials[S.material.name] + amnt <= res_max_amount)
 			if(S && S.get_amount() >= 1)
 				var/count = 0
-				overlays += "fab-load-metal"
-				spawn(10)
-					overlays -= "fab-load-metal"
+				flick("[initial(icon_state)]_loading", src)
 				while(materials[S.material.name] + amnt <= res_max_amount && S.get_amount() >= 1)
 					materials[S.material.name] += amnt
 					S.use(1)
@@ -273,6 +278,7 @@
 		materials[M] = max(0, materials[M] - D.materials[M] * mat_efficiency)
 	if(D.build_path)
 		var/obj/new_item = D.Fabricate(get_step(get_turf(src), src.dir), src) // Sometimes returns a mob. Beware!
+		flick("[initial(icon_state)]_finish", src)
 		visible_message("\The [src] pings, indicating that \the [D] is complete.", "You hear a ping.")
 		if(mat_efficiency != 1)
 			if(istype(new_item, /obj/) && new_item.matter && new_item.matter.len > 0)

code/modules/research/protolathe.dm

@@ -61,6 +61,7 @@
 			removeFromQueue(1)
 			if(linked_console)
 				linked_console.updateUsrDialog()
+			flick("[initial(icon_state)]_finish", src)
 		update_icon()
 	else
 		if(busy)
@@ -93,15 +94,20 @@
 		eject_materials(f, -1)
 	..()
 
+
 /obj/machinery/r_n_d/protolathe/update_icon()
+	overlays.Cut()
+
+	icon_state = initial(icon_state)
+
 	if(panel_open)
-		icon_state = "protolathe_t"
-	else if(busy)
-		icon_state = "protolathe_n"
-	else
-		if(icon_state == "protolathe_n")
-			flick("protolathe_u", src) // If lid WAS closed, show opening animation
-		icon_state = "protolathe"
+		overlays.Add(image(icon, "[icon_state]_panel"))
+
+	if(stat & NOPOWER)
+		return
+
+	if(busy)
+		icon_state = "[icon_state]_work"
 
 /obj/machinery/r_n_d/protolathe/attackby(var/obj/item/O as obj, var/mob/user as mob)
 	if(busy)
@@ -147,9 +153,7 @@
 	if(materials[S.material.name] + amnt <= max_res_amount)
 		if(S && S.get_amount() >= 1)
 			var/count = 0
-			overlays += "fab-load-metal"
-			spawn(10)
-				overlays -= "fab-load-metal"
+			flick("[initial(icon_state)]_loading", src)
 			while(materials[S.material.name] + amnt <= max_res_amount && S.get_amount() >= 1)
 				materials[S.material.name] += amnt
 				S.use(1)