cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-12 07:33:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

allow for undershirts to be ckey-enabled (#30795)

Browse Source
This commit is contained in:
warriorstar-orion
2025-10-26 18:17:32 -04:00
committed by GitHub
parent 2afd734f38
commit 601ff5601e
9 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference/character.dm
+1 -1
View File
@@ -1017,7 +1017,7 @@
var/icon/undershirt_s = null
if(undershirt && (current_species.clothing_flags & HAS_UNDERSHIRT))
var/datum/sprite_accessory/undershirt/U2 = GLOB.undershirt_list[undershirt]
var/datum/sprite_accessory/undershirt/U2 = GLOB.undershirt_full_list[undershirt]
if(U2)
var/u2_icon = U2.sprite_sheets && (current_species.sprite_sheet_name in U2.sprite_sheets) ? U2.sprite_sheets[current_species.sprite_sheet_name] : U2.icon
undershirt_s = new/icon(u2_icon, "us_[U2.icon_state]_s", ICON_OVERLAY)
code/modules/client/preference/link_processing.dm
+3
View File
@@ -613,6 +613,9 @@
if(active_character.body_type == FEMALE && SA.body_type == MALE)
continue
valid_undershirts[undershirt] = GLOB.undershirt_list[undershirt]
for(var/config in GLOB.configuration.custom_sprites.fluff_undershirts)
if(user.ckey in config["ckeys"])
valid_undershirts[config["name"]] = GLOB.undershirt_full_list[config["name"]]
sortTim(valid_undershirts, GLOBAL_PROC_REF(cmp_text_asc))
var/new_undershirt = tgui_input_list(user, "Choose your character's undershirt", "Character Preference", valid_undershirts)
ShowChoices(user)
code/modules/mob/living/carbon/human/human_update_icons.dm
+1 -1
View File
@@ -257,7 +257,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts)
underwear_standing.Blend(new /icon(u_icon, "uw_[U.icon_state]_s"), ICON_OVERLAY)
if(undershirt && dna.species.clothing_flags & HAS_UNDERSHIRT)
var/datum/sprite_accessory/undershirt/U2 = GLOB.undershirt_list[undershirt]
var/datum/sprite_accessory/undershirt/U2 = GLOB.undershirt_full_list[undershirt]
if(U2)
var/u2_icon = U2.sprite_sheets && (dna.species.sprite_sheet_name in U2.sprite_sheets) ? U2.sprite_sheets[dna.species.sprite_sheet_name] : U2.icon
underwear_standing.Blend(new /icon(u2_icon, "us_[U2.icon_state]_s"), ICON_OVERLAY)