Resprites Robuddies

code/mob/living/silicon/robot.dm

@@ -3345,8 +3345,8 @@
 /mob/living/silicon/robot/buddy
 	name = "Robot"
 	real_name = "Robot"
-	icon = 'icons/obj/bots/aibots.dmi'
-	icon_state = "robuddy1"
+	icon = 'icons/obj/bots/robuddy/pr-6.dmi'
+	icon_state = "body"
 	health = 1000
 	custom = 1
 

code/modules/economy/shady_robot.dm

@@ -1,7 +1,7 @@
 /obj/npc/station_trader //separate obj because he has a lot of different behaviours eg. no buying, no set area, no defence systems to activate
 	name="Shady Robot"
-	icon = 'icons/misc/evilreaverstation.dmi' //temporary
-	icon_state = "pr1_b"
+	icon = 'icons/obj/bots/robuddy/pr-1.dmi'
+	icon_state = "body"
 	picture = "robot.png"
 	var/hiketolerance = 20 //How much they will tolerate price hike
 	var/list/droplist = null //What the merchant will drop upon their death
@@ -96,6 +96,9 @@
 
 	New()
 		..()
+		src.UpdateOverlays(image(src.icon, "face-happy"), "emotion")
+		src.UpdateOverlays(image(src.icon, "lights-on"), "lights")
+
 		teleport()
 		process()
 

code/modules/economy/trader.dm

@@ -792,8 +792,8 @@
 
 ////////Robot
 /obj/npc/trader/robot
-	icon = 'icons/misc/evilreaverstation.dmi' // changed from the ancient robot sprite to pr1
-	icon_state = "pr1_b"
+	icon = 'icons/obj/bots/robuddy/pr-1.dmi'
+	icon_state = "body"
 	picture = "robot.png"
 	trader_area = "/area/turret_protected/robot_trade_outpost"
 	var/productset = 0 // 0 is robots and salvage, 1 is podparts and drugs, 2 is produce. 3 is syndicate junk, 4 is medical stuff
@@ -802,6 +802,9 @@
 
 	New()
 		..()
+		src.UpdateOverlays(image(src.icon, "face-happy"), "emotion")
+		src.UpdateOverlays(image(src.icon, "lights-on"), "lights")
+
 		switch(productset)
 			if(1) // drugs and pod stuff
 				src.goods_sell += new /datum/commodity/podparts/engine(src)

code/modules/holiday/spacemas.dm

@@ -146,7 +146,7 @@ var/static/list/santa_snacks = list(/obj/item/reagent_containers/food/drinks/egg
 /obj/machinery/bot/guardbot/bootleg
 	name = "Super Protector Friend III"
 	desc = "The label on the back reads 'New technology! Blinking light action!'."
-	icon = 'icons/misc/xmas.dmi'
+	icon = 'icons/obj/bots/robuddy/super-protector-friend.dmi'
 
 	speak(var/message)
 		var/fontmode = rand(1,4)
@@ -172,7 +172,7 @@ var/static/list/santa_snacks = list(/obj/item/reagent_containers/food/drinks/egg
 /obj/machinery/bot/guardbot/xmas
 	name = "Jinglebuddy"
 	desc = "Festive!"
-	icon = 'icons/obj/bots/xmasbuddy.dmi'
+	skin_icon_state = "xmasbuddy"
 	setup_default_tool_path = /obj/item/device/guardbot_tool/xmas
 
 	speak(var/message)

code/modules/robotics/bot/barbot.dm

@@ -4,8 +4,8 @@
 /obj/machinery/bot/barbuddy
 	name = "BarBuddy"
 	desc = "A little bartending robot!"
-	icon = 'icons/obj/bots/aibots.dmi'
-	icon_state = "robuddy1"
+	icon = 'icons/obj/bots/robuddy/pr-6.dmi'
+	icon_state = "body"
 	layer = 5.0 //TODO LAYER
 	density = 0
 	anchored = UNANCHORED
@@ -16,7 +16,7 @@
 	var/list/targets = list() // Nearby tables that are in need of drinks.
 	var/atom/moveTowards // The object that should be moved towards.
 	var/worryLevel = 0 // Taking the barbuddy away from their bar makes them sad. Very sad. This stores how sad they are.
-	var/emotion // The face the barbuddy should be making.
+	var/emotion = "neutral" // The face the barbuddy should be making.
 
 	var/possible_drinks = list("bilk","beer","cider","mead","wine","champagne","rum","vodka","bourbon", \
 							"boorbon","beepskybeer","screwdriver","bloody_mary","bloody_scary",\
@@ -55,6 +55,7 @@
 	New()
 		..()
 		src.setEmotion("happy")
+		src.UpdateOverlays(image(src.icon, "lights-on"), "lights")
 		// Start by getting a few initial things
 		home = get_turf(src)
 		if (!home)

code/modules/robotics/bot/evilbot.dm

@@ -4,7 +4,8 @@
 /obj/machinery/bot/guardbot/bad
 	name = "Secbuddy"
 	desc = "An early sub-model of the popular PR-6S Guardbuddy line. It seems to be in rather poor shape."
-	icon = 'icons/misc/hstation.dmi'
+	skin_icon_state = "secbuddy"
+	face_icon_override = 'icons/obj/bots/robuddy/hemera-secbuddy-faces.dmi'
 
 	control_freq = FREQ_SECBUDDY
 	beacon_freq = FREQ_SECBUDDY_NAVBEACON