Applies alternative sprites from Talos to everything, except vents, s…

…crubbers and surgery cases. (#232)

* replace iv drip sprite to its alt

* bioprinter and optable

added emissives

* sleeper and bodyscanner

* cryopod dirs

* Update TGS_Talos.dmm

* repath alt windows, window frames and walls

* alt camera

* little magmoor fix

code/datums/components/deployable_item.dm

@@ -1,4 +1,3 @@
-
 /datum/component/deployable_item
 	///Time it takes for the parent to be deployed.
 	var/deploy_time = 0

code/game/objects/machinery/OpTable.dm

@@ -2,7 +2,7 @@
 	name = "Operating Table"
 	desc = "Used for advanced medical procedures."
 	icon = 'icons/obj/surgery.dmi'
-	icon_state = "table2-idle"
+	icon_state = "table2_idle"
 	base_icon_state = "table2"
 	density = TRUE
 	coverage = 10
@@ -13,10 +13,10 @@
 	use_power = IDLE_POWER_USE
 	idle_power_usage = 1
 	active_power_usage = 5
-	var/mob/living/carbon/human/victim = null
-	var/strapped = 0
 	buckle_flags = CAN_BUCKLE
 	buckle_lying = 90
+	var/mob/living/carbon/human/victim = null
+	var/strapped = 0
 	var/obj/item/tank/anesthetic/anes_tank
 	var/obj/machinery/computer/operating/computer = null
 
@@ -37,6 +37,13 @@
 			computer.table = src
 			break
 
+/obj/machinery/optable/update_overlays()
+	. = ..()
+	if(machine_stat & (BROKEN|DISABLED|NOPOWER))
+		return
+	. += emissive_appearance(icon, "[icon_state]_emissive", alpha = src.alpha)
+	. += mutable_appearance(icon, "[icon_state]_emissive", alpha = src.alpha)
+
 /obj/machinery/optable/ex_act(severity)
 	if(prob(severity * 0.3))
 		qdel(src)
@@ -139,12 +146,14 @@
 		var/mob/living/carbon/human/M = locate(/mob/living/carbon/human, loc)
 		if(M.lying_angle)
 			victim = M
-			icon_state = M.handle_pulse() ? "[base_icon_state]-active" : "[base_icon_state]-idle"
-			return 1
+			icon_state = M.handle_pulse() ? "[base_icon_state]_active" : "[base_icon_state]_idle"
+			update_icon()
+			return TRUE
 	victim = null
 	stop_processing()
-	icon_state = "[base_icon_state]-idle"
-	return 0
+	icon_state = "[base_icon_state]_idle"
+	update_icon()
+	return FALSE
 
 /obj/machinery/optable/process()
 	check_victim()
@@ -161,9 +170,10 @@
 		var/mob/living/carbon/human/H = C
 		victim = H
 		start_processing()
-		icon_state = H.handle_pulse() ? "[base_icon_state]-active" : "[base_icon_state]-idle"
+		icon_state = H.handle_pulse() ? "[base_icon_state]_active" : "[base_icon_state]_idle"
 	else
-		icon_state = "[base_icon_state]-idle"
+		icon_state = "[base_icon_state]_idle"
+	update_icon()
 
 /obj/machinery/optable/verb/climb_on()
 	set name = "Climb On Table"
@@ -225,7 +235,3 @@
 
 /obj/machinery/optable/yautja
 	icon = 'icons/obj/machines/yautja_machines.dmi'
-
-/obj/machinery/optable/alt
-	icon_state = "alt_table2-idle"
-	base_icon_state = "alt_table2"

code/game/objects/machinery/adv_med.dm

@@ -32,9 +32,9 @@
 /obj/machinery/bodyscanner/update_icon_state()
 	. = ..()
 	if(occupant)
-		icon_state = "[initial(icon_state)]_occupied"
+		icon_state = "body_scanner_occupied"
 	else
-		icon_state = initial(icon_state)
+		icon_state = "body_scanner"
 
 /obj/machinery/bodyscanner/update_overlays()
 	. = ..()
@@ -252,10 +252,3 @@
 	icon = 'icons/obj/machines/yautja_machines.dmi'
 	icon_state = "sleeperconsole"
 	base_icon_state = "sleeperconsole"
-
-/obj/machinery/bodyscanner/alt
-	icon_state = "alt_body_scanner"
-
-/obj/machinery/computer/body_scanconsole/alt
-	icon_state = "alt_body_scannerconsole"
-	screen_overlay = "alt_body_scannerconsole_emissive"

code/game/objects/machinery/bioprinter.dm

@@ -1,5 +1,3 @@
-//These machines are mostly just here for debugging/spawning. Skeletons of the feature to come.
-
 /obj/machinery/bioprinter
 	name = "bio/synthetic printer"
 	desc = "It's a machine that can either grow replacement or manufacture synthetic organs."
@@ -24,8 +22,8 @@
 		"synthetic left arm (125 - Metal)" = list(/obj/item/robot_parts/l_arm,  0, LIMB_METAL_AMOUNT, LIMB_PRINTING_TIME),
 		"synthetic right arm (125 - Metal)" = list(/obj/item/robot_parts/r_arm,  0, LIMB_METAL_AMOUNT, LIMB_PRINTING_TIME),
 		"synthetic left leg (125 - Metal)" = list(/obj/item/robot_parts/l_leg,  0, LIMB_METAL_AMOUNT, LIMB_PRINTING_TIME),
-		"synthetic right leg (125 - Metal)" = list(/obj/item/robot_parts/r_leg,  0, LIMB_METAL_AMOUNT, LIMB_PRINTING_TIME)
-		)
+		"synthetic right leg (125 - Metal)" = list(/obj/item/robot_parts/r_leg,  0, LIMB_METAL_AMOUNT, LIMB_PRINTING_TIME),
+	)
 
 /obj/machinery/bioprinter/attack_hand(mob/living/user)
 	. = ..()
