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] Hide illegal cosmetics from selection (#11321)

Browse Source 
Co-authored-by: Will <7099514+Willburd@users.noreply.github.com>
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-08-05 01:57:30 -07:00
committed by GitHub
parent 72981b68cd
commit a766d74477
4 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/mob/living/carbon/human/appearance.dm
View File

@@ -203,6 +203,9 @@
for(var/hairstyle in GLOB.hair_styles_list)
var/datum/sprite_accessory/S = GLOB.hair_styles_list[hairstyle]
if(S.name == DEVELOPER_WARNING_NAME)
continue
if(check_gender && gender != NEUTER)
if(gender == MALE && S.gender == FEMALE)
continue
@@ -229,6 +232,9 @@
for(var/facialhairstyle in GLOB.facial_hair_styles_list)
var/datum/sprite_accessory/S = GLOB.facial_hair_styles_list[facialhairstyle]
if(S.name == DEVELOPER_WARNING_NAME)
continue
if(gender != NEUTER)
if(gender == MALE && S.gender == FEMALE)
continue

4
code/modules/mob/living/carbon/human/species/species_shapeshift.dm
View File

@@ -86,6 +86,8 @@ var/list/wrapped_species_by_ref = list()
var/list/valid_gradstyles = GLOB.hair_gradients
for(var/hairstyle in GLOB.hair_styles_list)
var/datum/sprite_accessory/S = GLOB.hair_styles_list[hairstyle]
if(S.name == DEVELOPER_WARNING_NAME)
continue
if(gender == MALE && S.gender == FEMALE)
continue
if(gender == FEMALE && S.gender == MALE)
@@ -95,6 +97,8 @@ var/list/wrapped_species_by_ref = list()
valid_hairstyles += hairstyle
for(var/facialhairstyle in GLOB.facial_hair_styles_list)
var/datum/sprite_accessory/S = GLOB.facial_hair_styles_list[facialhairstyle]
if(S.name == DEVELOPER_WARNING_NAME)
continue
if(gender == MALE && S.gender == FEMALE)
continue
if(gender == FEMALE && S.gender == MALE)

4
code/modules/mob/new_player/preferences_setup.dm
View File

@@ -278,6 +278,8 @@
var/list/valid_hairstyles = list()
for(var/hairstyle in GLOB.hair_styles_list)
var/datum/sprite_accessory/S = GLOB.hair_styles_list[hairstyle]
if(S.name == DEVELOPER_WARNING_NAME)
continue
if(!(species in S.species_allowed) && (!custom_base || !(custom_base in S.species_allowed)))
continue
if((!S.ckeys_allowed) || (user.ckey in S.ckeys_allowed))
@@ -290,6 +292,8 @@
var/list/valid_facialhairstyles = list()
for(var/facialhairstyle in GLOB.facial_hair_styles_list)
var/datum/sprite_accessory/S = GLOB.facial_hair_styles_list[facialhairstyle]
if(S.name == DEVELOPER_WARNING_NAME)
continue
if(biological_gender == MALE && S.gender == FEMALE)
continue
if(biological_gender == FEMALE && S.gender == MALE)

2
code/modules/mob/new_player/sprite_accessories.dm
View File

@@ -31,7 +31,7 @@ GLOBAL_LIST_INIT(fancy_sprite_accessory_color_channel_names, list("Primary", "Se
var/icon_state // the icon_state of the accessory
var/preview_state // a custom preview state for whatever reason
var/name = "ERROR - FIXME" // the preview name of the accessory
var/name = DEVELOPER_WARNING_NAME // the preview name of the accessory
// Determines if the accessory will be skipped or included in random hair generations
var/gender = NEUTER