Monkey forms for skeletons, plasmamen and greys, vox monkey form improved (#12006)

* Monkey forms for skeletons and greys, vox monkey form improved

* I fucked up, this is on my bleeding edge so I can't branch easy

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

@@ -11,6 +11,7 @@
 	flags = NO_BLOOD|IS_WHITELISTED
 
 	//default_mutations=list(SKELETON) // This screws things up
+	primitive = /mob/living/carbon/monkey/skellington/plasma
 
 	breath_type = "toxins"
 

code/modules/mob/living/carbon/monkey/monkey.dm

@@ -78,6 +78,13 @@
 	species_type = /mob/living/carbon/monkey/unathi
 	languagetoadd = LANGUAGE_UNATHI
 
+/mob/living/carbon/monkey/grey
+	name = "greyling"
+	voice_name = "greyling"
+	icon_state = "grey"
+	canWearGlasses = 0
+	languagetoadd = LANGUAGE_GREY
+
 /mob/living/carbon/monkey/New()
 	var/datum/reagents/R = new/datum/reagents(1000)
 	reagents = R

code/modules/mob/living/carbon/monkey/skeleton.dm

@@ -0,0 +1,38 @@
+/mob/living/carbon/monkey/skellington
+	name = "skull"
+	voice_name = "skull"
+	icon_state = "skull"
+	attack_text = "bites"
+	species_type = /mob/living/carbon/monkey/skellington
+	can_butcher = 0 //It's a skull, what do you expect?
+	canWearClothes = 0
+	canWearHats = 0
+	canWearGlasses = 0
+	languagetoadd = LANGUAGE_CLATTER
+	brute_damage_modifier = 2
+	movement_speed_modifier = 0.23
+	greaterform = "Skellington"
+
+/mob/living/carbon/monkey/skellington/say(var/message)
+	if (prob(25))
+		message += "  ACK ACK!"
+
+	return ..(message)
+
+
+/mob/living/carbon/monkey/skellington/put_in_hand_check(var/obj/item/W)
+	return 0
+
+/mob/living/carbon/monkey/skellington/New()
+	..()
+	set_hand_amount(0)
+
+/mob/living/carbon/monkey/skellington/plasma
+	name = "flaming skull"
+	voice_name = "flaming skull"
+	icon_state = "flaming_skull"
+	greaterform = "Plasmaman"
+	light_range = 2
+	light_power = 0.5
+	light_color = "#FAA019"
+	species_type = /mob/living/carbon/monkey/skellington/plasma

code/modules/mob/living/carbon/monkey/vox.dm

@@ -32,14 +32,44 @@
 	greaterform = "Vox"
 	alien = 1
 	eggsleft = rand(1,6)
+	set_hand_amount(1)
+
+/mob/living/carbon/monkey/vox/Life()
+	..()
+	if(prob(5) && eggsleft > 4)
+		lay_egg()
+
+/mob/living/carbon/monkey/vox/say(var/message)
+	if (prob(25))
+		message += pick("  sqrk", "  bok bok", ",bwak", ",cluck!")
+
+	return ..(message)
+
+/mob/living/carbon/monkey/vox/attackby(var/obj/item/O as obj, var/mob/user as mob)
+	if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/grown/wheat)) //feedin' dem chickens
+		if(!stat && eggsleft < 8)
+			if(!user.drop_item(O))
+				to_chat(user, "<span class='notice'>You can't let go of \the [O]!</span>")
+				return
+
+			user.visible_message("<span class='notice'>[user] feeds [O] to [name]! It clucks happily.</span>","<span class='notice'>You feed [O] to [name]! It clucks happily.</span>")
+			qdel(O)
+			eggsleft += rand(1, 4)
+//			to_chat(world, eggsleft)
+		else
+			to_chat(user, "<span class='notice'>[name] doesn't seem hungry!</span>")
+	else
+		..()
 
 /mob/living/carbon/monkey/vox/put_in_hand_check(var/obj/item/W) //Silly chicken, you don't have hands
+	if(src.reagents.has_reagent(GRAVY) || src.reagents.has_reagent(METHYLIN))
+		return 1
+	else
 		return 0
 
-
 //Cant believe I'm doing this
 /mob/living/carbon/monkey/vox/proc/lay_egg()
-	if(!stat && nutrition > 250)
+	if(!stat && nutrition > 250 && eggsleft > 0)
 		visible_message("[src] [pick("lays an egg.","squats down and croons.","begins making a huge racket.","begins clucking raucously.")]")
 		nutrition -= eggcost
 		eggsleft--

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

@@ -314,6 +314,8 @@ var/global/list/whitelisted_species = list("Human")
 
 	move_speed_mod = 3
 
+	primitive = /mob/living/carbon/monkey/skellington
+
 /datum/species/skellington/handle_speech(var/datum/speech/speech, mob/living/carbon/human/H)
 	if (prob(25))
 		speech.message += "  ACK ACK!"
@@ -457,7 +459,7 @@ var/global/list/whitelisted_species = list("Human")
 
 	max_hurt_damage = 3 // From 5 (for humans)
 
-	primitive = /mob/living/carbon/monkey // TODO
+	primitive = /mob/living/carbon/monkey/grey // TODO
 
 	flags = IS_WHITELISTED | HAS_LIPS | CAN_BE_FAT
 

vgstation13.dme

@@ -1388,6 +1388,7 @@
 #include "code\modules\mob\living\carbon\monkey\powers.dm"
 #include "code\modules\mob\living\carbon\monkey\rock.dm"
 #include "code\modules\mob\living\carbon\monkey\say.dm"
+#include "code\modules\mob\living\carbon\monkey\skeleton.dm"
 #include "code\modules\mob\living\carbon\monkey\update_icons.dm"
 #include "code\modules\mob\living\carbon\monkey\vox.dm"
 #include "code\modules\mob\living\carbon\monkey\martian\martian.dm"