Satyr mark 3

code/__DEFINES/DNA.dm

@@ -141,6 +141,7 @@
 #define ORGAN_SLOT_EXTERNAL_ANIME_CHEST "anime_chest"
 #define ORGAN_SLOT_EXTERNAL_ANIME_BOTTOM "anime_bottom"
 #define ORGAN_SLOT_EXTERNAL_FLORAN_LEAVES "floran_leaves"
+#define ORGAN_SLOT_EXTERNAL_FLUFF "fluff"
 
 /// Xenomorph organ slots
 #define ORGAN_SLOT_XENO_ACIDGLAND "acid_gland"

code/__DEFINES/is_helpers.dm

@@ -101,6 +101,7 @@ GLOBAL_LIST_INIT(turfs_openspace, typecacheof(list(
 #define isgoblin(A) (is_species(A, /datum/species/goblin)) //Monkestation Addition
 #define isfloran(A) (is_species(A, /datum/species/floran)) //Monkestation Addition
 #define isarachnid(A) (is_species(A, /datum/species/arachnid)) //Monkestation Addition
+#define issatyr(A) (is_species(A, /datum/species/satyr)) //Monkestation Addition
 
 
 //More carbon mobs

code/__DEFINES/mobs.dm

@@ -124,6 +124,7 @@
 #define SPECIES_TALLBOY "tallboy"
 #define SPECIES_VAMPIRE "vampire"
 #define SPECIES_ZOMBIE "zombie"
+#define SPECIES_SATYR "satyr" //Monkestation Addition
 #define SPECIES_ZOMBIE_INFECTIOUS "memezombie"
 #define SPECIES_ZOMBIE_KROKODIL "krokodil_zombie"
 #define SPECIES_OOZELING "oozeling"

code/__DEFINES/traits.dm

@@ -1280,6 +1280,9 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 
 /// Do IPC's dream of doomsday? The answer is yes
 #define TRAIT_ROBOT_CAN_BLEED "robots_can_bleed"
+
+/// tough feets for the satyrs
+#define TRAIT_HARD_SOLES "hard_soles" //Taken from Skyrat
 //monkestation edit end
 /// This atom can have spells cast from it if a mob is within it
 /// This means the "caster" of the spell is changed to the mob's loc

code/__HELPERS/global_lists.dm

@@ -24,6 +24,9 @@
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/horns,GLOB.horns_list)
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/ears, GLOB.ears_list)
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/wings, GLOB.wings_list)
+	init_sprite_accessory_subtypes(/datum/sprite_accessory/satyr_fluff, GLOB.satyr_fluff_list) //Monkestation Addition
+	init_sprite_accessory_subtypes(/datum/sprite_accessory/satyr_tail, GLOB.satyr_tail_list) //Monkestation Addition
+	init_sprite_accessory_subtypes(/datum/sprite_accessory/satyr_horns, GLOB.satyr_horns_list) //Monkestation Addition
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/wings_open, GLOB.wings_open_list)
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/frills, GLOB.frills_list)
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/spines, GLOB.spines_list)

code/__HELPERS/mobs.dm

@@ -112,6 +112,12 @@
 		init_sprite_accessory_subtypes(/datum/sprite_accessory/goblin_ears, GLOB.goblin_ears_list)
 	if(!GLOB.floran_leaves_list.len)
 		init_sprite_accessory_subtypes(/datum/sprite_accessory/floran_leaves, GLOB.floran_leaves_list)
+	if(!GLOB.satyr_fluff_list.len)
+		init_sprite_accessory_subtypes(/datum/sprite_accessory/satyr_fluff, GLOB.satyr_fluff_list)
+	if(!GLOB.satyr_tail_list.len)
+		init_sprite_accessory_subtypes(/datum/sprite_accessory/satyr_tail, GLOB.satyr_tail_list)
+	if(!GLOB.satyr_horns_list.len)
+		init_sprite_accessory_subtypes(/datum/sprite_accessory/satyr_horns, GLOB.satyr_horns_list)
 //Monkestation Addition End
 
 	//For now we will always return none for tail_human and ears. | "For now" he says.
@@ -146,6 +152,9 @@
 		"animecolor" = "#[pick("7F","FF")][pick("7F","FF")][pick("7F","FF")]", //Monkestation Addition
 		"goblin_ears" = pick(GLOB.goblin_ears_list), //Monkestation Addition
 		"floran_leaves" = pick(GLOB.floran_leaves_list), //Monkestation Addition