@@ -85,20 +83,20 @@
 /obj/machinery/bioprinter/update_icon_state()
 	. = ..()
 	if(machine_stat & NOPOWER)
-		icon_state = "[initial(icon_state)]_off"
+		icon_state = "bioprinter_off"
 		return
 	if(working)
-		icon_state = "[initial(icon_state)]_busy"
+		icon_state = "bioprinter_busy"
 	else
-		icon_state = "[initial(icon_state)]"
-
-/obj/machinery/bioprinter/stocked
-	stored_metal = 1000
-	stored_matter = 1000
+		icon_state = "bioprinter"
 
-/obj/machinery/bioprinter/alt
-	icon_state = "alt_bioprinter"
+/obj/machinery/bioprinter/update_overlays()
+	. = ..()
+	if(machine_stat & (BROKEN|DISABLED|NOPOWER))
+		return
+	. += emissive_appearance(icon, "[icon_state]_emissive", alpha = src.alpha)
+	. += mutable_appearance(icon, "[icon_state]_emissive", alpha = src.alpha)
 
-/obj/machinery/bioprinter/alt/stocked
+/obj/machinery/bioprinter/stocked
 	stored_metal = 1000
 	stored_matter = 1000

code/game/objects/machinery/camera/camera.dm

@@ -51,13 +51,17 @@
 /obj/machinery/camera/proc/set_offsets()
 	switch(dir)
 		if(NORTH)
-			pixel_y = -16
+			pixel_y = 0
+			pixel_x = -10
 		if(SOUTH)
-			pixel_y = 16
+			pixel_y = 18
+			pixel_x = 10
 		if(EAST)
-			pixel_x = -16
+			pixel_x = -9
+			pixel_y = -5
 		if(WEST)
-			pixel_x = 16
+			pixel_x = 9
+			pixel_y = -5
 
 /obj/machinery/camera/Destroy()
 	if(can_use())
@@ -378,31 +382,6 @@
 	. = ..()
 	icon_state = "nothing"
 
