Merge branch 'master' into aro-bellies

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

@@ -302,7 +302,7 @@
 	msg += attempt_vr(src,"examine_bellies",args) //VOREStation Code
 	msg += attempt_vr(src,"examine_pickup_size",args) //VOREStation Code
 	msg += attempt_vr(src,"examine_step_size",args) //VOREStation Code
-	msg += attempt_vr(src,"nif_examine",args) //VOREStation Code
+	msg += attempt_vr(src,"examine_nif",args) //VOREStation Code
 
 	if(mSmallsize in mutations)
 		msg += "[T.He] [T.is] small halfling!\n"

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

@@ -130,23 +130,18 @@
 
 	return FALSE
 
-/mob/living/carbon/human/proc/examine_pickup_size(mob/living/carbon/human/H)
+/mob/living/carbon/human/proc/examine_pickup_size(mob/living/H)
 	var/message = ""
-	if(isliving(src) && (H.get_effective_size() - src.get_effective_size()) >= 0.50)
+	if(istype(H) && (H.get_effective_size() - src.get_effective_size()) >= 0.50)
 		message = "<font color='blue'>They are small enough that you could easily pick them up!</font>\n"
 	return message
 
-
-/mob/living/carbon/human/proc/examine_step_size(mob/living/carbon/human/H)
+/mob/living/carbon/human/proc/examine_step_size(mob/living/H)
 	var/message = ""
-	if(isliving(src) && (H.get_effective_size() - src.get_effective_size()) >= 0.75)
+	if(istype(H) && (H.get_effective_size() - src.get_effective_size()) >= 0.75)
 		message = "<font color='red'>They are small enough that you could easily trample them!</font>\n"
 	return message
 
-/mob/living/carbon/human/proc/nif_examine(mob/living/carbon/human/H)
-	var/message = ""
-	if(!src.nif || src.conceal_nif || !src.nif_examine) //Do they have a nif, do they have the NIF concealed, and do they have a NIF examine message?
-		return "" //If so, no message.
-	else
-		message += "[src.nif_examine]\n"
-		return message
+/mob/living/carbon/human/proc/examine_nif(mob/living/carbon/human/H)
+	if(nif && nif.examine_msg) //If you have one set, anyway.
+		return "<span class='notice'>[nif.examine_msg]</span>\n"

code/modules/mob/living/carbon/human/species/station/prometheans_vr.dm

@@ -9,6 +9,7 @@
 	mob_size = MOB_MEDIUM
 	num_alternate_languages = 1 //Let's at least give them one
 	appearance_flags = HAS_SKIN_COLOR | HAS_EYE_COLOR | HAS_HAIR_COLOR | RADIATION_GLOWS | HAS_UNDERWEAR
+	trashcan = 1 //They have goopy bodies. They can just dissolve things within them.
 	inherent_verbs = list(
 		/mob/living/carbon/human/proc/shapeshifter_select_shape,
 		/mob/living/carbon/human/proc/shapeshifter_select_colour,
@@ -20,7 +21,8 @@
 		/mob/living/carbon/human/proc/succubus_drain,
 		/mob/living/carbon/human/proc/succubus_drain_finalize,
 		/mob/living/carbon/human/proc/succubus_drain_lethal,
-		/mob/living/carbon/human/proc/slime_feed
+		/mob/living/carbon/human/proc/slime_feed,
+		/mob/living/proc/eat_trash
 		)
 
 

code/modules/mob/living/carbon/human/species/station/station_special_vr.dm

@@ -279,8 +279,9 @@
 
 	//primitive_form = "Monkey" //I dunno. Replace this in the future.
 
+	flags = NO_MINOR_CUT
 	spawn_flags = SPECIES_CAN_JOIN
-	appearance_flags = HAS_HAIR_COLOR | HAS_LIPS | HAS_UNDERWEAR | HAS_SKIN_COLOR | HAS_EYE_COLOR | NO_MINOR_CUT
+	appearance_flags = HAS_HAIR_COLOR | HAS_LIPS | HAS_UNDERWEAR | HAS_SKIN_COLOR | HAS_EYE_COLOR
 
 	flesh_color = "#AFA59E" //Gray-ish. Not sure if this is really needed, but eh.
 	base_color 	= "#333333" //Blackish-gray

