Merge pull request ParadiseSS13#287 from Kiyahitayika/Wryn-Larvae-Cubes

Wryn Larvae Cubes
Kiyahitayika · Dec 19, 2020 · f00252b · f00252b
2 parents 95df7d8 + 0ba28cb
commit f00252b
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 1 deletion.
diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm
@@ -1073,13 +1073,17 @@ GLOBAL_LIST_INIT(all_supply_groups, list(SUPPLY_EMERGENCY,SUPPLY_SECURITY,SUPPLY
 	cost = 20
 	containername = "farwa crate"
 
-
 /datum/supply_packs/organic/wolpin
 	name = "Wolpin Crate"
 	contains = list (/obj/item/storage/box/monkeycubes/wolpincubes)
 	cost = 20
 	containername = "wolpin crate"
 
+/datum/supply_packs/organic/wrynlarvae
+	name = "Wryn Larvae Crate"
+	contains = list(/obj/item/storage/box/monkeycubes/wryncubes)
+	cost = 20
+	containername ="wryn crate"
 
 /datum/supply_packs/organic/skrell
 	name = "Neaera Crate"

diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm
@@ -586,6 +586,11 @@
 	desc = "Drymate brand wolpin cubes. Just add water!"
 	monkey_cube_type = /obj/item/reagent_containers/food/snacks/monkeycube/wolpincube
 
+/obj/item/storage/box/monkeycubes/wryncubes
+	name = "wryn cube box"
+	desc = "Drymate brand wryn larva cubes. Just add water!"
+	monkey_cube_type = /obj/item/reagent_containers/food/snacks/monkeycube/wryncube
+
 /obj/item/storage/box/permits
 	name = "box of construction permits"
 	desc = "A box for containing construction permits, used to officially declare built rooms as additions to the station."

diff --git a/code/modules/food_and_drinks/food/foods/meat.dm b/code/modules/food_and_drinks/food/foods/meat.dm
@@ -333,6 +333,9 @@
 	name = "neaera cube"
 	monkey_type = /datum/species/monkey/skrell
 
+/obj/item/reagent_containers/food/snacks/monkeycube/wryncube
+	name = "wryn larva cube"
+	monkey_type = /datum/species/monkey/wryn
 
 //////////////////////
 //		Eggs		//

diff --git a/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm b/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm
@@ -72,6 +72,8 @@ GLOBAL_LIST_EMPTY(monkey_recyclers)
 				if(4)
 					cube_type = /obj/item/reagent_containers/food/snacks/monkeycube/neaeracube
 				if(5)
+					cube_type = /obj/item/reagent_containers/food/snacks/monkeycube/wryncube
+				if(6)
 					cube_type = /obj/item/reagent_containers/food/snacks/monkeycube
 					cycle_through = 0
 			to_chat(user, "<span class='notice'>You change the monkeycube type to [initial(cube_type.name)].</span>")

diff --git a/code/modules/mob/living/carbon/human/species/monkey.dm b/code/modules/mob/living/carbon/human/species/monkey.dm
@@ -165,3 +165,26 @@
 		"appendix" = /obj/item/organ/internal/appendix,
 		"eyes" =     /obj/item/organ/internal/eyes/unathi
 		)
+
+/datum/species/monkey/wryn
+	name = "Larva"
+	name_plural = "Larvae"
+
+	icobase = 'icons/mob/human_races/monkeys/r_larva.dmi'
+	deform = 'icons/mob/human_races/monkeys/r_larva.dmi'
+
+	greater_form = /datum/species/wryn
+	default_language = "Wryn Hivemind"
+	flesh_color = "#966464"
+	base_color = "#000000"
+	reagent_tag = PROCESS_ORG
+	tail = null
+
+	has_organ = list(	//Larvae don't have antennae
+	//New organs need to be made specifically for Wryn
+		"heart" =		/obj/item/organ/internal/heart,
+		"lungs" =		/obj/item/organ/internal/lungs/kidan,
+		"brain" =		/obj/item/organ/internal/brain,
+		"appendix" =	/obj/item/organ/internal/appendix,
+		"eyes" =		/obj/item/organ/internal/eyes/wryn,
+	)
diff --git a/icons/mob/human_races/monkeys/r_larva.dmi b/icons/mob/human_races/monkeys/r_larva.dmi