Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

De-Racisms a lot of the NPCs 2 #716

Merged
merged 2 commits into from
Feb 13, 2025
+84 −32
Merged

De-Racisms a lot of the NPCs 2 #716

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee8bc9d
De-Racisms a lot of the NPCs 2
theselfish Feb 8, 2025
999f003
Apply suggestions from code review
theselfish Feb 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
118 changes: 87 additions & 31 deletions code/modules/wod13/npcroles.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",)
theselfish marked this conversation as resolved.
Show resolved Hide resolved

min_age = 18
max_age = 45
Expand Down Expand Up @@ -137,7 +140,15 @@
"albino",
"caucasian1",
"caucasian2",
"caucasian3"
"caucasian3",
"latino",
"mediterranean",
"asian1",
"asian2",
"arab",
"indian",
"african1",
"african2",
)
theselfish marked this conversation as resolved.
Show resolved Hide resolved

min_age = 18
Expand Down Expand Up @@ -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",
)
theselfish marked this conversation as resolved.
Show resolved Hide resolved

min_age = 18
max_age = 85
Expand Down Expand Up @@ -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",)
theselfish marked this conversation as resolved.
Show resolved Hide resolved

min_age = 45
max_age = 85
Expand Down Expand Up @@ -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",)
theselfish marked this conversation as resolved.
Show resolved Hide resolved

min_age = 45
max_age = 85
Expand Down Expand Up @@ -599,7 +633,10 @@
"Dick!")

/datum/socialrole/richmale
s_tones = list("albino")
s_tones = list("albino",
"caucasian1",
"caucasian2",
)
theselfish marked this conversation as resolved.
Show resolved Hide resolved

min_age = 18
max_age = 85
Expand Down Expand Up @@ -670,7 +707,10 @@
"Someone, call the cops!")

/datum/socialrole/richfemale
s_tones = list("albino")
s_tones = list("albino",
"caucasian1",
"caucasian2",
)
theselfish marked this conversation as resolved.
Show resolved Hide resolved

min_age = 18
max_age = 85
Expand Down Expand Up @@ -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",)
theselfish marked this conversation as resolved.
Show resolved Hide resolved

min_age = 18
max_age = 45
Expand Down Expand Up @@ -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!!",
Expand Down Expand Up @@ -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",)
theselfish marked this conversation as resolved.
Show resolved Hide resolved

min_age = 18
max_age = 30
Expand Down