Skip to content

Commit

Permalink
Revert "Fixes gender neutral people lacking underwear (#13569)" (#13653)
Browse files Browse the repository at this point in the history 
This reverts commit 1047ce0.
  • Loading branch information
@Lumipharon
Lumipharon authored Aug 2, 2023
1 parent 394ead3 commit 1192f5b
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 49 deletions.
4 changes: 0 additions & 4 deletions code/_globalvars/lists/flavor_misc.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,9 @@ GLOBAL_LIST_EMPTY(facial_hair_styles_list) //stores /datum/sprite_accessory/faci
GLOBAL_LIST_EMPTY(underwear_list) //stores /datum/sprite_accessory/underwear indexed by name
GLOBAL_LIST_INIT(underwear_m, list("Briefs"))
GLOBAL_LIST_INIT(underwear_f, list("Sports bra and briefs", "Bra and brief", "Bra and panties"))
GLOBAL_LIST_INIT(underwear_n, list("Briefs", "Sports bra and briefs", "Bra and brief", "Bra and panties"))

//Undershirts
GLOBAL_LIST_INIT(undershirt_m, list("None","Black undershirt", "White undershirt", "Beige undershirt", "Fitness shirt", "Beige undershirt(sleeveless)"))
GLOBAL_LIST_INIT(undershirt_f, list("None","Black undershirt", "White undershirt", "Beige undershirt", "Beige undershirt(sleeveless)"))
GLOBAL_LIST_INIT(undershirt_n, list("None","Black undershirt", "White undershirt", "Beige undershirt", "Fitness shirt", "Beige undershirt(sleeveless)"))

//Mutant Human bits
GLOBAL_LIST_EMPTY(moth_wings_list)
GLOBAL_LIST_EMPTY(tails_list_monkey)
Expand Down
18 changes: 6 additions & 12 deletions code/_onclick/hud/human.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -217,18 +217,12 @@
f_style = "Shaved"
if(ishumanbasic(src))
h_style = pick("Bedhead", "Bedhead 2", "Bedhead 3")
switch(gender)
if(MALE)
underwear = GLOB.underwear_m.Find("None")
undershirt = GLOB.undershirt_m.Find("None")
if(FEMALE)
underwear = GLOB.underwear_f.Find("None")
undershirt = GLOB.undershirt_f.Find("None")
else
underwear = GLOB.underwear_n.Find("None")
undershirt = GLOB.undershirt_n.Find("None")


if(gender == MALE)
underwear = GLOB.underwear_m.Find("None")
undershirt = GLOB.undershirt_m.Find("None")
else
underwear = GLOB.underwear_f.Find("None")
undershirt = GLOB.undershirt_f.Find("None")
regenerate_icons()


Expand Down
34 changes: 12 additions & 22 deletions code/modules/client/preferences_savefile.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -464,17 +464,12 @@
quick_equip = sanitize_islist(quick_equip, QUICK_EQUIP_ORDER, MAX_QUICK_EQUIP_SLOTS, TRUE, VALID_EQUIP_SLOTS)
for(var/quick_equip_slots in quick_equip)
quick_equip_slots = sanitize_inlist(quick_equip_slots, SLOT_DRAW_ORDER[quick_equip], initial(quick_equip_slots))
switch(gender)
if(MALE)
underwear = sanitize_integer(underwear, 1, length(GLOB.underwear_m), initial(underwear))
undershirt = sanitize_integer(undershirt, 1, length(GLOB.undershirt_m), initial(undershirt))
if(FEMALE)
underwear = sanitize_integer(underwear, 1, length(GLOB.underwear_f), initial(underwear))
undershirt = sanitize_integer(undershirt, 1, length(GLOB.undershirt_f), initial(undershirt))
else
underwear = sanitize_integer(underwear, 1, length(GLOB.underwear_n), initial(underwear))
undershirt = sanitize_integer(undershirt, 1, length(GLOB.undershirt_n), initial(undershirt))

if(gender == MALE)
underwear = sanitize_integer(underwear, 1, length(GLOB.underwear_m), initial(underwear))
undershirt = sanitize_integer(undershirt, 1, length(GLOB.undershirt_m), initial(undershirt))
else
underwear = sanitize_integer(underwear, 1, length(GLOB.underwear_f), initial(underwear))
undershirt = sanitize_integer(undershirt, 1, length(GLOB.undershirt_f), initial(undershirt))
backpack = sanitize_integer(backpack, 1, length(GLOB.backpacklist), initial(backpack))

h_style = sanitize_inlist(h_style, GLOB.hair_styles_list, initial(h_style))
Expand Down Expand Up @@ -558,17 +553,12 @@
quick_equip = sanitize_islist(quick_equip, QUICK_EQUIP_ORDER, MAX_QUICK_EQUIP_SLOTS, TRUE, VALID_EQUIP_SLOTS)
for(var/quick_equip_slots in quick_equip)
quick_equip_slots = sanitize_inlist(quick_equip_slots, SLOT_DRAW_ORDER[quick_equip], initial(quick_equip_slots))
switch(gender)
if(MALE)
underwear = sanitize_integer(underwear, 1, length(GLOB.underwear_m), initial(underwear))
undershirt = sanitize_integer(undershirt, 1, length(GLOB.undershirt_m), initial(undershirt))
if(FEMALE)
underwear = sanitize_integer(underwear, 1, length(GLOB.underwear_f), initial(underwear))
undershirt = sanitize_integer(undershirt, 1, length(GLOB.undershirt_f), initial(undershirt))
else
underwear = sanitize_integer(underwear, 1, length(GLOB.underwear_n), initial(underwear))
undershirt = sanitize_integer(undershirt, 1, length(GLOB.undershirt_n), initial(undershirt))

if(gender == MALE)
underwear = sanitize_integer(underwear, 1, length(GLOB.underwear_m), initial(underwear))
undershirt = sanitize_integer(undershirt, 1, length(GLOB.undershirt_m), initial(undershirt))
else
underwear = sanitize_integer(underwear, 1, length(GLOB.underwear_f), initial(underwear))
undershirt = sanitize_integer(undershirt, 1, length(GLOB.undershirt_f), initial(undershirt))
backpack = sanitize_integer(backpack, 1, length(GLOB.backpacklist), initial(backpack))

h_style = sanitize_inlist(h_style, GLOB.hair_styles_list, initial(h_style))
Expand Down
15 changes: 6 additions & 9 deletions code/modules/client/preferences_ui.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,12 +156,12 @@
"underwear" = list(
"male" = GLOB.underwear_m,
"female" = GLOB.underwear_f,
"plural" = GLOB.underwear_n
"plural" = GLOB.underwear_f + GLOB.underwear_m,
),
"undershirt" = list(
"male" = GLOB.undershirt_m,
"female" = GLOB.undershirt_f,
"plural" = GLOB.undershirt_n
"plural" = GLOB.undershirt_m + GLOB.undershirt_f,
),
"backpack" = GLOB.backpacklist,
)
Expand Down Expand Up @@ -339,13 +339,10 @@

