cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Changes how pronouns are selected on character setup (#10541)

Browse Source 
Co-authored-by: TheToaster98 <51209769+TheToaster98@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-03-28 09:29:18 -07:00
committed by GitHub
parent 30c1f4c7d8
commit af1d624a99
5 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
code/_helpers/global_lists.dm
View File

@@ -22,6 +22,20 @@ var/global/list/joblist = list() //list of all jobstypes, minus borg and AI
#define all_genders_define_list list(MALE,FEMALE,PLURAL,NEUTER,HERM) //VOREStaton Edit
#define all_genders_text_list list("Male","Female","Plural","Neuter","Herm") //VOREStation Edit
#define pronoun_set_to_genders list(\
"He/Him" = MALE,\
"She/Her" = FEMALE,\
"It/Its" = NEUTER,\
"They/Them" = PLURAL,\
"Shi/Hir" = HERM\
)
#define genders_to_pronoun_set list(\
MALE = "He/Him",\
FEMALE = "She/Her",\
NEUTER = "It/Its",\
PLURAL = "They/Them",\
HERM = "Shi/Hir"\
)
var/list/mannequins_

2
code/game/machinery/adv_med.dm
View File

@@ -538,7 +538,7 @@
// CHOMPedit begin - malignant organs
if(istype(i, /obj/item/organ/internal/malignant))
var/obj/item/organ/internal/ORG = occupant.organs_by_name[i.parent_organ]
var/obj/item/organ/external/ORG = occupant.organs_by_name[i.parent_organ]
hasMalignants += span_red(" -[ORG.name]") + "<BR>"
// CHOMPedit end

2
code/game/objects/items/devices/scanners/health.dm
View File

@@ -304,7 +304,7 @@
dat += "<br>"
else if(istype(io,/obj/item/organ/internal/malignant))
if(advscan >= 2)
var/obj/item/organ/internal/ORG = H.organs_by_name[io.parent_organ]
var/obj/item/organ/external/ORG = H.organs_by_name[io.parent_organ]
dat += span_warning("Anatomical irregularities detected in subject's [ORG.name].")
dat += "<br>"
else

6
code/modules/client/preference_setup/general/01_basic.dm
View File

@@ -61,7 +61,7 @@
. += "(<a href='byond://?src=\ref[src];reset_nickname=1'>Clear</A>)"
. += "<br>"
. += span_bold("Biological Sex:") + " <a href='byond://?src=\ref[src];bio_gender=1'><b>[gender2text(pref.biological_gender)]</b></a><br>"
. += span_bold("Pronouns:") + " <a href='byond://?src=\ref[src];id_gender=1'><b>[gender2text(pref.identifying_gender)]</b></a><br>"
. += span_bold("Pronouns:") + " <a href='byond://?src=\ref[src];id_gender=1'><b>[genders_to_pronoun_set[pref.identifying_gender]]</b></a><br>"
. += span_bold("Age:") + " <a href='byond://?src=\ref[src];age=1'>[pref.read_preference(/datum/preference/numeric/human/age)]</a> <b>Birthday:</b> <a href='byond://?src=\ref[src];bday_month=1'>[pref.read_preference(/datum/preference/numeric/human/bday_month)]</a><b>/</b><a href='byond://?src=\ref[src];bday_day=1'>[pref.read_preference(/datum/preference/numeric/human/bday_day)]</a> - <b>Announce?:</b> <a href='byond://?src=\ref[src];bday_announce=1'>[pref.read_preference(/datum/preference/toggle/human/bday_announce) ? "Yes" : "Disabled"]</a><br>" //ChompEDIT - DISABLE the announcement
. += span_bold("Spawn Point:") + " <a href='byond://?src=\ref[src];spawnpoint=1'>[pref.read_preference(/datum/preference/choiced/living/spawnpoint)]</a><br>"
if(CONFIG_GET(flag/allow_metadata))
@@ -115,9 +115,9 @@
return TOPIC_REFRESH_UPDATE_PREVIEW
else if(href_list["id_gender"])
var/new_gender = tgui_input_list(user, "Choose your character's pronouns:", "Character Preference", all_genders_define_list, pref.identifying_gender)
var/new_gender = tgui_input_list(user, "Choose your character's pronouns:", "Character Preference", pronoun_set_to_genders, genders_to_pronoun_set[pref.identifying_gender])
if(new_gender && CanUseTopic(user))
pref.identifying_gender = new_gender
pref.identifying_gender = pronoun_set_to_genders[new_gender]
return TOPIC_REFRESH
else if(href_list["age"])

11
modular_chomp/code/modules/organs/internal/malignant/malignant.dm
View File

@@ -22,9 +22,10 @@
while(++i < 10)
// done here, because New() does all the setup for placing the organ...
// attempt to select a valid exterior organ that isn't synthetic!
if(isliving(loc))
parent_organ = pick(validBPspawns)
if(isliving(owner))
var/obj/item/organ/checklimb = owner.organs_by_name[parent_organ]
var/mob/living/L = loc
var/obj/item/organ/checklimb = L.organs_by_name[parent_organ]
if(checklimb)
// valid limb, check if organic!
if(checklimb.status == 0 && checklimb.robotic < ORGAN_ROBOT)
@@ -155,7 +156,7 @@
owner.AdjustWeakened(3 * base_mult)
if(prob(75))
owner.AdjustConfused(4 * base_mult)
var/obj/item/organ/O = owner.organs_by_name[parent_organ]
var/obj/item/organ/external/O = owner.organs_by_name[parent_organ]
if(damage >= min_broken_damage)
owner.custom_pain(span_warning("You feel a painful sensation in your [O.name]."),damage,TRUE)
owner.AdjustBlinded(6 * base_mult)
@@ -303,7 +304,7 @@
owner.Confuse(30)
if(prob(2))
var/obj/item/organ/O = owner.organs_by_name[parent_organ]
var/obj/item/organ/external/O = owner.organs_by_name[parent_organ]
if(stage_progress > 200)
owner.custom_pain(span_warning("You feel bloated. The pain in your [O.name] is agonizing."),20,TRUE)
owner.automatic_custom_emote(VISIBLE_MESSAGE, "winces slightly.", check_stat = TRUE)
@@ -455,7 +456,7 @@
supply_conversion_value = initial(supply_conversion_value) + ((thalers * SSsupply.points_per_money))
if(prob(2))
var/obj/item/organ/O = owner.organs_by_name[parent_organ]
var/obj/item/organ/external/O = owner.organs_by_name[parent_organ]
if(thalers < 100)
pass()
else if(thalers < 500)