[MIRROR] Organs for catgirls (#1457)

* Organs for catgirls

* Delete tgstation.dme.rej

* Update tgstation.dme

code/modules/mob/living/carbon/human/species_types/humans.dm

@@ -20,4 +20,12 @@
 /datum/species/human/space_move(mob/living/carbon/human/H)
 	var/obj/item/device/flightpack/F = H.get_flightpack()
 	if(istype(F) && (F.flight) && F.allow_thrust(0.01, src))
-		return TRUE
+		return TRUE
+
+datum/species/human/on_species_gain(mob/living/carbon/human/H, datum/species/old_species)
+	if(H.dna.features["ears"] == "Cat")
+		mutantears = /obj/item/organ/ears/cat
+	if(H.dna.features["tail_human"] == "Cat")
+		var/tail = /obj/item/organ/tail/cat
+		mutant_organs += tail
+	..()

code/modules/surgery/organs/ears.dm

@@ -70,3 +70,24 @@
 	var/obj/item/organ/ears/ears = getorgan(/obj/item/organ/ears)
 	if(ears)
 		ears.minimumDeafTicks(value)
+
+
+/obj/item/organ/ears/cat
+	name = "cat ears"
+	icon = 'icons/obj/clothing/hats.dmi'
+	icon_state = "kitty"
+
+/obj/item/organ/ears/cat/adjustEarDamage(ddmg, ddeaf)
+	..(ddmg*2,ddeaf*2)
+
+/obj/item/organ/ears/cat/Insert(mob/living/carbon/human/H, special = 0, drop_if_replaced = TRUE)
+	..()
+	color = H.hair_color
+	H.dna.features["ears"] = "Cat"
+	H.update_body()
+
+/obj/item/organ/ears/cat/Remove(mob/living/carbon/human/H,  special = 0)
+	..()
+	color = H.hair_color
+	H.dna.features["ears"] = "None"
+	H.update_body()

code/modules/surgery/organs/tails.dm

@@ -0,0 +1,23 @@
+/obj/item/organ/tail
+	name = "tail"
+	desc = "What did you cut this off of?"
+	zone = "groin"
+	slot = "tail"
+
+/obj/item/organ/tail/cat
+	name = "cat tail"
+	desc = "Who's wagging now?"
+	icon_state = "severedtail"
+
+/obj/item/organ/tail/cat/Insert(mob/living/carbon/human/H, special = 0, drop_if_replaced = TRUE)
+	..()
+	color = H.hair_color
+	H.dna.features["tail_human"] = "Cat"
+	H.update_body()
+
+/obj/item/organ/ears/cat/Remove(mob/living/carbon/human/H,  special = 0)
+	..()
+	H.endTailWag()
+	H.dna.features["tail_human"] = "None"
+	color = H.hair_color
+	H.update_body()