Merge branch 'master' into master
This commit is contained in:
Thalpy
@@ -6,8 +6,11 @@
|
||||
else
|
||||
gender = pick(MALE,FEMALE)
|
||||
underwear = random_underwear(gender)
|
||||
undie_color = random_color()
|
||||
undershirt = random_undershirt(gender)
|
||||
shirt_color = random_color()
|
||||
socks = random_socks()
|
||||
socks_color = random_color()
|
||||
skin_tone = random_skin_tone()
|
||||
hair_style = random_hair_style(gender)
|
||||
facial_hair_style = random_facial_hair_style(gender)
|
||||
|
||||
@@ -59,4 +59,8 @@
|
||||
var/locked = FALSE //Is this part locked from roundstart selection? Used for parts that apply effects
|
||||
var/dimension_x = 32
|
||||
var/dimension_y = 32
|
||||
var/center = FALSE //Should we center the sprite?
|
||||
var/center = FALSE //Should we center the sprite?
|
||||
|
||||
/datum/sprite_accessory/underwear
|
||||
icon = 'icons/mob/underwear.dmi'
|
||||
var/has_color = FALSE
|
||||
@@ -2,135 +2,132 @@
|
||||
// Socks Definitions //
|
||||
///////////////////////
|
||||
|
||||
/datum/sprite_accessory/socks
|
||||
icon = 'icons/mob/underwear.dmi'
|
||||
|
||||
/datum/sprite_accessory/socks/nude
|
||||
/datum/sprite_accessory/underwear/socks/nude
|
||||
name = "Nude"
|
||||
icon_state = null
|
||||
|
||||
// please make sure they're sorted alphabetically and categorized
|
||||
|
||||
/datum/sprite_accessory/socks/bee_knee
|
||||
name = "Knee-high (Bee)"
|
||||
/datum/sprite_accessory/underwear/socks/socks_knee
|
||||
name = "Knee-high"
|
||||
icon_state = "socks_knee"
|
||||
has_color = TRUE
|
||||
|
||||
/datum/sprite_accessory/underwear/socks/bee_knee
|
||||
name = "Knee-high - Bee"
|
||||
icon_state = "bee_knee"
|
||||
|
||||
/datum/sprite_accessory/socks/black_knee
|
||||
name = "Knee-high (Black)"
|
||||
icon_state = "black_knee"
|
||||
|
||||
/datum/sprite_accessory/socks/commie_knee
|
||||
name = "Knee-High (Commie)"
|
||||
/datum/sprite_accessory/underwear/socks/commie_knee
|
||||
name = "Knee-High - Commie"
|
||||
icon_state = "commie_knee"
|
||||
|
||||
/datum/sprite_accessory/socks/usa_knee
|
||||
name = "Knee-High (Freedom)"
|
||||
/datum/sprite_accessory/underwear/socks/usa_knee
|
||||
name = "Knee-High - Freedom"
|
||||
icon_state = "assblastusa_knee"
|
||||
|
||||
/datum/sprite_accessory/socks/rainbow_knee
|
||||
name = "Knee-high (Rainbow)"
|
||||
/datum/sprite_accessory/underwear/socks/rainbow_knee
|
||||
name = "Knee-high - Rainbow"
|
||||
icon_state = "rainbow_knee"
|
||||
|
||||
/datum/sprite_accessory/socks/striped_knee
|
||||
name = "Knee-high (Striped)"
|
||||
/datum/sprite_accessory/underwear/socks/striped_knee
|
||||
name = "Knee-high - Striped"
|
||||
icon_state = "striped_knee"
|
||||
has_color = TRUE
|
||||
|
||||
/datum/sprite_accessory/socks/thin_knee
|
||||
name = "Knee-high (Thin)"
|
||||
/datum/sprite_accessory/underwear/socks/thin_knee
|
||||
name = "Knee-high - Thin"
|
||||
icon_state = "thin_knee"
|
||||
has_color = TRUE
|
||||
|
||||
/datum/sprite_accessory/socks/uk_knee
|
||||
name = "Knee-High (UK)"
|
||||
/datum/sprite_accessory/underwear/socks/uk_knee
|
||||
name = "Knee-High - UK"
|
||||
icon_state = "uk_knee"
|
||||
|
||||
/datum/sprite_accessory/socks/white_knee
|
||||
name = "Knee-high (White)"
|
||||
icon_state = "white_knee"
|
||||
/datum/sprite_accessory/underwear/socks/socks_norm
|
||||
name = "Normal"
|
||||
icon_state = "socks_norm"
|
||||
has_color = TRUE
|
||||
|
||||
/datum/sprite_accessory/socks/black_norm
|
||||
name = "Normal (Black)"
|
||||
icon_state = "black_norm"
|
||||
/datum/sprite_accessory/underwear/socks/bee_norm
|
||||
name = "Normal - Bee"
|
||||
icon_state = "bee_norm"
|
||||
|
||||
/datum/sprite_accessory/socks/white_norm
|
||||
name = "Normal (White)"
|
||||
icon_state = "white_norm"
|
||||
|
||||
/datum/sprite_accessory/socks/pantyhose
|
||||
/datum/sprite_accessory/underwear/socks/pantyhose
|
||||
name = "Pantyhose"
|
||||
icon_state = "pantyhose"
|
||||
|
||||
/datum/sprite_accessory/socks/black_short
|
||||
name = "Short (Black)"
|
||||
icon_state = "black_short"
|
||||
/datum/sprite_accessory/underwear/socks/socks_short
|
||||
name = "Short"
|
||||
icon_state = "socks_short"
|
||||
has_color = TRUE
|
||||
|
||||
/datum/sprite_accessory/socks/white_short
|
||||
name = "Short (White)"
|
||||
icon_state = "white_short"
|
||||
|
||||
/datum/sprite_accessory/socks/stockings_blue
|
||||
name = "Stockings (Blue)"
|
||||
/datum/sprite_accessory/underwear/socks/stockings_blue
|
||||
name = "Stockings - Blue"
|
||||
icon_state = "stockings_blue"
|
||||
|
||||
/datum/sprite_accessory/socks/stockings_cyan
|
||||
name = "Stockings (Cyan)"
|
||||
/datum/sprite_accessory/underwear/socks/stockings_cyan
|
||||
name = "Stockings - Cyan"
|
||||
icon_state = "stockings_cyan"
|
||||
|
||||
/datum/sprite_accessory/socks/stockings_dpink
|
||||
name = "Stockings (Dark Pink)"
|
||||
/datum/sprite_accessory/underwear/socks/stockings_dpink
|
||||
name = "Stockings - Dark Pink"
|
||||
icon_state = "stockings_dpink"
|
||||
|
||||
/datum/sprite_accessory/socks/stockings_green
|
||||
name = "Stockings (Green)"
|
||||
/datum/sprite_accessory/underwear/socks/stockings_green
|
||||
name = "Stockings - Green"
|
||||
icon_state = "stockings_black"
|
||||
|
||||
/datum/sprite_accessory/socks/stockings_orange
|
||||
name = "Stockings (Orange)"
|
||||
/datum/sprite_accessory/underwear/socks/stockings_orange
|
||||
name = "Stockings - Orange"
|
||||
icon_state = "stockings_orange"
|
||||
|
||||
/datum/sprite_accessory/socks/stockings_programmer
|
||||
name = "Stockings (Programmer)"
|
||||
/datum/sprite_accessory/underwear/socks/stockings_programmer
|
||||
name = "Stockings - Programmer"
|
||||
icon_state = "stockings_lpink"
|
||||
|
||||
/datum/sprite_accessory/socks/stockings_purple
|
||||
name = "Stockings (Purple)"
|
||||
/datum/sprite_accessory/underwear/socks/stockings_purple
|
||||
name = "Stockings - Purple"
|
||||
icon_state = "stockings_purple"
|
||||
|
||||
/datum/sprite_accessory/socks/stockings_yellow
|
||||
name = "Stockings (Yellow)"
|
||||
/datum/sprite_accessory/underwear/socks/stockings_yellow
|
||||
name = "Stockings - Yellow"
|
||||
icon_state = "stockings_yellow"
|
||||
|
||||
/datum/sprite_accessory/socks/bee_thigh
|
||||
name = "Thigh-high (Bee)"
|
||||
/datum/sprite_accessory/underwear/socks/socks_thigh
|
||||
name = "Thigh-high"
|
||||
icon_state = "socks_thigh"
|
||||
has_color = TRUE
|
||||
|
||||
/datum/sprite_accessory/underwear/socks/bee_thigh
|
||||
name = "Thigh-high - Bee"
|
||||
icon_state = "bee_thigh"
|
||||
|
||||
/datum/sprite_accessory/socks/black_thigh
|
||||
name = "Thigh-high (Black)"
|
||||
icon_state = "black_thigh"
|
||||
|
||||
/datum/sprite_accessory/socks/commie_thigh
|
||||
name = "Thigh-high (Commie)"
|
||||
/datum/sprite_accessory/underwear/socks/commie_thigh
|
||||
name = "Thigh-high - Commie"
|
||||
icon_state = "commie_thigh"
|
||||
|
||||
/datum/sprite_accessory/socks/usa_thigh
|
||||
name = "Thigh-high (Freedom)"
|
||||
/datum/sprite_accessory/underwear/socks/usa_thigh
|
||||
name = "Thigh-high - Freedom"
|
||||
icon_state = "assblastusa_thigh"
|
||||
|
||||
/datum/sprite_accessory/socks/rainbow_thigh
|
||||
name = "Thigh-high (Rainbow)"
|
||||
/datum/sprite_accessory/underwear/socks/fishnet
|
||||
name = "Thigh-high - Fishnet"
|
||||
icon_state = "fishnet"
|
||||
|
||||
/datum/sprite_accessory/underwear/socks/rainbow_thigh
|
||||
name = "Thigh-high - Rainbow"
|
||||
icon_state = "rainbow_thigh"
|
||||
|
||||
/datum/sprite_accessory/socks/striped_thigh
|
||||
name = "Thigh-high (Striped)"
|
||||
/datum/sprite_accessory/underwear/socks/striped_thigh
|
||||
name = "Thigh-high - Striped"
|
||||
icon_state = "striped_thigh"
|
||||
has_color = TRUE
|
||||
|
||||
/datum/sprite_accessory/socks/thin_thigh
|
||||
name = "Thigh-high (Thin)"
|
||||
/datum/sprite_accessory/underwear/socks/thin_thigh
|
||||
name = "Thigh-high - Thin"
|
||||
icon_state = "thin_thigh"
|
||||
has_color = TRUE
|
||||
|
||||
/datum/sprite_accessory/socks/uk_thigh
|
||||
name = "Thigh-high (UK)"
|
||||
/datum/sprite_accessory/underwear/socks/uk_thigh
|
||||
name = "Thigh-high - UK"
|
||||
icon_state = "uk_thigh"
|
||||
|
||||
/datum/sprite_accessory/socks/white_thigh
|
||||
name = "Thigh-high (White)"
|
||||
icon_state = "white_thigh"
|
||||
|
||||
@@ -2,311 +2,288 @@
|
||||
// Undershirt Definitions //
|
||||
////////////////////////////
|
||||
|
||||
/datum/sprite_accessory/undershirt
|
||||
icon = 'icons/mob/underwear.dmi'
|
||||
gender = NEUTER
|
||||
|
||||
/datum/sprite_accessory/undershirt/nude
|
||||
/datum/sprite_accessory/underwear/top/nude
|
||||
name = "Nude"
|
||||
icon_state = null
|
||||
|
||||
// please make sure they're sorted alphabetically and categorized
|
||||
|
||||
/datum/sprite_accessory/undershirt/bluejersey
|
||||
/datum/sprite_accessory/underwear/top/longjon
|
||||
name = "Long John Shirt"
|
||||
icon_state = "ljont"
|
||||
has_color = TRUE
|
||||
|
||||
/datum/sprite_accessory/underwear/top/longstripe_black
|
||||
name = "Longsleeve Striped Shirt - Black"
|
||||
icon_state = "longstripe"
|
||||
|
||||
/datum/sprite_accessory/underwear/top/longstripe_blue
|
||||
name = "Longsleeve Striped Shirt - Blue"
|
||||
icon_state = "longstripe_blue"
|
||||
|
||||
/datum/sprite_accessory/underwear/top/shirt
|
||||
name = "Shirt"
|
||||
icon_state = "undershirt"
|
||||
has_color = TRUE
|
||||
|
||||
/datum/sprite_accessory/underwear/top/bowlingw
|
||||
name = "Shirt - Bowling"
|
||||
icon_state = "bowlingw"
|
||||
has_color = TRUE
|
||||
|
||||
/datum/sprite_accessory/underwear/top/bowling
|
||||
name = "Shirt, Bowling - Red"
|
||||
icon_state = "bowling"
|
||||
|
||||
/datum/sprite_accessory/underwear/top/bowlingp
|
||||
name = "Shirt, Bowling - Pink"
|
||||
icon_state = "bowlingp"
|
||||
|
||||
/datum/sprite_accessory/underwear/top/bowlinga
|
||||
name = "Shirt, Bowling - Aqua"
|
||||
icon_state = "bowlinga"
|
||||
|
||||
/datum/sprite_accessory/underwear/top/bluejersey
|
||||
name = "Shirt, Jersey - Blue"
|
||||
icon_state = "shirt_bluejersey"
|
||||
|
||||
/datum/sprite_accessory/undershirt/redjersey
|
||||
/datum/sprite_accessory/underwear/top/redjersey
|
||||
name = "Shirt, Jersey - Red"
|
||||
icon_state = "shirt_redjersey"
|
||||
|
||||
/datum/sprite_accessory/undershirt/bluepolo
|
||||
name = "Shirt, Polo - Blue"
|
||||
icon_state = "bluepolo"
|
||||
/datum/sprite_accessory/underwear/top/polo
|
||||
name = "Shirt - Polo"
|
||||
icon_state = "polo"
|
||||
has_color = TRUE
|
||||
|
||||
/datum/sprite_accessory/undershirt/grayyellowpolo
|
||||
name = "Shirt, Polo - Gray, Yellow"
|
||||
icon_state = "grayyellowpolo"
|
||||
|
||||
/datum/sprite_accessory/undershirt/redpolo
|
||||
name = "Shirt, Polo - Red"
|
||||
icon_state = "redpolo"
|
||||
|
||||
/datum/sprite_accessory/undershirt/whitepolo
|
||||
name = "Shirt, Polo - White"
|
||||
icon_state = "whitepolo"
|
||||
|
||||
/datum/sprite_accessory/undershirt/alienshirt
|
||||
/datum/sprite_accessory/underwear/top/alienshirt
|
||||
name = "Shirt - Alien"
|
||||
icon_state = "shirt_alien"
|
||||
|
||||
/datum/sprite_accessory/undershirt/mondmondjaja
|
||||
/datum/sprite_accessory/underwear/top/mondmondjaja
|
||||
name = "Shirt - Band"
|
||||
icon_state = "band"
|
||||
|
||||
/datum/sprite_accessory/undershirt/shirt_black
|
||||
name = "Shirt - Black"
|
||||
icon_state = "shirt_black"
|
||||
/datum/sprite_accessory/underwear/top/shirt_bee
|
||||
name = "Shirt - Bee"
|
||||
icon_state = "bee_shirt"
|
||||
|
||||
/datum/sprite_accessory/undershirt/blueshirt
|
||||
name = "Shirt - Blue"
|
||||
icon_state = "shirt_blue"
|
||||
|
||||
/datum/sprite_accessory/undershirt/clownshirt
|
||||
/datum/sprite_accessory/underwear/top/clownshirt
|
||||
name = "Shirt - Clown"
|
||||
icon_state = "shirt_clown"
|
||||
|
||||
/datum/sprite_accessory/undershirt/commie
|
||||
/datum/sprite_accessory/underwear/top/commie
|
||||
name = "Shirt - Commie"
|
||||
icon_state = "shirt_commie"
|
||||
|
||||
/datum/sprite_accessory/undershirt/greenshirt
|
||||
name = "Shirt - Green"
|
||||
icon_state = "shirt_green"
|
||||
|
||||
/datum/sprite_accessory/undershirt/shirt_grey
|
||||
name = "Shirt - Grey"
|
||||
icon_state = "shirt_grey"
|
||||
|
||||
/datum/sprite_accessory/undershirt/ian
|
||||
/datum/sprite_accessory/underwear/top/ian
|
||||
name = "Shirt - Ian"
|
||||
icon_state = "ian"
|
||||
|
||||
/datum/sprite_accessory/undershirt/ilovent
|
||||
/datum/sprite_accessory/underwear/top/ilovent
|
||||
name = "Shirt - I Love NT"
|
||||
icon_state = "ilovent"
|
||||
|
||||
/datum/sprite_accessory/undershirt/lover
|
||||
/datum/sprite_accessory/underwear/top/lover
|
||||
name = "Shirt - Lover"
|
||||
icon_state = "lover"
|
||||
|
||||
/datum/sprite_accessory/undershirt/matroska
|
||||
/datum/sprite_accessory/underwear/top/matroska
|
||||
name = "Shirt - Matroska"
|
||||
icon_state = "matroska"
|
||||
|
||||
/datum/sprite_accessory/undershirt/meat
|
||||
/datum/sprite_accessory/underwear/top/meat
|
||||
name = "Shirt - Meat"
|
||||
icon_state = "shirt_meat"
|
||||
|
||||
/datum/sprite_accessory/undershirt/nano
|
||||
/datum/sprite_accessory/underwear/top/nano
|
||||
name = "Shirt - Nanotrasen"
|
||||
icon_state = "shirt_nano"
|
||||
|
||||
/datum/sprite_accessory/undershirt/peace
|
||||
/datum/sprite_accessory/underwear/top/peace
|
||||
name = "Shirt - Peace"
|
||||
icon_state = "peace"
|
||||
|
||||
/datum/sprite_accessory/undershirt/pacman
|
||||
/datum/sprite_accessory/underwear/top/pacman
|
||||
name = "Shirt - Pogoman"
|
||||
icon_state = "pogoman"
|
||||
|
||||
/datum/sprite_accessory/undershirt/question
|
||||
/datum/sprite_accessory/underwear/top/question
|
||||
name = "Shirt - Question"
|
||||
icon_state = "shirt_question"
|
||||
|
||||
/datum/sprite_accessory/undershirt/redshirt
|
||||
name = "Shirt - Red"
|
||||
icon_state = "shirt_red"
|
||||
|
||||
/datum/sprite_accessory/undershirt/skull
|
||||
/datum/sprite_accessory/underwear/top/skull
|
||||
name = "Shirt - Skull"
|
||||
icon_state = "shirt_skull"
|
||||
|
||||
/datum/sprite_accessory/undershirt/ss13
|
||||
/datum/sprite_accessory/underwear/top/ss13
|
||||
name = "Shirt - SS13"
|
||||
icon_state = "shirt_ss13"
|
||||
has_color = TRUE
|
||||
|
||||
/datum/sprite_accessory/undershirt/stripe
|
||||
/datum/sprite_accessory/underwear/top/stripe
|
||||
name = "Shirt - Striped"
|
||||
icon_state = "shirt_stripes"
|
||||
|
||||
/datum/sprite_accessory/undershirt/tiedye
|
||||
/datum/sprite_accessory/underwear/top/tiedye
|
||||
name = "Shirt - Tie-dye"
|
||||
icon_state = "shirt_tiedye"
|
||||
|
||||
/datum/sprite_accessory/undershirt/uk
|
||||
/datum/sprite_accessory/underwear/top/uk
|
||||
name = "Shirt - UK"
|
||||
icon_state = "uk"
|
||||
|
||||
/datum/sprite_accessory/undershirt/usa
|
||||
/datum/sprite_accessory/underwear/top/usa
|
||||
name = "Shirt - USA"
|
||||
icon_state = "shirt_assblastusa"
|
||||
|
||||
/datum/sprite_accessory/undershirt/shirt_white
|
||||
name = "Shirt - White"
|
||||
icon_state = "shirt_white"
|
||||
/datum/sprite_accessory/underwear/top/shortsleeve
|
||||
name = "Shirt - Short Sleeved"
|
||||
icon_state = "shortsleeve"
|
||||
has_color = TRUE
|
||||
|
||||
/datum/sprite_accessory/undershirt/blackshortsleeve
|
||||
name = "Shirt, Short Sleeved - Black"
|
||||
icon_state = "blackshortsleeve"
|
||||
|
||||
/datum/sprite_accessory/undershirt/blueshortsleeve
|
||||
name = "Shirt, Short Sleeved - Blue"
|
||||
icon_state = "blueshortsleeve"
|
||||
|
||||
/datum/sprite_accessory/undershirt/greenshortsleeve
|
||||
name = "Shirt, Short Sleeved - Green"
|
||||
icon_state = "greenshortsleeve"
|
||||
|
||||
/datum/sprite_accessory/undershirt/purpleshortsleeve
|
||||
name = "Shirt, Short Sleeved - Purple"
|
||||
icon_state = "purpleshortsleeve"
|
||||
|
||||
/datum/sprite_accessory/undershirt/whiteshortsleeve
|
||||
name = "Shirt, Short Sleeved - White"
|
||||
icon_state = "whiteshortsleeve"
|
||||
|
||||
/datum/sprite_accessory/undershirt/blueshirtsport
|
||||
/datum/sprite_accessory/underwear/top/blueshirtsport
|
||||
name = "Shirt, Sports - Blue"
|
||||
icon_state = "blueshirtsport"
|
||||
gender = NEUTER
|
||||
|
||||
/datum/sprite_accessory/undershirt/greenshirtsport
|
||||
/datum/sprite_accessory/underwear/top/greenshirtsport
|
||||
name = "Shirt, Sports - Green"
|
||||
icon_state = "greenshirtsport"
|
||||
gender = NEUTER
|
||||
|
||||
/datum/sprite_accessory/undershirt/redshirtsport
|
||||
/datum/sprite_accessory/underwear/top/redshirtsport
|
||||
name = "Shirt, Sports - Red"
|
||||
icon_state = "redshirtsport"
|
||||
gender = NEUTER
|
||||
|
||||
/datum/sprite_accessory/undershirt/redtop
|
||||
name = "Shirt, Short - Red"
|
||||
icon_state = "redtop"
|
||||
|
||||
/datum/sprite_accessory/undershirt/whitetop
|
||||
name = "Shirt, Short - White"
|
||||
icon_state = "whitetop"
|
||||
|
||||
/datum/sprite_accessory/undershirt/tshirt_blue
|
||||
name = "T-Shirt - Blue"
|
||||
icon_state = "blueshirt"
|
||||
|
||||
/datum/sprite_accessory/undershirt/tshirt_green
|
||||
name = "T-Shirt - Green"
|
||||
icon_state = "greenshirt"
|
||||
|
||||
/datum/sprite_accessory/undershirt/tshirt_red
|
||||
name = "T-Shirt - Red"
|
||||
icon_state = "redshirt"
|
||||
|
||||
/datum/sprite_accessory/undershirt/yellowshirt
|
||||
name = "T-Shirt - Yellow"
|
||||
icon_state = "yellowshirt"
|
||||
|
||||
/datum/sprite_accessory/undershirt/tank_black
|
||||
name = "Tank Top - Black"
|
||||
icon_state = "tank_black"
|
||||
|
||||
/datum/sprite_accessory/undershirt/tankfire
|
||||
/datum/sprite_accessory/underwear/top/tankfire
|
||||
name = "Tank Top - Fire"
|
||||
icon_state = "tank_fire"
|
||||
|
||||
/datum/sprite_accessory/undershirt/tank_grey
|
||||
name = "Tank Top - Grey"
|
||||
icon_state = "tank_grey"
|
||||
/datum/sprite_accessory/underwear/top/tanktop
|
||||
name = "Tank Top"
|
||||
icon_state = "tanktop"
|
||||
has_color = TRUE
|
||||
|
||||
/datum/sprite_accessory/undershirt/female_midriff
|
||||
/datum/sprite_accessory/underwear/top/tanktop_alt
|
||||
name = "Tank Top - Alt"
|
||||
icon_state = "tanktop_alt"
|
||||
has_color = TRUE
|
||||
|
||||
/datum/sprite_accessory/underwear/top/tanktop_midriff
|
||||
name = "Tank Top - Midriff"
|
||||
icon_state = "tank_midriff"
|
||||
has_color = TRUE
|
||||
|
||||
/datum/sprite_accessory/undershirt/tank_red
|
||||
name = "Tank Top - Red"
|
||||
icon_state = "tank_red"
|
||||
/datum/sprite_accessory/underwear/top/tanktop_midriff_alt
|
||||
name = "Tank Top - Midriff Halterneck"
|
||||
icon_state = "tank_midriff_alt"
|
||||
has_color = TRUE
|
||||
|
||||
/datum/sprite_accessory/undershirt/tankstripe
|
||||
/datum/sprite_accessory/underwear/top/tankstripe
|
||||
name = "Tank Top - Striped"
|
||||
icon_state = "tank_stripes"
|
||||
|
||||
/datum/sprite_accessory/undershirt/tank_white
|
||||
name = "Tank Top - White"
|
||||
icon_state = "tank_white"
|
||||
/datum/sprite_accessory/underwear/top/tank_top_sun
|
||||
name = "Tank top - Sun"
|
||||
icon_state = "tank_sun"
|
||||
|
||||
/datum/sprite_accessory/undershirt/female_red
|
||||
name = "Bra - Red"
|
||||
icon_state = "bra_red"
|
||||
/datum/sprite_accessory/underwear/top/babydoll
|
||||
name = "Baby-Doll"
|
||||
icon_state = "babydoll"
|
||||
has_color = TRUE
|
||||
|
||||
/datum/sprite_accessory/undershirt/female_pink
|
||||
name = "Bra - Pink"
|
||||
icon_state = "bra_pink"
|
||||
/datum/sprite_accessory/underwear/top/bra
|
||||
name = "Bra"
|
||||
icon_state = "bra"
|
||||
has_color = TRUE
|
||||
|
||||
/datum/sprite_accessory/undershirt/female_kinky
|
||||
/datum/sprite_accessory/underwear/top/bra_alt
|
||||
name = "Bra - Alt"
|
||||
icon_state = "bra_alt"
|
||||
has_color = TRUE
|
||||
|
||||
/datum/sprite_accessory/underwear/top/bra_thin
|
||||
name = "Bra - Thin"
|
||||
icon_state = "bra_thin"
|
||||
has_color = TRUE
|
||||
|
||||
/datum/sprite_accessory/underwear/top/bra_kinky
|
||||
name = "Bra - Kinky Black"
|
||||
icon_state = "bra_kinky"
|
||||
|
||||
/datum/sprite_accessory/undershirt/female_green
|
||||
name = "Bra - Green"
|
||||
icon_state = "bra_green"
|
||||
|
||||
/datum/sprite_accessory/undershirt/female_commie
|
||||
/datum/sprite_accessory/underwear/top/bra_freedom
|
||||
name = "Bra - Freedom"
|
||||
icon_state = "bra_assblastusa"
|
||||
|
||||
/datum/sprite_accessory/undershirt/female_commie
|
||||
/datum/sprite_accessory/underwear/top/bra_commie
|
||||
name = "Bra - Commie"
|
||||
icon_state = "bra_commie"
|
||||
|
||||
/datum/sprite_accessory/undershirt/female_babyblue
|
||||
name = "Bra - Baby Blue"
|
||||
icon_state = "bra_babyblue"
|
||||
|
||||
/datum/sprite_accessory/undershirt/female_beekini
|
||||
/datum/sprite_accessory/underwear/top/bra_beekini
|
||||
name = "Bra - Bee-kini"
|
||||
icon_state = "bra_bee-kini"
|
||||
|
||||
/datum/sprite_accessory/undershirt/female_black
|
||||
name = "Bra - Black"
|
||||
icon_state = "bra_black"
|
||||
|
||||
/datum/sprite_accessory/undershirt/female_uk
|
||||
/datum/sprite_accessory/underwear/top/bra_uk
|
||||
name = "Bra - UK"
|
||||
icon_state = "bra_uk"
|
||||
|
||||
/datum/sprite_accessory/undershirt/female_white
|
||||
name = "Bra - White"
|
||||
icon_state = "bra_white"
|
||||
/datum/sprite_accessory/underwear/top/bra_neko
|
||||
name = "Bra - Neko"
|
||||
icon_state = "bra_neko"
|
||||
has_color = TRUE
|
||||
|
||||
/datum/sprite_accessory/undershirt/female_white_neko
|
||||
name = "Bra, Neko - white"
|
||||
icon_state = "bra_neko_white"
|
||||
/datum/sprite_accessory/underwear/top/halterneck_bra
|
||||
name = "Bra - Halterneck"
|
||||
icon_state = "halterneck_bra"
|
||||
has_color = TRUE
|
||||
|
||||
/datum/sprite_accessory/undershirt/female_black_neko
|
||||
name = "Bra, Neko - Black"
|
||||
icon_state = "bra_neko_black"
|
||||
|
||||
/datum/sprite_accessory/undershirt/female_blackalt
|
||||
name = "Bra, Sports - Black"
|
||||
icon_state = "bra_sports_black"
|
||||
|
||||
/datum/sprite_accessory/undershirt/sports_bra
|
||||
name = "Bra, Sports 1 - White"
|
||||
/datum/sprite_accessory/underwear/top/sports_bra
|
||||
name = "Bra, Sports"
|
||||
icon_state = "sports_bra"
|
||||
has_color = TRUE
|
||||
|
||||
/datum/sprite_accessory/undershirt/female_whitealt
|
||||
name = "Bra, Sports 2 - White"
|
||||
icon_state = "bra_sports_white"
|
||||
|
||||
/datum/sprite_accessory/undershirt/sports_bra2
|
||||
name = "Bra, Sports 3 - White"
|
||||
/datum/sprite_accessory/underwear/top/sports_bra_alt
|
||||
name = "Bra, Sports - Alt"
|
||||
icon_state = "sports_bra_alt"
|
||||
has_color = TRUE
|
||||
|
||||
/datum/sprite_accessory/undershirt/female_yellow
|
||||
name = "Bra - Yellow"
|
||||
icon_state = "bra_yellow"
|
||||
/datum/sprite_accessory/underwear/top/bra_strapless
|
||||
name = "Bra, Strapless"
|
||||
icon_state = "bra_strapless"
|
||||
has_color = TRUE
|
||||
|
||||
/datum/sprite_accessory/undershirt/female_thong
|
||||
name = "Bra, Strapless - Pink"
|
||||
icon_state = "bra_strapless_pink"
|
||||
|
||||
/datum/sprite_accessory/undershirt/female_blue
|
||||
name = "Bra, Strapless - Blue"
|
||||
/datum/sprite_accessory/underwear/top/bra_strapless_alt
|
||||
name = "Bra, Strapless - Alt"
|
||||
icon_state = "bra_blue"
|
||||
has_color = TRUE
|
||||
|
||||
/datum/sprite_accessory/undershirt/swimsuit_green
|
||||
name = "Swimsuit, Top - Green"
|
||||
icon_state = "bra_swimming_green"
|
||||
/datum/sprite_accessory/underwear/top/striped_bra
|
||||
name = "Bra - Striped"
|
||||
icon_state = "striped_bra"
|
||||
has_color = TRUE
|
||||
|
||||
/datum/sprite_accessory/undershirt/swimsuit_purple
|
||||
name = "Swimsuit, Top - Purple"
|
||||
icon_state = "bra_swimming_purple"
|
||||
/datum/sprite_accessory/underwear/top/fishnet_sleeves
|
||||
name = "Fishnet - sleeves"
|
||||
icon_state = "fishnet_sleeves"
|
||||
|
||||
/datum/sprite_accessory/underwear/top/fishnet_gloves
|
||||
name = "Fishnet - gloves"
|
||||
icon_state = "fishnet_gloves"
|
||||
|
||||
/datum/sprite_accessory/underwear/top/fishnet_base
|
||||
name = "Fishnet - top"
|
||||
icon_state = "fishnet_body"
|
||||
|
||||
/datum/sprite_accessory/underwear/top/swimsuit
|
||||
name = "Swimsuit Top"
|
||||
icon_state = "bra_swimming"
|
||||
has_color = TRUE
|
||||
|
||||
/datum/sprite_accessory/underwear/top/swimsuit_alt
|
||||
name = "Swimsuit Top - Strapless"
|
||||
icon_state = "bra_swimming_alt"
|
||||
has_color = TRUE
|
||||
|
||||
/datum/sprite_accessory/underwear/top/tubetop
|
||||
name = "Tube Top"
|
||||
icon_state = "tubetop"
|
||||
has_color = TRUE
|
||||
@@ -1,174 +1,144 @@
|
||||
///////////////////////////
|
||||
// Underwear Definitions //
|
||||
///////////////////////////
|
||||
/datum/sprite_accessory/underwear
|
||||
icon = 'icons/mob/underwear.dmi'
|
||||
gender = NEUTER
|
||||
|
||||
/datum/sprite_accessory/underwear/nude
|
||||
/datum/sprite_accessory/underwear/bottom/nude
|
||||
name = "Nude"
|
||||
icon_state = null
|
||||
|
||||
/datum/sprite_accessory/underwear/mankini
|
||||
name = "Mankini - Green"
|
||||
icon_state = "mankini_green"
|
||||
/datum/sprite_accessory/underwear/bottom/mankini
|
||||
name = "Mankini"
|
||||
icon_state = "mankini"
|
||||
has_color = TRUE
|
||||
|
||||
/datum/sprite_accessory/underwear/male_kinky
|
||||
name = "Jockstrap - White"
|
||||
icon_state = "jockstrap_white"
|
||||
/datum/sprite_accessory/underwear/bottom/male_kinky
|
||||
name = "Jockstrap"
|
||||
icon_state = "jockstrap"
|
||||
has_color = TRUE
|
||||
|
||||
/datum/sprite_accessory/underwear/male_white
|
||||
name = "Briefs - White"
|
||||
icon_state = "briefs_white"
|
||||
/datum/sprite_accessory/underwear/bottom/briefs
|
||||
name = "Briefs"
|
||||
icon_state = "briefs"
|
||||
has_color = TRUE
|
||||
|
||||
/datum/sprite_accessory/underwear/male_black
|
||||
name = "Briefs - Black"
|
||||
icon_state = "briefs_black"
|
||||
/datum/sprite_accessory/underwear/bottom/boxers
|
||||
name = "Boxers"
|
||||
icon_state = "boxers"
|
||||
has_color = TRUE
|
||||
|
||||
/datum/sprite_accessory/underwear/male_grey
|
||||
name = "Briefs - Grey"
|
||||
icon_state = "briefs_grey"
|
||||
/datum/sprite_accessory/underwear/bottom/male_bee
|
||||
name = "Boxers - Bee"
|
||||
icon_state = "bee_shorts"
|
||||
|
||||
/datum/sprite_accessory/underwear/male_red
|
||||
name = "Briefs - Red"
|
||||
icon_state = "briefs_red"
|
||||
|
||||
/datum/sprite_accessory/underwear/male_green
|
||||
name = "Briefs - Green"
|
||||
icon_state = "briefs_green"
|
||||
|
||||
/datum/sprite_accessory/underwear/male_blue
|
||||
name = "Briefs - Blue"
|
||||
icon_state = "briefs_blue"
|
||||
|
||||
/datum/sprite_accessory/underwear/male_blackalt
|
||||
name = "Boxers - Black"
|
||||
icon_state = "boxers_black"
|
||||
|
||||
/datum/sprite_accessory/underwear/male_greyalt
|
||||
name = "Boxers - Grey"
|
||||
icon_state = "boxers_grey"
|
||||
|
||||
/datum/sprite_accessory/underwear/male_hearts
|
||||
/datum/sprite_accessory/underwear/bottom/male_hearts
|
||||
name = "Boxers - Heart"
|
||||
icon_state = "boxers_heart"
|
||||
|
||||
/datum/sprite_accessory/underwear/male_stripe
|
||||
/datum/sprite_accessory/underwear/bottom/male_stripe
|
||||
name = "Boxers - Striped"
|
||||
icon_state = "boxers_striped"
|
||||
|
||||
/datum/sprite_accessory/underwear/male_commie
|
||||
/datum/sprite_accessory/underwear/bottom/male_commie
|
||||
name = "Boxers - Striped Communist"
|
||||
icon_state = "boxers_commie"
|
||||
|
||||
/datum/sprite_accessory/underwear/male_usastripe
|
||||
/datum/sprite_accessory/underwear/bottom/male_usastripe
|
||||
name = "Boxers - Striped Freedom"
|
||||
icon_state = "boxers_assblastusa"
|
||||
|
||||
/datum/sprite_accessory/underwear/male_uk
|
||||
/datum/sprite_accessory/underwear/bottom/male_uk
|
||||
name = "Boxers - Striped UK"
|
||||
icon_state = "boxers_uk"
|
||||
|
||||
/datum/sprite_accessory/underwear/bottom/boxer_briefs
|
||||
name = "Boxer Briefs"
|
||||
icon_state = "boxer_briefs"
|
||||
has_color = TRUE
|
||||
|
||||
/datum/sprite_accessory/underwear/female_whitealt
|
||||
name = "Boxer Briefs - White"
|
||||
icon_state = "boxer_briefs_white"
|
||||
/datum/sprite_accessory/underwear/bottom/panties
|
||||
name = "Panties"
|
||||
icon_state = "panties"
|
||||
has_color = TRUE
|
||||
|
||||
/datum/sprite_accessory/underwear/female_blackalt
|
||||
name = "Boxer Briefs - Black"
|
||||
icon_state = "boxer_briefs_black"
|
||||
/datum/sprite_accessory/underwear/bottom/panties_alt
|
||||
name = "Panties - Alt"
|
||||
icon_state = "panties_alt"
|
||||
has_color = TRUE
|
||||
|
||||
/datum/sprite_accessory/underwear/female_pink
|
||||
name = "Boxer Briefs - Pink"
|
||||
icon_state = "boxer_briefs_pink"
|
||||
/datum/sprite_accessory/underwear/bottom/fishnet_lower
|
||||
name = "Panties - Fishnet"
|
||||
icon_state = "fishnet_lower"
|
||||
|
||||
/datum/sprite_accessory/underwear/female_babyblue
|
||||
name = "Boxer Briefs - Baby Blue"
|
||||
icon_state = "boxer_briefs_babyblue"
|
||||
|
||||
/datum/sprite_accessory/underwear/female_yellow
|
||||
name = "Boxer Briefs - Yellow"
|
||||
icon_state = "boxer_briefs_yellow"
|
||||
|
||||
/datum/sprite_accessory/underwear/female_beekini
|
||||
/datum/sprite_accessory/underwear/bottom/female_beekini
|
||||
name = "Panties - Bee-kini"
|
||||
icon_state = "panties_bee-kini"
|
||||
|
||||
/datum/sprite_accessory/underwear/female_black
|
||||
name = "Panties - Black"
|
||||
icon_state = "panties_black"
|
||||
|
||||
/datum/sprite_accessory/underwear/female_blue
|
||||
name = "Panties - Blue"
|
||||
icon_state = "panties_blue"
|
||||
|
||||
/datum/sprite_accessory/underwear/female_commie
|
||||
/datum/sprite_accessory/underwear/bottom/female_commie
|
||||
name = "Panties - Commie"
|
||||
icon_state = "panties_commie"
|
||||
|
||||
/datum/sprite_accessory/underwear/female_usastripe
|
||||
/datum/sprite_accessory/underwear/bottom/female_usastripe
|
||||
name = "Panties - Freedom"
|
||||
icon_state = "panties_assblastusa"
|
||||
|
||||
/datum/sprite_accessory/underwear/female_green
|
||||
name = "Panties - Green"
|
||||
icon_state = "panties_green"
|
||||
|
||||
/datum/sprite_accessory/underwear/female_kinky
|
||||
/datum/sprite_accessory/underwear/bottom/female_kinky
|
||||
name = "Panties - Kinky Black"
|
||||
icon_state = "panties_kinky"
|
||||
|
||||
/datum/sprite_accessory/underwear/female_red
|
||||
name = "Panties - Red"
|
||||
icon_state = "panties_red"
|
||||
|
||||
/datum/sprite_accessory/underwear/female_uk
|
||||
/datum/sprite_accessory/underwear/bottom/panties_uk
|
||||
name = "Panties - UK"
|
||||
icon_state = "panties_uk"
|
||||
|
||||
/datum/sprite_accessory/underwear/female_white
|
||||
name = "Panties - White"
|
||||
icon_state = "panties_white"
|
||||
/datum/sprite_accessory/underwear/bottom/panties_neko
|
||||
name = "Panties - Neko"
|
||||
icon_state = "panties_neko"
|
||||
has_color = TRUE
|
||||
|
||||
/datum/sprite_accessory/underwear/female_white_neko
|
||||
name = "Panties, Neko - White"
|
||||
icon_state = "panties_neko_white"
|
||||
/datum/sprite_accessory/underwear/bottom/panties_slim
|
||||
name = "Panties - Slim"
|
||||
icon_state = "panties_slim"
|
||||
has_color = TRUE
|
||||
|
||||
/datum/sprite_accessory/underwear/female_black_neko
|
||||
name = "Panties, Neko - Black"
|
||||
icon_state = "panties_neko_black"
|
||||
/datum/sprite_accessory/underwear/bottom/striped_panties
|
||||
name = "Panties - Striped"
|
||||
icon_state = "striped_panties"
|
||||
has_color = TRUE
|
||||
|
||||
/datum/sprite_accessory/underwear/bottom/panties_swimsuit
|
||||
name = "Panties - Swimsuit"
|
||||
icon_state = "panties_swimming"
|
||||
has_color = TRUE
|
||||
|
||||
/datum/sprite_accessory/underwear/swimsuit_red
|
||||
/datum/sprite_accessory/underwear/bottom/panties_thin
|
||||
name = "Panties - Thin"
|
||||
icon_state = "panties_thin"
|
||||
has_color = TRUE
|
||||
|
||||
/datum/sprite_accessory/underwear/bottom/longjon
|
||||
name = "Long John Bottoms"
|
||||
icon_state = "ljonb"
|
||||
has_color = TRUE
|
||||
|
||||
/datum/sprite_accessory/underwear/bottom/swimsuit_red
|
||||
name = "Swimsuit, One Piece - Red"
|
||||
icon_state = "swimming_red"
|
||||
|
||||
/datum/sprite_accessory/underwear/swimsuit
|
||||
/datum/sprite_accessory/underwear/bottom/swimsuit
|
||||
name = "Swimsuit, One Piece - Black"
|
||||
icon_state = "swimming_black"
|
||||
|
||||
/datum/sprite_accessory/underwear/swimsuit_blue
|
||||
/datum/sprite_accessory/underwear/bottom/swimsuit_blue
|
||||
name = "Swimsuit, One Piece - Striped Blue"
|
||||
icon_state = "swimming_blue"
|
||||
|
||||
/datum/sprite_accessory/underwear/swimsuit_green
|
||||
name = "Swimsuit, Bottom - Green"
|
||||
icon_state = "panties_swimming_green"
|
||||
/datum/sprite_accessory/underwear/bottom/thong
|
||||
name = "Thong"
|
||||
icon_state = "thong"
|
||||
has_color = TRUE
|
||||
|
||||
/datum/sprite_accessory/underwear/swimsuit_purple
|
||||
name = "Swimsuit, Bottom - Purple"
|
||||
icon_state = "panties_swimming_purple"
|
||||
|
||||
/datum/sprite_accessory/underwear/female_thong_black
|
||||
name = "Thong - Black"
|
||||
icon_state = "thong_black"
|
||||
|
||||
/datum/sprite_accessory/underwear/female_thong
|
||||
name = "Thong - Pink"
|
||||
icon_state = "thong_pink"
|
||||
|
||||
/datum/sprite_accessory/underwear/female_babydoll
|
||||
name = "Babydoll - Black"
|
||||
icon_state = "babydoll"
|
||||
/datum/sprite_accessory/underwear/bottom/thong_babydoll
|
||||
name = "Thong - Alt"
|
||||
icon_state = "thong_babydoll"
|
||||
has_color = TRUE
|
||||
|
||||
|
||||
|
||||
@@ -25,8 +25,11 @@
|
||||
var/age = 30 //Player's age
|
||||
|
||||
var/underwear = "Nude" //Which underwear the player wants
|
||||
var/undie_color = "#FFFFFF"
|
||||
var/undershirt = "Nude" //Which undershirt the player wants
|
||||
var/shirt_color = "#FFFFFF"
|
||||
var/socks = "Nude" //Which socks the player wants
|
||||
var/socks_color = "#FFFFFF"
|
||||
var/backbag = DBACKPACK //Which backpack type the player has chosen.
|
||||
|
||||
//Equipment slots
|
||||
|
||||
@@ -495,34 +495,42 @@ GLOBAL_LIST_EMPTY(roundstart_races)
|
||||
if(H.hidden_underwear)
|
||||
H.underwear = "Nude"
|
||||
else
|
||||
H.underwear = H.saved_underwear
|
||||
var/datum/sprite_accessory/underwear/underwear = GLOB.underwear_list[H.underwear]
|
||||
if(underwear)
|
||||
standing += mutable_appearance(underwear.icon, underwear.icon_state, -BODY_LAYER)
|
||||
H.saved_underwear = H.underwear
|
||||
var/datum/sprite_accessory/underwear/bottom/B = GLOB.underwear_list[H.underwear]
|
||||
if(B)
|
||||
var/mutable_appearance/MA = mutable_appearance(B.icon, B.icon_state, -BODY_LAYER)
|
||||
if(UNDIE_COLORABLE(B))
|
||||
MA.color = H.undie_color
|
||||
standing += MA
|
||||
|
||||
if(H.undershirt)
|
||||
if(H.hidden_undershirt)
|
||||
H.undershirt = "Nude"
|
||||
else
|
||||
H.undershirt = H.saved_undershirt
|
||||
var/datum/sprite_accessory/undershirt/undershirt = GLOB.undershirt_list[H.undershirt]
|
||||
if(undershirt)
|
||||
if(H.dna.species.sexes && H.gender == FEMALE)
|
||||
standing += wear_female_version(undershirt.icon_state, undershirt.icon, BODY_LAYER)
|
||||
else
|
||||
standing += mutable_appearance(undershirt.icon, undershirt.icon_state, -BODY_LAYER)
|
||||
H.saved_undershirt = H.undershirt
|
||||
var/datum/sprite_accessory/underwear/top/T = GLOB.undershirt_list[H.undershirt]
|
||||
if(T)
|
||||
var/mutable_appearance/MA
|
||||
if(H.dna.species.sexes && H.gender == FEMALE)
|
||||
MA = wear_female_version(T.icon_state, T.icon, BODY_LAYER)
|
||||
else
|
||||
MA = mutable_appearance(T.icon, T.icon_state, -BODY_LAYER)
|
||||
if(UNDIE_COLORABLE(T))
|
||||
MA.color = H.shirt_color
|
||||
standing += MA
|
||||
|
||||
if(H.socks && H.get_num_legs(FALSE) >= 2)
|
||||
if(H.hidden_socks)
|
||||
H.socks = "Nude"
|
||||
else
|
||||
H.socks = H.saved_socks
|
||||
var/datum/sprite_accessory/socks/socks = GLOB.socks_list[H.socks]
|
||||
if(socks)
|
||||
if(DIGITIGRADE in species_traits)
|
||||
standing += mutable_appearance(socks.icon, socks.icon_state + "_d", -BODY_LAYER)
|
||||
else
|
||||
standing += mutable_appearance(socks.icon, socks.icon_state, -BODY_LAYER)
|
||||
H.saved_socks = H.socks
|
||||
var/datum/sprite_accessory/underwear/socks/S = GLOB.socks_list[H.socks]
|
||||
if(S)
|
||||
var/digilegs = (DIGITIGRADE in species_traits) ? "_d" : ""
|
||||
var/mutable_appearance/MA = mutable_appearance(S.icon, "[S.icon_state][digilegs]", -BODY_LAYER)
|
||||
if(UNDIE_COLORABLE(S))
|
||||
MA.color = H.socks_color
|
||||
standing += MA
|
||||
|
||||
if(standing.len)
|
||||
H.overlays_standing[BODY_LAYER] = standing
|
||||
|
||||
Reference in New Issue
Block a user