Refactor of catpeople mutant organs

This commit is contained in:
ACCount
2017-11-01 21:38:06 -05:00
committed by CitadelStationBot
parent 56c534fa62
commit eb54055278
15 changed files with 220 additions and 144 deletions
+50 -11
View File
@@ -1,23 +1,62 @@
// Note: tails only work in humans. They use human-specific parameters and rely on human code for displaying.
/obj/item/organ/tail
name = "tail"
desc = "What did you cut this off of?"
desc = "A severed tail. What did you cut this off of?"
icon_state = "severedtail"
zone = "groin"
slot = ORGAN_SLOT_TAIL
var/tail_type = "None"
/obj/item/organ/tail/Remove(mob/living/carbon/human/H, special = 0)
..()
if(istype(H))
H.endTailWag()
/obj/item/organ/tail/cat
name = "cat tail"
desc = "Who's wagging now?"
icon_state = "severedtail"
desc = "A severed cat tail. Who's wagging now?"
tail_type = "Cat"
/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()
if(istype(H))
H.dna.species.mutant_bodyparts |= "tail_human"
H.dna.features["tail_human"] = tail_type
H.update_body()
/obj/item/organ/ears/cat/Remove(mob/living/carbon/human/H, special = 0)
/obj/item/organ/tail/cat/Remove(mob/living/carbon/human/H, special = 0)
..()
H.endTailWag()
H.dna.features["tail_human"] = "None"
color = H.hair_color
H.update_body()
if(istype(H))
H.dna.species.mutant_bodyparts -= "tail_human"
tail_type = H.dna.features["tail_human"]
color = H.hair_color
H.update_body()
/obj/item/organ/tail/lizard
name = "lizard tail"
desc = "A severed lizard tail. Somewhere, no doubt, a lizard hater is very pleased with themselves."
color = "#116611"
tail_type = "Smooth"
var/spines = "None"
/obj/item/organ/tail/lizard/Insert(mob/living/carbon/human/H, special = 0, drop_if_replaced = TRUE)
..()
if(istype(H))
H.dna.features["tail_lizard"] = tail_type
H.dna.features["spines"] = spines
H.dna.species.mutant_bodyparts |= "tail_lizard"
H.dna.species.mutant_bodyparts |= "spines"
H.update_body()
/obj/item/organ/tail/lizard/Remove(mob/living/carbon/human/H, special = 0)
..()
if(istype(H))
H.dna.species.mutant_bodyparts -= "tail_lizard"
H.dna.species.mutant_bodyparts -= "spines"
color = "#" + H.dna.features["mcolor"]
tail_type = H.dna.features["tail_lizard"]
spines = H.dna.features["spines"]
H.update_body()