Skip to content

Commit

Permalink
[modular] adds (optional) fox tails to felinids (MrMelbert#112)
Browse files Browse the repository at this point in the history
  • Loading branch information
Gofawful5 authored Nov 9, 2021
1 parent b8b11b6 commit 04cfbdd
Show file tree
Hide file tree
Showing 5 changed files with 46 additions and 0 deletions.
1 change: 1 addition & 0 deletions jollystation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -4186,6 +4186,7 @@
#include "jollystation_modules\code\modules\research\designs\medical_designs.dm"
#include "jollystation_modules\code\modules\research\techweb\all_nodes.dm"
#include "jollystation_modules\code\modules\surgery\organs\ears.dm"
#include "jollystation_modules\code\modules\surgery\organs\tails.dm"
#include "jollystation_modules\code\modules\uplink\uplink_devices.dm"
#include "jollystation_modules\code\modules\uplink\uplink_infiltrator.dm"
#include "jollystation_modules\code\modules\uplink\uplink_items.dm"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,15 @@
icon_state = "catcyber"
icon = 'jollystation_modules/icons/mob/mutant_bodyparts.dmi'
locked = TRUE

/datum/sprite_accessory/tails/human/fox
name = "Fox"
icon_state = "fox"
icon = 'jollystation_modules/icons/mob/mutant_bodyparts.dmi'
color_src = HAIR

/datum/sprite_accessory/tails_animated/human/fox
name = "Fox"
icon_state = "fox"
icon = 'jollystation_modules/icons/mob/mutant_bodyparts.dmi'
color_src = HAIR
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,13 @@
species_speech_sounds = list('jollystation_modules/sound/voice/meow1.ogg' = 50, \
'jollystation_modules/sound/voice/meow2.ogg' = 50,
'jollystation_modules/sound/voice/meow3.ogg' = 50)

//adds fox tail option
/datum/species/human/felinid/on_species_gain(mob/living/carbon/C, datum/species/old_species, pref_load)
. = ..()
if(ishuman(C))
var/mob/living/carbon/human/H = C
if(H.dna.features["tail_human"] == "Fox")
var/obj/item/organ/tail/cat/fox/tail = new
tail.Insert(H, special = TRUE, drop_if_replaced = FALSE)
mutant_organs += /obj/item/organ/tail/cat/fox
23 changes: 23 additions & 0 deletions jollystation_modules/code/modules/surgery/organs/tails.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
/obj/item/organ/tail/cat/fox
name = "fox tail"
desc = "A severed fox tail. Geckers."
tail_type = "Fox"

/obj/item/organ/tail/cat/fox/Insert(mob/living/carbon/human/tail_owner, special = FALSE, drop_if_replaced = TRUE)
..()
if(istype(tail_owner))
var/default_part = tail_owner.dna.species.mutant_bodyparts["tail_human"]
if(!default_part || default_part == "None")
if(tail_type)
tail_owner.dna.features["tail_human"] = tail_owner.dna.species.mutant_bodyparts["tail_human"] = tail_type
tail_owner.dna.update_uf_block(DNA_HUMAN_TAIL_BLOCK)
else
tail_owner.dna.species.mutant_bodyparts["tail_human"] = tail_owner.dna.features["tail_human"]
tail_owner.update_body()

/obj/item/organ/tail/cat/fox/Remove(mob/living/carbon/human/tail_owner, special = FALSE)
..()
if(istype(tail_owner))
tail_owner.dna.species.mutant_bodyparts -= "tail_human"
color = tail_owner.hair_color
tail_owner.update_body()
Binary file modified jollystation_modules/icons/mob/mutant_bodyparts.dmi
Binary file not shown.

0 comments on commit 04cfbdd

Please sign in to comment.