cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adds ability for FBPs to select neuter as a gender when changing gender using the appearance changer

Browse Source
This commit is contained in:
Yoshax
2016-04-27 14:52:55 +01:00
parent 2f63caacaf
commit 7be9dd4b14
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -116,5 +116,5 @@ datum/preferences/proc/set_biological_gender(var/gender)
if(pref.organ_data[BP_TORSO] != "cyborg") if(pref.organ_data[BP_TORSO] != "cyborg")
return possible_genders return possible_genders
possible_genders = possible_genders.Copy() possible_genders = possible_genders.Copy()
possible_genders += NEUTER possible_genders |= NEUTER
return possible_genders return possible_genders

14
code/modules/nano/modules/human_appearance.dm
View File

@@ -27,7 +27,7 @@
cut_and_generate_data() cut_and_generate_data()
return 1 return 1
if(href_list["gender"]) if(href_list["gender"])
if(can_change(APPEARANCE_GENDER) && (href_list["gender"] in owner.species.genders)) if(can_change(APPEARANCE_GENDER) && (href_list["gender"] in get_genders()))
if(owner.change_gender(href_list["gender"])) if(owner.change_gender(href_list["gender"]))
cut_and_generate_data() cut_and_generate_data()
return 1 return 1
@@ -115,7 +115,7 @@
data["change_gender"] = can_change(APPEARANCE_GENDER) data["change_gender"] = can_change(APPEARANCE_GENDER)
if(data["change_gender"]) if(data["change_gender"])
var/genders[0] var/genders[0]
for(var/gender in owner.species.genders) for(var/gender in get_genders())
genders[++genders.len] = list("gender_name" = gender2text(gender), "gender_key" = gender) genders[++genders.len] = list("gender_name" = gender2text(gender), "gender_key" = gender)
data["genders"] = genders data["genders"] = genders
var/id_genders[0] var/id_genders[0]
@@ -179,3 +179,13 @@
if(!valid_hairstyles.len || !valid_facial_hairstyles.len) if(!valid_hairstyles.len || !valid_facial_hairstyles.len)
valid_hairstyles = owner.generate_valid_hairstyles(check_gender = 0) valid_hairstyles = owner.generate_valid_hairstyles(check_gender = 0)
valid_facial_hairstyles = owner.generate_valid_facial_hairstyles() valid_facial_hairstyles = owner.generate_valid_facial_hairstyles()
/datum/nano_module/appearance_changer/proc/get_genders()
var/datum/species/S = owner.species
var/list/possible_genders = S.genders
if(!owner.internal_organs_by_name["cell"])
return possible_genders
possible_genders = possible_genders.Copy()
possible_genders |= NEUTER
return possible_genders