Merge pull request #385 from Cameron653/master

Bugfixes and features

code/game/objects/structures/crates_lockers/closets/egg_vr.dm

@@ -58,7 +58,7 @@
 /obj/structure/closet/secure_closet/egg/shark
 	name = "akula egg"
 	desc = "Its soft and slimy to the touch"
-	icon = 'icons/obj/closet.dmi'
+	icon_state  = "egg_akula"
 	icon_closed = "egg_akula"
 	icon_opened = "egg_akula_open"
 

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

@@ -1,23 +1,26 @@
 /datum/species/monkey/shark
-	name = "Sobaka"
-	voice_name = "Sobaka"
-	speak_emote = list("squeaks")
-	icon_state = "sharkpup1"
-	greaterform = "Akula"
+	name 			= "Sobaka"
+	name_plural 	= "Sobaka"
+	icobase 		= 'icons/mob/human_races/monkeys/r_sobaka_vr.dmi'
+	deform  		= 'icons/mob/human_races/monkeys/r_sobaka_vr.dmi'
+	tail 			= null //The tail is part of its body due to tail using the "icons/effects/species.dmi" file. It must be null, or they'll have a chimp tail.
+	greater_form 	= "Akula" //Oh, also, I went ahead and made it so everything lines up so it looks nice.
 
 /datum/species/monkey/sergal
-	name = "Sergaling"
-	voice_name = "Sergaling"
-	speak_emote = list("growls")
-	icon_state = "sergal1"
-	greaterform = "Sergal"
+	name 			= "Sergaling"
+	greater_form 	= "Sergal"
+	icobase 		= 'icons/mob/human_races/monkeys/r_sergaling_vr.dmi'
+	deform  		= 'icons/mob/human_races/monkeys/r_sergaling_vr.dmi'
+	tail 			= null
 
 /datum/species/monkey/sparra
-	name = "Sparra"
-	voice_name = "Sparra"
-	speak_emote = list("chirps")
-	icon_state = "sparra1"
-	greaterform = "Nevrean"
+	name 			= "Sparra"
+	name_plural 	= "Sparra"
+	greater_form 	= "Nevrean"
+	tail 			= null
+	icobase 		= 'icons/mob/human_races/monkeys/r_sparra_vr.dmi'
+	deform  		= 'icons/mob/human_races/monkeys/r_sparra_vr.dmi'
+
 
 /* Example from Polaris code
 /datum/species/monkey/tajaran
@@ -35,14 +38,29 @@
 */
 
 /datum/species/monkey/vulpkanin
-	name = "Wolpin"
-	name_plural = "Wolpin"
-	speak_emote = list("rrfts")
+	name 			= "Wolpin"
+	name_plural 	= "Wolpin"
 
-	icobase = 'icons/mob/human_races/monkeys/r_wolpin.dmi'
-	deform = 'icons/mob/human_races/monkeys/r_wolpin.dmi'
+	icobase 		= 'icons/mob/human_races/monkeys/r_wolpin.dmi'
+	deform 			= 'icons/mob/human_races/monkeys/r_wolpin.dmi'
 
-	greater_form = "Vulpkanin"
+	greater_form 	= "Vulpkanin"
 	default_language = "Canilunzt"
-	flesh_color = "#966464"
-	base_color = "#000000"
+	flesh_color 	= "#966464"
+	base_color 		= "#000000"
+	tail 			= null
+
+//INSERT CODE HERE SO MONKEYS CAN BE SPAWNED.
+//Also, M was added to the end of the spawn names to signify that it's a monkey, since some names were conflicting.
+
+/mob/living/carbon/human/sharkm/New(var/new_loc)
+	..(new_loc, "Sobaka")
+
+/mob/living/carbon/human/sergallingm/New(var/new_loc)
+	..(new_loc, "Sergaling")
+
+/mob/living/carbon/human/sparram/New(var/new_loc)
+	..(new_loc, "Sparra")
+
+/mob/living/carbon/human/vulpkaninm/New(var/new_loc)
+	..(new_loc, "Wolpin")

code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm

@@ -362,7 +362,7 @@
 					hearer << deathsound
 				T << deathsound
 				//Spill(T) //TODOPOLARIS
-				T.Del()
+				qdel(T)
 				src.update_patient()
 
 		//Handle the target being anything but a /mob/living/carbon/human
@@ -392,7 +392,7 @@
 				//Anything not perserved, PDA, or ID
 				else
 					//Spill(T) //Needs the spill proc to be added
-					T.Del()
+					qdel(T)
 					src.update_patient()
 					src.hound.cell.charge += 10
 		return

code/modules/vore/eating/bellymodes_vr.dm

@@ -88,10 +88,11 @@
 			if(M.absorbed)
 				continue
 
-			if(M.nutrition >= 4) //Drain them until there's no nutrients left. Slowly "absorb" them.
-				M.nutrition -= 3
-				owner.nutrition += 3
-			else if(M.nutrition < 4) //When they're finally drained.
+			if(M.nutrition >= 100) //Drain them until there's no nutrients left. Slowly "absorb" them.
+				var/oldnutrition = (M.nutrition * 0.05)
+				M.nutrition = (M.nutrition * 0.95)
+				owner.nutrition += oldnutrition
+			else if(M.nutrition < 100) //When they're finally drained.
 				absorb_living(M)
 
 		return

vorestation.dme

@@ -1480,6 +1480,7 @@
 #include "code\modules\mob\living\carbon\human\species\outsider\shadow.dm"
 #include "code\modules\mob\living\carbon\human\species\station\golem.dm"
 #include "code\modules\mob\living\carbon\human\species\station\monkey.dm"
+#include "code\modules\mob\living\carbon\human\species\station\monkey_vr.dm"
 #include "code\modules\mob\living\carbon\human\species\station\prometheans.dm"
 #include "code\modules\mob\living\carbon\human\species\station\prometheans_vr.dm"
 #include "code\modules\mob\living\carbon\human\species\station\seromi.dm"