From f90b2543aad98c80b9695b896fddee1e24654683 Mon Sep 17 00:00:00 2001 From: Tk420634 Date: Mon, 4 Nov 2024 11:08:31 -0600 Subject: [PATCH] Snuggler and Risky Binuss --- code/__DEFINES/traits.dm | 2 + code/datums/traits/neutral.dm | 25 ++++++++++++ .../mob/living/carbon/human/examine.dm | 38 +++++++++++++------ .../tgui-panel/styles/goon/chat-dark.scss | 3 +- 4 files changed, 54 insertions(+), 14 deletions(-) diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm index e9f4d2c5720..87a51e8dc1b 100644 --- a/code/__DEFINES/traits.dm +++ b/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" diff --git a/code/datums/traits/neutral.dm b/code/datums/traits/neutral.dm index 53c5b1147f8..3583f965b4e 100644 --- a/code/datums/traits/neutral.dm +++ b/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." diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index d19373c3a1a..2e8ca90bc8b 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/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!") //gunner if(HAS_TRAIT(src, TRAIT_ADV_GUNNER)) - . += span_purple("[t_He] looks like [t_He]'s quick on the draw!") + . += span_purple("[t_He] looks good with a gun!") //healer if(HAS_TRAIT(src, TRAIT_ADV_HEALER)) . += span_purple("[t_He] looks like [t_He] know's how to fix people up!") @@ -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!") + //short term + if(HAS_TRAIT(src, TRAIT_RPLONGTERM)) + . += span_green("[t_He] wants short term RP/ERP relationships!") //quick physical info //big ass if(HAS_TRAIT(src, TRAIT_BIGBUTT)) - . += span_love("[t_He] has a big backside!") - //vanilla + . += span_neovgre_small("[t_He] has a big backside!") + //booba if(HAS_TRAIT(src, TRAIT_BIGBOOBS)) - . += span_love("[t_He] has big boobs!") - //rough + . += span_neovgre_small("[t_He] has big boobs!") + //balls if(HAS_TRAIT(src, TRAIT_BIGBALLS)) - . += span_love("[t_He] has stuffed pants!") - //extreme + . += span_neovgre_small("[t_He] has stuffed pants!") + //weenus if(HAS_TRAIT(src, TRAIT_BIGWEENIE)) - . += span_love("[t_He] might buy cucumbers!") + . += span_neovgre_small("[t_He] might buy cucumbers!") + + //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_clown("[t_He] doesn't ERP!") //vanilla if(HAS_TRAIT(src, TRAIT_VANILLAERP)) - . += span_love("[t_He] prefers vanilla scenes!") + . += span_clown("[t_He] prefers vanilla scenes!") //rough if(HAS_TRAIT(src, TRAIT_ROUGHERP)) - . += span_love("[t_He] prefers rougher scenes!") + . += span_clown("[t_He] prefers rougher scenes!") //extreme if(HAS_TRAIT(src, TRAIT_EXTREMEERP)) - . += span_love("[t_He] prefers extreme scenes!") + . += span_clown("[t_He] prefers extreme scenes!") + //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 diff --git a/tgui/packages/tgui-panel/styles/goon/chat-dark.scss b/tgui/packages/tgui-panel/styles/goon/chat-dark.scss index 26ed30561b0..1f2dce2c8b6 100644 --- a/tgui/packages/tgui-panel/styles/goon/chat-dark.scss +++ b/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 {