Merge pull request #428 from Cameron653/master

Adds in two new cyborg sprites and multiple bugfixes

code/global_vr.dm

@@ -1,4 +1,4 @@
 /hook/startup/proc/modules_vr()
 	robot_module_types += "Medihound"
 	robot_module_types += "K9"
-	return 1
+	return 1

code/modules/mob/living/silicon/robot/robot_modules_vr.dm

@@ -6,7 +6,10 @@
 
 /obj/item/weapon/robot_module/knine
 	name = "k9 robot module"
-	sprites = list("K9 hound" = "k9")
+	sprites = list(
+					"K9 hound" = "k9",
+					"K9 Alternative (Static)" = "k92"
+					)
 	channels = list("Security" = 1)
 	networks = list(NETWORK_SECURITY)
 	can_be_pushed = 0
@@ -25,7 +28,7 @@
 	src.emag 	 = new /obj/item/weapon/gun/energy/laser/mounted(src) //Emag. Not a big problem.
 	R.icon 		 = 'icons/mob/widerobot_vr.dmi'
 	R.hands.icon = 'icons/mob/screen1_robot_vr.dmi'
-	R.icon_state = "k9"
+	//R.icon_state = "k9"
 	R.pixel_x 	 = -16
 	R.old_x 	 = -16
 	..()
@@ -54,7 +57,10 @@
 	channels = list("Medical" = 1)
 	networks = list(NETWORK_MEDICAL)
 	can_be_pushed = 0
-	sprites = list("Medical Hound" = "medihound")
+	sprites = list(
+					"Medical Hound" = "medihound",
+					"Dark Medical Hound (Static)" = "medihounddark"
+					)
 
 /obj/item/weapon/robot_module/medihound/New(var/mob/living/silicon/robot/R)
 	src.modules += new /obj/item/weapon/dogborg/jaws/small(src) //In case a patient is being attacked by carp.
@@ -67,7 +73,7 @@
 	src.modules += new /obj/item/weapon/reagent_containers/syringe(src) //In case the chemist is nice!
 	R.icon = 'icons/mob/widerobot_vr.dmi'
 	R.hands.icon = 'icons/mob/screen1_robot_vr.dmi'
-	R.icon_state = "medihound"
+	//R.icon_state = "medihound"
 	R.pixel_x 	 = -16
 	R.old_x  	 = -16
 	..()

code/modules/mob/living/silicon/robot/robot_vr.dm

@@ -3,9 +3,9 @@
 	if(stat == CONSCIOUS)
 		overlays += "eyes-[module_sprites[icontype]]"
 		if(sleeper_g == 1)
-			overlays += "sleeper_g"
+			overlays += "[module_sprites[icontype]]-sleeper_g"
 		if(sleeper_r == 1)
-			overlays += "sleeper_r"
+			overlays += "[module_sprites[icontype]]-sleeper_r"
 
 	if(opened)
 		var/panelprefix = custom_sprite ? src.ckey : "ov"
@@ -27,6 +27,6 @@
 		return
 	if(stat == 0)
 		if(sleeper_g == 1)
-			overlays += "sleeper_g"
+			overlays += "[module_sprites[icontype]]-sleeper_g"
 		if(sleeper_r == 1)
-			overlays += "sleeper_r"
+			overlays += "[module_sprites[icontype]]-sleeper_r"

code/modules/mob/new_player/sprite_accessories_vr.dm

@@ -34,7 +34,7 @@
 
 	braid
 		name = "Floorlength Braid"
-		icon_state = "hair_braid" //Trust me, it's better this way.
+		icon_state = "hair_braid_s" //Trust me, it's better this way.
 
 	bald
 		name = "Bald"

code/modules/vore/eating/bellymodes_vr.dm

@@ -539,6 +539,9 @@
 				P.g_skin 			= O.g_skin
 				P.b_skin 			= O.b_skin
 				P.h_style 			= O.h_style
+				P.r_eyes 			= O.r_eyes
+				P.g_eyes 			= O.g_eyes
+				P.b_eyes 			= O.b_eyes
 				P << "<span class='notice'>Your body tingles all over...</span>"
 				owner << "<span class='notice'>You tingle as you make noticeable changes to your captive's body.</span>"
 				P.update_hair()
@@ -623,6 +626,9 @@
 				P.g_skin 			= O.g_skin
 				P.b_skin 			= O.b_skin
 				P.h_style 			= O.h_style
+				P.r_eyes 			= O.r_eyes
+				P.g_eyes 			= O.g_eyes
+				P.b_eyes 			= O.b_eyes
 				P << "<span class='notice'>Your body tingles all over...</span>"
 				owner << "<span class='notice'>You tingle as you make noticeable changes to your captive's body.</span>"
 				P.update_hair()