-/obj/machinery/camera/autoname/alt
-	icon_state = "alt_camera_icon"
-	base_icon_state = "alt_camera"
-
-/obj/machinery/camera/autoname/alt/update_icon_state()
-	if(obj_integrity <= 0)
-		icon_state = "alt_camera_assembly"
-	else
-		icon_state = "alt_camera"
-
-/obj/machinery/camera/autoname/alt/set_offsets()
-	switch(dir)
-		if(NORTH)
-			pixel_y = 0
-			pixel_x = -10
-		if(SOUTH)
-			pixel_y = 18
-			pixel_x = 10
-		if(EAST)
-			pixel_x = -9
-			pixel_y = -5
-		if(WEST)
-			pixel_x = 9
-			pixel_y = -5
-
 /obj/machinery/camera/miner
 	name = "miner camera"
 	desc = "It's used to monitor miners."

code/game/objects/machinery/iv_drip.dm

@@ -1,8 +1,7 @@
 /obj/machinery/iv_drip
 	name = "\improper IV drip"
 	icon = 'icons/obj/iv_drip.dmi'
-	icon_state = "original"
-	base_icon_state = "original"
+	icon_state = "iv_drip"
 	anchored = FALSE
 	density = FALSE
 	drag_delay = 1
@@ -15,9 +14,9 @@
 /obj/machinery/iv_drip/update_icon_state()
 	. = ..()
 	if(attached)
-		icon_state = "[base_icon_state]_hooked"
+		icon_state = "iv_drip_hooked"
 	else
-		icon_state = base_icon_state
+		icon_state = "iv_drip"
 
 /obj/machinery/iv_drip/update_overlays()
 	. = ..()
@@ -34,19 +33,19 @@
 	var/percent = round((reagents.total_volume / beaker.volume) * 100)
 	switch(percent)
 		if(0 to 9)
-			filling.icon_state = "[base_icon_state]_reagent0"
+			filling.icon_state = "reagent0"
 		if(10 to 24)
-			filling.icon_state = "[base_icon_state]_reagent10"
+			filling.icon_state = "reagent10"
 		if(25 to 49)
-			filling.icon_state = "[base_icon_state]_reagent25"
+			filling.icon_state = "reagent25"
 		if(50 to 74)
-			filling.icon_state = "[base_icon_state]_reagent50"
+			filling.icon_state = "reagent50"
 		if(75 to 79)
-			filling.icon_state = "[base_icon_state]_reagent75"
+			filling.icon_state = "reagent75"
 		if(80 to 90)
-			filling.icon_state = "[base_icon_state]_reagent80"
+			filling.icon_state = "reagent80"
 		if(91 to INFINITY)
-			filling.icon_state = "[base_icon_state]_reagent100"
+			filling.icon_state = "reagent100"
 
 	filling.color = mix_color_from_reagents(reagents.reagent_list)
 	. += filling
@@ -200,7 +199,3 @@
 	attached = null
 	update_beam()
 	. = ..()
-
-/obj/machinery/iv_drip/alt
-	icon_state = "alt"
-	base_icon_state = "alt"

code/game/objects/machinery/sleeper.dm

@@ -254,9 +254,9 @@
 /obj/machinery/sleeper/update_icon_state()
 	. = ..()
 	if(occupant)
-		icon_state = "[initial(icon_state)]_occupied"
+		icon_state = "sleeper_occupied"
 	else
-		icon_state = initial(icon_state)
+		icon_state = "sleeper"
 
 /obj/machinery/sleeper/update_overlays()
 	. = ..()
@@ -450,10 +450,3 @@
 	set src in oview(1)
 
 	move_inside_wrapper(usr, usr)
-
-/obj/machinery/sleeper/alt
-	icon_state = "alt_sleeper"
-
-/obj/machinery/computer/sleep_console/alt
-	icon_state = "alt_sleeperconsole"
-	screen_overlay = "alt_sleeperconsole_emissive"

code/game/objects/machinery/surgery_table.dm

@@ -14,6 +14,8 @@
 
 /obj/machinery/optable/deployable
 	name = "Deployable Operating Table"
+	icon_state = "table_deployable_idle"
+	base_icon_state = "table_deployable"
 	desc = "Used for advanced medical procedures in field."
 	use_power = NO_POWER_USE
 	resistance_flags = UNACIDABLE|XENO_DAMAGEABLE

