cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-22 04:22:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes pronoun issues. (#9780)

Browse Source
This commit is contained in:
MarinaGryphon
2020-08-25 16:06:11 +02:00
committed by GitHub
parent e3d6beb3d9
commit 70c11c8f03
5 changed files with 54 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/general/01_basic.dm
+1 -1
View File
@@ -199,7 +199,7 @@
var/datum/category_item/player_setup_item/general/equipment/equipment_item = category.items[4]
equipment_item.sanitize_character() // sanitize equipment
return TOPIC_UPDATE_PREVIEW
return TOPIC_REFRESH_UPDATE_PREVIEW
else if(href_list["age"])
var/new_age = input(user, "Choose your character's age:\n([pref.getMinAge()]-[pref.getMaxAge()])", "Character Preference", pref.age) as num|null
code/modules/emotes/emote_define.dm
+3 -3
View File
@@ -52,7 +52,7 @@
use_1p = get_emote_message_1p(user, target, extra_params)
use_1p = replacetext(use_1p, "TARGET_THEM", target.get_pronoun("him"))
use_1p = replacetext(use_1p, "TARGET_THEIR", target.get_pronoun("his"))
use_1p = replacetext(use_1p, "TARGET_SELF", target.get_pronoun("self"))
use_1p = replacetext(use_1p, "TARGET_SELF", target.get_pronoun("himself"))
use_1p = replacetext(use_1p, "TARGET", "<b>\the [target]</b>")
else
use_1p = get_emote_message_1p(user, null, extra_params)
@@ -63,13 +63,13 @@
use_3p = get_emote_message_3p(user, target, extra_params)
use_3p = replacetext(use_3p, "TARGET_THEM", target.get_pronoun("him"))
use_3p = replacetext(use_3p, "TARGET_THEIR", target.get_pronoun("his"))
use_3p = replacetext(use_3p, "TARGET_SELF", target.get_pronoun("self"))
use_3p = replacetext(use_3p, "TARGET_SELF", target.get_pronoun("himself"))
use_3p = replacetext(use_3p, "TARGET", "<b>\the [target]</b>")
else
use_3p = get_emote_message_3p(user, null, extra_params)
use_3p = replacetext(use_3p, "USER_THEM", user.get_pronoun("him"))
use_3p = replacetext(use_3p, "USER_THEIR", user.get_pronoun("his"))
use_3p = replacetext(use_3p, "USER_SELF", user.get_pronoun("self"))
use_3p = replacetext(use_3p, "USER_SELF", user.get_pronoun("himself"))
use_3p = replacetext(use_3p, "USER", "<b>\the [user]</b>")
use_3p = capitalize(use_3p)
code/modules/mob/gender.dm
+6 -7
View File
@@ -19,7 +19,7 @@ var/list/datum/gender/gender_datums = list()
var/has = "have"
var/is = "are"
var/does = "do"
var/self = "themselves"
var/himself = "themselves"
var/end = ""
/datum/gender/male
@@ -35,7 +35,7 @@ var/list/datum/gender/gender_datums = list()
has = "has"
is = "is"
does = "does"
self = "himself"
himself = "himself"
end = "s"
/datum/gender/female
@@ -51,7 +51,7 @@ var/list/datum/gender/gender_datums = list()
has = "has"
is = "is"
does = "does"
self = "herself"
himself = "herself"
end = "s"
/datum/gender/neuter
@@ -67,13 +67,12 @@ var/list/datum/gender/gender_datums = list()
has = "has"
is = "is"
does = "does"
self = "itself"
himself = "itself"
end = "s"
/atom/proc/get_gender() // This is on /atom/ for compatibility reasons, e.g. for emotes to not have to typecheck.
return gender
/atom/proc/get_pronoun(var/type)
/atom/proc/get_pronoun(var/wordtype)
var/gender_to_use = get_gender()
if (type in gender_datums[gender_to_use])
return gender_datums[gender_to_use][type]
return gender_datums[gender_to_use][wordtype]
code/modules/mob/living/carbon/human/human.dm
+1 -1
View File
@@ -1222,7 +1222,7 @@
var/skipitems = get_covered_clothes()
var/skipbody = get_covered_body_parts()
. = ..()
if((skipbody & FACE || (skipitems & (HIDEMASK|HIDEFACE))) && (skipbody & (UPPER_TORSO | LOWER_TORSO) || (skipitems & HIDEJUMPSUIT))) //big suits/masks/helmets make it hard to tell their gender
if((skipbody & FACE || (skipitems & (HIDEMASK|HIDEFACE))) && ((skipbody & UPPER_TORSO && skipbody & LOWER_TORSO) || (skipitems & HIDEJUMPSUIT))) //big suits/masks/helmets make it hard to tell their gender
. = PLURAL
/mob/living/carbon/human/proc/increase_germ_level(n)