Merge remote-tracking branch 'refs/remotes/VOREStation/master'

code/modules/mob/dead/observer/observer.dm

@@ -219,7 +219,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 					return
 				src.client.admin_ghost()
 		else
-			response = alert(src, "Are you -sure- you want to ghost?\n(You are alive. If you ghost, you won't be able to play this round for another 30 minutes! You can't change your mind so choose wisely!)", "Are you sure you want to ghost?", "Ghost", "Stay in body")
+			response = alert(src, "Are you -sure- you want to ghost?\n(You are alive. Don't abuse ghost unless you are inside a cryopod or equivalent! You can't change your mind so choose wisely!)", "Are you sure you want to ghost?", "Ghost", "Stay in body") // VOREStation edit because we don't make players stay dead for 30 minutes.
 		if(response != "Ghost")
 			return
 		resting = 1

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

@@ -1,33 +1,33 @@
 /mob/living/carbon/human/proc/examine_weight()
-    var/message = ""
-
-    switch(weight)
-        if(0 to 74)
-            message = "<span class='warning'>They are terribly lithe and frail!</span>\n"
-        if(75 to 99)
-            message = "They have a very slender frame.\n"
-        if(100 to 124)
-            message = "They have a lightweight, athletic build.\n"
-        if(125 to 174)
-            message = "They have a healthy, average body.\n"
-        if(175 to 224)
-            message = "They have a thick, heavy physique.\n"
-        if(225 to 274)
-            message = "They have a plush, chubby figure.\n"
-        if(275 to 325)
-            message = "They have an especially plump body with a round potbelly and large hips.\n"
-        if(325 to 374)
-            message = "They have a very fat frame with a bulging potbelly, squishy rolls of pudge, very wide hips, and plump set of jiggling thighs.\n"
-        if(375 to 474)
-            message = "<span class='warning'>They are incredibly obese. Their massive potbelly sags over their waistline while their fat ass would probably require two chairs to sit down comfortably!</span>\n"
-        else
-            message += "<span class='warning'>They are so morbidly obese, you wonder how they can even stand, let alone waddle around the station. They can't get any fatter without being immobilized.</span>\n"
-    return message //Credit to Aronai for helping me actually get this working!
+	var/message = ""
+	var/weight_examine = round(weight)
+	switch(weight_examine)
+		if(0 to 74)
+			message = "<span class='warning'>They are terribly lithe and frail!</span>\n"
+		if(75 to 99)
+			message = "They have a very slender frame.\n"
+		if(100 to 124)
+			message = "They have a lightweight, athletic build.\n"
+		if(125 to 174)
+			message = "They have a healthy, average body.\n"
+		if(175 to 224)
+			message = "They have a thick, heavy physique.\n"
+		if(225 to 274)
+			message = "They have a plush, chubby figure.\n"
+		if(275 to 325)
+			message = "They have an especially plump body with a round potbelly and large hips.\n"
+		if(325 to 374)
+			message = "They have a very fat frame with a bulging potbelly, squishy rolls of pudge, very wide hips, and plump set of jiggling thighs.\n"
+		if(375 to 474)
+			message = "<span class='warning'>They are incredibly obese. Their massive potbelly sags over their waistline while their fat ass would probably require two chairs to sit down comfortably!</span>\n"
+		else
+			message += "<span class='warning'>They are so morbidly obese, you wonder how they can even stand, let alone waddle around the station. They can't get any fatter without being immobilized.</span>\n"
+	return message //Credit to Aronai for helping me actually get this working!
 
 /mob/living/carbon/human/proc/examine_nutrition()
 	var/message = ""
-
-	switch(nutrition)
+	var/nutrition_examine = round(nutrition)
+	switch(nutrition_examine)
 		if(0 to 49)
 			message = "<span class='warning'>They are starving! You can hear their stomach snarling from across the room!</span>\n"
 		if(50 to 99)

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

@@ -15,7 +15,9 @@
 	max_age = 110
 
 	spawn_flags = SPECIES_CAN_JOIN
-	appearance_flags = HAS_HAIR_COLOR | HAS_SKIN_COLOR | HAS_LIPS | HAS_UNDERWEAR | HAS_EYE_COLOR //VOREStation Edit - Skin Color
+	appearance_flags = HAS_HAIR_COLOR | HAS_SKIN_TONE | HAS_LIPS | HAS_UNDERWEAR | HAS_EYE_COLOR
+//	appearance_flags = HAS_HAIR_COLOR | HAS_SKIN_COLOR | HAS_LIPS | HAS_UNDERWEAR | HAS_EYE_COLOR //VOREStation Edit - Skin Color // NEED SPRITES. CAN'T USE IT UNTIL WE HAVE SPRITES.
+
 
 /datum/species/human/get_bodytype(var/mob/living/carbon/human/H)
 	return "Human"

code/modules/mob/living/simple_animal/hostile/vore/alien.dm

@@ -78,10 +78,14 @@
 	icon_state = "queen_s"
 	icon_living = "queen_s"
 	icon_dead = "queen_dead"
+	faction = "alien"
 	move_to_delay = 4
 	maxHealth = 400
 	health = 400
+	old_x = -16
+	old_y = 0
 	pixel_x = -16
+	pixel_y = 0
 	capacity = 3
 
 /obj/item/projectile/neurotox

code/modules/mob/living/simple_animal/hostile/vore/vore.dm

@@ -116,7 +116,7 @@ Don't use ranged mobs for vore mobs.
 		return
 
 	if(target_mob.lying && target_mob.size_multiplier >= min_size && target_mob.size_multiplier <= max_size && !(target_mob in prey_exclusions))
-		if(!capacity || (target_mob.size_multiplier + fullness) < capacity)
+		if(!capacity || (target_mob.size_multiplier + fullness) <= capacity)
 			stance = HOSTILE_STANCE_EATING
 			stop_automated_movement = 1
 			animal_nom(target_mob)
@@ -140,6 +140,9 @@ Don't use ranged mobs for vore mobs.
 	icon_dead = "snake-dead"
 	icon_living = "snake"
 	icon_state = "snake"
+	old_x = -16
+	old_y = -16
 	pixel_x = -16
+	pixel_y = -16
 	maxHealth = 200
 	health = 200