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

[SEMI-MODULAR] [READY] Underwear Ports, in 2022? Also fixing dutch jacket (#14069)

Browse Source 
* yetanotherfashionshow

* why is my second commit always named 'wew.' like, what's with that shit.

* recolorables

* Apply suggestions from code review

Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>

* yeah baby

* yeah sure

Co-authored-by: Snakebittenn <12636964+Snakebittenn@users.noreply.github.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
This commit is contained in:
Nerevar
2022-06-07 21:07:11 -04:00
committed by GitHub
co-authored by Tom Snakebittenn
parent fa2bbb0876
commit 27ddc6c0ab
3 changed files with 132 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
icons/mob/clothing/suit.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 320 KiB

After

Width:  |  Height:  |  Size: 330 KiB

modular_skyrat/master_files/icons/mob/clothing/underwear.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 98 KiB

After

Width:  |  Height:  |  Size: 105 KiB

modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories.dm
+132 -10
View File
@@ -169,6 +169,11 @@ GLOBAL_LIST_EMPTY(cached_mutant_icon_files)
icon_state = "socks_knee"
use_static = null
/datum/sprite_accessory/socks/stirrups_knee
name = "Knee-high Stirrups"
icon_state = "socks_knee-stir"
use_static = null
/datum/sprite_accessory/socks/striped_knee
name = "Knee-high - Striped"
icon_state = "striped_knee"
@@ -184,6 +189,16 @@ GLOBAL_LIST_EMPTY(cached_mutant_icon_files)
icon_state = "socks_norm"
use_static = null
/datum/sprite_accessory/socks/stirrups_norm
name = "Normal Stirrups"
icon_state = "socks_norm-stir"
use_static = null
/datum/sprite_accessory/socks/stirrups_mid
name = "Mid-Length Stirrups"
icon_state = "socks_mid-stir"
use_static = null
/datum/sprite_accessory/socks/socks_short
name = "Short"
icon_state = "socks_short"
@@ -194,11 +209,21 @@ GLOBAL_LIST_EMPTY(cached_mutant_icon_files)
icon_state = "socks_thigh"
use_static = null
/datum/sprite_accessory/socks/stirrups_thigh
name = "Thigh-high Stirrups"
icon_state = "socks_thigh-stir"
use_static = null
/datum/sprite_accessory/socks/striped_thigh
name = "Thigh-high (Striped)"
icon_state = "striped_thigh"
use_static = null
/datum/sprite_accessory/socks/striped_thigh/stirrups
name = "Thigh-high (Striped Stirrups)"
icon_state = "striped_thigh-stir"
use_static = null
/datum/sprite_accessory/socks/bee_thigh
name = "Thigh-high - Bee (Old)"
icon_state = "bee_thigh_old"
@@ -247,23 +272,56 @@ GLOBAL_LIST_EMPTY(cached_mutant_icon_files)
name = "Knee-high - Rainbow"
icon_state = "rainbow_knee"
/datum/sprite_accessory/socks/rainbow_knee/stirrups
name = "Knee-high - Rainbow Stirrups"
icon_state = "rainbow_knee-stir"
/datum/sprite_accessory/socks/rainbow_thigh
name = "Thigh-high - Rainbow"
icon_state = "rainbow_thigh"
/datum/sprite_accessory/socks/rainbow_thigh/stirrups
name = "Thigh-high - Rainbow Stirrups"
icon_state = "rainbow_thigh-stir"
/datum/sprite_accessory/socks/fishnet_thigh
name = "Thigh-high - Fishnet"
icon_state = "fishnet"
/datum/sprite_accessory/socks/fishnet_thigh/alt
name = "Thigh-high - Fishnet Alt"
icon_state = "fishnet_alt"
use_static = null
/datum/sprite_accessory/socks/pantyhose/stirrups
name = "Pantyhose Stirrups"
icon_state = "pantyhose-stir"
use_static = null
/datum/sprite_accessory/socks/pantyhose_ripped
name = "Pantyhose - Ripped"
icon_state = "pantyhose_ripped"
use_static = null
/datum/sprite_accessory/socks/pantyhose_ripped/stirrups
name = "Pantyhose - Ripped Stirrups"
icon_state = "pantyhose_ripped-stir"
use_static = null
/datum/sprite_accessory/socks/stockings_ripped
name = "Stockings - Ripped"
icon_state = "stockings_ripped"
/datum/sprite_accessory/socks/leggings
name = "Leggings"
icon_state = "leggings"
use_static = null
/datum/sprite_accessory/socks/leggings/stirrups
name = "Leggings - Stirrups"
icon_state = "leggings-stir"
use_static = null
/datum/sprite_accessory/underwear
icon = 'modular_skyrat/master_files/icons/mob/clothing/underwear.dmi'
///Whether the underwear uses a special sprite for digitigrade style (i.e. briefs, not panties). Adds a "_d" suffix to the icon state
@@ -298,6 +356,11 @@ GLOBAL_LIST_EMPTY(cached_mutant_icon_files)
gender = FEMALE
use_static = TRUE
/datum/sprite_accessory/underwear/fishnet_lower/alt
name = "Panties - Fishnet Alt"
icon_state = "fishnet_lower_alt"
use_static = null
/datum/sprite_accessory/underwear/female_beekini
name = "Panties - Bee-kini"
icon_state = "panties_bee-kini"
@@ -380,7 +443,6 @@ GLOBAL_LIST_EMPTY(cached_mutant_icon_files)
name = "Thong"
icon_state = "thong"
gender = FEMALE
use_static = TRUE
/datum/sprite_accessory/underwear/thong_babydoll
name = "Thong - Alt"
@@ -549,36 +611,51 @@ GLOBAL_LIST_EMPTY(cached_mutant_icon_files)
gender = FEMALE
use_static = null
/datum/sprite_accessory/undershirt/bra_strapless_alt
name = "Bra, Strapless - Alt"
icon_state = "bra_blue"
gender = FEMALE
use_static = null
/datum/sprite_accessory/undershirt/striped_bra
name = "Bra - Striped"
icon_state = "striped_bra"
gender = FEMALE
use_static = null
/datum/sprite_accessory/undershirt/sarashi
name = "Bra - Sarashi"
icon_state = "bandages"
gender = NEUTER
use_static = null
/datum/sprite_accessory/undershirt/fishnet_sleeves
name = "Fishnet - sleeves"
name = "Fishnet - Sleeves"
icon_state = "fishnet_sleeves"
gender = FEMALE
use_static = TRUE
/datum/sprite_accessory/undershirt/fishnet_sleeves/alt
name = "Fishnet - Sleeves Alt"
icon_state = "fishnet_sleeves_alt"
use_static = null
/datum/sprite_accessory/undershirt/fishnet_gloves
name = "Fishnet - gloves"
name = "Fishnet - Gloves"
icon_state = "fishnet_gloves"
gender = FEMALE
use_static = TRUE
/datum/sprite_accessory/undershirt/fishnet_gloves/alt
name = "Fishnet - Gloves Alt"
icon_state = "fishnet_gloves_alt"
use_static = null
/datum/sprite_accessory/undershirt/fishnet_base
name = "Fishnet - top"
name = "Fishnet - Top"
icon_state = "fishnet_body"
gender = FEMALE
use_static = TRUE
/datum/sprite_accessory/undershirt/fishnet_base/alt
name = "Fishnet - Top Alt"
icon_state = "fishnet_body_alt"
use_static = null
/datum/sprite_accessory/undershirt/swimsuit
name = "Swimsuit Top"
icon_state = "bra_swimming"
@@ -632,3 +709,48 @@ GLOBAL_LIST_EMPTY(cached_mutant_icon_files)
icon_state = "shirt_bc"
gender = NEUTER
/datum/sprite_accessory/undershirt/striped
name = "Shirt - Black Stripes"
icon_state = "longstripe"
gender = NEUTER
use_static = TRUE
/datum/sprite_accessory/undershirt/striped/blue
name = "Shirt - Blue Stripes"
icon_state = "longstripe_blue"
/datum/sprite_accessory/undershirt/binder
name = "Binder"
icon_state = "binder"
gender = MALE
use_static = null
/datum/sprite_accessory/undershirt/binder/strapless
name = "Binder - Strapless"
icon_state = "binder_strapless"
/datum/sprite_accessory/undershirt/turtleneck
name = "Sweater - Turtleneck"
icon_state = "turtleneck"
use_static = null
gender = NEUTER
/datum/sprite_accessory/undershirt/turtleneck/sleeveless
name = "Sweater - Sleeveless Turtleneck"
icon_state = "turtleneck_sleeveless"
/datum/sprite_accessory/undershirt/offshoulder
name = "Shirt - Off-Shoulder"
icon_state = "one_arm"
gender = FEMALE
use_static = null
/datum/sprite_accessory/undershirt/leotard
name = "Shirt - Leotard"
icon_state = "leotard"
gender = FEMALE
use_static = null
/datum/sprite_accessory/undershirt/leotard/turtleneck
name = "Shirt - Turtleneck Leotard"
icon_state = "leotard_turtleneck"