AAAAAAAAAAA

cfg/admin.txt

@@ -1,2 +1,3 @@
 glennerbean role=admin
 emoats18 role=admin
+chaoticagent role=admin

code/__DEFINES/is_helpers.dm

@@ -87,6 +87,15 @@ GLOBAL_LIST_INIT(our_forest_sex, typecacheof(list(
 #define isethereal(A) (is_species(A, /datum/species/ethereal))
 #define isvampire(A) (is_species(A,/datum/species/vampire))
 
+//RT species
+#define ishumannorthern(A) (is_species(A, /datum/species/human/northern))
+#define isdwarf(A) (is_species(A, /datum/species/dwarf))
+#define iself(A) (is_species(A, /datum/species/elf))
+#define isdarkelf(A) (is_species(A, /datum/species/elf/dark))
+#define iswoodelf(A) (is_species(A, /datum/species/elf/snow))
+#define ishalfelf(A) (is_species(A, /datum/species/human/halfelf))
+#define istiefling(A) (is_species(A, /datum/species/tieberian))
+
 //more carbon mobs
 #define ismonkey(A) (istype(A, /mob/living/carbon/monkey))
 

code/modules/client/preferences.dm

@@ -351,11 +351,9 @@ GLOBAL_LIST_EMPTY(chosen_names)
 			if(use_skintones)
 
 //				dat += APPEARANCE_CATEGORY_COLUMN
-				var/skintone_word_swap = "Skin Tone" // Both the skintone names and the word swap here is useless fluff
-				if(pref_species.string_to_replace_skintone_on_charpref) // If they have a string in there on that var
-					skintone_word_swap = pref_species.string_to_replace_skintone_on_charpref // It is now in place of the word Skin Tone which will be the default.
+				var/skin_tone_wording = pref_species.skin_tone_wording // Both the skintone names and the word swap here is useless fluff
 
-				dat += "<b>[skintone_word_swap]: </b><a href='?_src_=prefs;preference=s_tone;task=input'>Change </a>"
+				dat += "<b>[skin_tone_wording]: </b><a href='?_src_=prefs;preference=s_tone;task=input'>Change </a>"
 //				dat += "<a href='?_src_=prefs;preference=toggle_random;random_type=[RANDOM_SKIN_TONE]'>[(randomise[RANDOM_SKIN_TONE]) ? "Lock" : "Unlock"]</A>"
 				dat += "<br>"
 
@@ -365,7 +363,7 @@ GLOBAL_LIST_EMPTY(chosen_names)
 //				if(!use_skintones)
 //					dat += APPEARANCE_CATEGORY_COLUMN
 
-				dat += "<h3>MUtant color</h3>"
+				dat += "<h3>Mutant color</h3>"
 
 				dat += "<span style='border: 1px solid #161616; background-color: #[features["mcolor"]];'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span> <a href='?_src_=prefs;preference=mutant_color;task=input'>Change</a><BR>"
 

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

@@ -1,16 +1,12 @@
 /mob/living/carbon/human/proc/on_examine_face(mob/living/carbon/human/user)
 	if(!istype(user))
 		return
-	if(user.dna?.species && dna?.species)
-		if(user.dna.species.name != "Dark Elf")
-			if(dna.species.name == "Dark Elf")
-				user.add_stress(/datum/stressevent/delf)
-		if(user.dna.species.name != "Tiefling")
-			if(dna.species.name == "Tiefling")
-				user.add_stress(/datum/stressevent/tieb)
-	if(user.has_flaw(/datum/charflaw/paranoid))
-		if((STASTR - user.STASTR) > 1)
-			user.add_stress(/datum/stressevent/parastr)
+	if(!isdarkelf(user) && isdarkelf(src))
+		user.add_stress(/datum/stressevent/delf)
+	if(!istiefling(user) && istiefling(src))
+		user.add_stress(/datum/stressevent/tieb)
+	if(user.has_flaw(/datum/charflaw/paranoid) && (STASTR - user.STASTR) > 1)
+		user.add_stress(/datum/stressevent/parastr)
 
 /mob/living/carbon/human/examine(mob/user)
 //this is very slightly better than it was because you can use it more places. still can't do \his[src] though.
@@ -63,6 +59,11 @@
 					. = list("<span class='info'>ø ------------ ø\nThis is <EM>[used_name]</EM>, the [race_name] [used_title].")
 		else
 			. = list("<span class='info'>ø ------------ ø\nThis is the [race_name], <EM>[used_name]</EM>.")
+
+		if(dna.species.use_skintones)
+			var/skin_tone_wording = dna.species.skin_tone_wording ? lowertext(dna.species.skin_tone_wording) : "skin tone"
+			var/skin_tone_seen = lowertext(skin_tone) || "incomprehensible"
+			. += "<span class='info'>[capitalize(m2)] [skin_tone_wording] is [skin_tone_seen].</span>"
 
 		if(ishuman(user))
 			var/mob/living/carbon/human/H = user

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

@@ -117,8 +117,8 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 
 	var/possible_faiths
 
-	//If you set a word here it swaps out the word skintone when the species is selected on the pref menu
-	var/string_to_replace_skintone_on_charpref = FALSE
+	//Wording for skin tone on examine and on character setup
+	var/skin_tone_wording = "Skin Tone"
 
 ///////////
 // PROCS //

code/modules/mob/living/carbon/human/species_types/roguetown/dwarf/dwarfm.dm

@@ -19,7 +19,7 @@
 	Dwarves are hearty, but are not known for their speed or eyesight... \
 	Each dwarf hails from a ancient fortress named after the most plentiful mineral."
 
-	string_to_replace_skintone_on_charpref = "Fortress Origin"
+	skin_tone_wording = "Fortress Origin"
 
 	default_color = "FFFFFF"
 	species_traits = list(EYECOLOR,HAIR,FACEHAIR,LIPS,YOUNGBEARD,STUBBLE,OLDGREY)

code/modules/mob/living/carbon/human/species_types/roguetown/elf/elfd.dm

@@ -29,7 +29,7 @@
 	without careful upkeep...\
 	They typically trace their beginnings to how their progenator died before being raised."
 */
-	string_to_replace_skintone_on_charpref = "Origin City-State"
+	skin_tone_wording = "Origin City-State"
 
 	species_traits = list(EYECOLOR,HAIR,FACEHAIR,LIPS,OLDGREY)
 	inherent_traits = list(TRAIT_NOMOBSWAP)

code/modules/mob/living/carbon/human/species_types/roguetown/elf/elfs.dm

@@ -17,7 +17,7 @@
 	not lend itself to the concepts of strength or durability... \
 	There are elves from a small smattering of tribes in these parts."
 
-	string_to_replace_skintone_on_charpref = "Tribal Identity"
+	skin_tone_wording = "Tribal Identity"
 
 	default_color = "FFFFFF"
 	species_traits = list(EYECOLOR,HAIR,FACEHAIR,LIPS,OLDGREY)

code/modules/mob/living/carbon/human/species_types/roguetown/human/humann.dm

@@ -13,7 +13,7 @@
 	tend to find fortune easier than the other races, and are so diverse that no other racial trait\
 	are dominant in their species..."
 
-	string_to_replace_skintone_on_charpref = "Ancestry"
+	skin_tone_wording = "Ancestry"
 
 	default_color = "FFFFFF"
 	species_traits = list(EYECOLOR,HAIR,FACEHAIR,LIPS,STUBBLE,OLDGREY)

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

@@ -14,7 +14,7 @@
 	Rockhills populace holds them with a mixture of uneasy fear or, and respect. \
 	It is also widely believed that an Aasimars death is a bad omen..."
 
-	string_to_replace_skintone_on_charpref = "Crafted With"
+	skin_tone_wording = "Crafted With"
 
 	species_traits = list(EYECOLOR,HAIR,FACEHAIR,LIPS,STUBBLE,OLDGREY)
 	inherent_traits = list(TRAIT_NOMOBSWAP)

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

@@ -15,7 +15,7 @@
 	Due to their heritage, Half-Elves tend to gain racial traits depending on how strong their fathers, or mothers, genes were. \
 	Half-Elves also typically try to find identity in one of two regions they have similarities towards."
 
-	string_to_replace_skintone_on_charpref = "Identifies As"
+	skin_tone_wording = "Identifies As"
 	default_color = "FFFFFF"
 	species_traits = list(EYECOLOR,HAIR,FACEHAIR,LIPS,STUBBLE,OLDGREY)
 	inherent_traits = list(TRAIT_NOMOBSWAP)

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

@@ -17,7 +17,7 @@
 	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."
 
-	string_to_replace_skintone_on_charpref = "Progenitor"
+	skin_tone_wording = "Progenitor"
 
 	species_traits = list(EYECOLOR,HAIR,FACEHAIR,LIPS,STUBBLE,OLDGREY)
 	inherent_traits = list(TRAIT_NOMOBSWAP)

config/admins.txt

@@ -6,3 +6,4 @@
 
 Glennerbean = Host
 emoats18 = Host
+ChaoticAgent = Host

strings/accent_universal.json

@@ -52,7 +52,6 @@
 		"dope": "gaunt",
 		"FOMO": "fear of gods",
 		"stanning": "worshipping",
-		"stan": "worshipper",
 		"cunny": "lechery",
 		"rizz": "charm",
 		"rizzed": "charmed",
@@ -72,7 +71,6 @@
 		"poggers": "gleeming",
 		"fap": "self abusing",
 		"fapping": "self abusing",
-		"yap": "prattle",
 		"yapping": "prattling",
 		"sigma": "beastly",
 		"looksmaxxing": "refining",
@@ -90,7 +88,6 @@
 		"gooning": "self abusing",
 		"swell": "jivin",
 		"cringe": "swive",
-		"simp": "wittol",
 		"bussing": "splendid",
 		"bussin": "splendid",
 		"pussy": "cunt-bitten coward",