Skip to content

Commit

Permalink
the great underwear purge (#2121)
Browse files Browse the repository at this point in the history
## About The Pull Request
sprites from tg, skyrat, and my aseprite file
Done by me, various others I can't count, Halcyon, Onule
Medical clothes sprites from TG

Organizes sprite_accessories.dm into sane files
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
look good = better
better = good
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl:
add: Resprites underwear/socks/undershirts, adds a bunch of new ones,
greyscales some
add: Redesigns athletic shorts
add: Resprites the basic pants in loadouts
add: Hoodies, they're in loadouts. Couple colors selectable
add: Resprites organs, by Onule
add: Support for Kepori underwear/socks/undershirt
del: Some underwear/shirts were removed
del: Medical job alt outfits
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
  • Loading branch information
thgvr authored Jul 21, 2023
1 parent 57ec918 commit 143dd5b
Show file tree
Hide file tree
Showing 84 changed files with 3,047 additions and 3,382 deletions.
1 change: 0 additions & 1 deletion _maps/deprecated/Ships/Syndicate_Cascade.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -3016,7 +3016,6 @@
pixel_x = -3
},
/obj/item/clothing/under/rank/medical/doctor/red,
/obj/item/clothing/under/rank/medical/chief_medical_officer/surgeon_general,
/obj/item/clothing/under/syndicate/sniper,
/obj/item/clothing/under/utility/skirt,
/obj/item/clothing/under/utility,
Expand Down
3 changes: 1 addition & 2 deletions _maps/shuttles/shiptest/independent_box.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2163,7 +2163,6 @@
/obj/item/clothing/accessory/armband/medblue,
/obj/item/clothing/accessory/armband/med,
/obj/item/clothing/accessory/armband/med,
/obj/item/clothing/under/rank/medical/psychiatrist/blue,
/obj/item/clothing/accessory/pocketprotector,
/obj/item/clothing/accessory/pocketprotector,
/obj/item/clothing/accessory/pocketprotector,
Expand Down Expand Up @@ -2501,7 +2500,7 @@
pixel_x = -32
},
/obj/item/storage/box/pillbottles,
/obj/item/clothing/under/rank/medical/chemist/pharmacist,
/obj/item/clothing/under/rank/medical/chemist/,
/obj/item/clothing/suit/longcoat/chemist,
/obj/item/reagent_containers/dropper,
/obj/item/clothing/head/beret/chem,
Expand Down
13 changes: 6 additions & 7 deletions _maps/shuttles/shiptest/independent_litieguai.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -892,12 +892,12 @@
/obj/item/storage/backpack/satchel/med,
/obj/item/storage/backpack/satchel/med,
/obj/item/storage/backpack/satchel/med,
/obj/item/clothing/under/rank/medical/doctor/junior_doctor/skirt,
/obj/item/clothing/under/rank/medical/doctor/junior_doctor/skirt,
/obj/item/clothing/under/rank/medical/doctor/junior_doctor/skirt,
/obj/item/clothing/under/rank/medical/doctor/junior_doctor,
/obj/item/clothing/under/rank/medical/doctor/junior_doctor,
/obj/item/clothing/under/rank/medical/doctor/junior_doctor,
/obj/item/clothing/under/rank/medical,
/obj/item/clothing/under/rank/medical,
/obj/item/clothing/under/rank/medical,
/obj/item/clothing/under/rank/medical,
/obj/item/clothing/under/rank/medical,
/obj/item/clothing/under/rank/medical,
/obj/item/clothing/shoes/sneakers/blue,
/obj/item/clothing/shoes/sneakers/blue,
/obj/item/clothing/shoes/sneakers/blue,
Expand Down Expand Up @@ -1721,7 +1721,6 @@
/area/ship/bridge)
"Nq" = (
/obj/item/clothing/gloves/color/latex/nitrile,
/obj/item/clothing/under/suit/cmo,
/obj/item/clothing/suit/toggle/labcoat/cmo,
/obj/item/clothing/shoes/sneakers/white,
/obj/item/storage/belt/medical,
Expand Down
16 changes: 6 additions & 10 deletions _maps/shuttles/shiptest/independent_schmiedeberg.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2654,16 +2654,12 @@
/obj/item/clothing/suit/longcoat/chemist,
/obj/item/clothing/under/rank/medical/chemist,
/obj/item/clothing/under/rank/medical/chemist,
/obj/item/clothing/under/rank/medical/chemist/pharmacist,
/obj/item/clothing/under/rank/medical/chemist/pharmacist,
/obj/item/clothing/under/rank/medical/chemist/pharmacist/skirt,
/obj/item/clothing/under/rank/medical/chemist/pharmacist/skirt,
/obj/item/clothing/under/rank/medical/chemist/pharmacologist,
/obj/item/clothing/under/rank/medical/chemist/pharmacologist,
/obj/item/clothing/under/rank/medical/chemist/pharmacologist/skirt,
/obj/item/clothing/under/rank/medical/chemist/pharmacologist/skirt,
/obj/item/clothing/under/suit/senior_chemist,
/obj/item/clothing/under/suit/senior_chemist/skirt,
/obj/item/clothing/under/rank/medical/chemist,
/obj/item/clothing/under/rank/medical/chemist,
/obj/item/clothing/under/rank/medical/chemist/skirt,
/obj/item/clothing/under/rank/medical/chemist/skirt,
/obj/item/clothing/under/rank/medical/chemist/skirt,
/obj/item/clothing/under/rank/medical/chemist/skirt,
/obj/item/clothing/shoes/sneakers/orange,
/obj/item/clothing/shoes/sneakers/orange,
/obj/item/clothing/shoes/sneakers/orange,
Expand Down
9 changes: 4 additions & 5 deletions _maps/shuttles/shiptest/minutemen_asclepius.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -4335,10 +4335,10 @@
name = "Chemistry locker";
pixel_y = -28
},
/obj/item/clothing/under/rank/medical/chemist/pharmacist,
/obj/item/clothing/under/rank/medical/chemist/pharmacist/skirt,
/obj/item/clothing/under/rank/medical/chemist/pharmacologist/skirt,
/obj/item/clothing/under/rank/medical/chemist/pharmacologist,
/obj/item/clothing/under/rank/medical/chemist,
/obj/item/clothing/under/rank/medical/chemist,
/obj/item/clothing/under/rank/medical/chemist/skirt,
/obj/item/clothing/under/rank/medical/chemist/skirt,
/obj/item/clothing/suit/longcoat/chemist,
/obj/item/clothing/suit/toggle/labcoat/chemist/side,
/obj/item/clothing/head/beret/chem,
Expand Down Expand Up @@ -4417,7 +4417,6 @@
/obj/item/clothing/under/rank/command/minutemen,
/obj/item/clothing/suit/toggle/lawyer/minutemen,
/obj/item/clothing/suit/toggle/labcoat/cmo,
/obj/item/clothing/under/rank/medical/chief_medical_officer/surgeon_general,
/obj/item/clothing/glasses/hud/security/sunglasses/eyepatch,
/obj/item/autosurgeon/cmo,
/obj/item/clothing/gloves/color/latex/nitrile/evil,
Expand Down
8 changes: 2 additions & 6 deletions _maps/shuttles/shiptest/syndicate_aegis.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,6 @@
/obj/structure/table/wood,
/obj/item/paper_bin/carbon,
/obj/item/clothing/under/rank/medical/psychiatrist,
/obj/item/clothing/under/rank/medical/psychiatrist/blue,
/obj/item/stack/sheet/mineral/wood/fifty,
/obj/item/lighter,
/obj/item/clothing/suit/toggle/labcoat,
Expand Down Expand Up @@ -525,7 +524,6 @@
/obj/item/surgicaldrill/advanced,
/obj/item/healthanalyzer/advanced,
/obj/item/clothing/glasses/hud/health/sunglasses,
/obj/item/clothing/under/rank/medical/chief_medical_officer/surgeon_general,
/obj/item/clothing/gloves/color/latex/nitrile/evil,
/obj/item/clothing/shoes/combat,
/obj/item/clothing/neck/stripedredscarf,
Expand Down Expand Up @@ -3104,7 +3102,6 @@
name = "syndicate medic's black longcoat"
},
/obj/item/clothing/under/rank/medical/doctor/red,
/obj/item/clothing/under/suit/senior_doctor,
/obj/item/clothing/suit/longcoat,
/obj/item/clothing/neck/stripedbluescarf,
/obj/item/clothing/neck/stripedredscarf,
Expand Down Expand Up @@ -3678,7 +3675,6 @@
name = "syndicate medic's black longcoat"
},
/obj/item/clothing/under/rank/medical/doctor/red,
/obj/item/clothing/under/suit/senior_doctor,
/obj/item/clothing/suit/longcoat,
/obj/item/clothing/neck/stripedbluescarf,
/obj/item/clothing/neck/stripedredscarf,
Expand Down Expand Up @@ -4574,8 +4570,8 @@
/obj/item/storage/bag/chemistry,
/obj/item/clothing/suit/longcoat/chemist,
/obj/item/clothing/suit/toggle/labcoat/chemist,
/obj/item/clothing/under/rank/medical/chemist/pharmacist/skirt,
/obj/item/clothing/under/rank/medical/chemist/pharmacist,
/obj/item/clothing/under/rank/medical/chemist,
/obj/item/clothing/under/rank/medical/chemist/skirt,
/obj/item/clothing/shoes/combat,
/obj/item/clothing/shoes/combat,
/obj/item/clothing/gloves/color/latex,
Expand Down
5 changes: 0 additions & 5 deletions code/__DEFINES/inventory.dm
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,6 @@
#define LEFT_HANDS 1
#define RIGHT_HANDS 2

