Merge pull request #34 from Lhars/Celestial

Fixes celestial/infernal font, tiefling tail wags

code/__DEFINES/say.dm

@@ -58,9 +58,9 @@
 #define SPAN_GEN "say"
 #define SPAN_DWARF "dwarf"
 #define SPAN_ELF "elf"
-#define SPAN_SAND "celestial"
+#define SPAN_SAND "sandspeak"
 #define SPAN_DELF "delf"
-#define SPAN_HELL "infernal"
+#define SPAN_HELL "hellspeak"
 #define SPAN_LUPIAN "lupian"
 #define SPAN_BEAST "beast"
 #define SPAN_ORC "orc"

code/modules/client/customizer/customizers/organ/horns.dm

@@ -26,6 +26,12 @@
 		/datum/sprite_accessory/horns/ram,
 		/datum/sprite_accessory/horns/angler,
 		/datum/sprite_accessory/horns/guilmon,
+		/datum/sprite_accessory/horns/uni,
+		/datum/sprite_accessory/horns/oni,
+		/datum/sprite_accessory/horns/oni_large,
+		/datum/sprite_accessory/horns/broken,
+		/datum/sprite_accessory/horns/rbroken,
+		/datum/sprite_accessory/horns/lbroken,
 		/datum/sprite_accessory/horns/drake,
 		/datum/sprite_accessory/horns/knight,
 		/datum/sprite_accessory/horns/antlers,
@@ -37,9 +43,12 @@
 		/datum/sprite_accessory/horns/smallramhornsalt,
 		/datum/sprite_accessory/horns/smallramhornsthree,
 		/datum/sprite_accessory/horns/liftedhorns,
+		/datum/sprite_accessory/horns/sideswept,
 		/datum/sprite_accessory/horns/bigcurlyhorns,
 		/datum/sprite_accessory/horns/billberry,
 		/datum/sprite_accessory/horns/stabbers,
+		/datum/sprite_accessory/horns/unihorn,
+		/datum/sprite_accessory/horns/longhorns,
 		/datum/sprite_accessory/horns/outstretched,
 		/datum/sprite_accessory/horns/halo,
 		/datum/sprite_accessory/horns/greathorns,
@@ -48,6 +57,7 @@
 		/datum/sprite_accessory/horns/faceguard,
 		/datum/sprite_accessory/horns/sheephorns,
 		/datum/sprite_accessory/horns/doublehorns,
+		/datum/sprite_accessory/horns/tiefling
 		)
 
 /datum/customizer/organ/horns/demihuman
@@ -64,6 +74,12 @@
 		/datum/sprite_accessory/horns/curled,
 		/datum/sprite_accessory/horns/ram,
 		/datum/sprite_accessory/horns/guilmon,
+		/datum/sprite_accessory/horns/uni,
+		/datum/sprite_accessory/horns/oni,
+		/datum/sprite_accessory/horns/oni_large,
+		/datum/sprite_accessory/horns/broken,
+		/datum/sprite_accessory/horns/rbroken,
+		/datum/sprite_accessory/horns/lbroken,
 		/datum/sprite_accessory/horns/drake,
 		/datum/sprite_accessory/horns/knight,
 		/datum/sprite_accessory/horns/antlers,
@@ -75,6 +91,7 @@
 		/datum/sprite_accessory/horns/smallramhornsalt,
 		/datum/sprite_accessory/horns/smallramhornsthree,
 		/datum/sprite_accessory/horns/liftedhorns,
+		/datum/sprite_accessory/horns/sideswept,
 		/datum/sprite_accessory/horns/bigcurlyhorns,
 		/datum/sprite_accessory/horns/billberry,
 		/datum/sprite_accessory/horns/stabbers,
@@ -88,6 +105,7 @@
 		/datum/sprite_accessory/horns/faceguard,
 		/datum/sprite_accessory/horns/sheephorns,
 		/datum/sprite_accessory/horns/doublehorns,
+		/datum/sprite_accessory/horns/tiefling
 		)
 
 /datum/customizer/organ/horns/anthro
@@ -104,6 +122,12 @@
 		/datum/sprite_accessory/horns/curled,
 		/datum/sprite_accessory/horns/ram,
 		/datum/sprite_accessory/horns/guilmon,
