Skip to content

Commit 939f945

Browse files
authored
Makes the Fox and Five Fox tail organs work properly (and adds them to limb grower) (#752)
1 parent 88a0625 commit 939f945

2 files changed

Lines changed: 42 additions & 3 deletions

File tree

code/modules/research/designs/limbgrower_designs.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@
242242

243243
/obj/item/disk/design_disk/limbs/felinid
244244
name = "Felinid Organ Design Disk"
245-
limb_designs = list(/datum/design/cat_tail, /datum/design/cat_ears)
245+
limb_designs = list(/datum/design/cat_tail, /datum/design/cat_ears, /datum/design/fox_tail, /datum/design/fivefox_tail) // NON-MODULE CHANGE
246246

247247
/datum/design/limb_disk/felinid
248248
name = "Felinid Organ Design Disk"
Lines changed: 41 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,60 @@
1-
/obj/item/organ/external/tail/cat/fox
1+
// fox tails. Renault Geckers.
2+
/obj/item/organ/external/tail/fox // redundant, this is either a failsafe, or if someone specifically wants a fox tail for whatever purpose (EG. Limbgrower), that is detached from cat tails
23
name = "fox tail"
34
icon = 'maplestation_modules/icons/obj/surgery.dmi'
45
icon_state = "severedfoxtail"
56

7+
bodypart_overlay = /datum/bodypart_overlay/mutant/tail/fox
8+
wag_flags = WAG_ABLE
9+
preference = "feature_human_tail"
10+
11+
12+
/datum/bodypart_overlay/mutant/tail/fox // also redundant, used exclusively for above, the ones accesible through character creator are just different sprite_accessories on cat_tail
13+
feature_key = "tail_cat"
14+
color_source = ORGAN_COLOR_HAIR
15+
sprite_datum = /datum/sprite_accessory/tails/human/fox
16+
617
/datum/sprite_accessory/tails/human/fox
718
name = "Fox"
819
icon_state = "fox"
920
icon = 'maplestation_modules/icons/mob/mutant_bodyparts.dmi'
1021
color_src = HAIR_COLOR
1122

12-
/obj/item/organ/external/tail/cat/fivefox
23+
/datum/design/fox_tail
24+
name = "Fox Tail"
25+
id = "foxtail"
26+
build_type = LIMBGROWER
27+
reagents_list = list(/datum/reagent/medicine/c2/synthflesh = 20)
28+
build_path = /obj/item/organ/external/tail/fox
29+
category = list(SPECIES_HUMAN)
30+
31+
// five fox tails, because having 9 would be impossible to sprite and have it look good
32+
33+
/obj/item/organ/external/tail/fivefox // ditto.
1334
name = "five fox tails"
1435
icon = 'maplestation_modules/icons/obj/surgery.dmi'
1536
icon_state = "severedfivefoxtail"
1637

38+
bodypart_overlay = /datum/bodypart_overlay/mutant/tail/cat/fivefox
39+
wag_flags = WAG_ABLE
40+
preference = "feature_human_tail"
41+
42+
/datum/bodypart_overlay/mutant/tail/cat/fivefox // ditto.
43+
feature_key = "tail_cat"
44+
color_source = ORGAN_COLOR_HAIR
45+
sprite_datum = /datum/sprite_accessory/tails/human/fivefox
46+
1747
/datum/sprite_accessory/tails/human/fivefox
1848
name = "Five Fox"
1949
icon_state = "fivefox"
2050
icon = 'maplestation_modules/icons/mob/mutant_bodyparts.dmi'
2151
color_src = HAIR_COLOR
52+
53+
/datum/design/fivefox_tail
54+
name = "Five Fox Tails"
55+
id = "fivefoxtails"
56+
build_type = LIMBGROWER
57+
reagents_list = list(/datum/reagent/medicine/c2/synthflesh = 20)
58+
build_path = /obj/item/organ/external/tail/fivefox
59+
category = list(SPECIES_HUMAN)
60+

0 commit comments

Comments
 (0)