Merge pull request #379 from Nerev4r/spacefish

Adds Some Genetics Infusions to Animalistic Traits

code/__DEFINES/~doppler_defines/mutant_variations.dm

@@ -6,6 +6,7 @@
 #define BUG "bug"
 #define BUNNY "bunny"
 #define CAT "cat"
+#define CARP "carp"
 #define CYBERNETIC "cybernetic"
 #define DEER "deer"
 #define DOG "dog"
@@ -16,6 +17,7 @@
 #define LIZARD "lizard"
 #define MONKEY "monkey"
 #define MOUSE "mouse"
+#define ROACH "roach"
 
 ///	This list gets read by the dropdown pref when a player chooses what type of sprite accessory to access
 GLOBAL_LIST_INIT(mutant_variations, list(
@@ -41,6 +43,7 @@ GLOBAL_LIST_INIT(genemod_variations, list(
 	BUG,
 	BUNNY,
 	CAT,
+	CARP,
 	DEER,
 	DOG,
 	FISH,
@@ -49,5 +52,6 @@ GLOBAL_LIST_INIT(genemod_variations, list(
 	LIZARD,
 	MONKEY,
 	MOUSE,
+	ROACH,
 	NO_VARIATION,
 ))

code/game/machinery/dna_infuser/organ_sets/carp_organs.dm

@@ -11,7 +11,7 @@
 	bonus_deactivate_text = span_notice("Your DNA is once again mostly yours, and so fades your ability to space-swim...")
 	bonus_traits = list(TRAIT_SPACEWALK)
 	bonus_biotype = MOB_AQUATIC
-	limb_overlay = /datum/bodypart_overlay/texture/carpskin
+	//limb_overlay = /datum/bodypart_overlay/texture/carpskin -- DOPPLER EDIT CHANGE: No thanks on the really pretty gradient, Smartkar.
 	color_overlay_priority = LIMB_COLOR_CARP_INFUSION
 
 ///Carp lungs! You can breathe in space! Oh... you can't breathe on the station, you need low oxygen environments.

code/modules/language/carptongue.dm

@@ -6,7 +6,8 @@
 	flags = NO_STUTTER|TONGUELESS_SPEECH
 	sentence_chance = 0
 	space_chance = 75
-	syllables = list("glub", "blub", "bloop")
+	// DOPPLER EDIT CHANGE - Original: syllables = list("glub", "blub", "bloop")
+	syllables = list("grak", "shar", "krak", "zrak", "gnar", "thrak", "klak", "grun", "skar", "zruk", "gnash", "throk", "klur", "gral", "shur", "krul", "zral", "gnok", "klor", "gruk", "shak", "kror")
 	default_priority = 25
 	default_name_syllable_min = 1
 	default_name_syllable_max = 2

modular_doppler/modular_customization/preferences/species_traits.dm

@@ -18,15 +18,17 @@
 		if(BUNNY)
 			return icon('icons/mob/simple/rabbit.dmi', "rabbit_white", WEST)
 		if(BUG)
-			return icon('icons/mob/simple/animal.dmi', "cockroach", EAST)
+			return icon('icons/mob/simple/arachnoid.dmi', "young_tangle", SOUTH)
 		if(CAT)
 			return icon('icons/mob/simple/pets.dmi', "cat2", WEST)
+		if(CARP)
+			return icon('icons/mob/simple/carp.dmi', "carp", EAST)
 		if(DEER)
 			return icon('icons/mob/simple/animal.dmi', "deer-doe", EAST)
 		if(DOG)
 			return icon('icons/mob/simple/pets.dmi', "corgi", WEST)
 		if(FISH)
-			return icon('icons/mob/simple/carp.dmi', "carp", EAST)
+			return icon('icons/obj/toys/plushes.dmi', "blahaj")
 		if(FOX)
 			return icon('icons/mob/simple/pets.dmi', "fox", WEST)
 		if(FROG)
@@ -37,6 +39,8 @@
 			return icon('icons/mob/human/human.dmi', "monkey", EAST)
 		if(MOUSE)
 			return icon('icons/mob/simple/animal.dmi', "mouse_white", WEST)
+		if(ROACH)
+			return icon('icons/mob/simple/animal.dmi', "cockroach_sewer", SOUTH)
 		else
 			return icon('icons/effects/crayondecal.dmi', "x")
 

modular_doppler/modular_species/_species.dm

@@ -67,6 +67,16 @@
 	if(tongue) // text2path nulls if it can't find a matching subtype, so don't worry adding an organ for every single trait value
 		mutanttongue = tongue.type
 
+	// brain
+	var/obj/item/organ/brain = text2path("/obj/item/organ/brain/[animal_trait]")
+	if(brain)
+		mutantbrain = brain.type
+
+	// eyes
+	var/obj/item/organ/eyes = text2path("/obj/item/organ/eyes/[animal_trait]")
+	if(eyes)
+		mutanteyes = eyes.type
+
 	// lungs
 	var/obj/item/organ/lungs = text2path("/obj/item/organ/lungs/[animal_trait]")
 	if(lungs)
@@ -76,6 +86,11 @@
 			if(FROG)
 				mutantlungs = /obj/item/organ/lungs/fish/amphibious
 
+	// heart
+	var/obj/item/organ/heart = text2path("/obj/item/organ/heart/[animal_trait]")
+	if(heart)
+		mutantheart = heart.type
+
 	// liver
 	var/obj/item/organ/liver = text2path("/obj/item/organ/liver/[animal_trait]")
 	if(liver)
@@ -116,13 +131,18 @@
 			ADD_TRAIT(target, TRAIT_CATLIKE_GRACE, SPECIES_TRAIT)
 			ADD_TRAIT(target, TRAIT_HATED_BY_DOGS, SPECIES_TRAIT)
 			ADD_TRAIT(target, TRAIT_WATER_HATER, SPECIES_TRAIT)
+		if(CARP)
+			target.faction += FACTION_CARP
+			ADD_TRAIT(target, TRAIT_FREE_HYPERSPACE_MOVEMENT, SPECIES_TRAIT)
 		if(DEER)
 			target.AddElement(/datum/element/cliff_walking)
 		if(FISH)
 			ADD_TRAIT(target, TRAIT_WATER_ADAPTATION, SPECIES_TRAIT)
 			target.add_quirk(/datum/quirk/item_quirk/breather/water_breather) // this trait necessitates you get this 'item_quirk'
 		if(FROG)
 			ADD_TRAIT(target, TRAIT_WATER_ADAPTATION, SPECIES_TRAIT)
+		if(ROACH)
+			inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID|MOB_BUG
 
 /// spec_revival logic
 /datum/species/proc/spec_revival(mob/living/carbon/human/target)