+		/datum/sprite_accessory/horns/uni,
+		/datum/sprite_accessory/horns/oni,
+		/datum/sprite_accessory/horns/oni_large,
+		/datum/sprite_accessory/horns/broken,
+		/datum/sprite_accessory/horns/rbroken,
+		/datum/sprite_accessory/horns/lbroken,
 		/datum/sprite_accessory/horns/drake,
 		/datum/sprite_accessory/horns/knight,
 		/datum/sprite_accessory/horns/antlers,
@@ -115,6 +139,7 @@
 		/datum/sprite_accessory/horns/smallramhornsalt,
 		/datum/sprite_accessory/horns/smallramhornsthree,
 		/datum/sprite_accessory/horns/liftedhorns,
+		/datum/sprite_accessory/horns/sideswept,
 		/datum/sprite_accessory/horns/bigcurlyhorns,
 		/datum/sprite_accessory/horns/billberry,
 		/datum/sprite_accessory/horns/stabbers,
@@ -128,4 +153,5 @@
 		/datum/sprite_accessory/horns/faceguard,
 		/datum/sprite_accessory/horns/sheephorns,
 		/datum/sprite_accessory/horns/doublehorns,
+		/datum/sprite_accessory/horns/tiefling
 		)

code/modules/client/customizer/customizers/organ/tail.dm

@@ -70,6 +70,20 @@
 		/datum/sprite_accessory/tail/sharknofin,
 		)
 
+/datum/customizer/organ/tail/tiefling
+	customizer_choices = list(/datum/customizer_choice/organ/tail/tiefling)
+	allows_disabling = FALSE
+
+/datum/customizer_choice/organ/tail/tiefling
+	name = "Tiefling Tail"
+	organ_type = /obj/item/organ/tail/tiefling
+	generic_random_pick = TRUE
+	sprite_accessories = list(
+		/datum/sprite_accessory/tail/tiefling,
+		/datum/sprite_accessory/tail/tiefling/heart,
+		)
+	allows_accessory_color_customization = FALSE
+
 /datum/customizer/organ/tail/demihuman
 	customizer_choices = list(/datum/customizer_choice/organ/tail/demihuman)
 	allows_disabling = TRUE

code/modules/mob/dead/new_player/sprite_accessory/horns.dm

@@ -35,6 +35,33 @@
 	name = "Guilmon"
 	icon_state = "guilmon"
 
+/datum/sprite_accessory/horns/uni
+	name = "Uni"
+	icon_state = "uni"
+	relevant_layers = list(BODY_FRONT_LAYER, BODY_ADJ_LAYER, BODY_BEHIND_LAYER)
+
+/datum/sprite_accessory/horns/oni
+	name = "Oni"
+	icon_state = "oni"
+	relevant_layers = list(BODY_FRONT_LAYER, BODY_BEHIND_LAYER)
+
+/datum/sprite_accessory/horns/oni_large
+	name = "Oni (Large)"
+	icon_state = "oni_large"
+	relevant_layers = list(BODY_FRONT_LAYER, BODY_ADJ_LAYER, BODY_BEHIND_LAYER)
+
+/datum/sprite_accessory/horns/broken
+	name = "Broken"
+	icon_state = "broken"
+
+/datum/sprite_accessory/horns/rbroken
+	name = "Broken (Right)"
+	icon_state = "rbroken"
+
+/datum/sprite_accessory/horns/lbroken
+	name = "Broken (Left)"
+	icon_state = "lbroken"
+
 /datum/sprite_accessory/horns/drake
 	name = "Drake"
 	icon_state = "drake"
@@ -83,6 +110,10 @@
 	name = "Lifted Horns"
 	icon_state = "lifted"
 
+/datum/sprite_accessory/horns/sideswept
+	name = "Side Swept Horns"
+	icon_state = "sideswept"
+
 /datum/sprite_accessory/horns/bigcurlyhorns
 	name = "Big Curly Horns"
 	icon_state = "bigcurly"
@@ -146,7 +177,6 @@
 
 /datum/sprite_accessory/horns/tiefling
 	name = "Tiefling"
-	icon = 'icons/mob/sprite_accessory/tiefling.dmi'
 	icon_state = "tiebhorns"
 
 /datum/sprite_accessory/horns/halforc

code/modules/mob/dead/new_player/sprite_accessory/tails.dm