code/game/objects/structures/dropship_equipment.dm

@@ -850,17 +850,14 @@
 		else
 			icon_state = "launch_bay"
 
-
-
-
 //////////////// OTHER EQUIPMENT /////////////////
 
 /obj/structure/dropship_equipment/shuttle/operatingtable
 	name = "Dropship Operating Table Deployment System"
 	desc = "Used for advanced medical procedures. Fits on the crewserved weapon attach points of dropships. You need a powerloader to lift it."
 	equip_category = DROPSHIP_CREW_WEAPON
 	icon = 'icons/obj/surgery.dmi'
-	icon_state = "table2-idle"
+	icon_state = "table1"
 	point_cost = 100
 	var/obj/machinery/optable/deployed_table
 
@@ -887,7 +884,7 @@
 		return
 	deployed_table.layer = ABOVE_OBJ_LAYER + 0.01 //make sure its directly ABOVE the layer
 	deployed_table.loc = loc
-	icon_state = "table2-idle"
+	icon_state = "table1"
 
 // bomb pod
 

code/game/objects/structures/misc.dm

@@ -364,7 +364,7 @@
 /obj/structure/cryopods
 	name = "hypersleep chamber"
 	icon = 'icons/obj/machines/cryogenics.dmi'
-	icon_state = "body_scanner_0"
+	icon_state = "body_scanner"
 	desc = "A large automated capsule with LED displays intended to put anyone inside into 'hypersleep'."
 	density = TRUE
 	anchored = TRUE

code/game/objects/structures/window.dm

@@ -439,11 +439,11 @@
 	dir = 5
 	window_frame = /obj/structure/window_frame/mainship
 
-/obj/structure/window/framed/mainship/alt
+/obj/structure/window/framed/mainship/talos
 	icon = 'icons/obj/smooth_objects/alt_ship_window.dmi'
 	icon_state = "alt_ship_window-0"
 	base_icon_state = "alt_ship_window"
-	window_frame = /obj/structure/window_frame/mainship/alt
+	window_frame = /obj/structure/window_frame/mainship/talos
 
 /obj/structure/window/framed/mainship/canterbury //So we can wallsmooth properly.
 
@@ -544,7 +544,7 @@
 	resistance_flags = RESIST_ALL
 	icon_state = "window-invincible"
 
-/obj/structure/window/framed/mainship/gray/toughened/hull/alt
+/obj/structure/window/framed/mainship/gray/toughened/hull/talos
 	icon = 'icons/obj/smooth_objects/alt_ship_rwindow.dmi'
 	icon_state = "alt_ship_rwindow-0"
 	base_icon_state = "alt_ship_rwindow"

code/game/objects/structures/window_frame.dm

@@ -117,8 +117,8 @@
 	basestate = "ship_window_frame"
 	base_icon_state = "ship_window_frame"
 
-/obj/structure/window_frame/mainship/alt
-	window_type = /obj/structure/window/framed/mainship/alt
+/obj/structure/window_frame/mainship/talos
+	window_type = /obj/structure/window/framed/mainship/talos
 	icon = 'icons/obj/smooth_objects/alt_ship_window_frame.dmi'
 	icon_state = "alt_ship_window_frame-0"
 	basestate = "alt_ship_window_frame"

code/game/turfs/walls/wall_types.dm

@@ -35,7 +35,7 @@
 //turf/closed/wall/mainship/update_icon()
 
 
-/turf/closed/wall/mainship/alt
+/turf/closed/wall/mainship/talos
 	icon = 'icons/turf/walls/talos.dmi'
 
 /turf/closed/wall/mainship/outer
@@ -47,7 +47,7 @@
 	icon_state = "wall-invincible"
 	decorated_wall = FALSE
 
-/turf/closed/wall/mainship/outer/alt
+/turf/closed/wall/mainship/outer/talos
 	icon = 'icons/turf/walls/talos.dmi'
 	icon_state = "testwall-0"
 	walltype = "testwall"