Merge pull request #5548 from ARF-SS13/more-defined-quirks

Snuggler and Risky Binuss

code/__DEFINES/traits.dm

@@ -353,10 +353,12 @@
 #define TRAIT_DISTANT "distant"
 #define TRAIT_HEADPAT_SLUT "headpat_sluuuuut"
 #define TRAIT_ORAL_FIXATION "oral fixation"
+#define TRAIT_RISKY_BUSINESS "creampie fixation"
 #define TRAIT_NOERP "no erp"
 #define TRAIT_VANILLAERP "vanilla erp"
 #define TRAIT_ROUGHERP "rough erp"
 #define TRAIT_EXTREMEERP "extreme erp"
+#define TRAIT_SNUGGLER "snuggle rp"
 #define TRAIT_FERALERP "feral erp"
 #define TRAIT_ROBOTERP "robot erp"
 #define TRAIT_VOREERP "vore erp"

code/datums/traits/neutral.dm

@@ -1313,6 +1313,31 @@
 	gain_text = span_notice("Why yes, I have spent too much time online. How did you know?")
 	lose_text = span_notice("Should have paid your internet bill.")
 
+
+/datum/quirk/snuggle_erp
+	name = "Snuggly ERP/RP"
+	desc = "You just really love a snuggly comfy scene, it doesn't even have to be lewd."
+	value = 0
+	category = "Bawdy Quirks"
+	mechanics = "Shows your prefs in examine."
+	conflicts = list(
+	)
+	mob_trait = TRAIT_SNUGGLER
+	gain_text = span_notice("You have a sudden need to be close to another.")
+	lose_text = span_notice("Cooties are real, your mom said so.")
+
+/datum/quirk/breeding_erp
+	name = "Breeding ERP/RP"
+	desc = "Be you the pied or the piper you have a preference for lewdness that ends with at least the risk of making babies."
+	value = 0
+	category = "Bawdy Quirks"
+	mechanics = "Shows your prefs in examine."
+	conflicts = list(
+	)
+	mob_trait = TRAIT_RISKY_BUSINESS
+	gain_text = span_notice("Your biological clock starts screaming that it's Sex O'clock.")
+	lose_text = span_notice("You decide cats are great pets.")
+
 /datum/quirk/feral_erp
 	name = "Feral ERP"
 	desc = "Your ERP partner preferences include things that need to pass a harkness test."

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

@@ -574,7 +574,7 @@ GLOBAL_LIST_INIT(personalitytrait2description, list(
 		. += span_purple("[t_He] looks like a natural born fighter!</span>")
 	//gunner
 	if(HAS_TRAIT(src, TRAIT_ADV_GUNNER))
-		. += span_purple("[t_He] looks like [t_He]'s quick on the draw!</span>")
+		. += span_purple("[t_He] looks good with a gun!</span>")
 	//healer
 	if(HAS_TRAIT(src, TRAIT_ADV_HEALER))
 		. += span_purple("[t_He] looks like [t_He] know's how to fix people up!</span>")
@@ -595,20 +595,25 @@ GLOBAL_LIST_INIT(personalitytrait2description, list(
 	//short term
 	if(HAS_TRAIT(src, TRAIT_RPLONGTERM))
 		. += span_green("[t_He] wants short term RP/ERP relationships!</span>")
+	//short term
+	if(HAS_TRAIT(src, TRAIT_RPLONGTERM))
+		. += span_green("[t_He] wants short term RP/ERP relationships!</span>")
 
 //quick physical info
 	//big ass
 	if(HAS_TRAIT(src, TRAIT_BIGBUTT))
-		. += span_love("[t_He] has a big backside!</span>")
-	//vanilla
+		. += span_neovgre_small("[t_He] has a big backside!</span>")
+	//booba
 	if(HAS_TRAIT(src, TRAIT_BIGBOOBS))
-		. += span_love("[t_He] has big boobs!</span>")
-	//rough
+		. += span_neovgre_small("[t_He] has big boobs!</span>")
+	//balls
 	if(HAS_TRAIT(src, TRAIT_BIGBALLS))
-		. += span_love("[t_He] has stuffed pants!</span>")
-	//extreme
+		. += span_neovgre_small("[t_He] has stuffed pants!</span>")
+	//weenus
 	if(HAS_TRAIT(src, TRAIT_BIGWEENIE))
-		. += span_love("[t_He] might buy cucumbers!</span>")
+		. += span_neovgre_small("[t_He] might buy cucumbers!</span>")
+
+
 
 
 //The kissers
@@ -638,16 +643,25 @@ GLOBAL_LIST_INIT(personalitytrait2description, list(
 //The stylers
 	//no erp
 	if(HAS_TRAIT(src, TRAIT_NOERP))
-		. += span_love("[t_He] doesn't ERP!</span>")
+		. += span_clown("[t_He] doesn't ERP!</span>")
 	//vanilla
 	if(HAS_TRAIT(src, TRAIT_VANILLAERP))
-		. += span_love("[t_He] prefers vanilla scenes!</span>")
+		. += span_clown("[t_He] prefers vanilla scenes!</span>")
 	//rough
 	if(HAS_TRAIT(src, TRAIT_ROUGHERP))
-		. += span_love("[t_He] prefers rougher scenes!</span>")
+		. += span_clown("[t_He] prefers rougher scenes!</span>")
 	//extreme
 	if(HAS_TRAIT(src, TRAIT_EXTREMEERP))
-		. += span_love("[t_He] prefers extreme scenes!</span>")
+		. += span_clown("[t_He] prefers extreme scenes!</span>")
+	//snuggler
+	if(HAS_TRAIT(src, TRAIT_SNUGGLER))
+		. += span_clown("[t_He] is a softy that wants snuggles for sure.")
+	//orally fixated
+	if(HAS_TRAIT(src, TRAIT_ORAL_FIXATION))
+		. += span_clown("[t_He] seems a bit orally fixated.")
+	//orally fixated
+	if(HAS_TRAIT(src, TRAIT_RISKY_BUSINESS))
+		. += span_clown("[t_He] is into creampies.")
 
 //The partners
 	//feral

tgui/packages/tgui-panel/styles/goon/chat-dark.scss

@@ -948,9 +948,8 @@ em {
 
 .clown {
   color: #ff70c1;
-  font-size: 125%;
+  font-size: 100%;
   font-family: "Comic Sans MS", cursive, sans-serif;
-  font-weight: bold;
 }
 
 .singing {