if("underwear")
var/list/underwear_options
switch(gender)
if(MALE)
underwear_options = GLOB.underwear_m
if(FEMALE)
underwear_options = GLOB.underwear_f
else
underwear_options = GLOB.underwear_n
if(gender == MALE)
underwear_options = GLOB.underwear_m
else
underwear_options = GLOB.underwear_f

var/new_underwear = underwear_options.Find(params["newValue"])
if(!new_underwear)
Expand Down
4 changes: 2 additions & 2 deletions code/modules/mob/living/carbon/human/update_icons.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -290,8 +290,8 @@ GLOBAL_LIST_EMPTY(damage_icon_parts)


if(species.species_flags & HAS_UNDERWEAR)
stand_icon.Blend(new /icon('icons/mob/human.dmi', "underwear_[underwear]"), ICON_OVERLAY)
stand_icon.Blend(new /icon('icons/mob/human.dmi', "undershirt_[undershirt]"), ICON_OVERLAY)
stand_icon.Blend(new /icon('icons/mob/human.dmi', "underwear_[underwear]_[gender]"), ICON_OVERLAY)
stand_icon.Blend(new /icon('icons/mob/human.dmi', "undershirt_[undershirt]_[gender]"), ICON_OVERLAY)

icon = stand_icon

Expand Down
Binary file modified icons/mob/human.dmi
View file
Binary file not shown.

0 comments on commit 1192f5b

Please sign in to comment.