@@ -323,6 +323,14 @@
 
 /datum/sprite_accessory/tail/tiefling
 	name = "Tiefling"
-	icon = 'icons/mob/sprite_accessory/tiefling.dmi'
+	icon = 'icons/mob/sprite_accessory/tails/tiefling.dmi'
 	icon_state = "tiebtail"
 	color_key_defaults = list(KEY_SKIN_COLOR)
+	can_wag = TRUE
+
+/datum/sprite_accessory/tail/tiefling/heart
+	name = "Succubus"
+	icon = 'icons/mob/sprite_accessory/tails/tiefling.dmi'
+	icon_state = "hearttail"
+	color_key_defaults = list(KEY_SKIN_COLOR)
+	can_wag = TRUE

code/modules/mob/living/carbon/human/species_types/roguetown/other/tiefling.dm

@@ -15,7 +15,8 @@
 	and leading to most seeking a solitary life outside the watchful eyes of others. \
 	Tiefling cannot reproduce with mortals, and so no half-breed exists. \
 	Tiefling tend to be extremely perceptive and paranoid, as luck is rarely on their side \
-	and their unique biology makes them extremely susceptible to injury."
+	and their unique biology makes them extremely susceptible to injury. \
+	+1 Intelligence."
 
 	skin_tone_wording = "Progenitor"
 
@@ -60,8 +61,8 @@
 		ORGAN_SLOT_LIVER = /obj/item/organ/liver,
 		ORGAN_SLOT_STOMACH = /obj/item/organ/stomach,
 		ORGAN_SLOT_APPENDIX = /obj/item/organ/appendix,
-		ORGAN_SLOT_TAIL = /obj/item/organ/tail/tiefling,
-		ORGAN_SLOT_HORNS = /obj/item/organ/horns/tiefling,
+		//ORGAN_SLOT_TAIL = /obj/item/organ/tail/tiefling,
+		//ORGAN_SLOT_HORNS = /obj/item/organ/horns/tiefling, We don't need these. No duplicate horns!
 		)
 	bodypart_features = list(
 		/datum/bodypart_feature/hair/head,
@@ -75,19 +76,20 @@
 		/datum/customizer/bodypart_feature/face_detail,
 		/datum/customizer/bodypart_feature/underwear,
 		/datum/customizer/organ/horns/anthro,
+		/datum/customizer/organ/tail/tiefling,
 		/datum/customizer/organ/testicles/human,
 		/datum/customizer/organ/penis/human,
 		/datum/customizer/organ/breasts/human,
 		/datum/customizer/organ/vagina/human,
 		)
 	body_markings = list(
-		/datum/body_marking/tonage,
+		/datum/body_marking/tonage
 	)
 	languages = list(
 		/datum/language/common,
 		/datum/language/hellspeak,
 	)
-	stress_examine = FALSE
+	stress_examine = TRUE
 	stress_desc = span_red("Helldweller... better stay away.")
 
 /datum/species/tieberian/on_species_gain(mob/living/carbon/C, datum/species/old_species)

code/modules/surgery/organs/feature_organs/horns.dm

@@ -8,10 +8,6 @@
 
 /obj/item/organ/horns/humanoid
 
-/obj/item/organ/horns/tiefling
-	name = "tiefling horns"
-	accessory_type =  /datum/sprite_accessory/horns/tiefling
-
 /obj/item/organ/horns/halforc
 	name = "halforc horns"
-	accessory_type = /datum/sprite_accessory/horns/halforc
+	accessory_type = /datum/sprite_accessory/horns/halforc

interface/stylesheet.dm

@@ -129,7 +129,7 @@ h1.alert, h2.alert	{color: #c9c1ba;font-family: Pterra, TrueType;}
 .dwarf					{font-family: "MasonAlternate", Pterra;}
 .sandspeak				{font-family: "Arabolical", Pterra;}
 .delf					{font-family: "Dauphin", Pterra;}
-.hellspeak				{font-family: "Nosfer", Pterra;}
+.hellspeak				{font-family: "Xaphan", Pterra; font-size: 110%}
 .undead					{font-family: "FriskyVampire", Pterra;}
 .orc					{font-family: "Thief by The Riddler", Pterra;}
 .beast					{font-family: "Thief by The Riddler", Pterra;}