//flags for female outfits: How much the game can safely "take off" the uniform without it looking weird
#define NO_FEMALE_UNIFORM 0
#define FEMALE_UNIFORM_FULL 1
#define FEMALE_UNIFORM_TOP 2

//flags for alternate styles: These are hard sprited so don't set this if you didn't put the effort in
#define NORMAL_STYLE 0
#define ALT_STYLE 1
Expand Down
2 changes: 2 additions & 0 deletions code/__DEFINES/preferences.dm
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,9 @@
#define RANDOM_UNDERWEAR "random_underwear"
#define RANDOM_UNDERWEAR_COLOR "random_underwear_color"
#define RANDOM_UNDERSHIRT "random_undershirt"
#define RANDOM_UNDERSHIRT_COLOR "random_undershirt_color"
#define RANDOM_SOCKS "random_socks"
#define RANDOM_SOCKS_COLOR "random_socks_color"
#define RANDOM_BACKPACK "random_backpack"
#define RANDOM_JUMPSUIT_STYLE "random_jumpsuit_style"
#define RANDOM_EXOWEAR_STYLE "random_jumpsuit_style"
Expand Down
3 changes: 3 additions & 0 deletions code/__DEFINES/species_clothing_defines.dm
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,6 @@

///KEPORI PATHS
#define KEPORI_UNIFORM_PATH 'icons/mob/species/kepori/onmob_uniform_kepori.dmi'
#define KEPORI_UNDERWEAR_TORSO_PATH 'icons/mob/clothing/underwear/species/underwear_torso_kepori.dmi'
#define KEPORI_UNDERWEAR_LEGS_PATH 'icons/mob/clothing/underwear/species/underwear_legs_kepori.dmi'
#define KEPORI_UNDERWEAR_SOCKS_PATH 'icons/mob/clothing/underwear/species/underwear_socks_kepori.dmi'
9 changes: 2 additions & 7 deletions code/__HELPERS/global_lists.dm
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
//facial hair
init_sprite_accessory_subtypes(/datum/sprite_accessory/facial_hair, GLOB.facial_hairstyles_list, GLOB.facial_hairstyles_male_list, GLOB.facial_hairstyles_female_list)
//underwear
init_sprite_accessory_subtypes(/datum/sprite_accessory/underwear, GLOB.underwear_list, GLOB.underwear_m, GLOB.underwear_f)
init_sprite_accessory_subtypes(/datum/sprite_accessory/underwear, GLOB.underwear_list)
//undershirt
init_sprite_accessory_subtypes(/datum/sprite_accessory/undershirt, GLOB.undershirt_list, GLOB.undershirt_m, GLOB.undershirt_f)
init_sprite_accessory_subtypes(/datum/sprite_accessory/undershirt, GLOB.undershirt_list)
//socks
init_sprite_accessory_subtypes(/datum/sprite_accessory/socks, GLOB.socks_list)
//bodypart accessories (blizzard intensifies)
Expand All @@ -29,12 +29,8 @@
init_sprite_accessory_subtypes(/datum/sprite_accessory/spines_animated, GLOB.animated_spines_list)
init_sprite_accessory_subtypes(/datum/sprite_accessory/legs, GLOB.legs_list)
init_sprite_accessory_subtypes(/datum/sprite_accessory/wings, GLOB.r_wings_list,roundstart = TRUE)
init_sprite_accessory_subtypes(/datum/sprite_accessory/caps, GLOB.caps_list)
init_sprite_accessory_subtypes(/datum/sprite_accessory/moth_wings, GLOB.moth_wings_list)
init_sprite_accessory_subtypes(/datum/sprite_accessory/moth_markings, GLOB.moth_markings_list)


