From ee8bc9d0462f586d0cd3964366e834e82467f1ff Mon Sep 17 00:00:00 2001 From: Cursor Date: Sat, 8 Feb 2025 11:47:57 +0000 Subject: [PATCH 1/2] De-Racisms a lot of the NPCs 2 --- code/modules/wod13/npcroles.dm | 118 ++++++++++++++++++++++++--------- 1 file changed, 87 insertions(+), 31 deletions(-) diff --git a/code/modules/wod13/npcroles.dm b/code/modules/wod13/npcroles.dm index 624c08b3bb..2f6f3dc596 100644 --- a/code/modules/wod13/npcroles.dm +++ b/code/modules/wod13/npcroles.dm @@ -1,14 +1,17 @@ /datum/socialrole/bandit - s_tones = list("caucasian3", - "latino", - "mediterranean", - "asian1", - "asian2", - "arab", - "indian", - "african1", - "african2") + s_tones = list("albino", + "caucasian1", + "caucasian2", + "caucasian3", + "latino", + "mediterranean", + "asian1", + "asian2", + "arab", + "indian", + "african1", + "african2",) min_age = 18 max_age = 45 @@ -137,7 +140,15 @@ "albino", "caucasian1", "caucasian2", - "caucasian3" + "caucasian3", + "latino", + "mediterranean", + "asian1", + "asian2", + "arab", + "indian", + "african1", + "african2", ) min_age = 18 @@ -270,9 +281,18 @@ /datum/socialrole/usualfemale s_tones = list("albino", - "caucasian1", - "caucasian2", - "caucasian3") + "caucasian1", + "caucasian2", + "caucasian3", + "latino", + "mediterranean", + "asian1", + "asian2", + "arab", + "indian", + "african1", + "african2", + ) min_age = 18 max_age = 85 @@ -398,12 +418,18 @@ ) /datum/socialrole/poormale - s_tones = list( - "albino", + s_tones = list("albino", "caucasian1", "caucasian2", - "caucasian3" - ) + "caucasian3", + "latino", + "mediterranean", + "asian1", + "asian2", + "arab", + "indian", + "african1", + "african2",) min_age = 45 max_age = 85 @@ -497,9 +523,17 @@ /datum/socialrole/poorfemale s_tones = list("albino", - "caucasian1", - "caucasian2", - "caucasian3") + "caucasian1", + "caucasian2", + "caucasian3", + "latino", + "mediterranean", + "asian1", + "asian2", + "arab", + "indian", + "african1", + "african2",) min_age = 45 max_age = 85 @@ -599,7 +633,10 @@ "Dick!") /datum/socialrole/richmale - s_tones = list("albino") + s_tones = list("albino", + "caucasian1", + "caucasian2", +) min_age = 18 max_age = 85 @@ -670,7 +707,10 @@ "Someone, call the cops!") /datum/socialrole/richfemale - s_tones = list("albino") + s_tones = list("albino", + "caucasian1", + "caucasian2", +) min_age = 18 max_age = 85 @@ -906,9 +946,17 @@ /datum/socialrole/shop s_tones = list("albino", - "caucasian1", - "caucasian2", - "caucasian3") + "caucasian1", + "caucasian2", + "caucasian3", + "latino", + "mediterranean", + "asian1", + "asian2", + "arab", + "indian", + "african1", + "african2",) min_age = 18 max_age = 45 @@ -1101,17 +1149,17 @@ "Looking suspicious...", "Don't try anything stupid.", "Nothing to see here.", - "Have you seen man in black coat with black hair?") + "Have you seen a man in black coat with black hair?") neutral_phrases = list("I see you.", "Looking suspicious...", "Don't try anything stupid.", "Nothing to see here.", - "Have you seen man in black coat with black hair?") + "Have you seen a man in black coat with black hair?") random_phrases = list("I see you.", "Looking suspicious...", "Don't try anything stupid.", "Nothing to see here.", - "Have you seen man in black coat with black hair?") + "Have you seen a man in black coat with black hair?") answer_phrases = list("I'm here to protect you.") help_phrases = list("Lay down!", "Stop right there!!", @@ -1273,9 +1321,17 @@ /datum/socialrole/stripfemale s_tones = list("albino", - "caucasian1", - "caucasian2", - "caucasian3") + "caucasian1", + "caucasian2", + "caucasian3", + "latino", + "mediterranean", + "asian1", + "asian2", + "arab", + "indian", + "african1", + "african2",) min_age = 18 max_age = 30 From 999f0034c7f56f3018dd0c595c924967e8926557 Mon Sep 17 00:00:00 2001 From: Cursor <102828457+theselfish@users.noreply.github.com> Date: Sun, 9 Feb 2025 02:59:26 +0000 Subject: [PATCH 2/2] Apply suggestions from code review Co-authored-by: Adri <33333517+Miraviel@users.noreply.github.com> --- code/modules/wod13/npcroles.dm | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/code/modules/wod13/npcroles.dm b/code/modules/wod13/npcroles.dm index 2f6f3dc596..a1a178772d 100644 --- a/code/modules/wod13/npcroles.dm +++ b/code/modules/wod13/npcroles.dm @@ -11,7 +11,7 @@ "arab", "indian", "african1", - "african2",) + "african2") min_age = 18 max_age = 45 @@ -148,8 +148,7 @@ "arab", "indian", "african1", - "african2", - ) + "african2") min_age = 18 max_age = 85 @@ -291,8 +290,7 @@ "arab", "indian", "african1", - "african2", - ) + "african2") min_age = 18 max_age = 85 @@ -429,7 +427,7 @@ "arab", "indian", "african1", - "african2",) + "african2") min_age = 45 max_age = 85 @@ -533,7 +531,7 @@ "arab", "indian", "african1", - "african2",) + "african2") min_age = 45 max_age = 85 @@ -635,8 +633,7 @@ /datum/socialrole/richmale s_tones = list("albino", "caucasian1", - "caucasian2", -) + "caucasian2") min_age = 18 max_age = 85 @@ -709,8 +706,7 @@ /datum/socialrole/richfemale s_tones = list("albino", "caucasian1", - "caucasian2", -) + "caucasian2") min_age = 18 max_age = 85 @@ -956,7 +952,7 @@ "arab", "indian", "african1", - "african2",) + "african2") min_age = 18 max_age = 45 @@ -1331,7 +1327,7 @@ "arab", "indian", "african1", - "african2",) + "african2") min_age = 18 max_age = 30