code/modules/mob/living/silicon/robot/robot_modules/station.dm

@@ -51,6 +51,8 @@ var/global/list/robot_modules = list(
 	if(R.radio)
 		R.radio.recalculateChannels()
 
+	vr_add_sprites() //Vorestation Edit: For vorestation only sprites
+
 	R.set_module_sprites(sprites)
 	R.choose_icon(R.module_sprites.len + 1, R.module_sprites)
 

code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm

@@ -14,6 +14,7 @@
 					LANGUAGE_DAEMON		= 0,
 					LANGUAGE_ENOCHIAN	= 0
 					)
+	var/vr_sprites = list()
 
 /obj/item/weapon/robot_module/robot/clerical
 	languages = list(
@@ -47,6 +48,10 @@
 /obj/item/weapon/robot_module/proc/vr_new() // Any Global modules, just add them before the return (This will also affect all the borgs in this file)
 	return
 
+/obj/item/weapon/robot_module/proc/vr_add_sprites() // Adds sprites from this file into list of avialible ones for global modules
+	sprites += vr_sprites
+	return
+
 /obj/item/weapon/robot_module/robot/medical/surgeon/vr_new() //Surgeon Bot
 	src.modules += new /obj/item/device/sleevemate(src) //Lets them scan people.
 	. = ..() //Any Global vore modules will come from here
@@ -55,6 +60,42 @@
 	src.modules += new /obj/item/device/sleevemate(src) //Lets them scan people.
 	. = ..() //Any Global vore modules will come from here
 
+/obj/item/weapon/robot_module/robot/medical/crisis //Allows Crisis module to use Handy sprite
+	vr_sprites = list(
+						"Handy" = "handy-med"
+					 )
+
+/obj/item/weapon/robot_module/robot/clerical/butler //VR Handy sprites
+	vr_sprites = list(
+						"Handy - Service" = "handy-service",
+						"Handy - Hydro" = "handy-hydro"
+					 )
+
+/obj/item/weapon/robot_module/robot/clerical/general //VR Handy sprites
+	vr_sprites = list(
+						"Handy" = "handy-clerk"
+					 )
+
+/obj/item/weapon/robot_module/robot/janitor //VR Handy sprites
+	vr_sprites = list(
+						"Handy" = "handy-janitor"
+					 )
+
+/obj/item/weapon/robot_module/robot/security/general //VR Handy sprites
+	vr_sprites = list(
+						"Handy" = "handy-sec"
+					 )
+
+/obj/item/weapon/robot_module/robot/miner //VR Handy sprites
+	vr_sprites = list(
+						"Handy" = "handy-miner"
+					 )
+
+/obj/item/weapon/robot_module/robot/standard //VR Handy sprites
+	vr_sprites = list(
+						"Handy" = "handy-standard"
+					 )
+
 /obj/item/weapon/robot_module/robot/knine
 	name = "k9 robot module"
 	sprites = list(

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

@@ -6,6 +6,17 @@
 	var/pounce_cooldown_time = 40
 	var/leap_at
 	var/dogborg = FALSE
+	var/original_icon = 'icons/mob/robots.dmi'
+	var/vr_icons = list(
+					   "handy-hydro",
+					   "handy-service",
+					   "handy-clerk",
+					   "handy-janitor",
+					   "handy-miner",
+					   "handy-standard",
+					   "handy-sec"
+					   )					//List of all used sprites that are in robots_vr.dmi
+
 
 /mob/living/silicon/robot/verb/robot_nom(var/mob/living/T in living_mobs(1))
 	set name = "Robot Nom"
@@ -17,6 +28,7 @@
 	return feed_grabbed_to_self(src,T)
 
 /mob/living/silicon/robot/updateicon()
+	vr_sprite_check()
 	..()
 	if(dogborg == TRUE && stat == CONSCIOUS)
 		if(sleeper_g == TRUE)
@@ -70,3 +82,10 @@
 							cleaned_human << "<span class='warning'>[src] cleans your face!</span>"
 		return
 	return
+
+/mob/living/silicon/robot/proc/vr_sprite_check()
+	if((icon_state in vr_icons) && (icon == 'icons/mob/robots.dmi'))
+		original_icon = icon
+		icon = 'icons/mob/robots_vr.dmi'
+	else if(!(icon_state in vr_icons))
+		icon = original_icon