cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-28 15:47:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/dresser.dm
+14 -3
View File
@@ -36,7 +36,7 @@
to_chat(dressing_human, span_warning("You are not capable of wearing underwear."))
return
var/choice = tgui_input_list(user, "Underwear, Undershirt, or Socks?", "Changing", list("Underwear", "Underwear Color", "Undershirt", "Socks", "Undershirt Color", "Socks Color")) //SKYRAT EDIT ADDITION - Colorable Undershirt/Socks
var/choice = tgui_input_list(user, "Underwear, Bra, Undershirt, or Socks?", "Changing", list("Underwear", "Underwear Color", "Bra", "Bra Color", "Undershirt", "Undershirt Color", "Socks", "Socks Color")) //SKYRAT EDIT ADDITION - Colorable Undershirt/Socks/Bra
if(isnull(choice))
return
@@ -59,7 +59,7 @@
var/new_socks = tgui_input_list(user, "Select your socks", "Changing", GLOB.socks_list)
if(new_socks)
dressing_human.socks = new_socks
//SKYRAT EDIT ADDITION BEGIN - Colorable Undershirt/Socks
//SKYRAT EDIT ADDITION BEGIN - Colorable Undershirt/Socks/Bras
if("Undershirt Color")
var/new_undershirt_color = input(dressing_human, "Choose your undershirt color", "Undershirt Color", dressing_human.undershirt_color) as color|null
if(new_undershirt_color)
@@ -68,7 +68,18 @@
var/new_socks_color = input(dressing_human, "Choose your socks color", "Socks Color", dressing_human.socks_color) as color|null
if(new_socks_color)
dressing_human.socks_color = sanitize_hexcolor(new_socks_color)
//SKYRAT EDIT ADDITION END - Colorable Undershirt/Socks
if("Bra")
var/new_bra = tgui_input_list(user, "Select your Bra", "Changing", GLOB.bra_list)
if(new_bra)
dressing_human.bra = new_bra
if("Bra Color")
var/new_bra_color = input(dressing_human, "Choose your Bra color", "Bra Color", dressing_human.bra_color) as color|null
if(new_bra_color)
dressing_human.bra_color = sanitize_hexcolor(new_bra_color)
//SKYRAT EDIT ADDITION END - Colorable Undershirt/Socks/Bras
add_fingerprint(dressing_human)
dressing_human.update_body()
code/game/objects/structures/mannequin.dm
+13 -1
View File
@@ -109,6 +109,12 @@
var/datum/sprite_accessory/socks/socks = GLOB.socks_list[socks_name]
if(socks)
. += mutable_appearance(socks.icon, socks.icon_state, -BODY_LAYER)
//SKYRAT EDIT ADDITION BEGIN - Underwear and Bra split
var/datum/sprite_accessory/bra/bra = GLOB.bra_list[bra_name]
if(bra)
. += mutable_appearance(bra.icon, bra.icon_state, -BODY_LAYER)
//SKYRAT EDIT END
for(var/slot_flag in worn_items)
var/obj/item/worn_item = worn_items[slot_flag]
if(!worn_item)
@@ -162,7 +168,7 @@
. = ..()
if(. == SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN)
return
var/choice = tgui_input_list(user, "Underwear, Undershirt, or Socks?", "Changing", list("Underwear","Undershirt","Socks"))
var/choice = tgui_input_list(user, "Underwear, Bra, Undershirt, or Socks?", "Changing", list("Underwear", "Bra", "Undershirt","Socks")) //SKYRAT EDIT ADDITION - Underwear and Bra split
if(!Adjacent(user))
return
switch(choice)
@@ -178,6 +184,12 @@
var/new_socks = tgui_input_list(user, "Select the mannequin's socks", "Changing", GLOB.socks_list)
if(new_socks)
socks_name = new_socks
//SKYRAT EDIT ADDITION BEGIN - Underwear and Bra split
if("Bra")
var/new_bra = tgui_input_list(user, "Select the mannequin's bra", "Changing", GLOB.bra_list)
if(new_bra)
bra_name = new_bra
//SKYRAT EDIT END
update_appearance()
/obj/structure/mannequin/wood