//WS Begin
init_sprite_accessory_subtypes(/datum/sprite_accessory/moth_fluff, GLOB.moth_fluff_list)
init_sprite_accessory_subtypes(/datum/sprite_accessory/squid_face, GLOB.squid_face_list)
init_sprite_accessory_subtypes(/datum/sprite_accessory/ipc_screens, GLOB.ipc_screens_list)
Expand All @@ -52,7 +48,6 @@
init_sprite_accessory_subtypes(/datum/sprite_accessory/elzu_horns,GLOB.elzu_horns_list)
init_sprite_accessory_subtypes(/datum/sprite_accessory/tails/elzu, GLOB.tails_list_elzu)
init_sprite_accessory_subtypes(/datum/sprite_accessory/tails_animated/elzu, GLOB.animated_tails_list_elzu)
//WS End

//Species
for(var/spath in subtypesof(/datum/species))
Expand Down
23 changes: 5 additions & 18 deletions code/__HELPERS/mobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -23,25 +23,13 @@

/proc/random_underwear(gender)
if(!GLOB.underwear_list.len)
init_sprite_accessory_subtypes(/datum/sprite_accessory/underwear, GLOB.underwear_list, GLOB.underwear_m, GLOB.underwear_f)
switch(gender)
if(MALE)
return pick(GLOB.underwear_m)
if(FEMALE)
return pick(GLOB.underwear_f)
else
return pick(GLOB.underwear_list)
init_sprite_accessory_subtypes(/datum/sprite_accessory/underwear, GLOB.underwear_list)
return pick(GLOB.underwear_list)

