[SEMI-MODULAR] Underwear and Bra split (#23269)

* First go, should be all set.

* Adds SKYRATS additions

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* code markings

* modular code markings

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* modular code markings

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* shuffle socks and undershirt color

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* adds a space and sanitizes

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* various comment and modular fixes

* more spacing

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* more spacing

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* various spacing fixes

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* variable comment

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* Fixes a dumb oversight

* fixes the return list.

* converts the bras properly

* Apply suggestions from code review

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* fixes the overlaying issue.

* Apply suggestions from code review

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* adds the space

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* adds the descrptiors to changling vars

* Fixes a small oversight

* hard resolves the conflict by merging safekini

* Removed a duplicated proc

* Reverted Baby-Doll to Babydoll (for simplicity in the future)

* Implement the migration for bras from the various sources it could come from

Also cleans up some of the code in that file, so that should help nicely.

* Fixed the bikini underwear update

* Fixed issue with migrating the safekini

* sets the binder to be a bra.

* disables the bra as a undershirt

---------

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
This commit is contained in:
lukevale
2023-09-23 13:40:30 -04:00
committed by GitHub
co-authored by GoldenAlpharex GoldenAlpharex
parent 86e5130486
commit 2b38953932
31 changed files with 594 additions and 262 deletions
@@ -548,9 +548,12 @@
new_profile.socks = target.socks
// SKYRAT EDIT START
new_profile.bra = target.bra
new_profile.underwear_color = target.underwear_color
new_profile.undershirt_color = target.undershirt_color
new_profile.socks_color = target.socks_color
new_profile.bra_color = target.bra_color
new_profile.eye_color_left = target.eye_color_left
new_profile.eye_color_right = target.eye_color_right
new_profile.emissive_eyes = target.emissive_eyes
@@ -790,9 +793,12 @@
user.socks = chosen_profile.socks
// SKYRAT EDIT START
user.bra = chosen_profile.bra
user.underwear_color = chosen_profile.underwear_color
user.undershirt_color = chosen_profile.undershirt_color
user.socks_color = chosen_profile.socks_color
user.bra_color = chosen_profile.bra_color
user.emissive_eyes = chosen_profile.emissive_eyes
user.dna.mutant_bodyparts = chosen_dna.mutant_bodyparts.Copy()
user.dna.body_markings = chosen_dna.body_markings.Copy()
@@ -974,27 +980,6 @@
/// ID HUD icon associated with the profile
var/id_icon
/// SKYRAT EDIT START
var/underwear_color
var/undershirt_color
var/socks_color
var/eye_color_left
var/eye_color_right
var/emissive_eyes
var/list/grad_style = list("None", "None")
var/list/grad_color = list(null, null)
var/physique
var/list/worn_icon_digi_list = list()
var/list/worn_icon_monkey_list = list()
var/list/worn_icon_teshari_list = list()
var/list/worn_icon_vox_list = list()
var/list/supports_variations_flags_list = list()
var/scream_type
var/laugh_type
var/age
var/list/quirks = list()
/// SKYRAT EDIT END
/// The TTS voice of the profile source
var/voice
@@ -1037,6 +1022,8 @@
new_profile.underwear_color = underwear_color
new_profile.undershirt_color = undershirt_color
new_profile.socks_color = socks_color
new_profile.bra = bra
new_profile.bra_color = bra_color
new_profile.eye_color_left = eye_color_left
new_profile.eye_color_right = eye_color_right
new_profile.emissive_eyes = emissive_eyes
@@ -845,6 +845,7 @@ GLOBAL_LIST_EMPTY(features_by_species)
human_mob.undershirt = random_undershirt(human_mob.gender)
human_mob.underwear = random_underwear(human_mob.gender)
human_mob.socks = random_socks(human_mob.gender)
human_mob.bra = random_bra(human_mob.gender) //SKYRAT EDIT ADDITION - Underwear and Bra split
///Proc that will randomise the underwear (i.e. top, pants and socks) of a species' associated mob
/datum/species/proc/randomize_active_underwear(mob/living/carbon/human/human_mob)
@@ -247,7 +247,6 @@
destination.socks = socks
destination.jumpsuit_style = jumpsuit_style
/// Fully randomizes everything according to the given flags.
/mob/living/carbon/human/proc/randomize_human_appearance(randomize_flags = ALL)
var/datum/preferences/preferences = new(new /datum/client_interface)
+1
View File
@@ -58,6 +58,7 @@
spawned_human.underwear = "Nude"
spawned_human.undershirt = "Nude"
spawned_human.socks = "Nude"
spawned_human.bra = "Nude" //SKYRAT EDIT ADDITION
if(hairstyle)
spawned_human.hairstyle = hairstyle
else