+		"satyr_fluff" = pick(GLOB.satyr_fluff_list), //Monkestation Addition
+		"satyr_tail" = pick(GLOB.satyr_tail_list), //Monkestation Addition
+		"satyr_horns" = pick(GLOB.satyr_horns_list), //Monkestation Addition
 	))
 
 /proc/random_hairstyle(gender)

code/_globalvars/lists/flavor_misc.dm

@@ -51,6 +51,9 @@ GLOBAL_LIST_EMPTY(arachnid_appendages_list) //Monkestation Addition
 GLOBAL_LIST_EMPTY(arachnid_chelicerae_list) //Monkestation Addition
 GLOBAL_LIST_EMPTY(goblin_ears_list) //Monkestation Addition
 GLOBAL_LIST_EMPTY(floran_leaves_list) //Monkestation Addition
+GLOBAL_LIST_EMPTY(satyr_fluff_list) //Monkestation Addition
+GLOBAL_LIST_EMPTY(satyr_tail_list) //Monkestation Addition
+GLOBAL_LIST_EMPTY(satyr_horns_list) //Monkestation Addition
 
 GLOBAL_LIST_INIT(color_list_ethereal, list(
 	"Blue" = "#3399ff",

code/datums/components/caltrop.dm

@@ -97,6 +97,10 @@
 		return
 
 	if (!(flags & CALTROP_BYPASS_SHOES))
+		// Monkestation addition start, taken from Skyrat
+		if(HAS_TRAIT(H, TRAIT_HARD_SOLES))
+			return
+		// Monkestation addition end, taken from Skyrat
 		if ((H.wear_suit?.body_parts_covered | H.w_uniform?.body_parts_covered | H.shoes?.body_parts_covered) & FEET)
 			return
 

code/modules/mob/living/carbon/human/dummy.dm

@@ -110,6 +110,9 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy)
 	target.dna.features["arachnid_chelicerae"] = "Basic" //Monkestation Addition
 	target.dna.features["goblin_ears"] = "Normal" //Monkestation Addition
 	target.dna.features["floran_leaves"] = "Furnivour" //Monkestation Addition
+	target.dna.features["satyr_fluff"] = "Normal" //Monkestation Addition
+	target.dna.features["satyr_tail"] = "Short" //Monkestation Addition
+	target.dna.features["satyr_horns"] = "Back" //Monkestation Addition
 
 /// Provides a dummy that is consistently bald, white, naked, etc.
 /mob/living/carbon/human/dummy/consistent

config/game_options.txt

@@ -347,6 +347,7 @@ ROUNDSTART_RACES human
 
 ## Races that are strictly worse than humans that could probably be turned on without balance concerns
 ROUNDSTART_RACES lizard
+ROUNDSTART_RACES satyr
 #ROUNDSTART_RACES fly
 ROUNDSTART_RACES moth
 ROUNDSTART_RACES plasmaman

monkestation/code/modules/client/preferences/species_features/satyr.dm

@@ -0,0 +1,53 @@
+//Satyr Fluff
+/datum/preference/choiced/satyr_fluff
+	savefile_key = "feature_satyr_fluff"
+	savefile_identifier = PREFERENCE_CHARACTER
+	category = PREFERENCE_CATEGORY_FEATURES
+	main_feature_name = "Satyr Fluff"
+	should_generate_icons = TRUE
+
+/datum/preference/choiced/satyr_fluff/init_possible_values()
+	return possible_values_for_sprite_accessory_list_for_body_part(
+		GLOB.satyr_fluff_list,
+		"satyr_fluff",
+		list("ADJ"),
+	)
+
+/datum/preference/choiced/satyr_fluff/apply_to_human(mob/living/carbon/human/target, value)
+	target.dna.features["satyr_fluff"] = value
+
+//Satyr Tail
+/datum/preference/choiced/satyr_tail
+	savefile_key = "feature_satyr_tail"
+	savefile_identifier = PREFERENCE_CHARACTER
+	category = PREFERENCE_CATEGORY_FEATURES
+	main_feature_name = "Satyr Tail"
+	should_generate_icons = TRUE
+
+/datum/preference/choiced/satyr_tail/init_possible_values()
+	return possible_values_for_sprite_accessory_list_for_body_part(
+		GLOB.satyr_tail_list,
+		"satyr_tail",
+		list("ADJ", "FRONT"),
+	)
+
+/datum/preference/choiced/satyr_tail/apply_to_human(mob/living/carbon/human/target, value)
+	target.dna.features["satyr_tail"] = value
+
+//Satyr Horns
+/datum/preference/choiced/satyr_horns
+	savefile_key = "feature_satyr_horns"
+	savefile_identifier = PREFERENCE_CHARACTER
+	category = PREFERENCE_CATEGORY_FEATURES
+	main_feature_name = "Satyr Horns"
+	should_generate_icons = TRUE
+
+/datum/preference/choiced/satyr_horns/init_possible_values()
+	return possible_values_for_sprite_accessory_list_for_body_part(
+		GLOB.satyr_horns_list,
+		"satyr_horns",
+		list("ADJ", "FRONT"),
+	)
+
+/datum/preference/choiced/satyr_horns/apply_to_human(mob/living/carbon/human/target, value)
+	target.dna.features["satyr_horns"] = value

monkestation/code/modules/mob/dead/new_player/sprite_accessories/satyr_fluff.dm

@@ -0,0 +1,7 @@
+/datum/sprite_accessory/satyr_fluff
+	icon = 'monkestation/icons/mob/species/satyr/satyr_fluff.dmi'
+	color_src = HAIR
+
+/datum/sprite_accessory/satyr_fluff/normal
+	name = "Normal"
+	icon_state = "normal"

monkestation/code/modules/mob/dead/new_player/sprite_accessories/satyr_horns.dm

@@ -0,0 +1,14 @@
+/datum/sprite_accessory/satyr_horns
+	icon = 'monkestation/icons/mob/species/satyr/satyr_horns.dmi'
+
+/datum/sprite_accessory/satyr_horns/back
+	name = "Back"
+	icon_state = "back"
+
+/datum/sprite_accessory/satyr_horns/tall
+	name = "Tall"
+	icon_state = "tall"
+
+/datum/sprite_accessory/satyr_horns/thick
+	name = "Thick"
+	icon_state = "thick"

monkestation/code/modules/mob/dead/new_player/sprite_accessories/satyr_tail.dm

@@ -0,0 +1,7 @@
+/datum/sprite_accessory/satyr_tail
+	icon = 'monkestation/icons/mob/species/satyr/satyr_tail.dmi'
+	color_src = HAIR
+
+/datum/sprite_accessory/satyr_tail/short
+	name = "Short"
+	icon_state = "short"

monkestation/code/modules/mob/living/carbon/human/species_type/satyrs.dm

@@ -0,0 +1,87 @@
+/datum/species/satyr
+	name = "\improper Satyr"
+	plural_form = "Satyrs"
+	id = SPECIES_SATYR
+	changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN
+	no_equip_flags = ITEM_SLOT_FEET
+	sexes = TRUE
+	species_traits = list(
+		EYECOLOR,
+		HAIR,
+		FACEHAIR,
+		NO_UNDERWEAR,
+	)
+	inherent_traits = list(
+		TRAIT_ALCOHOL_TOLERANCE,
+		TRAIT_HARD_SOLES
+	)
+	inherent_biotypes = MOB_ORGANIC | MOB_HUMANOID
+	use_skintones = TRUE
+	external_organs = list(
+		/obj/item/organ/external/satyr_fluff = "normal",
+		/obj/item/organ/external/satyr_tail = "short",
+		/obj/item/organ/external/satyr_horns = "back",
+	)
+	meat = /obj/item/food/meat/steak
+	liked_food = GROSS | VEGETABLES | FRUIT
+	disliked_food = MEAT | DAIRY
+	maxhealthmod = 0.8
+	stunmod = 1.2
+	//speedmod = 1
+	payday_modifier = 1
+	bodypart_overrides = list(
+		BODY_ZONE_HEAD = /obj/item/bodypart/head/satyr,
+		BODY_ZONE_CHEST = /obj/item/bodypart/chest/satyr,
+		BODY_ZONE_L_ARM = /obj/item/bodypart/arm/left/satyr,
+		BODY_ZONE_R_ARM = /obj/item/bodypart/arm/right/satyr,
+		BODY_ZONE_L_LEG = /obj/item/bodypart/leg/left/satyr,
+		BODY_ZONE_R_LEG = /obj/item/bodypart/leg/right/satyr,
+	)
+
+/datum/species/satyr/get_species_description()
+	return "Mythical goat-people. The clacking of hooves and smell of beer follow them around."
+
+/mob/living/carbon/human/species/satyr
+    race = /datum/species/satyr
+
+/datum/species/satyr/create_pref_unique_perks()
+	var/list/to_add = list()
+
+	to_add += list(
+		list(
+			SPECIES_PERK_TYPE = SPECIES_POSITIVE_PERK,
+			SPECIES_PERK_ICON = "",
+			SPECIES_PERK_NAME = "Hooves",
+			SPECIES_PERK_DESC = "Cloven feet prevent wearing of shoes, but also protect as a shoe would.",
+		)
+	)
+
+	return to_add
+
+/obj/item/bodypart/head/satyr
+	icon_greyscale = 'monkestation/icons/mob/species/satyr/bodyparts.dmi'
+	limb_id = SPECIES_SATYR
+	is_dimorphic = TRUE
+
+/obj/item/bodypart/chest/satyr
+	icon_greyscale = 'monkestation/icons/mob/species/satyr/bodyparts.dmi'
+	limb_id = SPECIES_SATYR
+	is_dimorphic = TRUE
+
+/obj/item/bodypart/arm/left/satyr
+	icon_greyscale = 'monkestation/icons/mob/species/satyr/bodyparts.dmi'
+	limb_id = SPECIES_SATYR
+
+/obj/item/bodypart/arm/right/satyr
+	icon_greyscale = 'monkestation/icons/mob/species/satyr/bodyparts.dmi'
+	limb_id = SPECIES_SATYR
+
+/obj/item/bodypart/leg/left/satyr
+	icon_greyscale = 'monkestation/icons/mob/species/satyr/bodyparts.dmi'
+	limb_id = SPECIES_SATYR
+	bodytype = BODYTYPE_DIGITIGRADE
+
+/obj/item/bodypart/leg/right/satyr
+	icon_greyscale = 'monkestation/icons/mob/species/satyr/bodyparts.dmi'
+	limb_id = SPECIES_SATYR
+	bodytype = BODYTYPE_DIGITIGRADE

monkestation/code/modules/surgery/organs/external/satyr/satyr_fluff.dm

@@ -0,0 +1,26 @@
+/obj/item/organ/external/satyr_fluff
+	name = "satyr fluff"
+	desc = "You shouldn't see this"
+	icon_state = ""
+	icon = 'monkestation/icons/obj/medical/organs/organs.dmi'
+
+	preference = "feature_satyr_fluff"
+	zone = BODY_ZONE_HEAD
+	slot = ORGAN_SLOT_EXTERNAL_FLUFF
+
+	use_mob_sprite_as_obj_sprite = TRUE
+	bodypart_overlay = /datum/bodypart_overlay/mutant/satyr_fluff
+
+/datum/bodypart_overlay/mutant/satyr_fluff
+	layers = EXTERNAL_ADJACENT //| EXTERNAL_FRONT
+	feature_key = "satyr_fluff"
+	color_source = ORGAN_COLOR_HAIR
+
+/datum/bodypart_overlay/mutant/satyr_fluff/get_global_feature_list()
+	return GLOB.satyr_fluff_list
+
+/datum/bodypart_overlay/mutant/satyr_fluff/get_base_icon_state()
+	return sprite_datum.icon_state
+
+/datum/bodypart_overlay/mutant/satyr_fluff/can_draw_on_bodypart(mob/living/carbon/human/human)
+	return TRUE

monkestation/code/modules/surgery/organs/external/satyr/satyr_horns.dm

@@ -0,0 +1,25 @@
+/obj/item/organ/external/satyr_horns
+	name = "satyr horns"
+	desc = "You shouldn't see this"
+	icon_state = ""
+	icon = 'monkestation/icons/obj/medical/organs/organs.dmi'
+
+	preference = "feature_satyr_horns"
+	zone = BODY_ZONE_HEAD
+	slot = ORGAN_SLOT_EXTERNAL_HORNS
+
+	use_mob_sprite_as_obj_sprite = TRUE
+	bodypart_overlay = /datum/bodypart_overlay/mutant/satyr_horns
+
+/datum/bodypart_overlay/mutant/satyr_horns
+	layers = EXTERNAL_ADJACENT | EXTERNAL_FRONT
+	feature_key = "satyr_horns"
+
+/datum/bodypart_overlay/mutant/satyr_horns/get_global_feature_list()
+	return GLOB.satyr_horns_list
+
+/datum/bodypart_overlay/mutant/satyr_horns/get_base_icon_state()
+	return sprite_datum.icon_state
+
+/datum/bodypart_overlay/mutant/satyr_horns/can_draw_on_bodypart(mob/living/carbon/human/human)
+	return TRUE

monkestation/code/modules/surgery/organs/external/satyr/satyr_tail.dm

@@ -0,0 +1,26 @@
+/obj/item/organ/external/satyr_tail
+	name = "satyr tail"
+	desc = "You shouldn't see this"
+	icon_state = ""
+	icon = 'monkestation/icons/obj/medical/organs/organs.dmi'
+
+	preference = "feature_satyr_tail"
+	zone = BODY_ZONE_HEAD
+	slot = ORGAN_SLOT_EXTERNAL_TAIL
+
+	use_mob_sprite_as_obj_sprite = TRUE
+	bodypart_overlay = /datum/bodypart_overlay/mutant/satyr_tail
+
+/datum/bodypart_overlay/mutant/satyr_tail
+	layers = EXTERNAL_ADJACENT | EXTERNAL_FRONT
+	feature_key = "satyr_tail"
+	color_source = ORGAN_COLOR_HAIR
+
+/datum/bodypart_overlay/mutant/satyr_tail/get_global_feature_list()
+	return GLOB.satyr_tail_list
+
+/datum/bodypart_overlay/mutant/satyr_tail/get_base_icon_state()
+	return sprite_datum.icon_state
+
+/datum/bodypart_overlay/mutant/satyr_tail/can_draw_on_bodypart(mob/living/carbon/human/human)
+	return TRUE

tgstation.dme

@@ -6151,6 +6151,7 @@
 #include "monkestation\code\modules\client\preferences\species_features\floran.dm"
 #include "monkestation\code\modules\client\preferences\species_features\goblin.dm"
 #include "monkestation\code\modules\client\preferences\species_features\ipc.dm"
+#include "monkestation\code\modules\client\preferences\species_features\satyr.dm"
 #include "monkestation\code\modules\client\preferences\species_features\secondary_mut_color.dm"
 #include "monkestation\code\modules\client\preferences\species_features\simians.dm"
 #include "monkestation\code\modules\client\verbs\looc.dm"
@@ -6419,6 +6420,9 @@
 #include "monkestation\code\modules\mob\dead\new_player\sprite_accessories\ipc_chassis.dm"
 #include "monkestation\code\modules\mob\dead\new_player\sprite_accessories\ipc_screens.dm"
 #include "monkestation\code\modules\mob\dead\new_player\sprite_accessories\multi_part.dm"
+#include "monkestation\code\modules\mob\dead\new_player\sprite_accessories\satyr_fluff.dm"
+#include "monkestation\code\modules\mob\dead\new_player\sprite_accessories\satyr_horns.dm"
+#include "monkestation\code\modules\mob\dead\new_player\sprite_accessories\satyr_tail.dm"
 #include "monkestation\code\modules\mob\dead\new_player\sprite_accessories\sock_color.dm"
 #include "monkestation\code\modules\mob\dead\new_player\sprite_accessories\tails.dm"
 #include "monkestation\code\modules\mob\dead\new_player\sprite_accessories\underwear.dm"
@@ -6464,6 +6468,7 @@
 #include "monkestation\code\modules\mob\living\carbon\human\species_type\mothmen.dm"
 #include "monkestation\code\modules\mob\living\carbon\human\species_type\plasmamen.dm"
 #include "monkestation\code\modules\mob\living\carbon\human\species_type\podpeople.dm"
+#include "monkestation\code\modules\mob\living\carbon\human\species_type\satyrs.dm"
 #include "monkestation\code\modules\mob\living\carbon\human\species_type\shadowpeople.dm"
 #include "monkestation\code\modules\mob\living\carbon\human\species_type\simian.dm"
 #include "monkestation\code\modules\mob\living\carbon\human\species_type\skeletons.dm"
@@ -6956,6 +6961,9 @@
 #include "monkestation\code\modules\surgery\organs\external\simian.dm"
 #include "monkestation\code\modules\surgery\organs\external\appendages\appendages.dm"
 #include "monkestation\code\modules\surgery\organs\external\chelicerae\chelicerae.dm"
+#include "monkestation\code\modules\surgery\organs\external\satyr\satyr_fluff.dm"
+#include "monkestation\code\modules\surgery\organs\external\satyr\satyr_horns.dm"
+#include "monkestation\code\modules\surgery\organs\external\satyr\satyr_tail.dm"
 #include "monkestation\code\modules\surgery\organs\external\tail\clockworktail.dm"
 #include "monkestation\code\modules\surgery\organs\external\wings\functional_wings.dm"
 #include "monkestation\code\modules\surgery\organs\internal\brain.dm"