/proc/random_undershirt(gender)
/proc/random_undershirt()
if(!GLOB.undershirt_list.len)
init_sprite_accessory_subtypes(/datum/sprite_accessory/undershirt, GLOB.undershirt_list, GLOB.undershirt_m, GLOB.undershirt_f)
switch(gender)
if(MALE)
return pick(GLOB.undershirt_m)
if(FEMALE)
return pick(GLOB.undershirt_f)
else
return pick(GLOB.undershirt_list)
init_sprite_accessory_subtypes(/datum/sprite_accessory/undershirt, GLOB.undershirt_list)
return pick(GLOB.undershirt_list)

/proc/random_socks()
if(!GLOB.socks_list.len)
Expand Down Expand Up @@ -109,7 +97,6 @@
return list(
"body_markings" = pick(GLOB.body_markings_list),
"body_size" = pick(GLOB.body_sizes),
"caps" = pick(GLOB.caps_list),
"ears" = "None",
"elzu_horns" = pick(GLOB.elzu_horns_list),
"ethcolor" = GLOB.color_list_ethereal[pick(GLOB.color_list_ethereal)],
Expand Down
5 changes: 0 additions & 5 deletions code/_globalvars/lists/flavor_misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,8 @@ GLOBAL_LIST_EMPTY(facial_hairstyles_female_list) //stores only hair names
GLOBAL_LIST_EMPTY(hair_gradients_list) //stores /datum/sprite_accessory/hair_gradient indexed by name
//Underwear
GLOBAL_LIST_EMPTY(underwear_list) //stores /datum/sprite_accessory/underwear indexed by name
GLOBAL_LIST_EMPTY(underwear_m) //stores only underwear name
GLOBAL_LIST_EMPTY(underwear_f) //stores only underwear name
//Undershirts
GLOBAL_LIST_EMPTY(undershirt_list) //stores /datum/sprite_accessory/undershirt indexed by name
GLOBAL_LIST_EMPTY(undershirt_m) //stores only undershirt name
GLOBAL_LIST_EMPTY(undershirt_f) //stores only undershirt name
//Socks
GLOBAL_LIST_EMPTY(socks_list) //stores /datum/sprite_accessory/socks indexed by name
//Body Sizes
Expand All @@ -40,7 +36,6 @@ GLOBAL_LIST_EMPTY(r_wings_list)
GLOBAL_LIST_EMPTY(moth_wings_list)
GLOBAL_LIST_EMPTY(moth_fluff_list)
GLOBAL_LIST_EMPTY(moth_markings_list)
GLOBAL_LIST_EMPTY(caps_list)
GLOBAL_LIST_EMPTY(squid_face_list)
GLOBAL_LIST_EMPTY(ipc_screens_list)
GLOBAL_LIST_EMPTY(ipc_antennas_list)
Expand Down
10 changes: 9 additions & 1 deletion code/game/objects/structures/dresser.dm
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
to_chat(user, "<span class='warning'>You are not capable of wearing underwear.</span>")
return

var/choice = input(user, "Underwear, Undershirt, or Socks?", "Changing") as null|anything in list("Underwear","Underwear Color","Undershirt","Socks")
var/choice = input(user, "Underwear, Undershirt, or Socks?", "Changing") as null|anything in list("Underwear", "Underwear Color", "Undershirt", "Undershirt Color", "Socks", "Socks Color")

if(!Adjacent(user))
return
Expand All @@ -49,10 +49,18 @@
var/new_undershirt = input(user, "Select your undershirt", "Changing") as null|anything in GLOB.undershirt_list
if(new_undershirt)
H.undershirt = new_undershirt
if("Undershirt Color")
var/new_undershirt_color = input(H, "Choose your undershirt color", "Undershirt Color","#"+H.undershirt_color) as color|null
if(new_undershirt_color)
H.undershirt_color = sanitize_hexcolor(new_undershirt_color)
if("Socks")
var/new_socks = input(user, "Select your socks", "Changing") as null|anything in GLOB.socks_list
if(new_socks)
H.socks= new_socks
if("Socks Color")
var/new_socks_color = input(H, "Choose your socks color", "Socks Color","#"+H.socks_color) as color|null
if(new_socks_color)
H.socks_color = sanitize_hexcolor(new_socks_color)

add_fingerprint(H)
H.update_body()
1 change: 0 additions & 1 deletion code/game/objects/structures/ghost_role_spawners.dm
Original file line number Diff line number Diff line change
Expand Up @@ -531,7 +531,6 @@
/datum/outfit/syndicate_empty/sbc/med
name = "Syndicate Battlecruiser Ship Medical Doctor"
gloves = /obj/item/clothing/gloves/color/latex/nitrile/evil
uniform = /obj/item/clothing/under/rank/medical/doctor/red
glasses = /obj/item/clothing/glasses/hud/health
belt = /obj/item/pda/medical
back = /obj/item/storage/backpack/duffelbag/syndie/med
Expand Down
26 changes: 17 additions & 9 deletions code/modules/client/loadout/loadout_suit.dm
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,6 @@
display_name = "goth jacket"
path = /obj/item/clothing/suit/gothcoat

/datum/gear/suit/jacket/bronze
display_name = "bronze suit"
path = /obj/item/clothing/suit/bronze

/datum/gear/suit/jacket/yakuza
display_name = "yakuza suit"
path = /obj/item/clothing/suit/yakuza

/datum/gear/suit/jacket/burgundy
display_name = "suit jacket, burgundy"
path = /obj/item/clothing/suit/toggle/lawyer/burgundy
Expand All @@ -63,7 +55,23 @@
display_name = "suit jacket, charcoal"
path = /obj/item/clothing/suit/toggle/lawyer/charcoal

/datum/gear/suit/jacket/navy
/datum/gear/suit/jacket/navy //why is this blank? i dont know

/datum/gear/suit/jacket/hoodie_black
display_name = "hoodie, black"
path = /obj/item/clothing/suit/hooded/hoodie/black

/datum/gear/suit/jacket/hoodie_red
display_name = "hoodie, red"
path = /obj/item/clothing/suit/hooded/hoodie/red

/datum/gear/suit/jacket/hoodie_blue
display_name = "hoodie, blue"
path = /obj/item/clothing/suit/hooded/hoodie/blue

/datum/gear/suit/jacket/hoodie_gray
display_name = "hoodie, gray"
path = /obj/item/clothing/suit/hooded/hoodie/gray

/datum/gear/suit/jacket/highvis
display_name = "industrial jacket"
Expand Down
Loading

0 comments on commit 143dd5b

Please sign in to comment.