diff --git a/aurorastation.dme b/aurorastation.dme index f2ae630614f..33d229a9eda 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -1858,7 +1858,9 @@ #include "code\modules\client\preference_setup\loadout\items\gloves.dm" #include "code\modules\client\preference_setup\loadout\items\head.dm" #include "code\modules\client\preference_setup\loadout\items\mask.dm" +#include "code\modules\client\preference_setup\loadout\items\pants.dm" #include "code\modules\client\preference_setup\loadout\items\religion.dm" +#include "code\modules\client\preference_setup\loadout\items\shirts.dm" #include "code\modules\client\preference_setup\loadout\items\shoes.dm" #include "code\modules\client\preference_setup\loadout\items\smoking.dm" #include "code\modules\client\preference_setup\loadout\items\suit.dm" @@ -1945,6 +1947,9 @@ #include "code\modules\clothing\masks\xeno\skrell.dm" #include "code\modules\clothing\masks\xeno\tajara.dm" #include "code\modules\clothing\masks\xeno\unathi.dm" +#include "code\modules\clothing\pants\pants.dm" +#include "code\modules\clothing\pants\shorts.dm" +#include "code\modules\clothing\pants\skirts.dm" #include "code\modules\clothing\rings\material.dm" #include "code\modules\clothing\rings\rings.dm" #include "code\modules\clothing\rings\xeno\tajara.dm" @@ -2018,9 +2023,6 @@ #include "code\modules\clothing\under\color.dm" #include "code\modules\clothing\under\dresses.dm" #include "code\modules\clothing\under\miscellaneous.dm" -#include "code\modules\clothing\under\pants.dm" -#include "code\modules\clothing\under\shorts.dm" -#include "code\modules\clothing\under\skirts.dm" #include "code\modules\clothing\under\syndicate.dm" #include "code\modules\clothing\under\accessories\accessory.dm" #include "code\modules\clothing\under\accessories\armband.dm" @@ -2045,6 +2047,7 @@ #include "code\modules\clothing\under\jobs\medsci.dm" #include "code\modules\clothing\under\jobs\security.dm" #include "code\modules\clothing\under\jobs\sol.dm" +#include "code\modules\clothing\under\shirts\shirts.dm" #include "code\modules\clothing\under\xenos\diona.dm" #include "code\modules\clothing\under\xenos\skrell.dm" #include "code\modules\clothing\under\xenos\tajara.dm" diff --git a/code/__DEFINES/accessories.dm b/code/__DEFINES/accessories.dm index 8c0fa8a1cd7..853936a4a15 100644 --- a/code/__DEFINES/accessories.dm +++ b/code/__DEFINES/accessories.dm @@ -8,7 +8,8 @@ #define ACCESSORY_SLOT_ARM_GUARDS "arm guards" #define ACCESSORY_SLOT_ARMOR_PIN "armor pin" #define ACCESSORY_SLOT_ARMOR_POCKETS "armor pockets" -#define ACCESSORY_SLOT_HEAD "head" +#define ACCESSORY_SLOT_HEAD "head" +#define ACCESSORY_SLOT_PANTS "pants" // Accessory Layering diff --git a/code/__DEFINES/icon_layering.dm b/code/__DEFINES/icon_layering.dm index 31b3a96db5c..e9d08572297 100644 --- a/code/__DEFINES/icon_layering.dm +++ b/code/__DEFINES/icon_layering.dm @@ -7,40 +7,43 @@ #define TAIL_SOUTH_LAYER 6 #define TAIL_SOUTH_ACC_LAYER 7 #define SHOES_LAYER_ALT 8 -#define WRISTS_LAYER_UNDER 9 -#define UNIFORM_LAYER 10 -#define MOB_DAMAGE_LAYER 11 -#define ID_LAYER 12 -#define BANDAGE_LAYER 13 -#define SHOES_LAYER 14 -#define GLOVES_LAYER 15 -#define BELT_LAYER 16 -#define WRISTS_LAYER_UNIFORM 17 -#define SUIT_LAYER 18 -#define ID_LAYER_ALT 19 -#define TAIL_NORTH_LAYER 20 -#define TAIL_NORTH_ACC_LAYER 21 -#define HAIR_LAYER_ALT 22 -#define HAIR_LAYER_ALT_EMISSIVE 23 -#define GLASSES_LAYER 24 -#define BELT_LAYER_ALT 25 -#define SUIT_STORE_LAYER 26 -#define BACK_LAYER 27 -#define HAIR_LAYER 28 -#define HAIR_LAYER_EMISSIVE 29 -#define GLASSES_LAYER_ALT 30 -#define L_EAR_LAYER 31 -#define R_EAR_LAYER 32 -#define FACEMASK_LAYER 33 -#define HEAD_LAYER 34 -#define L_EAR_LAYER_ALT 35 -#define R_EAR_LAYER_ALT 36 -#define GLASSES_LAYER_OVER 37 -#define COLLAR_LAYER 38 -#define WRISTS_LAYER_OVER 39 -#define HANDCUFF_LAYER 40 -#define LEGCUFF_LAYER 41 -#define L_HAND_LAYER 42 -#define R_HAND_LAYER 43 -#define FIRE_LAYER_UPPER 44 -#define TOTAL_LAYERS 44 +#define UNDER_UNIFORM_LAYER_WR 9 +#define UNDER_UNIFORM_LAYER_PA 10 +#define UNIFORM_LAYER 11 +#define ABOVE_UNIFORM_LAYER_PA 12 +#define MOB_DAMAGE_LAYER 13 +#define ID_LAYER 14 +#define BANDAGE_LAYER 15 +#define SHOES_LAYER 16 +#define GLOVES_LAYER 17 +#define BELT_LAYER 18 +#define ABOVE_UNIFORM_LAYER_WR 19 +#define SUIT_LAYER 20 +#define ABOVE_SUIT_LAYER_PA 21 +#define ID_LAYER_ALT 22 +#define TAIL_NORTH_LAYER 23 +#define TAIL_NORTH_ACC_LAYER 24 +#define HAIR_LAYER_ALT 25 +#define HAIR_LAYER_ALT_EMISSIVE 26 +#define GLASSES_LAYER 27 +#define BELT_LAYER_ALT 28 +#define SUIT_STORE_LAYER 29 +#define BACK_LAYER 30 +#define HAIR_LAYER 31 +#define HAIR_LAYER_EMISSIVE 32 +#define GLASSES_LAYER_ALT 33 +#define L_EAR_LAYER 34 +#define R_EAR_LAYER 35 +#define FACEMASK_LAYER 36 +#define HEAD_LAYER 37 +#define L_EAR_LAYER_ALT 38 +#define R_EAR_LAYER_ALT 39 +#define GLASSES_LAYER_OVER 40 +#define COLLAR_LAYER 41 +#define ABOVE_SUIT_LAYER_WR 42 +#define HANDCUFF_LAYER 43 +#define LEGCUFF_LAYER 44 +#define L_HAND_LAYER 45 +#define R_HAND_LAYER 46 +#define FIRE_LAYER_UPPER 47 +#define TOTAL_LAYERS 47 diff --git a/code/__DEFINES/items_clothing.dm b/code/__DEFINES/items_clothing.dm index cada25e2f5a..f33ba8e1507 100644 --- a/code/__DEFINES/items_clothing.dm +++ b/code/__DEFINES/items_clothing.dm @@ -20,6 +20,7 @@ #define SLOT_HOLSTER BITFLAG(14) #define SLOT_WRISTS BITFLAG(15) #define SLOT_S_STORE BITFLAG(16) +#define SLOT_PANTS BITFLAG(17) // Bitmasks for the flags_inv variable. These determine when a piece of clothing hides another, i.e. a helmet hiding glasses. #define HIDEGLOVES 0x1 @@ -32,9 +33,10 @@ #define HIDEEYES 0x80 // Glasses. #define HIDEFACE 0x100// Dictates whether we appear as "Unknown". #define HIDEWRISTS 0x200 -#define BLOCKHEADHAIR 0x400// Hides the user's hair overlay. Leaves facial hair. -#define BLOCKHAIR 0x800/// Hides the user's hair, facial and otherwise. -#define ALWAYSDRAW 0x1000//If set, this item is always rendered even if its slot is hidden by other clothing +#define HIDEPANTS 0x400 +#define BLOCKHEADHAIR 0x800// Hides the user's hair overlay. Leaves facial hair. +#define BLOCKHAIR 0x1000/// Hides the user's hair, facial and otherwise. +#define ALWAYSDRAW 0x2000//If set, this item is always rendered even if its slot is hidden by other clothing //Note that the item may still not be visible if its sprite is actually covered up. // Slots. @@ -59,7 +61,7 @@ #define slot_in_backpack 19 #define slot_legcuffed 20 #define slot_r_ear 21 -#define slot_legs 22 +#define slot_pants 22 #define slot_tie 23 #define slot_in_belt 24 #define slot_wrists 25 @@ -81,6 +83,7 @@ #define slot_wear_suit_str "slot_suit" #define slot_l_ear_str "slot_l_ear" #define slot_r_ear_str "slot_r_ear" +#define slot_pants_str "slot_pants" #define slot_shoes_str "slot_shoes" #define slot_wrists_str "slot_wrists" #define slot_gloves_str "slot_gloves" @@ -105,6 +108,7 @@ #define WORN_ID "_id" #define WORN_MASK "_ma" #define WORN_WRISTS "_wr" +#define WORN_PANTS "_pa" // Bitflags for clothing parts. #define HEAD 0x1 diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm index 8ceccc7c55e..5414d0d788d 100644 --- a/code/__DEFINES/mobs.dm +++ b/code/__DEFINES/mobs.dm @@ -246,6 +246,7 @@ #define INV_R_EAR_DEF_ICON 'icons/mob/r_ear.dmi' #define INV_SHOES_DEF_ICON 'icons/mob/feet.dmi' #define INV_WRISTS_DEF_ICON 'icons/mob/wrist.dmi' +#define INV_PANTS_DEF_ICON 'icons/mob/pants.dmi' // IPC tags #define IPC_OWNERSHIP_SELF "Self Owned" diff --git a/code/_onclick/hud/_defines.dm b/code/_onclick/hud/_defines.dm index 3cee01c4d1e..300e3a6f551 100644 --- a/code/_onclick/hud/_defines.dm +++ b/code/_onclick/hud/_defines.dm @@ -104,18 +104,21 @@ //Pop-up inventory #define ui_shoes "WEST+1:8,SOUTH:5" -#define ui_iclothing "WEST:6,SOUTH+1:7" -#define ui_oclothing "WEST+1:8,SOUTH+1:7" -#define ui_gloves "WEST+2:10,SOUTH+1:7" +#define ui_gloves "WEST:6,SOUTH+1:7" +#define ui_pants "WEST+1:8,SOUTH+1:7" +// "WEST+2:10,SOUTH+1:7" -#define ui_glasses "WEST:6,SOUTH+2:9" -#define ui_mask "WEST+1:8,SOUTH+2:9" -#define ui_l_ear "WEST+2:10,SOUTH+3:11" -#define ui_r_ear "WEST:6,SOUTH+3:11" +#define ui_wrists "WEST:6,SOUTH+2:9" +#define ui_iclothing "WEST+1:8,SOUTH+2:9" +#define ui_oclothing "WEST+2:10,SOUTH+2:9" -#define ui_head "WEST+1:8,SOUTH+3:11" +// "WEST+2:10,SOUTH+3:11" +#define ui_mask "WEST+1:8,SOUTH+3:11" +#define ui_glasses "WEST:6,SOUTH+3:11" -#define ui_wrists "WEST+2:10,SOUTH+2:9" +#define ui_r_ear "WEST:6,SOUTH+4:13" +#define ui_head "WEST+1:8,SOUTH+4:13" +#define ui_l_ear "WEST+2:10,SOUTH+4:13" //Intent small buttons #define ui_help_small "EAST-3:8,SOUTH:1" diff --git a/code/_onclick/hud/hud.dm b/code/_onclick/hud/hud.dm index c2c6ca9a010..1871e0dea6d 100644 --- a/code/_onclick/hud/hud.dm +++ b/code/_onclick/hud/hud.dm @@ -206,13 +206,16 @@ var/list/global_huds H.w_uniform.screen_loc = hud_data["loc"] if(slot_wear_suit) if(H.wear_suit) - H.wear_suit.screen_loc =hud_data["loc"] + H.wear_suit.screen_loc = hud_data["loc"] if(slot_wear_mask) if(H.wear_mask) - H.wear_mask.screen_loc =hud_data["loc"] + H.wear_mask.screen_loc = hud_data["loc"] if(slot_wrists) if(H.wrists) - H.wrists.screen_loc = hud_data["loc"] + H.wrists.screen_loc = hud_data["loc"] + if(slot_pants) + if(H.pants) + H.pants.screen_loc = hud_data["loc"] else switch(hud_data["slot"]) if(slot_head) @@ -235,16 +238,20 @@ var/list/global_huds H.glasses.screen_loc = null if(slot_w_uniform) if(H.w_uniform) - H.w_uniform.screen_loc =null + H.w_uniform.screen_loc = null if(slot_wear_suit) if(H.wear_suit) H.wear_suit.screen_loc = null if(slot_wear_mask) if(H.wear_mask) - H.wear_mask.screen_loc =null + H.wear_mask.screen_loc = null if(slot_wrists) if(H.wrists) - H.wrists.screen_loc = null + H.wrists.screen_loc = null + if(slot_pants) + if(H.pants) + H.pants.screen_loc = null + /datum/hud/proc/persistant_inventory_update() if(!mymob) diff --git a/code/datums/outfits/outfit.dm b/code/datums/outfits/outfit.dm index 78a3ad415e7..b9405fefc05 100644 --- a/code/datums/outfits/outfit.dm +++ b/code/datums/outfits/outfit.dm @@ -24,6 +24,7 @@ var/belt = null var/gloves = null var/wrist = null + var/pants = null var/shoes = null var/head = null @@ -108,6 +109,7 @@ belt, gloves, wrist, + pants, shoes, head, @@ -406,6 +408,8 @@ if(wrist) equip_item(H, wrist, slot_wrists) var/got_shoes = FALSE + if(pants) + equip_item(H, pants, slot_pants) if(length(species_shoes)) var/path = species_shoes[H.species.name] if(path) diff --git a/code/datums/outfits/outfit_antag.dm b/code/datums/outfits/outfit_antag.dm index 9ae66e017e2..0d935f0a3cd 100644 --- a/code/datums/outfits/outfit_antag.dm +++ b/code/datums/outfits/outfit_antag.dm @@ -205,10 +205,6 @@ /obj/item/clothing/under/lance, /obj/item/clothing/under/legion/pilot, /obj/item/clothing/under/offworlder, - /obj/item/clothing/under/pants/jeans, - /obj/item/clothing/under/pants/camo, - /obj/item/clothing/under/pants/khaki, - /obj/item/clothing/under/pants/mustang, /obj/item/clothing/under/rank/bartender, /obj/item/clothing/under/rank/hangar_technician/heph, /obj/item/clothing/under/rank/chef, @@ -216,7 +212,7 @@ /obj/item/clothing/under/rank/engineer, /obj/item/clothing/under/rank/sol, /obj/item/clothing/under/rank/miner, - /obj/item/clothing/under/skirt/offworlder, + /obj/item/clothing/pants/skirt/offworlder, /obj/item/clothing/under/suit_jacket/tan, /obj/item/clothing/under/tactical, /obj/item/clothing/under/tajaran, diff --git a/code/datums/trading/misc.dm b/code/datums/trading/misc.dm index 19cfe163465..bd203579d93 100644 --- a/code/datums/trading/misc.dm +++ b/code/datums/trading/misc.dm @@ -269,7 +269,7 @@ /obj/item/clothing/suit/storage/hooded/tajaran = TRADER_ALL, /obj/item/clothing/under/tajaran/fancy = TRADER_THIS_TYPE, /obj/item/clothing/under/tajaran/summer = TRADER_THIS_TYPE, - /obj/item/clothing/under/pants/tajaran = TRADER_THIS_TYPE, + /obj/item/clothing/pants/tajaran = TRADER_THIS_TYPE, /obj/item/clothing/under/tajaran/raakti_shariim = TRADER_THIS_TYPE, /obj/item/clothing/suit/storage/tajaran/fancy = TRADER_THIS_TYPE, /obj/item/clothing/under/tajaran/nka_noble = TRADER_THIS_TYPE, diff --git a/code/game/machinery/vending_types.dm b/code/game/machinery/vending_types.dm index e120ccafb75..f5f835f7101 100644 --- a/code/game/machinery/vending_types.dm +++ b/code/game/machinery/vending_types.dm @@ -1529,7 +1529,7 @@ /obj/item/material/knife/butterfly/switchblade = 2, /obj/item/reagent_containers/hypospray/autoinjector/stimpack = 2, /obj/item/clothing/under/tajaran/summer = 2, - /obj/item/clothing/under/pants/tajaran = 2, + /obj/item/clothing/pants/tajaran = 2, /obj/item/clothing/under/dress/tajaran =2, /obj/item/clothing/under/dress/tajaran/blue = 2, /obj/item/clothing/under/dress/tajaran/green = 2, diff --git a/code/game/modifiers/modifiers.dm b/code/game/modifiers/modifiers.dm index 410a52065f2..a361d20f52d 100644 --- a/code/game/modifiers/modifiers.dm +++ b/code/game/modifiers/modifiers.dm @@ -172,7 +172,7 @@ it should be avoided in favour of manual removal where possible //This list can be overridden if you want a custom slot whitelist var/list/valid_equipment_slots = list(slot_back, slot_wear_mask, slot_handcuffed, slot_belt, \ slot_wear_id, slot_l_ear, slot_glasses, slot_gloves, slot_head, slot_shoes, slot_wear_suit, \ - slot_w_uniform,slot_legcuffed, slot_r_ear, slot_legs, slot_tie, slot_wrists) + slot_w_uniform,slot_legcuffed, slot_r_ear, slot_pants, slot_tie, slot_wrists) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index c3fb863729f..513c4050056 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -642,7 +642,8 @@ var/list/global/slot_flags_enumeration = list( "[slot_w_uniform]" = SLOT_ICLOTHING, "[slot_wear_id]" = SLOT_ID, "[slot_tie]" = SLOT_TIE, - "[slot_wrists]" = SLOT_WRISTS + "[slot_wrists]" = SLOT_WRISTS, + "[slot_pants]" = SLOT_PANTS ) //the mob M is attempting to equip this item into the slot passed through as 'slot'. Return 1 if it can do this and 0 if it can't. diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 34f4ac0b4eb..b1d8e9d09bf 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -213,7 +213,7 @@ item_state = "wristset" slot_flags = SLOT_WRISTS canhear_range = 1 - var/mob_wear_layer = WRISTS_LAYER_OVER + var/mob_wear_layer = ABOVE_SUIT_LAYER_WR EarSound = FALSE /obj/item/device/radio/headset/wrist/verb/change_layer() @@ -221,11 +221,11 @@ set name = "Change Wrist Layer" set src in usr - if(mob_wear_layer == WRISTS_LAYER_OVER) - mob_wear_layer = WRISTS_LAYER_UNIFORM + if(mob_wear_layer == ABOVE_SUIT_LAYER_WR) + mob_wear_layer = ABOVE_UNIFORM_LAYER_WR else - mob_wear_layer = WRISTS_LAYER_OVER - to_chat(usr, SPAN_NOTICE("\The [src] will now layer [mob_wear_layer == WRISTS_LAYER_OVER ? "over" : "under"] your outerwear.")) + mob_wear_layer = ABOVE_SUIT_LAYER_WR + to_chat(usr, SPAN_NOTICE("\The [src] will now layer [mob_wear_layer == ABOVE_SUIT_LAYER_WR ? "over" : "under"] your outerwear.")) if (ishuman(src.loc)) var/mob/living/carbon/human/H = src.loc if(H.wrists == src) @@ -268,7 +268,7 @@ /obj/item/device/radio/headset/wrist/clip/get_wrist_examine_text(mob/living/carbon/human/user) if(!istype(user)) return ..() - return "clipped to [user.get_pronoun("his")] [(mob_wear_layer == WRISTS_LAYER_OVER) && user.wear_suit ? user.wear_suit.name : user.w_uniform ? user.w_uniform.name : "chest"]" + return "clipped to [user.get_pronoun("his")] [(mob_wear_layer == ABOVE_SUIT_LAYER_WR) && user.wear_suit ? user.wear_suit.name : user.w_uniform ? user.w_uniform.name : "chest"]" /obj/item/device/radio/headset/wrist/clip/get_ear_examine_text(mob/living/carbon/human/user) if(!istype(user)) diff --git a/code/game/objects/structures/crates_lockers/closets/fitness.dm b/code/game/objects/structures/crates_lockers/closets/fitness.dm index 160ec6e0ecd..03b08f28e32 100644 --- a/code/game/objects/structures/crates_lockers/closets/fitness.dm +++ b/code/game/objects/structures/crates_lockers/closets/fitness.dm @@ -6,11 +6,11 @@ /obj/structure/closet/athletic_mixed/fill() new /obj/item/towel/random(src) new /obj/item/towel/random(src) - new /obj/item/clothing/under/shorts/athletic/grey(src) - new /obj/item/clothing/under/shorts/athletic/black(src) - new /obj/item/clothing/under/shorts/athletic/red(src) - new /obj/item/clothing/under/shorts/athletic/blue(src) - new /obj/item/clothing/under/shorts/athletic/green(src) + new /obj/item/clothing/pants/shorts/athletic/grey(src) + new /obj/item/clothing/pants/shorts/athletic/black(src) + new /obj/item/clothing/pants/shorts/athletic/red(src) + new /obj/item/clothing/pants/shorts/athletic/blue(src) + new /obj/item/clothing/pants/shorts/athletic/green(src) new /obj/item/clothing/under/swimsuit/red(src) new /obj/item/clothing/under/swimsuit/black(src) new /obj/item/clothing/under/swimsuit/blue(src) diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm index 5751247f915..493bc235a50 100644 --- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm +++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm @@ -344,8 +344,8 @@ new /obj/item/clothing/shoes/sneakers/green(src) new /obj/item/clothing/shoes/sneakers/blue(src) new /obj/item/clothing/shoes/sneakers/purple(src) - new /obj/item/clothing/accessory/silversun/random(src) - new /obj/item/clothing/accessory/silversun/random(src) + new /obj/item/clothing/under/dressshirt/silversun/random(src) + new /obj/item/clothing/under/dressshirt/silversun/random(src) return /obj/structure/closet/wardrobe/tactical diff --git a/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm b/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm index 6a9e7df0f14..e1239a11ecf 100644 --- a/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm +++ b/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm @@ -233,17 +233,16 @@ /obj/structure/closet/crate/secure/gear_loadout/frontier_cowboys/fill() for(var/i in 1 to 6) - var/obj/item/clothing/under/shorts/khaki/pants = new(src) - var/obj/item/clothing/accessory/dressshirt/rolled/shirt = new(src) + var/obj/item/clothing/pants/shorts/khaki/pants = new(src) + var/obj/item/clothing/under/dressshirt/rolled/shirt = new(src) var/obj/item/clothing/accessory/chaps/chaps = new(src) var/obj/item/clothing/accessory/suspenders/suspenders = new(src) var/obj/item/clothing/accessory/wcoat_rec/waistcoat = new(src) var/obj/item/clothing/head/cowboy/hat = new(src) - pants.attach_accessory(null, shirt) pants.attach_accessory(null, chaps) waistcoat.color = COLOR_BEASTY_BROWN - pants.attach_accessory(null, waistcoat) + shirt.attach_accessory(null, waistcoat) suspenders.color = COLOR_MAROON pants.attach_accessory(null, suspenders) hat.color = COLOR_BEASTY_BROWN @@ -256,17 +255,16 @@ new /obj/item/gun/projectile/shotgun/pump/lever_action(src) /obj/structure/closet/crate/secure/gear_loadout/frontier_cowboys/single/fill() - var/obj/item/clothing/under/shorts/khaki/pants = new(src) - var/obj/item/clothing/accessory/dressshirt/rolled/shirt = new(src) + var/obj/item/clothing/pants/shorts/khaki/pants = new(src) + var/obj/item/clothing/under/dressshirt/rolled/shirt = new(src) var/obj/item/clothing/accessory/chaps/chaps = new(src) var/obj/item/clothing/accessory/suspenders/suspenders = new(src) var/obj/item/clothing/accessory/wcoat_rec/waistcoat = new(src) var/obj/item/clothing/head/cowboy/hat = new(src) - pants.attach_accessory(null, shirt) pants.attach_accessory(null, chaps) waistcoat.color = "#78280b" - pants.attach_accessory(null, waistcoat) + shirt.attach_accessory(null, waistcoat) suspenders.color = "#521600" pants.attach_accessory(null, suspenders) hat.color = "#521600" diff --git a/code/game/objects/structures/trash_pile.dm b/code/game/objects/structures/trash_pile.dm index e67ef2f9ce9..0fcc988f9d7 100644 --- a/code/game/objects/structures/trash_pile.dm +++ b/code/game/objects/structures/trash_pile.dm @@ -159,7 +159,7 @@ /obj/item/clothing/mask/gas/alt = 2, /obj/item/clothing/mask/gas/half = 2, /obj/item/clothing/shoes/galoshes = 2, - /obj/item/clothing/under/pants/camo = 2, + /obj/item/clothing/pants/camo = 2, /obj/item/clothing/under/syndicate/tacticool = 2, /obj/item/device/camera = 2, /obj/item/device/flashlight/flare = 2, diff --git a/code/modules/client/preference_setup/loadout/items/accessories.dm b/code/modules/client/preference_setup/loadout/items/accessories.dm index 4a0be377fcf..25fb27e6dcb 100644 --- a/code/modules/client/preference_setup/loadout/items/accessories.dm +++ b/code/modules/client/preference_setup/loadout/items/accessories.dm @@ -20,7 +20,7 @@ ABSTRACT_TYPE(/datum/gear/accessory) ..() var/list/waistcoats = list() waistcoats["waistcoat"] = /obj/item/clothing/accessory/wcoat_rec - waistcoats["waistcoat, alt"] = /obj/item/clothing/accessory/silversun/wcoat + waistcoats["waistcoat, alt"] = /obj/item/clothing/accessory/wcoat_rec/det_vest gear_tweaks += new /datum/gear_tweak/path(waistcoats) /datum/gear/accessory/chaps @@ -188,45 +188,7 @@ ABSTRACT_TYPE(/datum/gear/accessory) allowed_roles = list("Shaft Miner", "Xenoarchaeologist", "Operations Personnel", "Science Personnel") cost = 2 -/datum/gear/accessory/polo - display_name = "polo shirts selection" - description = "A selection of polo shirts." - path = /obj/item/clothing/accessory/polo - flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION - -/datum/gear/accessory/polo/New() - ..() - var/list/polo = list() - - polo["blue polo shirt"] = /obj/item/clothing/accessory/polo/polo_blue - polo["blue polo shirt (waist fitted)"] = /obj/item/clothing/accessory/polo/polo_blue_fem - polo["red polo shirt"] = /obj/item/clothing/accessory/polo/polo_red - polo["red polo shirt (waist fitted)"] = /obj/item/clothing/accessory/polo/polo_red_fem - polo["tan polo shirt"] = /obj/item/clothing/accessory/polo/polo_grayyellow - polo["tan polo shirt (waist fitted)"] = /obj/item/clothing/accessory/polo/polo_grayyellow_fem - polo["polo shirt, green strip"] = /obj/item/clothing/accessory/polo/polo_greenstrip - polo["polo shirt, green strip (waist fitted)"] = /obj/item/clothing/accessory/polo/polo_greenstrip_fem - polo["polo shirt, blue strip"] = /obj/item/clothing/accessory/polo/polo_bluestrip - polo["polo shirt, blue strip (waist fitted)"] = /obj/item/clothing/accessory/polo/polo_bluestrip_fem - polo["polo shirt, red strip"] = /obj/item/clothing/accessory/polo/polo_redstrip - polo["polo shirt, red strip (waist fitted)"] = /obj/item/clothing/accessory/polo/polo_redstrip_fem - - gear_tweaks += new /datum/gear_tweak/path(polo) - -/datum/gear/accessory/polo_colorable - display_name = "polo shirts selection (colorable)" - description = "A selection of colorable polo shirts." - path = /obj/item/clothing/accessory/polo - flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION - -/datum/gear/accessory/polo_colorable/New() - ..() - var/list/polo_colorable = list() - - polo_colorable["polo shirt"] = /obj/item/clothing/accessory/polo - polo_colorable["polo shirt (waist fitted)"] = /obj/item/clothing/accessory/polo/polo_fem - gear_tweaks += new /datum/gear_tweak/path(polo_colorable) /datum/gear/accessory/sweater display_name = "sweater selection" @@ -259,53 +221,6 @@ ABSTRACT_TYPE(/datum/gear/accessory) gear_tweaks += new /datum/gear_tweak/path(sweater) -/datum/gear/accessory/shirt - display_name = "shirt selection" - path = /obj/item/clothing/accessory/dressshirt - description = "A selection of shirts." - flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION - -/datum/gear/accessory/shirt/New() - ..() - var/list/shirt = list() - shirt["dress shirt"] = /obj/item/clothing/accessory/dressshirt - shirt["dress shirt, rolled up"] = /obj/item/clothing/accessory/dressshirt/rolled - shirt["dress shirt, cropped"] = /obj/item/clothing/accessory/dressshirt/crop - shirt["cropped dress shirt, rolled up"] = /obj/item/clothing/accessory/dressshirt/crop/rolled - shirt["dress shirt, alt"] = /obj/item/clothing/accessory/dressshirt/alt - shirt["dress shirt, alt rolled up"] = /obj/item/clothing/accessory/dressshirt/alt/rolled - shirt["dress shirt, v-neck alt"] = /obj/item/clothing/accessory/dressshirt/alt/vneck - shirt["dress shirt, v-neck alt rolled up"] = /obj/item/clothing/accessory/dressshirt/alt/vneck/rolled - shirt["dress shirt, deep v-neck"] = /obj/item/clothing/accessory/dressshirt/deepv - shirt["dress shirt, deep v-neck rolled up"] = /obj/item/clothing/accessory/dressshirt/deepv/rolled - shirt["dress shirt, asymmetric"] = /obj/item/clothing/accessory/dressshirt/asymmetric - shirt["long-sleeved shirt"] = /obj/item/clothing/accessory/longsleeve - shirt["long-sleeved shirt, black striped"] = /obj/item/clothing/accessory/longsleeve_s - shirt["long-sleeved shirt, blue striped"] = /obj/item/clothing/accessory/longsleeve_sb - shirt["t-shirt"] = /obj/item/clothing/accessory/tshirt - shirt["t-shirt, cropped"] = /obj/item/clothing/accessory/tshirt_crop - shirt["blouse"] = /obj/item/clothing/accessory/blouse - shirt["long-sleeved blouse"] = /obj/item/clothing/accessory/longblouse - shirt["puffy blouse"] = /obj/item/clothing/accessory/puffyblouse - shirt["halter top"] = /obj/item/clothing/accessory/haltertop - shirt["tank top"] = /obj/item/clothing/accessory/tanktop - shirt["tank top, feminine"] = /obj/item/clothing/accessory/tanktop/feminine - gear_tweaks += new /datum/gear_tweak/path(shirt) - -/datum/gear/accessory/silversun - display_name = "silversun floral shirt selection" - path = /obj/item/clothing/accessory/silversun - description = "A selection of Silversun floral shirts." - flags = GEAR_HAS_DESC_SELECTION - -/datum/gear/accessory/silversun/New() - ..() - var/list/shirts = list() - shirts["cyan silversun shirt"] = /obj/item/clothing/accessory/silversun - shirts["red silversun shirt"] = /obj/item/clothing/accessory/silversun/red - shirts["random colored silversun shirt"] = /obj/item/clothing/accessory/silversun/random - gear_tweaks += new /datum/gear_tweak/path(shirts) - /datum/gear/accessory/university display_name = "university sweatshirt selection" path = /obj/item/clothing/accessory/university diff --git a/code/modules/client/preference_setup/loadout/items/pants.dm b/code/modules/client/preference_setup/loadout/items/pants.dm new file mode 100644 index 00000000000..ee5a5e919ba --- /dev/null +++ b/code/modules/client/preference_setup/loadout/items/pants.dm @@ -0,0 +1,111 @@ +ABSTRACT_TYPE(/datum/gear/pants) + sort_category = "Skirts and Trousers" //wikipedia definition puts shorts under trousers category, so. + slot = slot_pants + +/datum/gear/pants/trousers + display_name = "pants and shorts selection" + description = "A selection of pants and shorts." + path = /obj/item/clothing/pants + +/datum/gear/pants/trousers/New() + ..() + var/list/pants = list() + + // Pants + pants["jeans"] = /obj/item/clothing/pants/jeans + pants["classic jeans"] = /obj/item/clothing/pants/classic + pants["mustang jeans"] = /obj/item/clothing/pants/mustang + pants["black jeans"] = /obj/item/clothing/pants/jeansblack + pants["white pants"] = /obj/item/clothing/pants/white + pants["black pants"] = /obj/item/clothing/pants/black + pants["red pants"] = /obj/item/clothing/pants/red + pants["tan pants"] = /obj/item/clothing/pants/tan + pants["khaki pants"] = /obj/item/clothing/pants/khaki + pants["high visibility pants"] = /obj/item/clothing/pants/highvis + pants["high visibility pants, alt"] = /obj/item/clothing/pants/highvis_alt + pants["track pants"] = /obj/item/clothing/pants/track + pants["blue track pants"] = /obj/item/clothing/pants/track/blue + pants["green track pants"] = /obj/item/clothing/pants/track/green + pants["white track pants"] = /obj/item/clothing/pants/track/white + pants["red track pants"] = /obj/item/clothing/pants/track/red + pants["camo pants"] = /obj/item/clothing/pants/camo + pants["tacticool pants"] = /obj/item/clothing/pants/tacticool + pants["designer jeans"] = /obj/item/clothing/pants/designer + pants["ripped jeans"] = /obj/item/clothing/pants/ripped + pants["black ripped jeans"] = /obj/item/clothing/pants/blackripped + + // Shorts + pants["black shorts"] = /obj/item/clothing/pants/shorts/black + pants["black short shorts"] = /obj/item/clothing/pants/shorts/black/short + pants["khaki shorts"] = /obj/item/clothing/pants/shorts/khaki + pants["khaki short shorts"] = /obj/item/clothing/pants/shorts/khaki/short + + // Jeans Shorts + pants["jeans shorts"] = /obj/item/clothing/pants/shorts/jeans + pants["jeans short shorts"] = /obj/item/clothing/pants/shorts/jeans/short + pants["classic jeans shorts"] = /obj/item/clothing/pants/shorts/jeans/classic + pants["classic jeans short shorts"] = /obj/item/clothing/pants/shorts/jeans/classic/short + pants["mustang jeans shorts"] = /obj/item/clothing/pants/shorts/jeans/mustang + pants["mustang jeans short shorts"] = /obj/item/clothing/pants/shorts/jeans/mustang/short + pants["black jeans shorts"] = /obj/item/clothing/pants/shorts/jeans/black + pants["black jeans short shorts"] = /obj/item/clothing/pants/shorts/jeans/black/short + pants["grey jeans shorts"] = /obj/item/clothing/pants/shorts/jeans/grey + pants["grey jeans short shorts"] = /obj/item/clothing/pants/shorts/jeans/grey/short + + // Athletic Shorts + pants["black athletic shorts"] = /obj/item/clothing/pants/shorts/athletic/black + pants["red athletic shorts"] = /obj/item/clothing/pants/shorts/athletic/red + pants["green athletic shorts"] = /obj/item/clothing/pants/shorts/athletic/green + pants["grey athletic shorts"] = /obj/item/clothing/pants/shorts/athletic/grey + pants["SCC-branded athletic shorts"] = /obj/item/clothing/pants/shorts/athletic/scc + + gear_tweaks += new /datum/gear_tweak/path(pants) + +/datum/gear/pants/colorpants + display_name = "pants and shorts selection (colourable)" + description = "A selection of colourable pants and shorts." + path = /obj/item/clothing/pants/dress + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION + +/datum/gear/pants/colorpants/New() + ..() + var/list/colorpants = list() + + // Pants + colorpants["dress pants"] = /obj/item/clothing/pants/dress + colorpants["dress pants, with belt"] = /obj/item/clothing/pants/dress/belt + colorpants["striped pants"] = /obj/item/clothing/pants/striped + colorpants["flared pants"] = /obj/item/clothing/pants/flared + colorpants["mustang jeans"] = /obj/item/clothing/pants/mustang/colourable + colorpants["tailored jeans"] = /obj/item/clothing/pants/tailoredjeans + + // Shorts + colorpants["shorts"] = /obj/item/clothing/pants/shorts/colourable + colorpants["short shorts"] = /obj/item/clothing/pants/shorts/colourable/short + colorpants["athletic shorts"] = /obj/item/clothing/pants/shorts/athletic/colourable + + gear_tweaks += new /datum/gear_tweak/path(colorpants) + +/datum/gear/pants/skirt + display_name = "skirt selection" + description = "A selection of skirts." + path = /obj/item/clothing/pants/skirt + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION + +/datum/gear/pants/skirt/New() + ..() + var/list/skirts = list() + skirts["casual skirt"] = /obj/item/clothing/pants/skirt + skirts["puffy skirt"] = /obj/item/clothing/pants/skirt/puffy + skirts["long skirt"] = /obj/item/clothing/pants/skirt/long + skirts["pencil skirt"] = /obj/item/clothing/pants/skirt/pencil + skirts["swept skirt"] = /obj/item/clothing/pants/skirt/swept + skirts["plaid skirt"] = /obj/item/clothing/pants/skirt/plaid + skirts["pleated skirt"] = /obj/item/clothing/pants/skirt/pleated + skirts["high skirt"] = /obj/item/clothing/pants/skirt/high + skirts["skater skirt"] = /obj/item/clothing/pants/skirt/skater + skirts["tube skirt"] = /obj/item/clothing/pants/skirt/tube + skirts["jumper skirt"] = /obj/item/clothing/pants/skirt/jumper + skirts["jumper dress"] = /obj/item/clothing/pants/skirt/jumper_highcut + skirts["long straight skirt"] = /obj/item/clothing/pants/skirt/straightlong + gear_tweaks += new /datum/gear_tweak/path(skirts) diff --git a/code/modules/client/preference_setup/loadout/items/shirts.dm b/code/modules/client/preference_setup/loadout/items/shirts.dm new file mode 100644 index 00000000000..2114f10f3d1 --- /dev/null +++ b/code/modules/client/preference_setup/loadout/items/shirts.dm @@ -0,0 +1,90 @@ +ABSTRACT_TYPE(/datum/gear/shirts) + sort_category = "Shirts and Tops" + slot = slot_w_uniform + +/datum/gear/shirts/polo + display_name = "polo shirts selection" + description = "A selection of polo shirts." + path = /obj/item/clothing/under/dressshirt/polo + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION + +/datum/gear/shirts/polo/New() + ..() + var/list/polo = list() + + polo["blue polo shirt"] = /obj/item/clothing/under/dressshirt/polo/polo_blue + polo["blue polo shirt (waist fitted)"] = /obj/item/clothing/under/dressshirt/polo/polo_blue_fem + polo["red polo shirt"] = /obj/item/clothing/under/dressshirt/polo/polo_red + polo["red polo shirt (waist fitted)"] = /obj/item/clothing/under/dressshirt/polo/polo_red_fem + polo["tan polo shirt"] = /obj/item/clothing/under/dressshirt/polo/polo_grayyellow + polo["tan polo shirt (waist fitted)"] = /obj/item/clothing/under/dressshirt/polo/polo_grayyellow_fem + polo["polo shirt, green strip"] = /obj/item/clothing/under/dressshirt/polo/polo_greenstrip + polo["polo shirt, green strip (waist fitted)"] = /obj/item/clothing/under/dressshirt/polo/polo_greenstrip_fem + polo["polo shirt, blue strip"] = /obj/item/clothing/under/dressshirt/polo/polo_bluestrip + polo["polo shirt, blue strip (waist fitted)"] = /obj/item/clothing/under/dressshirt/polo/polo_bluestrip_fem + polo["polo shirt, red strip"] = /obj/item/clothing/under/dressshirt/polo/polo_redstrip + polo["polo shirt, red strip (waist fitted)"] = /obj/item/clothing/under/dressshirt/polo/polo_redstrip_fem + + gear_tweaks += new /datum/gear_tweak/path(polo) + +/datum/gear/shirts/polo_colorable + display_name = "polo shirts selection (colorable)" + description = "A selection of colorable polo shirts." + path = /obj/item/clothing/under/dressshirt/polo + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION + +/datum/gear/shirts/polo_colorable/New() + ..() + var/list/polo_colorable = list() + + polo_colorable["polo shirt"] = /obj/item/clothing/under/dressshirt/polo + polo_colorable["polo shirt (waist fitted)"] = /obj/item/clothing/under/dressshirt/polo/polo_fem + + gear_tweaks += new /datum/gear_tweak/path(polo_colorable) + +/datum/gear/shirts/shirt + display_name = "shirt selection" + path = /obj/item/clothing/under/dressshirt + description = "A selection of shirts." + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION + +/datum/gear/shirts/shirt/New() + ..() + var/list/shirt = list() + shirt["dress shirt"] = /obj/item/clothing/under/dressshirt + shirt["dress shirt, rolled up"] = /obj/item/clothing/under/dressshirt/rolled + shirt["dress shirt, cropped"] = /obj/item/clothing/under/dressshirt/crop + shirt["cropped dress shirt, rolled up"] = /obj/item/clothing/under/dressshirt/crop/rolled + shirt["dress shirt, alt"] = /obj/item/clothing/under/dressshirt/alt + shirt["dress shirt, alt rolled up"] = /obj/item/clothing/under/dressshirt/alt/rolled + shirt["dress shirt, v-neck alt"] = /obj/item/clothing/under/dressshirt/alt/vneck + shirt["dress shirt, v-neck alt rolled up"] = /obj/item/clothing/under/dressshirt/alt/vneck/rolled + shirt["dress shirt, deep v-neck"] = /obj/item/clothing/under/dressshirt/deepv + shirt["dress shirt, deep v-neck rolled up"] = /obj/item/clothing/under/dressshirt/deepv/rolled + shirt["dress shirt, asymmetric"] = /obj/item/clothing/under/dressshirt/asymmetric + shirt["long-sleeved shirt"] = /obj/item/clothing/under/dressshirt/longsleeve + shirt["long-sleeved shirt, black striped"] = /obj/item/clothing/under/dressshirt/longsleeve_s + shirt["long-sleeved shirt, blue striped"] = /obj/item/clothing/under/dressshirt/longsleeve_sb + shirt["t-shirt"] = /obj/item/clothing/under/dressshirt/tshirt + shirt["t-shirt, cropped"] = /obj/item/clothing/under/dressshirt/tshirt_crop + shirt["blouse"] = /obj/item/clothing/under/dressshirt/blouse + shirt["long-sleeved blouse"] = /obj/item/clothing/under/dressshirt/longblouse + shirt["puffy blouse"] = /obj/item/clothing/under/dressshirt/puffyblouse + shirt["halter top"] = /obj/item/clothing/under/dressshirt/haltertop + shirt["tank top"] = /obj/item/clothing/under/dressshirt/tanktop + shirt["tank top, feminine"] = /obj/item/clothing/under/dressshirt/tanktop/feminine + gear_tweaks += new /datum/gear_tweak/path(shirt) + +/datum/gear/shirts/silversun + display_name = "silversun floral shirt selection" + path = /obj/item/clothing/under/dressshirt/silversun + description = "A selection of Silversun floral shirts." + flags = GEAR_HAS_DESC_SELECTION + +/datum/gear/shirts/silversun/New() + ..() + var/list/shirts = list() + shirts["cyan silversun shirt"] = /obj/item/clothing/under/dressshirt/silversun + shirts["red silversun shirt"] = /obj/item/clothing/under/dressshirt/silversun/red + shirts["random colored silversun shirt"] = /obj/item/clothing/under/dressshirt/silversun/random + gear_tweaks += new /datum/gear_tweak/path(shirts) diff --git a/code/modules/client/preference_setup/loadout/items/uniform.dm b/code/modules/client/preference_setup/loadout/items/uniform.dm index 38969446ecf..8e9f54b9ec2 100644 --- a/code/modules/client/preference_setup/loadout/items/uniform.dm +++ b/code/modules/client/preference_setup/loadout/items/uniform.dm @@ -49,30 +49,6 @@ path = /obj/item/clothing/under/color/colorable flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION -/datum/gear/uniform/skirt - display_name = "skirt selection" - description = "A selection of skirts." - path = /obj/item/clothing/under/skirt - flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION - -/datum/gear/uniform/skirt/New() - ..() - var/list/skirts = list() - skirts["casual skirt"] = /obj/item/clothing/under/skirt - skirts["puffy skirt"] = /obj/item/clothing/under/skirt/puffy - skirts["long skirt"] = /obj/item/clothing/under/skirt/long - skirts["pencil skirt"] = /obj/item/clothing/under/skirt/pencil - skirts["swept skirt"] = /obj/item/clothing/under/skirt/swept - skirts["plaid skirt"] = /obj/item/clothing/under/skirt/plaid - skirts["pleated skirt"] = /obj/item/clothing/under/skirt/pleated - skirts["high skirt"] = /obj/item/clothing/under/skirt/high - skirts["skater skirt"] = /obj/item/clothing/under/skirt/skater - skirts["tube skirt"] = /obj/item/clothing/under/skirt/tube - skirts["jumper skirt"] = /obj/item/clothing/under/skirt/jumper - skirts["jumper dress"] = /obj/item/clothing/under/skirt/jumper_highcut - skirts["long straight skirt"] = /obj/item/clothing/under/skirt/straightlong - gear_tweaks += new /datum/gear_tweak/path(skirts) - /datum/gear/uniform/suit display_name = "suit selection" description = "A selection of formal suits." @@ -165,90 +141,6 @@ bridgecrew["bridge crew uniform, san colettish, blue"] = /obj/item/clothing/under/rank/bridge_crew/sancolette/alt gear_tweaks += new /datum/gear_tweak/path(bridgecrew) -/datum/gear/uniform/pants - display_name = "pants and shorts selection" - description = "A selection of pants and shorts." - path = /obj/item/clothing/under/pants - -/datum/gear/uniform/pants/New() - ..() - var/list/pants = list() - - // Pants - pants["jeans"] = /obj/item/clothing/under/pants/jeans - pants["classic jeans"] = /obj/item/clothing/under/pants/classic - pants["mustang jeans"] = /obj/item/clothing/under/pants/mustang - pants["black jeans"] = /obj/item/clothing/under/pants/jeansblack - pants["white pants"] = /obj/item/clothing/under/pants/white - pants["black pants"] = /obj/item/clothing/under/pants/black - pants["red pants"] = /obj/item/clothing/under/pants/red - pants["tan pants"] = /obj/item/clothing/under/pants/tan - pants["khaki pants"] = /obj/item/clothing/under/pants/khaki - pants["high visibility pants"] = /obj/item/clothing/under/pants/highvis - pants["high visibility pants, alt"] = /obj/item/clothing/under/pants/highvis_alt - pants["track pants"] = /obj/item/clothing/under/pants/track - pants["blue track pants"] = /obj/item/clothing/under/pants/track/blue - pants["green track pants"] = /obj/item/clothing/under/pants/track/green - pants["white track pants"] = /obj/item/clothing/under/pants/track/white - pants["red track pants"] = /obj/item/clothing/under/pants/track/red - pants["camo pants"] = /obj/item/clothing/under/pants/camo - pants["tacticool pants"] = /obj/item/clothing/under/pants/tacticool - pants["designer jeans"] = /obj/item/clothing/under/pants/designer - pants["ripped jeans"] = /obj/item/clothing/under/pants/ripped - pants["black ripped jeans"] = /obj/item/clothing/under/pants/blackripped - - // Shorts - pants["black shorts"] = /obj/item/clothing/under/shorts/black - pants["black short shorts"] = /obj/item/clothing/under/shorts/black/short - pants["khaki shorts"] = /obj/item/clothing/under/shorts/khaki - pants["khaki short shorts"] = /obj/item/clothing/under/shorts/khaki/short - - // Jeans Shorts - pants["jeans shorts"] = /obj/item/clothing/under/shorts/jeans - pants["jeans short shorts"] = /obj/item/clothing/under/shorts/jeans/short - pants["classic jeans shorts"] = /obj/item/clothing/under/shorts/jeans/classic - pants["classic jeans short shorts"] = /obj/item/clothing/under/shorts/jeans/classic/short - pants["mustang jeans shorts"] = /obj/item/clothing/under/shorts/jeans/mustang - pants["mustang jeans short shorts"] = /obj/item/clothing/under/shorts/jeans/mustang/short - pants["black jeans shorts"] = /obj/item/clothing/under/shorts/jeans/black - pants["black jeans short shorts"] = /obj/item/clothing/under/shorts/jeans/black/short - pants["grey jeans shorts"] = /obj/item/clothing/under/shorts/jeans/grey - pants["grey jeans short shorts"] = /obj/item/clothing/under/shorts/jeans/grey/short - - // Athletic Shorts - pants["black athletic shorts"] = /obj/item/clothing/under/shorts/athletic/black - pants["red athletic shorts"] = /obj/item/clothing/under/shorts/athletic/red - pants["green athletic shorts"] = /obj/item/clothing/under/shorts/athletic/green - pants["grey athletic shorts"] = /obj/item/clothing/under/shorts/athletic/grey - pants["SCC-branded athletic shorts"] = /obj/item/clothing/under/shorts/athletic/scc - - gear_tweaks += new /datum/gear_tweak/path(pants) - -/datum/gear/uniform/colorpants - display_name = "pants and shorts selection (colourable)" - description = "A selection of colourable pants and shorts." - path = /obj/item/clothing/under/pants/dress - flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION - -/datum/gear/uniform/colorpants/New() - ..() - var/list/colorpants = list() - - // Pants - colorpants["dress pants"] = /obj/item/clothing/under/pants/dress - colorpants["dress pants, with belt"] = /obj/item/clothing/under/pants/dress/belt - colorpants["striped pants"] = /obj/item/clothing/under/pants/striped - colorpants["flared pants"] = /obj/item/clothing/under/pants/flared - colorpants["mustang jeans"] = /obj/item/clothing/under/pants/mustang/colourable - colorpants["tailored jeans"] = /obj/item/clothing/under/pants/tailoredjeans - - // Shorts - colorpants["shorts"] = /obj/item/clothing/under/shorts/colourable - colorpants["short shorts"] = /obj/item/clothing/under/shorts/colourable/short - colorpants["athletic shorts"] = /obj/item/clothing/under/shorts/athletic/colourable - - gear_tweaks += new /datum/gear_tweak/path(colorpants) - /datum/gear/uniform/turtleneck display_name = "tacticool turtleneck" path = /obj/item/clothing/under/syndicate/tacticool diff --git a/code/modules/client/preference_setup/loadout/items/wrists.dm b/code/modules/client/preference_setup/loadout/items/wrists.dm index b76c655263f..ba9c1009604 100644 --- a/code/modules/client/preference_setup/loadout/items/wrists.dm +++ b/code/modules/client/preference_setup/loadout/items/wrists.dm @@ -47,7 +47,7 @@ GLOBAL_DATUM_INIT(gear_tweak_wrist_layer, /datum/gear_tweak/wrist_layer, new()) /datum/gear_tweak/wrist_layer - var/list/options = list(WRISTS_UNDER = WRISTS_LAYER_UNDER, WRISTS_OVER_UNIFORM = WRISTS_LAYER_UNIFORM, WRISTS_OVER_SUIT = WRISTS_LAYER_OVER) + var/list/options = list(WRISTS_UNDER = UNDER_UNIFORM_LAYER_WR, WRISTS_OVER_UNIFORM = ABOVE_UNIFORM_LAYER_WR, WRISTS_OVER_SUIT = ABOVE_SUIT_LAYER_WR) /datum/gear_tweak/wrist_layer/get_contents(var/metadata) return "Wrist Layer: [metadata]" diff --git a/code/modules/client/preference_setup/loadout/items/xeno/human.dm b/code/modules/client/preference_setup/loadout/items/xeno/human.dm index 7c13a3c0f2b..61979774938 100644 --- a/code/modules/client/preference_setup/loadout/items/xeno/human.dm +++ b/code/modules/client/preference_setup/loadout/items/xeno/human.dm @@ -11,7 +11,7 @@ /datum/gear/uniform/offworlder/skirt display_name = "CR skirt" - path = /obj/item/clothing/under/skirt/offworlder + path = /obj/item/clothing/pants/skirt/offworlder /datum/gear/eyes/starshades display_name = "starshades" diff --git a/code/modules/client/preference_setup/loadout/items/xeno/machine.dm b/code/modules/client/preference_setup/loadout/items/xeno/machine.dm index 345e5eee2e7..13d369aac22 100644 --- a/code/modules/client/preference_setup/loadout/items/xeno/machine.dm +++ b/code/modules/client/preference_setup/loadout/items/xeno/machine.dm @@ -204,9 +204,9 @@ ABSTRACT_TYPE(/datum/gear/augment/machine) /datum/gear/accessory/goldendeep/New() ..() var/list/goldendeepshirt = list() - goldendeepshirt["golden deep fine shirt"] = /obj/item/clothing/accessory/goldendeep - goldendeepshirt["golden deep pompous shirt"] = /obj/item/clothing/accessory/goldendeep/pompous - goldendeepshirt["golden deep cloth wrapped uniform"] = /obj/item/clothing/accessory/goldendeep/clothwrappeduniform + goldendeepshirt["golden deep fine shirt"] = /obj/item/clothing/under/dressshirt/goldendeep + goldendeepshirt["golden deep pompous shirt"] = /obj/item/clothing/under/dressshirt/goldendeep/pompous + goldendeepshirt["golden deep cloth wrapped uniform"] = /obj/item/clothing/under/dressshirt/goldendeep/clothwrappeduniform gear_tweaks += new /datum/gear_tweak/path(goldendeepshirt) /datum/gear/accessory/goldendeepouter diff --git a/code/modules/client/preference_setup/loadout/items/xeno/skrell.dm b/code/modules/client/preference_setup/loadout/items/xeno/skrell.dm index c7d83369c6e..24f76ebaa21 100644 --- a/code/modules/client/preference_setup/loadout/items/xeno/skrell.dm +++ b/code/modules/client/preference_setup/loadout/items/xeno/skrell.dm @@ -374,7 +374,7 @@ ABSTRACT_TYPE(/datum/gear/accessory/skrell) /datum/gear/accessory/skrell/tees display_name = "skrellian wetshirts" - path = /obj/item/clothing/accessory/tshirt/skrell + path = /obj/item/clothing/under/tshirt/skrell whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER) sort_category = "Xenowear - Skrell" flags = GEAR_HAS_DESC_SELECTION @@ -382,20 +382,20 @@ ABSTRACT_TYPE(/datum/gear/accessory/skrell) /datum/gear/accessory/skrell/tees/New() ..() var/list/tees = list() - tees["ocean wetshirt"] = /obj/item/clothing/accessory/tshirt/skrell/ocean - tees["maelstrom wetshirt"] = /obj/item/clothing/accessory/tshirt/skrell/maelstrom - tees["reef wetshirt"] = /obj/item/clothing/accessory/tshirt/skrell/reef - tees["pink eriuyushi nebula shirt"] = /obj/item/clothing/accessory/tshirt/skrell/nebula - tees["purple eriuyushi nebula shirt"] = /obj/item/clothing/accessory/tshirt/skrell/nebula/purple - tees["teal eriuyushi nebula shirt"] = /obj/item/clothing/accessory/tshirt/skrell/nebula/teal - tees["black eriuyushi nebula shirt"] = /obj/item/clothing/accessory/tshirt/skrell/nebula/black - tees["white eriuyushi nebula shirt"] = /obj/item/clothing/accessory/tshirt/skrell/nebula/white - tees["nralakk eriuyushi nebula shirt"] = /obj/item/clothing/accessory/tshirt/skrell/nebula/nralakk + tees["ocean wetshirt"] = /obj/item/clothing/under/tshirt/skrell/ocean + tees["maelstrom wetshirt"] = /obj/item/clothing/under/tshirt/skrell/maelstrom + tees["reef wetshirt"] = /obj/item/clothing/under/tshirt/skrell/reef + tees["pink eriuyushi nebula shirt"] = /obj/item/clothing/under/tshirt/skrell/nebula + tees["purple eriuyushi nebula shirt"] = /obj/item/clothing/under/tshirt/skrell/nebula/purple + tees["teal eriuyushi nebula shirt"] = /obj/item/clothing/under/tshirt/skrell/nebula/teal + tees["black eriuyushi nebula shirt"] = /obj/item/clothing/under/tshirt/skrell/nebula/black + tees["white eriuyushi nebula shirt"] = /obj/item/clothing/under/tshirt/skrell/nebula/white + tees["nralakk eriuyushi nebula shirt"] = /obj/item/clothing/under/tshirt/skrell/nebula/nralakk gear_tweaks += new /datum/gear_tweak/path(tees) /datum/gear/accessory/skrell/dress display_name = "skrellian formal wetshirts" - path = /obj/item/clothing/accessory/dressshirt/skrell + path = /obj/item/clothing/under/dressshirt/skrell whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER) sort_category = "Xenowear - Skrell" flags = GEAR_HAS_DESC_SELECTION @@ -403,9 +403,9 @@ ABSTRACT_TYPE(/datum/gear/accessory/skrell) /datum/gear/accessory/skrell/dress/New() ..() var/list/dress = list() - dress["ocean formal wetshirt"] = /obj/item/clothing/accessory/dressshirt/skrell/ocean - dress["maelstrom formal wetshirt"] = /obj/item/clothing/accessory/dressshirt/skrell/maelstrom - dress["reef formal wetshirt"] = /obj/item/clothing/accessory/dressshirt/skrell/reef + dress["ocean formal wetshirt"] = /obj/item/clothing/under/dressshirt/skrell/ocean + dress["maelstrom formal wetshirt"] = /obj/item/clothing/under/dressshirt/skrell/maelstrom + dress["reef formal wetshirt"] = /obj/item/clothing/under/dressshirt/skrell/reef gear_tweaks += new /datum/gear_tweak/path(dress) /datum/gear/uniform/skrell/wetsuit diff --git a/code/modules/client/preference_setup/loadout/items/xeno/tajara.dm b/code/modules/client/preference_setup/loadout/items/xeno/tajara.dm index 9aa1bb4a966..6d6eabb15e7 100644 --- a/code/modules/client/preference_setup/loadout/items/xeno/tajara.dm +++ b/code/modules/client/preference_setup/loadout/items/xeno/tajara.dm @@ -163,7 +163,7 @@ ABSTRACT_TYPE(/datum/gear/shoes/tajara) uniform["nanotrasen overalls"] = /obj/item/clothing/under/tajaran/nt uniform["matake priest garments"] = /obj/item/clothing/under/tajaran/matake uniform["adhomian summerwear"] = /obj/item/clothing/under/tajaran/summer - uniform["adhomian summer pants"] = /obj/item/clothing/under/pants/tajaran + uniform["adhomian summer pants"] = /obj/item/clothing/pants/tajaran uniform["machinist uniform"] = /obj/item/clothing/under/tajaran/mechanic uniform["raakti shariim uniform"] = /obj/item/clothing/under/tajaran/raakti_shariim uniform["a'lmariist laborer clothes"] = /obj/item/clothing/under/tajaran/dpra diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 50586d599da..6bc01e5de92 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -738,7 +738,7 @@ A.accessory_mob_overlay.ClearOverlays() else for(var/obj/item/clothing/accessory/A in accessories) - var/image/accessory_image = A.get_accessory_mob_overlay(H) + var/image/accessory_image = A.get_accessory_mob_overlay(H, FALSE, src) I.AddOverlays(accessory_image) if(blood_DNA && slot != slot_l_hand_str && slot != slot_r_hand_str) @@ -1079,7 +1079,7 @@ A.accessory_mob_overlay.ClearOverlays() else for(var/obj/item/clothing/accessory/A in accessories) - var/image/accessory_image = A.get_accessory_mob_overlay(H) + var/image/accessory_image = A.get_accessory_mob_overlay(H, FALSE, src) I.AddOverlays(accessory_image) if(blood_DNA && slot != slot_l_hand_str && slot != slot_r_hand_str) @@ -1178,12 +1178,12 @@ /obj/item/clothing/under/get_mob_overlay(mob/living/carbon/human/H, mob_icon, mob_state, slot) var/image/I = ..() - if(slot == slot_l_hand_str | slot == slot_r_hand_str) + if(slot == slot_l_hand_str || slot == slot_r_hand_str) for(var/obj/item/clothing/accessory/A in accessories) A.accessory_mob_overlay.ClearOverlays() else for(var/obj/item/clothing/accessory/A in accessories) - var/image/accessory_image = A.get_accessory_mob_overlay(H) + var/image/accessory_image = A.get_accessory_mob_overlay(H, FALSE, src) I.AddOverlays(accessory_image) if(blood_DNA && slot != slot_l_hand_str && slot != slot_r_hand_str) diff --git a/code/modules/clothing/factions/goldendeep.dm b/code/modules/clothing/factions/goldendeep.dm index ec0c16bad53..ca22b6417a2 100644 --- a/code/modules/clothing/factions/goldendeep.dm +++ b/code/modules/clothing/factions/goldendeep.dm @@ -76,60 +76,55 @@ //colorable items go under here //shirts -/obj/item/clothing/accessory/goldendeep +/obj/item/clothing/under/dressshirt/goldendeep name = "fine shirt" desc = "An expertly tailored shirt often found for formal events or doing good business." + icon = 'icons/obj/item/clothing/under/shirt/goldendeep.dmi' icon_state = "fine_shirt" item_state = "fine_shirt" - icon = 'icons/clothing/under/shirts/fine_shirt.dmi' contained_sprite = TRUE has_accents = TRUE // Unique variation for use with the Golden Deep ghostrole. -/obj/item/clothing/accessory/goldendeep/black +/obj/item/clothing/under/dressshirt/goldendeep/black color = "#333333" -/obj/item/clothing/accessory/goldendeep/pompous +/obj/item/clothing/under/dressshirt/goldendeep/pompous name = "pompous shirt" desc = "Poofy and ostentatious, this shirt of fine fabric screams wealth." icon_state = "pompous_shirt" item_state = "pompous_shirt" - icon = 'icons/clothing/under/shirts/pompous_shirt.dmi' +/obj/item/clothing/under/dressshirt/goldendeep/clothwrappeduniform + name = "cloth wrapped uniform" + desc = "Casual and resilient, these intricate wraps protect one against the acid rains of Pactolous while keeping their style." + icon_state = "cloth_wrapped_uniform" + item_state = "cloth_wrapped_uniform" + +// outerwear /obj/item/clothing/accessory/goldendeep/gambeson name = "quilted gambeson" desc = " Intricately woven fibers resemble armor of old, but now are reinforced for the wear and tear caused by moving metal joints." icon_state = "quilted_gambeson" item_state = "quilted_gambeson" - icon = 'icons/clothing/under/shirts/quilted_gambeson.dmi' /obj/item/clothing/accessory/goldendeep/tabbard name = "valiant tabbard" desc = " Tabbards of Pactolous represent businesses and merchants, if not an individual's own organization." icon_state = "valiant_tabbard" item_state = "valiant_tabbard" - icon = 'icons/clothing/under/shirts/valiant_tabbard.dmi' - -/obj/item/clothing/accessory/goldendeep/clothwrappeduniform - name = "cloth wrapped uniform" - desc = "Casual and resilient, these intricate wraps protect one against the acid rains of Pactolous while keeping their style." - icon_state = "cloth_wrapped_uniform" - item_state = "cloth_wrapped_uniform" - icon = 'icons/clothing/under/shirts/cloth_wrapped_uniform.dmi' /obj/item/clothing/accessory/goldendeep/pullover name = "armored pullover" desc = " A statement piece with leather or jeweled adornment make anyone stand out wearing this strange garb." icon_state = "armored_pullover" item_state = "armored_pullover" - icon = 'icons/clothing/under/shirts/armored_pullover.dmi' /obj/item/clothing/accessory/goldendeep/raingarb name = "pactolus rain garb" desc = "Surprisingly sturdy for its patchwork appearance, pieces like this have been protecting workers from Pactolus' radioactive rains for years." icon_state = "pactolus_raingarb" item_state = "pactolus_raingarb" - icon = 'icons/clothing/under/shirts/pactolus_raingarb.dmi' //suits /obj/item/clothing/suit/storage/goldendeep diff --git a/code/modules/clothing/factions/nralakk.dm b/code/modules/clothing/factions/nralakk.dm index 5e1ed1c0cba..f1e09d9074c 100644 --- a/code/modules/clothing/factions/nralakk.dm +++ b/code/modules/clothing/factions/nralakk.dm @@ -1,79 +1,79 @@ -/obj/item/clothing/accessory/dressshirt/skrell +/obj/item/clothing/under/dressshirt/skrell desc = "A formal wetshirt in Skrell style." - icon = 'icons/clothing/under/shirts/skrell_casual.dmi' + icon = 'icons/obj/item/clothing/under/shirt/skrell_casual.dmi' -/obj/item/clothing/accessory/dressshirt/skrell/ocean +/obj/item/clothing/under/dressshirt/skrell/ocean name = "ocean formal wetshirt" desc = "This wetshirt is meant to resemble the waves of Qerrbalak's homeworld. This clothing is meant to trap moisture, making it uncomfortable for non-Skrell." icon_state = "ocean_dressshirt" item_state = "ocean_dressshirt" -/obj/item/clothing/accessory/dressshirt/skrell/maelstrom +/obj/item/clothing/under/dressshirt/skrell/maelstrom name = "maelstrom formal wetshirt" desc = "This ferocious wetshirt resembles that of a maelstrom; a common occurance on Skrell planets. This clothing is meant to trap moisture, making it uncomfortable for non-Skrell." icon_state = "maelstrom_dressshirt" item_state = "maelstrom_dressshirt" -/obj/item/clothing/accessory/dressshirt/skrell/reef +/obj/item/clothing/under/dressshirt/skrell/reef name = "reef formal wetshirt" desc = "This slightly tacky wetshirt resembles the coral reefs found throughout Nralakk space. This clothing is meant to trap moisture, making it uncomfortable for non-Skrell." icon_state = "reef_dressshirt" item_state = "reef_dressshirt" -/obj/item/clothing/accessory/tshirt/skrell - icon = 'icons/clothing/under/shirts/skrell_casual.dmi' +/obj/item/clothing/under/tshirt/skrell + icon = 'icons/obj/item/clothing/under/shirt/skrell_casual.dmi' desc = "A wetshirt in Skrell style." contained_sprite = TRUE -/obj/item/clothing/accessory/tshirt/skrell/ocean +/obj/item/clothing/under/tshirt/skrell/ocean name = "ocean wetshirt" desc = "This wetshirt is meant to resemble the waves of Qerrbalak's homeworld. This clothing is meant to trap moisture, making it uncomfortable for non-Skrell." icon_state = "ocean_tee" item_state = "ocean_tee" -/obj/item/clothing/accessory/tshirt/skrell/maelstrom +/obj/item/clothing/under/tshirt/skrell/maelstrom name = "maelstrom wetshirt" desc = "This ferocious wetshirt resembles that of a maelstrom; a common occurance on Skrell planets. This clothing is meant to trap moisture, making it uncomfortable for non-Skrell." icon_state = "maelstrom_tee" item_state = "maelstrom_tee" -/obj/item/clothing/accessory/tshirt/skrell/reef +/obj/item/clothing/under/tshirt/skrell/reef name = "reef wetshirt" desc = "This slightly tacky wetshirt resembles the coral reefs found throughout Nralakk space. This clothing is meant to trap moisture, making it uncomfortable for non-Skrell." icon_state = "reef_tee" item_state = "reef_tee" -/obj/item/clothing/accessory/tshirt/skrell/nebula +/obj/item/clothing/under/tshirt/skrell/nebula name = "pink eriuyushi nebula shirt" desc = "This shirt resembles the designs of Silversun tourist clothing. Most of these shirts are made in Eriuyushi and sold at their resort. This clothing is meant to trap moisture, making it uncomfortable for non-Skrell." icon_state = "pink_skrell_hawaiian" item_state = "pink_skrell_hawaiian" -/obj/item/clothing/accessory/tshirt/skrell/nebula/purple +/obj/item/clothing/under/tshirt/skrell/nebula/purple name = "purple eriuyushi nebula shirt" desc = "This shirt resembles the designs of Silversun tourist clothing. Most of these shirts are made in Eriuyushi and sold at their resort. This clothing is meant to trap moisture, making it uncomfortable for non-Skrell." icon_state = "purple_skrell_hawaiian" item_state = "purple_skrell_hawaiian" -/obj/item/clothing/accessory/tshirt/skrell/nebula/teal +/obj/item/clothing/under/tshirt/skrell/nebula/teal name = "teal eriuyushi nebula shirt" desc = "This shirt resembles the designs of Silversun tourist clothing. Most of these shirts are made in Eriuyushi and sold at their resort. This clothing is meant to trap moisture, making it uncomfortable for non-Skrell." icon_state = "teal_skrell_hawaiian" item_state = "teal_skrell_hawaiian" -/obj/item/clothing/accessory/tshirt/skrell/nebula/black +/obj/item/clothing/under/tshirt/skrell/nebula/black name = "black eriuyushi nebula shirt" desc = "This shirt resembles the designs of Silversun tourist clothing. Most of these shirts are made in Eriuyushi and sold at their resort. This clothing is meant to trap moisture, making it uncomfortable for non-Skrell." icon_state = "black_skrell_hawaiian" item_state = "black_skrell_hawaiian" -/obj/item/clothing/accessory/tshirt/skrell/nebula/white +/obj/item/clothing/under/tshirt/skrell/nebula/white name = "white eriuyushi nebula shirt" desc = "This shirt resembles the designs of Silversun tourist clothing. Most of these shirts are made in Eriuyushi and sold at their resort. This clothing is meant to trap moisture, making it uncomfortable for non-Skrell." icon_state = "white_skrell_hawaiian" item_state = "white_skrell_hawaiian" -/obj/item/clothing/accessory/tshirt/skrell/nebula/nralakk +/obj/item/clothing/under/tshirt/skrell/nebula/nralakk name = "nralakk eriuyushi nebula shirt" desc = "This shirt resembles the designs of Silversun tourist clothing. Most of these shirts are made in Eriuyushi and sold at their resort. This clothing is meant to trap moisture, making it uncomfortable for non-Skrell." icon_state = "nralakk_skrell_hawaiian" diff --git a/code/modules/clothing/under/pants.dm b/code/modules/clothing/pants/pants.dm similarity index 60% rename from code/modules/clothing/under/pants.dm rename to code/modules/clothing/pants/pants.dm index 0698801d382..42aa69a58ca 100644 --- a/code/modules/clothing/under/pants.dm +++ b/code/modules/clothing/pants/pants.dm @@ -3,104 +3,146 @@ // // Pants Parent Item -ABSTRACT_TYPE(/obj/item/clothing/under/pants) +ABSTRACT_TYPE(/obj/item/clothing/pants) name = "pants parent item" desc = DESC_PARENT - icon = 'icons/obj/item/clothing/under/pants.dmi' + icon = 'icons/obj/item/clothing/pants/pants.dmi' + species_sprite_adaption_type = WORN_PANTS + slot_flags = SLOT_PANTS contained_sprite = TRUE body_parts_covered = LOWER_TORSO | LEGS + var/mob_wear_layer = ABOVE_UNIFORM_LAYER_PA + gender = PLURAL // some pants vs. a skirt + valid_accessory_slots = list(ACCESSORY_SLOT_PANTS) + center_of_mass = list("x" = 16,"y" = 8) + sprite_sheets = list( + BODYTYPE_VAURCA_BULWARK = 'icons/mob/species/bulwark/pants.dmi' // depreceated, only because bulwarks are 64x64 + ) + +/obj/item/clothing/pants/get_mob_overlay(mob/living/carbon/human/H, mob_icon, mob_state, slot) + var/image/I = ..() + if(slot == slot_l_hand_str || slot == slot_r_hand_str) + for(var/obj/item/clothing/accessory/A in accessories) + A.accessory_mob_overlay.ClearOverlays() + else + for(var/obj/item/clothing/accessory/A in accessories) + var/image/accessory_image = A.get_accessory_mob_overlay(H, FALSE, src) + I.AddOverlays(accessory_image) + + if(blood_DNA && slot != slot_l_hand_str && slot != slot_r_hand_str) + var/image/bloodsies = image(icon = H.species.blood_mask, icon_state = "pantsblood") + bloodsies.color = blood_color + I.AddOverlays(bloodsies) + return I + +/obj/item/clothing/pants/update_clothing_icon() + if (ismob(src.loc)) + var/mob/M = src.loc + M.update_inv_pants() + +/obj/item/clothing/pants/verb/change_layer() + set category = "Object" + set name = "Change Pants Layer" + set src in usr + + var/list/options = list("Under Uniform" = UNDER_UNIFORM_LAYER_PA, "Over Uniform" = ABOVE_UNIFORM_LAYER_PA, "Over Suit" = ABOVE_SUIT_LAYER_PA) + var/new_layer = tgui_input_list(usr, "Position Pants", "Pants Layer", options) + if(new_layer) + mob_wear_layer = options[new_layer] + to_chat(usr, SPAN_NOTICE("\The [src] will now layer [new_layer].")) + update_clothing_icon() /********** Pants Start **********/ // Pants -/obj/item/clothing/under/pants/white +/obj/item/clothing/pants/white name = "white pants" desc = "Plain boring white pants." icon_state = "whitepants" item_state = "whitepants" -/obj/item/clothing/under/pants/black +/obj/item/clothing/pants/black name = "black pants" desc = "A pair of plain black pants." icon_state = "blackpants" item_state = "blackpants" -/obj/item/clothing/under/pants/red +/obj/item/clothing/pants/red name = "red pants" desc = "Bright red pants." icon_state = "redpants" item_state = "redpants" -/obj/item/clothing/under/pants/tan +/obj/item/clothing/pants/tan name = "tan pants" desc = "Some tan pants. You look like a white collar worker with these on." icon_state = "tanpants" item_state = "tanpants" -/obj/item/clothing/under/pants/khaki +/obj/item/clothing/pants/khaki name = "tan pants" desc = "A pair of dust beige khaki pants." icon_state = "khaki" item_state = "khaki" -/obj/item/clothing/under/pants/highvis +/obj/item/clothing/pants/highvis name = "high visibility pants" desc = "A pair of loose-fitting, high visibility pants to help the wearer be recognizable in high traffic areas with large industrial equipment." icon = 'icons/clothing/kit/highvis.dmi' icon_state = "pants_highvis" item_state = "pants_highvis" -/obj/item/clothing/under/pants/highvis/get_mob_overlay(mob/living/carbon/human/H, mob_icon, mob_state, slot) +/obj/item/clothing/pants/highvis/get_mob_overlay(mob/living/carbon/human/H, mob_icon, mob_state, slot) var/image/I = ..() if(slot == slot_w_uniform_str) - var/image/emissive_overlay = emissive_appearance(mob_icon, "pants_highvis_un-emis", alpha = src.alpha) + var/image/emissive_overlay = emissive_appearance(mob_icon, "[icon_state][species_sprite_adaption_type]-emis", alpha = src.alpha) I.AddOverlays(emissive_overlay) return I -/obj/item/clothing/under/pants/highvis_alt +/obj/item/clothing/pants/highvis_alt name = "high visibility pants" desc = "A pair of bright yellow pants with reflective stripes. For use in operations, engineering, and sometimes even law enforcement, in cold and poor weather or when visibility is low." icon = 'icons/clothing/kit/highvis.dmi' icon_state = "pants_highvis_alt" item_state = "pants_highvis_alt" -/obj/item/clothing/under/pants/highvis_alt/get_mob_overlay(mob/living/carbon/human/H, mob_icon, mob_state, slot) +/obj/item/clothing/pants/highvis_alt/get_mob_overlay(mob/living/carbon/human/H, mob_icon, mob_state, slot) var/image/I = ..() if(slot == slot_w_uniform_str) - var/image/emissive_overlay = emissive_appearance(mob_icon, "pants_highvis_alt_un-emis", alpha = src.alpha) + var/image/emissive_overlay = emissive_appearance(mob_icon, "[icon_state][species_sprite_adaption_type]-emis", alpha = src.alpha) I.AddOverlays(emissive_overlay) return I -/obj/item/clothing/under/pants/camo +/obj/item/clothing/pants/camo name = "camouflage pants" desc = "A pair of woodland camouflage pants. Probably not the best choice for a space station." icon_state = "camopants" item_state = "camopants" -/obj/item/clothing/under/pants/dress +/obj/item/clothing/pants/dress name = "dress pants" desc = "A pair of suit trousers. The rest of the outfit can't have gone far." icon_state = "dresspants" item_state = "dresspants" -/obj/item/clothing/under/pants/dress/belt +/obj/item/clothing/pants/dress/belt name = "dress pants" desc = "A pair of suit trousers. Comes with a belt, to secure your burdens." icon_state = "dresspants_belt" item_state = "dresspants_belt" -/obj/item/clothing/under/pants/striped +/obj/item/clothing/pants/striped name = "striped pants" desc = "A pair of striped pants. Typically seen among privateers." icon_state = "stripedpants" item_state = "stripedpants" -/obj/item/clothing/under/pants/tacticool +/obj/item/clothing/pants/tacticool name = "tacticool pants" desc = "A pair of rugged camo pants. Pairs well with canned rations and an SKS." icon_state = "tacticoolpants" item_state = "tacticoolpants" -/obj/item/clothing/under/pants/flared +/obj/item/clothing/pants/flared name = "flared pants" desc = "The peak of Biesellite fashion, these pants are flared at the ankle." icon_state = "flaredpants" @@ -110,25 +152,25 @@ ABSTRACT_TYPE(/obj/item/clothing/under/pants) /********** Jeans Start **********/ // Jeans -/obj/item/clothing/under/pants/jeans +/obj/item/clothing/pants/jeans name = "jeans" desc = "A nondescript pair of tough blue jeans." icon_state = "jeans" item_state = "jeans" -/obj/item/clothing/under/pants/classic +/obj/item/clothing/pants/classic name = "classic jeans" desc = "A pair of classic jeans." icon_state = "jeansclassic" item_state = "jeansclassic" -/obj/item/clothing/under/pants/mustang +/obj/item/clothing/pants/mustang name = "mustang jeans" desc = "Made in the finest space jeans factory this side of Tau Ceti." icon_state = "jeansmustang" item_state = "jeansmustang" -/obj/item/clothing/under/pants/mustang/colourable +/obj/item/clothing/pants/mustang/colourable name = "mustang jeans" desc = "Made in the finest space jeans factory this side of Tau Ceti." icon_state = "mustangcolour" @@ -136,19 +178,19 @@ ABSTRACT_TYPE(/obj/item/clothing/under/pants) build_from_parts = TRUE worn_overlay = "belt" -/obj/item/clothing/under/pants/jeansblack +/obj/item/clothing/pants/jeansblack name = "black jeans" desc = "A pair of black jeans." icon_state = "jeansblack" item_state = "jeansblack" -/obj/item/clothing/under/pants/designer +/obj/item/clothing/pants/designer name = "designer jeans" desc = "Dark denim jeans carefully distressed to perfection. They're not as rugged as they look." icon_state = "designer_jeans" item_state = "designer_jeans" -/obj/item/clothing/under/pants/tailoredjeans +/obj/item/clothing/pants/tailoredjeans name = "tailored jeans" desc = "Close fitting denim jeans carefully distressed to perfection. They're not as rugged as they look." icon_state = "tailored_jeans" @@ -156,14 +198,14 @@ ABSTRACT_TYPE(/obj/item/clothing/under/pants) build_from_parts = TRUE worn_overlay = "belt" -/obj/item/clothing/under/pants/ripped +/obj/item/clothing/pants/ripped name = "ripped jeans" desc = "A pair of ripped denim jeans. Probably sold for more than they're worth." icon_state = "jeansripped" item_state = "jeansripped" body_parts_covered = LOWER_TORSO -/obj/item/clothing/under/pants/blackripped +/obj/item/clothing/pants/blackripped name = "black ripped jeans" desc = "A pair of ripped black jeans. The brown belt is an interesting touch." icon_state = "jeansblackripped" @@ -173,29 +215,29 @@ ABSTRACT_TYPE(/obj/item/clothing/under/pants) /********** Track Pants Start **********/ // Track Pants -/obj/item/clothing/under/pants/track +/obj/item/clothing/pants/track name = "track pants" desc = "Track pants, perfect for squatting." icon = 'icons/obj/tracksuit.dmi' icon_state = "trackpants" item_state = "trackpants" -/obj/item/clothing/under/pants/track/blue +/obj/item/clothing/pants/track/blue name = "blue track pants" icon_state = "trackpantsblue" item_state = "trackpantsblue" -/obj/item/clothing/under/pants/track/green +/obj/item/clothing/pants/track/green name = "green track pants" icon_state = "trackpantsgreen" item_state = "trackpantsgreen" -/obj/item/clothing/under/pants/track/white +/obj/item/clothing/pants/track/white name = "white track pants" icon_state = "trackpantswhite" item_state = "trackpantswhite" -/obj/item/clothing/under/pants/track/red +/obj/item/clothing/pants/track/red name = "red track pants" icon_state = "trackpantsred" item_state = "trackpantsred" diff --git a/code/modules/clothing/under/shorts.dm b/code/modules/clothing/pants/shorts.dm similarity index 74% rename from code/modules/clothing/under/shorts.dm rename to code/modules/clothing/pants/shorts.dm index 9565f5ff994..0005631b5c6 100644 --- a/code/modules/clothing/under/shorts.dm +++ b/code/modules/clothing/pants/shorts.dm @@ -3,43 +3,45 @@ // // Shorts Parent Item -/obj/item/clothing/under/shorts +/obj/item/clothing/pants/shorts name = "shorts parent item" desc = DESC_PARENT body_parts_covered = LOWER_TORSO - icon = 'icons/obj/item/clothing/under/shorts.dmi' + icon = 'icons/obj/item/clothing/pants/shorts.dmi' contained_sprite = TRUE /********** Shorts Start **********/ // Shorts -/obj/item/clothing/under/shorts/colourable +/obj/item/clothing/pants/shorts/colourable name = "shorts" desc = "A pair of cotton shorts." icon_state = "shorts_colourable" item_state = "shorts_colourable" -/obj/item/clothing/under/shorts/colourable/short +/obj/item/clothing/pants/shorts/colourable/short name = "short shorts" desc = "A pair of cotton short shorts." + icon_state = "shorts_s_colourable" + item_state = "shorts_s_colourable" -/obj/item/clothing/under/shorts/black +/obj/item/clothing/pants/shorts/black name = "black shorts" desc = "For that island getaway. It's five o'clock somewhere, right?" icon_state = "shorts_black" item_state = "shorts_black" -/obj/item/clothing/under/shorts/black/short +/obj/item/clothing/pants/shorts/black/short name = "black short shorts" icon_state = "shorts_s_black" item_state = "shorts_s_black" -/obj/item/clothing/under/shorts/khaki +/obj/item/clothing/pants/shorts/khaki name = "khaki shorts" desc = "For that island getaway. It's five o'clock somewhere, right?" icon_state = "shorts_khaki" item_state = "shorts_khaki" -/obj/item/clothing/under/shorts/khaki/short +/obj/item/clothing/pants/shorts/khaki/short name = "khaki short shorts" icon_state = "shorts_s_khaki" item_state = "shorts_s_khaki" @@ -47,53 +49,53 @@ /********** Jeans Shorts Start **********/ // Jeans Shorts -/obj/item/clothing/under/shorts/jeans +/obj/item/clothing/pants/shorts/jeans name = "jeans shorts" desc = "Some jeans! Just in short form!" icon_state = "shorts_jeans" item_state = "shorts_jeans" -/obj/item/clothing/under/shorts/jeans/short +/obj/item/clothing/pants/shorts/jeans/short name = "jeans short shorts" icon_state = "shorts_s_jeans" item_state = "shorts_s_jeans" -/obj/item/clothing/under/shorts/jeans/classic +/obj/item/clothing/pants/shorts/jeans/classic name = "classic jeans shorts" icon_state = "shorts_jeans_classic" item_state = "shorts_jeans_classic" -/obj/item/clothing/under/shorts/jeans/classic/short +/obj/item/clothing/pants/shorts/jeans/classic/short name = "classic jeans short shorts" icon_state = "shorts_s_jeans_classic" item_state = "shorts_s_jeans_classic" -/obj/item/clothing/under/shorts/jeans/mustang +/obj/item/clothing/pants/shorts/jeans/mustang name = "mustang jeans shorts" icon_state = "shorts_jeans_mustang" item_state = "shorts_jeans_mustang" -/obj/item/clothing/under/shorts/jeans/mustang/short +/obj/item/clothing/pants/shorts/jeans/mustang/short name = "mustang jeans short shorts" icon_state = "shorts_s_jeans_mustang" item_state = "shorts_s_jeans_mustang" -/obj/item/clothing/under/shorts/jeans/black +/obj/item/clothing/pants/shorts/jeans/black name = "black jeans shorts" icon_state = "shorts_jeans_black" item_state = "shorts_jeans_black" -/obj/item/clothing/under/shorts/jeans/black/short +/obj/item/clothing/pants/shorts/jeans/black/short name = "black jeans short shorts" icon_state = "shorts_s_jeans_black" item_state = "shorts_s_jeans_black" -/obj/item/clothing/under/shorts/jeans/grey +/obj/item/clothing/pants/shorts/jeans/grey name = "grey jeans shorts" icon_state = "shorts_jeans_grey" item_state = "shorts_jeans_grey" -/obj/item/clothing/under/shorts/jeans/grey/short +/obj/item/clothing/pants/shorts/jeans/grey/short name = "grey jeans short shorts" icon_state = "shorts_s_jeans_grey" item_state = "shorts_s_jeans_grey" @@ -101,47 +103,47 @@ /********** Athletic Shorts Start **********/ // Athletic Shorts -/obj/item/clothing/under/shorts/athletic +/obj/item/clothing/pants/shorts/athletic name = "athletic shorts parent item" desc = DESC_PARENT -/obj/item/clothing/under/shorts/athletic/colourable +/obj/item/clothing/pants/shorts/athletic/colourable name = "athletic shorts" desc = "A pair of athletic shorts." icon_state = "shorts_athletic_colourable" item_state = "shorts_athletic_colourable" -/obj/item/clothing/under/shorts/athletic/black +/obj/item/clothing/pants/shorts/athletic/black name = "black athletic shorts" desc = "A pair of black athletic shorts." icon_state = "shorts_athletic_black" item_state = "shorts_athletic_black" -/obj/item/clothing/under/shorts/athletic/red +/obj/item/clothing/pants/shorts/athletic/red name = "red athletic shorts" desc = "A pair of red athletic shorts." icon_state = "shorts_athletic_red" item_state = "shorts_athletic_red" -/obj/item/clothing/under/shorts/athletic/green +/obj/item/clothing/pants/shorts/athletic/green name = "green athletic shorts" desc = "A pair of green athletic shorts." icon_state = "shorts_athletic_green" item_state = "shorts_athletic_green" -/obj/item/clothing/under/shorts/athletic/blue +/obj/item/clothing/pants/shorts/athletic/blue name = "blue athletic shorts" desc = "A pair of blue athletic shorts." icon_state = "shorts_athletic_blue" item_state = "shorts_athletic_blue" -/obj/item/clothing/under/shorts/athletic/grey +/obj/item/clothing/pants/shorts/athletic/grey name = "grey athletic shorts" desc = "A pair of grey athletic shorts." icon_state = "shorts_athletic_grey" item_state = "shorts_athletic_grey" -/obj/item/clothing/under/shorts/athletic/scc +/obj/item/clothing/pants/shorts/athletic/scc name = "\improper Stellar Corporate Conglomerate athletic shorts" desc = "Shorts displaying the wearer's pride in their assigned corporate entity." desc_extended = "The Stellar Corporate Conglomerate, also known as the Chainlink, is a joint alliance between the NanoTrasen Corporation, Hephaestus Industries, Idris Incorporated, Zeng-Hu Pharmaceuticals, and Zavodskoi Interstellar to exercise an undisputed economic dominance over the Orion Spur." diff --git a/code/modules/clothing/under/skirts.dm b/code/modules/clothing/pants/skirts.dm similarity index 73% rename from code/modules/clothing/under/skirts.dm rename to code/modules/clothing/pants/skirts.dm index bdc3f02ed20..dad7e0152d3 100644 --- a/code/modules/clothing/under/skirts.dm +++ b/code/modules/clothing/pants/skirts.dm @@ -1,118 +1,103 @@ //skirts -/obj/item/clothing/under/skirt +/obj/item/clothing/pants/skirt name = "casual skirt" desc = "A short, colorful skirt." desc_extended = "Not to be mistaken with the similarly named cut of steak." - icon = 'icons/obj/clothing/skirts.dmi' + icon = 'icons/obj/item/clothing/pants/skirts.dmi' icon_state = "skirt_casual" item_state = "skirt_casual" - worn_state = "skirt_casual" body_parts_covered = LOWER_TORSO contained_sprite = TRUE + gender = NEUTER -/obj/item/clothing/under/skirt/puffy +/obj/item/clothing/pants/skirt/puffy name = "puffy skirt" desc = "A short, puffy skirt." desc_extended = "The opposite of a pencil skirt." icon_state = "skirt_puffy" item_state = "skirt_puffy" - worn_state = "skirt_puffy" -/obj/item/clothing/under/skirt/long +/obj/item/clothing/pants/skirt/long name = "long skirt" desc = "A long, modest skirt." desc_extended = "Long enough to do a curtsy, if that's something you want to do." icon_state = "skirt_long" item_state = "skirt_long" - worn_state = "skirt_long" -/obj/item/clothing/under/skirt/high +/obj/item/clothing/pants/skirt/high name = "high skirt" desc = "A modest skirt going up to the waist." desc_extended = "For when covering your legs isn't enough." icon_state = "skirt_high" item_state = "skirt_high" - worn_state = "skirt_high" -/obj/item/clothing/under/skirt/pencil +/obj/item/clothing/pants/skirt/pencil name = "pencil skirt" desc = "A professional-looking pencil skirt." desc_extended = "Revel in how professional you are." icon_state = "skirt_pencil" item_state = "skirt_pencil" - worn_state = "skirt_pencil" -/obj/item/clothing/under/skirt/swept +/obj/item/clothing/pants/skirt/swept name = "swept skirt" desc = "A skirt that is swept to one side." desc_extended = "When you want a little more skirt, but not too much." icon_state = "skirt_swept" item_state = "skirt_swept" - worn_state = "skirt_swept" -/obj/item/clothing/under/skirt/plaid +/obj/item/clothing/pants/skirt/plaid name = "plaid skirt" desc = "A preppy plaid skirt." desc_extended = "Stick it to gender stereotypes and be the lumberjack you've perhaps always wanted to be." icon_state = "skirt_plaid" item_state = "skirt_plaid" - worn_state = "skirt_plaid" -/obj/item/clothing/under/skirt/pleated +/obj/item/clothing/pants/skirt/pleated name = "pleated skirt" desc = "A sharp-looking knife-pleated skirt." desc_extended = "Would go great with a sailor uniform." icon_state = "skirt_pleated" item_state = "skirt_pleated" - worn_state = "skirt_pleated" -/obj/item/clothing/under/skirt/skater +/obj/item/clothing/pants/skirt/skater name = "skater skirt" desc = "A plush skater skirt." desc_extended = "For ice skating, skateboarding, or rollerskating." icon_state = "skirt_skater" item_state = "skirt_skater" - worn_state = "skirt_skater" -/obj/item/clothing/under/skirt/tube +/obj/item/clothing/pants/skirt/tube name = "tube skirt" desc = "A long tube skirt." desc_extended = "A pencil skirt. But longer." icon_state = "skirt_tube" item_state = "skirt_tube" - worn_state = "skirt_tube" -/obj/item/clothing/under/skirt/straightlong +/obj/item/clothing/pants/skirt/straightlong name = "straight long skirt" desc = "A skirt that goes all the way down to the ankles." desc_extended = "Enough fabric for two skirts, and then some." icon_state = "skirt_straightlong" item_state = "skirt_straightlong" - worn_state = "skirt_straightlong" -/obj/item/clothing/under/skirt/offworlder +/obj/item/clothing/pants/skirt/offworlder name = "\improper CR skirt" desc = "A very tight form-fitting padded suit that looks extremely comfortable to wear. This variant seems to have a poofy skirt and longer sleeves than normal." icon = 'icons/obj/item/clothing/accessory/offworlder.dmi' contained_sprite = TRUE icon_state = "crskirt" item_state = "crskirt" - worn_state = "crskirt" body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS -/obj/item/clothing/under/skirt/jumper +/obj/item/clothing/pants/skirt/jumper name = "jumper skirt" desc = "A short skirt with two large shoulder straps." desc_extended = "Too tall or too short? Too bad. These shoulder straps can't be adjusted." icon_state = "skirt_jumper" - worn_state = "skirt_jumper" - item_state = "skirt_jumper" -/obj/item/clothing/under/skirt/jumper_highcut +/obj/item/clothing/pants/skirt/jumper_highcut name = "jumper dress" desc = "A garment with open sides that seems to be a cross between a dress and an apron." desc_extended = "You could achieve the same effect with two aprons, we're pretty sure." icon_state = "skirt_jumper_highcut" - worn_state = "skirt_jumper_highcut" - item_state = "skirt_jumper_highcut" diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index b56b35532e9..a4cc27d2fd7 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -33,7 +33,7 @@ . = ..() update_icon() -/obj/item/clothing/accessory/proc/get_inv_overlay(var/mob/M, var/force = FALSE) +/obj/item/clothing/accessory/proc/get_inv_overlay(var/mob/M, var/force = FALSE, var/obj/item/clothing/attached_to) if(!accessory_mob_overlay) get_accessory_mob_overlay(M, force) var/I = accessory_mob_overlay.icon @@ -41,11 +41,11 @@ if(!inv_overlay || force) if(icon_override) if(contained_sprite) - tmp_icon_state = "[tmp_icon_state]_w" + tmp_icon_state = "[tmp_icon_state][attached_to? "[attached_to.species_sprite_adaption_type]" : "[WORN_UNDER]"]" else if("[tmp_icon_state]_tie" in icon_states(icon_override)) tmp_icon_state = "[tmp_icon_state]_tie" else if(contained_sprite) - tmp_icon_state = "[tmp_icon_state]_w" + tmp_icon_state = "[tmp_icon_state][attached_to? "[attached_to.species_sprite_adaption_type]" : "[WORN_UNDER]"]" inv_overlay = image(icon = I, icon_state = tmp_icon_state, dir = SOUTH) if(color) inv_overlay.color = color @@ -54,7 +54,7 @@ inv_overlay.AddOverlays(overlay_image(I, "[tmp_icon_state]_[worn_overlay]", flags=RESET_COLOR)) //add the overlay w/o coloration of the original sprite return inv_overlay -/obj/item/clothing/accessory/proc/get_accessory_mob_overlay(var/mob/living/carbon/human/H, var/force = FALSE) +/obj/item/clothing/accessory/proc/get_accessory_mob_overlay(var/mob/living/carbon/human/H, var/force = FALSE, var/obj/item/clothing/attached_to) var/I if(icon_override) I = icon_override @@ -70,12 +70,12 @@ if(icon_override) if(contained_sprite) auto_adapt_species(H) - tmp_icon_state = "[UNDERSCORE_OR_NULL(src.icon_species_tag)][src.item_state][WORN_UNDER]" + tmp_icon_state = "[UNDERSCORE_OR_NULL(src.icon_species_tag)][src.item_state][attached_to? "[attached_to.species_sprite_adaption_type]" : "[WORN_UNDER]"]" else if("[tmp_icon_state]_mob" in icon_states(I)) tmp_icon_state = "[tmp_icon_state]_mob" else if(contained_sprite) auto_adapt_species(H) - tmp_icon_state = "[UNDERSCORE_OR_NULL(src.icon_species_tag)][src.item_state][WORN_UNDER]" + tmp_icon_state = "[UNDERSCORE_OR_NULL(src.icon_species_tag)][src.item_state][attached_to? "[attached_to.species_sprite_adaption_type]" : "[WORN_UNDER]"]" accessory_mob_overlay = image("icon" = I, "icon_state" = "[tmp_icon_state]") if(build_from_parts || has_accents) accessory_mob_overlay.ClearOverlays() @@ -98,7 +98,7 @@ return has_suit = S loc = has_suit - has_suit.AddOverlays(get_inv_overlay()) + has_suit.AddOverlays(get_inv_overlay(user, FALSE, has_suit)) if(user) to_chat(user, SPAN_NOTICE("You attach \the [src] to \the [has_suit].")) src.add_fingerprint(user) @@ -329,6 +329,8 @@ desc = "They suspend the illusion of the mime's play." icon_state = "suspenders" item_state = "suspenders" + gender = PLURAL + slot = ACCESSORY_SLOT_PANTS /obj/item/clothing/accessory/scarf name = "scarf" @@ -387,6 +389,8 @@ desc = "A pair of loose, brown leather chaps." icon_state = "chaps" item_state = "chaps" + gender = PLURAL + slot = ACCESSORY_SLOT_PANTS /obj/item/clothing/accessory/chaps/black name = "black chaps" @@ -942,6 +946,7 @@ item_state = "kneepads" contained_sprite = TRUE gender = PLURAL + slot = ACCESSORY_SLOT_PANTS /obj/item/clothing/accessory/blood_patch name = "O- blood patch" diff --git a/code/modules/clothing/under/accessories/holster.dm b/code/modules/clothing/under/accessories/holster.dm index d70bb2ae089..45bba59318e 100644 --- a/code/modules/clothing/under/accessories/holster.dm +++ b/code/modules/clothing/under/accessories/holster.dm @@ -171,6 +171,7 @@ icon_state = "holster_hip" item_state = "holster_hip" + /obj/item/clothing/accessory/holster/thigh name = "black thigh holster" desc = "A drop leg holster made of a durable synthetic fiber." diff --git a/code/modules/clothing/under/accessories/shirts.dm b/code/modules/clothing/under/accessories/shirts.dm index e0bf3b270f3..58152b74400 100644 --- a/code/modules/clothing/under/accessories/shirts.dm +++ b/code/modules/clothing/under/accessories/shirts.dm @@ -103,128 +103,6 @@ icon_state = "visegradi_sweater" item_state = "visegradi_sweater" -// -// Shirts -// - -// Dress Shirt -/obj/item/clothing/accessory/dressshirt - name = "dress shirt" - desc = "A casual dress shirt." - icon_state = "dressshirt" - item_state = "dressshirt" - var/rolled = FALSE - -/obj/item/clothing/accessory/dressshirt/update_clothing_icon() - var/mob/M = loc - if(ismob(loc)) - M.update_inv_wear_suit() - get_accessory_mob_overlay(M, TRUE) - get_inv_overlay(M, TRUE) - -/obj/item/clothing/accessory/dressshirt/verb/roll_up_shirt_sleeves() - set name = "Roll Up Shirt Sleeves" - set desc = "Roll up your shirt sleeves. Doesn't work with some shirts." - set category = "Object" - set src in usr - - if(use_check_and_message(usr)) - return FALSE - - var/list/icon_states = icon_states(icon) - var/initial_state = initial(icon_state) - var/new_state = "[initial_state]_r" - if(!(new_state in icon_states)) - to_chat(usr, SPAN_WARNING("Your shirt doesn't allow this!")) - return - - rolled = !rolled - to_chat(usr, SPAN_NOTICE("You roll your shirt sleeves [rolled ? "up" : "down"].")) - icon_state = rolled ? new_state : initial_state - item_state = rolled ? new_state : initial_state - overlay_state = rolled ? new_state : initial_state - update_icon() - update_clothing_icon() - -/obj/item/clothing/accessory/dressshirt/alt - name = "dress shirt" - desc = "A casual dress shirt." - icon_state = "dressshirt_alt" - item_state = "dressshirt_alt" - -/obj/item/clothing/accessory/dressshirt/alt/vneck - name = "v-neck dress shirt" - desc = "A casual dress shirt." - icon_state = "dressshirtvneck_alt" - item_state = "dressshirtvneck_alt" - -/obj/item/clothing/accessory/dressshirt/deepv - name = "deep v-neck dress shirt" - desc = "A casual dress shirt with a deep neckline." - icon_state = "dressshirt_deepv" - item_state = "dressshirt_deepv" - -/obj/item/clothing/accessory/dressshirt/crop - name = "cropped dress shirt" - desc = "A casual cropped dress shirt." - icon_state = "dressshirt_crop" - item_state = "dressshirt_crop" - -// So people can see how these appear in the loadout -/obj/item/clothing/accessory/dressshirt/rolled - name = "dress shirt" - desc = "A casual dress shirt. This one has its sleeves rolled up." - icon_state = "dressshirt_r" - item_state = "dressshirt_r" - -/obj/item/clothing/accessory/dressshirt/alt/rolled - name = "dress shirt" - desc = "A casual dress shirt. This one has its sleeves rolled up." - icon_state = "dressshirt_alt_r" - item_state = "dressshirt_alt_r" - -/obj/item/clothing/accessory/dressshirt/alt/vneck/rolled - name = "v-neck dress shirt" - desc = "A casual dress shirt. This one has its sleeves rolled up." - icon_state = "dressshirtvneck_alt_r" - item_state = "dressshirtvneck_alt_r" - -/obj/item/clothing/accessory/dressshirt/deepv/rolled - name = "deep v-neck dress shirt" - desc = "A casual dress shirt with a deep neckline. This one has its sleeves rolled up." - icon_state = "dressshirt_deepv_r" - item_state = "dressshirt_deepv_r" - -/obj/item/clothing/accessory/dressshirt/crop/rolled - name = "cropped dress shirt" - desc = "A casual cropped dress shirt. This one has its sleeves rolled up" - icon_state = "dressshirt_crop" - item_state = "dressshirt_crop" - -/obj/item/clothing/accessory/blouse - name = "blouse" - desc = "A loose fitting garment." - icon_state = "blouse" - item_state = "blouse" - -/obj/item/clothing/accessory/longblouse - name = "long-sleeved blouse" - desc = "A long-sleeved, loose fitting garment." - icon_state = "longblouse" - item_state = "longblouse" - -/obj/item/clothing/accessory/puffyblouse - name = "puffy blouse" - desc = "A loose fitting garment with plenty of material around the arms." - icon_state = "puffyblouse" - item_state = "puffyblouse" - -/obj/item/clothing/accessory/dressshirt/asymmetric - name = "asymmetric dress shirt" - desc = "A casual dress shirt that opens diagonally down the front." - icon_state = "dressshirt_asymmetric" - item_state = "dressshirt_asymmetric" - //Legacy /obj/item/clothing/accessory/wcoat name = "waistcoat" @@ -239,67 +117,15 @@ icon_state = "wcoat_rec" item_state = "wcoat_rec" -/obj/item/clothing/accessory/longsleeve - name = "long-sleeved shirt" - desc = "A long-sleeved shirt made of light fabric." - icon_state = "longshirt" - item_state = "longshirt" - -/obj/item/clothing/accessory/longsleeve_s - name = "black striped long-sleeved shirt" - desc = "A long-sleeved shirt made of light fabric. This one is striped in black." - icon_state = "longshirt_s" - item_state = "longshirt_s" - -/obj/item/clothing/accessory/longsleeve_sb - name = "blue striped long-sleeved shirt" - desc = "A long-sleeved shirt made of light fabric. This one is striped in blue." - icon_state = "longshirt_sb" - item_state = "longshirt_sb" - -/obj/item/clothing/accessory/tshirt - name = "t-shirt" - desc = "A simple, cheap t-shirt." - icon_state = "tshirt" - item_state = "tshirt" - -/obj/item/clothing/accessory/tshirt_crop - name = "cropped t-shirt" - desc = "A simple, cheap cropped t-shirt." - icon_state = "tshirt_crop" - item_state = "tshirt_crop" - -/obj/item/clothing/accessory/haltertop - name = "halter top" - desc = "A sleeveless tank with straps tied behind the neck, commonly seen worn in Biesel." - icon = 'icons/obj/item/clothing/accessory/halter_top.dmi' - icon_state = "haltertop" - item_state = "haltertop" - contained_sprite = TRUE - -/obj/item/clothing/accessory/tanktop - name = "tank top" - desc = "A simple, cheap tank top." - icon = 'icons/obj/item/clothing/accessory/tank_top.dmi' - icon_state = "tanktop" - item_state = "tanktop" - contained_sprite = TRUE - -/obj/item/clothing/accessory/tanktop/feminine - icon_state = "tanktop_fem" - item_state = "tanktop_fem" - -/obj/item/clothing/accessory/silversun - name = "silversun floral shirt" - desc = "A stylish Solarian shirt of Silversun design. It bears a floral design. This one is cyan." - icon = 'icons/clothing/under/shirts/hawaiian.dmi' - icon_state = "hawaii" - item_state = "hawaii" - contained_sprite = TRUE +/obj/item/clothing/accessory/wcoat_rec/det_vest var/open = FALSE + desc = "A slick waistcoat." + icon_state = "det_vest" + item_state = "det_vest" + contained_sprite = FALSE -/obj/item/clothing/accessory/silversun/verb/unbutton() - set name = "Unbutton Shirt" +/obj/item/clothing/accessory/wcoat_rec/det_vest/verb/unbutton() + set name = "Unbutton Waistcoat" set category = "Object" set src in usr @@ -311,36 +137,13 @@ var/mob/user = usr attack_self(user) -/obj/item/clothing/accessory/silversun/attack_self(mob/user) +/obj/item/clothing/accessory/wcoat_rec/det_vest/attack_self(mob/user) open = !open icon_state = "[initial(icon_state)][open ? "_open" : ""]" item_state = icon_state to_chat(user, SPAN_NOTICE("You [open ? "open" : "close"] \the [src].")) // the below forces the shirt to hard reset its image so it resets later its fucking weird ok inv_overlay = null - accessory_mob_overlay = null - -/obj/item/clothing/accessory/silversun/red - desc = "A stylish Solarian shirt of Silversun design. It bears a floral design. This one is crimson." - icon_state = "hawaii_red" - item_state = "hawaii_red" - -/obj/item/clothing/accessory/silversun/random - name = "silversun floral shirt" - -/obj/item/clothing/accessory/silversun/random/Initialize() - . = ..() - if(prob(50)) - icon_state = "hawaii_red" - color = color_rotation(rand(-11,12)*15) - -/obj/item/clothing/accessory/silversun/wcoat - name = "waistcoat" - desc = "A slick waistcoat." - icon = 'icons/obj/clothing/ties.dmi' - icon_state = "det_vest" - item_state = "det_vest" - contained_sprite = FALSE /obj/item/clothing/accessory/university name = "university sweatshirt" @@ -368,82 +171,3 @@ icon_state = "usweatshirt_black" item_state = "usweatshirt_black" -// Polo Shirts -/obj/item/clothing/accessory/polo - name = "polo shirt" - desc = "A stylish polo shirt." - icon = 'icons/obj/item/clothing/accessory/polo.dmi' - icon_state = "polo" - item_state = "polo" - contained_sprite = TRUE - -/obj/item/clothing/accessory/polo/polo_fem - desc = "A stylish polo shirt with a waist fit." - icon_state = "polo_fem" - item_state = "polo_fem" - -/obj/item/clothing/accessory/polo/polo_blue - name = "blue polo shirt" - desc = "A blue, stylish polo shirt." - icon_state = "polo_blue" - item_state = "polo_blue" - -/obj/item/clothing/accessory/polo/polo_blue_fem - name = "blue polo shirt" - desc = "A blue, stylish polo shirt with a waist fit." - icon_state = "polo_blue_fem" - item_state = "polo_blue_fem" - -/obj/item/clothing/accessory/polo/polo_red - name = "red polo shirt" - desc = "A red, stylish polo shirt." - icon_state = "polo_red" - item_state = "polo_red" - -/obj/item/clothing/accessory/polo/polo_red_fem - name = "red polo shirt" - desc = "A red, stylish polo shirt with a waist fit." - icon_state = "polo_red_fem" - item_state = "polo_red_fem" - -/obj/item/clothing/accessory/polo/polo_grayyellow - name = "tan polo shirt" - desc = "A tan, stylish polo shirt." - icon_state = "polo_grayyellow" - item_state = "polo_grayyellow" - -/obj/item/clothing/accessory/polo/polo_grayyellow_fem - name = "tan polo shirt" - desc = "A tan, stylish polo shirt with a waist fit." - icon_state = "polo_grayyellow_fem" - item_state = "polo_grayyellow_fem" - -/obj/item/clothing/accessory/polo/polo_greenstrip - desc = "A stylish polo shirt with a green strip around the collar." - icon_state = "polo_corp" - item_state = "polo_corp" - -/obj/item/clothing/accessory/polo/polo_greenstrip_fem - desc = "A stylish polo shirt with a green strip around the collar and a waist fit." - icon_state = "polo_corp_fem" - item_state = "polo_corp_fem" - -/obj/item/clothing/accessory/polo/polo_bluestrip - desc = "A stylish polo shirt with a blue strip around the collar." - icon_state = "polo_dais" - item_state = "polo_dais" - -/obj/item/clothing/accessory/polo/polo_bluestrip_fem - desc = "A stylish polo shirt with a blue strip around the collar and a waist fit." - icon_state = "polo_dais_fem" - item_state = "polo_dais_fem" - -/obj/item/clothing/accessory/polo/polo_redstrip - desc = "A stylish polo shirt with a red strip around the collar." - icon_state = "polo_nt" - item_state = "polo_nt" - -/obj/item/clothing/accessory/polo/polo_redstrip_fem - desc = "A stylish polo shirt with a red strip around the collar and a waist fit." - icon_state = "polo_nt_fem" - item_state = "polo_nt_fem" diff --git a/code/modules/clothing/under/shirts/shirts.dm b/code/modules/clothing/under/shirts/shirts.dm new file mode 100644 index 00000000000..d120046dcdf --- /dev/null +++ b/code/modules/clothing/under/shirts/shirts.dm @@ -0,0 +1,297 @@ +// +// Shirts +// + +// Dress Shirt +/obj/item/clothing/under/dressshirt + name = "dress shirt" + desc = "A casual dress shirt." + icon = 'icons/obj/item/clothing/under/shirt/shirts.dmi' + icon_state = "dressshirt" + item_state = "dressshirt" + contained_sprite = TRUE + var/rolled = FALSE + +/obj/item/clothing/under/dressshirt/update_clothing_icon() + var/mob/M = loc + if(ismob(loc)) + M.update_inv_wear_suit() + +/obj/item/clothing/under/dressshirt/verb/roll_up_shirt_sleeves() + set name = "Roll Up Shirt Sleeves" + set desc = "Roll up your shirt sleeves. Doesn't work with some shirts." + set category = "Object" + set src in usr + + if(use_check_and_message(usr)) + return FALSE + + var/list/icon_states = icon_states(icon) + var/initial_state = initial(icon_state) + var/new_state = "[initial_state]_r" + if(!(new_state in icon_states)) + to_chat(usr, SPAN_WARNING("Your shirt doesn't allow this!")) + return + + rolled = !rolled + to_chat(usr, SPAN_NOTICE("You roll your shirt sleeves [rolled ? "up" : "down"].")) + icon_state = rolled ? new_state : initial_state + item_state = rolled ? new_state : initial_state + overlay_state = rolled ? new_state : initial_state + update_icon() + update_clothing_icon() + +/obj/item/clothing/under/dressshirt/alt + name = "dress shirt" + desc = "A casual dress shirt." + icon_state = "dressshirt_alt" + item_state = "dressshirt_alt" + +/obj/item/clothing/under/dressshirt/alt/vneck + name = "v-neck dress shirt" + desc = "A casual dress shirt." + icon_state = "dressshirtvneck_alt" + item_state = "dressshirtvneck_alt" + +/obj/item/clothing/under/dressshirt/deepv + name = "deep v-neck dress shirt" + desc = "A casual dress shirt with a deep neckline." + icon_state = "dressshirt_deepv" + item_state = "dressshirt_deepv" + +/obj/item/clothing/under/dressshirt/crop + name = "cropped dress shirt" + desc = "A casual cropped dress shirt." + icon_state = "dressshirt_crop" + item_state = "dressshirt_crop" + +// So people can see how these appear in the loadout +/obj/item/clothing/under/dressshirt/rolled + name = "dress shirt" + desc = "A casual dress shirt. This one has its sleeves rolled up." + icon_state = "dressshirt_r" + item_state = "dressshirt_r" + +/obj/item/clothing/under/dressshirt/alt/rolled + name = "dress shirt" + desc = "A casual dress shirt. This one has its sleeves rolled up." + icon_state = "dressshirt_alt_r" + item_state = "dressshirt_alt_r" + +/obj/item/clothing/under/dressshirt/alt/vneck/rolled + name = "v-neck dress shirt" + desc = "A casual dress shirt. This one has its sleeves rolled up." + icon_state = "dressshirtvneck_alt_r" + item_state = "dressshirtvneck_alt_r" + +/obj/item/clothing/under/dressshirt/deepv/rolled + name = "deep v-neck dress shirt" + desc = "A casual dress shirt with a deep neckline. This one has its sleeves rolled up." + icon_state = "dressshirt_deepv_r" + item_state = "dressshirt_deepv_r" + +/obj/item/clothing/under/dressshirt/crop/rolled + name = "cropped dress shirt" + desc = "A casual cropped dress shirt. This one has its sleeves rolled up" + icon_state = "dressshirt_crop" + item_state = "dressshirt_crop" + + +/obj/item/clothing/under/dressshirt/asymmetric + name = "asymmetric dress shirt" + desc = "A casual dress shirt that opens diagonally down the front." + icon_state = "dressshirt_asymmetric" + item_state = "dressshirt_asymmetric" + +// Long Sleeve + +/obj/item/clothing/under/dressshirt/longsleeve + name = "long-sleeved shirt" + desc = "A long-sleeved shirt made of light fabric." + icon_state = "longshirt" + item_state = "longshirt" + +/obj/item/clothing/under/dressshirt/longsleeve_s + name = "black striped long-sleeved shirt" + desc = "A long-sleeved shirt made of light fabric. This one is striped in black." + icon_state = "longshirt_s" + item_state = "longshirt_s" + +/obj/item/clothing/under/dressshirt/longsleeve_sb + name = "blue striped long-sleeved shirt" + desc = "A long-sleeved shirt made of light fabric. This one is striped in blue." + icon_state = "longshirt_sb" + item_state = "longshirt_sb" + +// T-shirt + +/obj/item/clothing/under/dressshirt/tshirt + name = "t-shirt" + desc = "A simple, cheap t-shirt." + icon_state = "tshirt" + item_state = "tshirt" + +/obj/item/clothing/under/dressshirt/tshirt_crop + name = "cropped t-shirt" + desc = "A simple, cheap cropped t-shirt." + icon_state = "tshirt_crop" + item_state = "tshirt_crop" + +// Blouses and Tops + +/obj/item/clothing/under/dressshirt/blouse + name = "blouse" + desc = "A loose fitting garment." + icon_state = "blouse" + item_state = "blouse" + +/obj/item/clothing/under/dressshirt/longblouse + name = "long-sleeved blouse" + desc = "A long-sleeved, loose fitting garment." + icon_state = "longblouse" + item_state = "longblouse" + +/obj/item/clothing/under/dressshirt/puffyblouse + name = "puffy blouse" + desc = "A loose fitting garment with plenty of material around the arms." + icon_state = "puffyblouse" + item_state = "puffyblouse" + +/obj/item/clothing/under/dressshirt/haltertop + name = "halter top" + desc = "A sleeveless tank with straps tied behind the neck, commonly seen worn in Biesel." + icon_state = "haltertop" + item_state = "haltertop" + +/obj/item/clothing/under/dressshirt/tanktop + name = "tank top" + desc = "A simple, cheap tank top." + icon_state = "tanktop" + item_state = "tanktop" + +/obj/item/clothing/under/dressshirt/tanktop/feminine + icon_state = "tanktop_fem" + item_state = "tanktop_fem" + + +// Polo Shirts +/obj/item/clothing/under/dressshirt/polo + name = "polo shirt" + desc = "A stylish polo shirt." + icon_state = "polo" + item_state = "polo" + +/obj/item/clothing/under/dressshirt/polo/polo_fem + desc = "A stylish polo shirt with a waist fit." + icon_state = "polo_fem" + item_state = "polo_fem" + +/obj/item/clothing/under/dressshirt/polo/polo_blue + name = "blue polo shirt" + desc = "A blue, stylish polo shirt." + icon_state = "polo_blue" + item_state = "polo_blue" + +/obj/item/clothing/under/dressshirt/polo/polo_blue_fem + name = "blue polo shirt" + desc = "A blue, stylish polo shirt with a waist fit." + icon_state = "polo_blue_fem" + item_state = "polo_blue_fem" + +/obj/item/clothing/under/dressshirt/polo/polo_red + name = "red polo shirt" + desc = "A red, stylish polo shirt." + icon_state = "polo_red" + item_state = "polo_red" + +/obj/item/clothing/under/dressshirt/polo/polo_red_fem + name = "red polo shirt" + desc = "A red, stylish polo shirt with a waist fit." + icon_state = "polo_red_fem" + item_state = "polo_red_fem" + +/obj/item/clothing/under/dressshirt/polo/polo_grayyellow + name = "tan polo shirt" + desc = "A tan, stylish polo shirt." + icon_state = "polo_grayyellow" + item_state = "polo_grayyellow" + +/obj/item/clothing/under/dressshirt/polo/polo_grayyellow_fem + name = "tan polo shirt" + desc = "A tan, stylish polo shirt with a waist fit." + icon_state = "polo_grayyellow_fem" + item_state = "polo_grayyellow_fem" + +/obj/item/clothing/under/dressshirt/polo/polo_greenstrip + desc = "A stylish polo shirt with a green strip around the collar." + icon_state = "polo_corp" + item_state = "polo_corp" + +/obj/item/clothing/under/dressshirt/polo/polo_greenstrip_fem + desc = "A stylish polo shirt with a green strip around the collar and a waist fit." + icon_state = "polo_corp_fem" + item_state = "polo_corp_fem" + +/obj/item/clothing/under/dressshirt/polo/polo_bluestrip + desc = "A stylish polo shirt with a blue strip around the collar." + icon_state = "polo_dais" + item_state = "polo_dais" + +/obj/item/clothing/under/dressshirt/polo/polo_bluestrip_fem + desc = "A stylish polo shirt with a blue strip around the collar and a waist fit." + icon_state = "polo_dais_fem" + item_state = "polo_dais_fem" + +/obj/item/clothing/under/dressshirt/polo/polo_redstrip + desc = "A stylish polo shirt with a red strip around the collar." + icon_state = "polo_nt" + item_state = "polo_nt" + +/obj/item/clothing/under/dressshirt/polo/polo_redstrip_fem + desc = "A stylish polo shirt with a red strip around the collar and a waist fit." + icon_state = "polo_nt_fem" + item_state = "polo_nt_fem" + +// Silversun + +/obj/item/clothing/under/dressshirt/silversun + name = "silversun floral shirt" + desc = "A stylish Solarian shirt of Silversun design. It bears a floral design. This one is cyan." + icon_state = "hawaii" + item_state = "hawaii" + contained_sprite = TRUE + var/open = FALSE + +/obj/item/clothing/under/dressshirt/silversun/verb/unbutton() + set name = "Unbutton Shirt" + set category = "Object" + set src in usr + + if(!istype(usr, /mob/living)) + return + if(use_check_and_message(usr)) + return + + var/mob/user = usr + attack_self(user) + +/obj/item/clothing/under/dressshirt/silversun/attack_self(mob/user) + open = !open + icon_state = "[initial(icon_state)][open ? "_open" : ""]" + item_state = icon_state + to_chat(user, SPAN_NOTICE("You [open ? "open" : "close"] \the [src].")) + + +/obj/item/clothing/under/dressshirt/silversun/red + desc = "A stylish Solarian shirt of Silversun design. It bears a floral design. This one is crimson." + icon_state = "hawaii_red" + item_state = "hawaii_red" + +/obj/item/clothing/under/dressshirt/silversun/random + name = "silversun floral shirt" + +/obj/item/clothing/under/dressshirt/silversun/random/Initialize() + . = ..() + if(prob(50)) + icon_state = "hawaii_red" + color = color_rotation(rand(-11,12)*15) diff --git a/code/modules/clothing/under/xenos/tajara.dm b/code/modules/clothing/under/xenos/tajara.dm index 5d778e5bdc0..a83bd66903c 100644 --- a/code/modules/clothing/under/xenos/tajara.dm +++ b/code/modules/clothing/under/xenos/tajara.dm @@ -201,7 +201,7 @@ body_parts_covered = LOWER_TORSO starting_accessories = list(/obj/item/clothing/accessory/tajaran/summershirt) -/obj/item/clothing/under/pants/tajaran +/obj/item/clothing/pants/tajaran name = "adhomian summer pants" desc = "A pair of adhomian pants usually worn during the summer." icon = 'icons/obj/tajara_items.dmi' diff --git a/code/modules/clothing/wrists/wrists.dm b/code/modules/clothing/wrists/wrists.dm index 48cbf9114ef..6d69fef3b9f 100644 --- a/code/modules/clothing/wrists/wrists.dm +++ b/code/modules/clothing/wrists/wrists.dm @@ -3,6 +3,7 @@ name = "wrists" w_class = WEIGHT_CLASS_TINY icon = 'icons/obj/item/clothing/wrists/wrist.dmi' + gender = NEUTER sprite_sheets = list( BODYTYPE_VAURCA_BULWARK = 'icons/mob/species/bulwark/wrist.dmi' ) @@ -11,7 +12,7 @@ pickup_sound = 'sound/items/pickup/accessory.ogg' siemens_coefficient = 1.0 var/flipped = 0 - var/mob_wear_layer = WRISTS_LAYER_OVER + var/mob_wear_layer = ABOVE_SUIT_LAYER_WR contained_sprite = TRUE /obj/item/clothing/wrists/update_clothing_icon() @@ -32,7 +33,7 @@ set name = "Change Wristwear Layer" set src in usr - var/list/options = list("Under Uniform" = WRISTS_LAYER_UNDER, "Over Uniform" = WRISTS_LAYER_UNIFORM, "Over Suit" = WRISTS_LAYER_OVER) + var/list/options = list("Under Uniform" = UNDER_UNIFORM_LAYER_WR, "Over Uniform" = ABOVE_UNIFORM_LAYER_WR, "Over Suit" = ABOVE_SUIT_LAYER_WR) var/new_layer = tgui_input_list(usr, "Position Wristwear", "Wristwear Style", options) if(new_layer) mob_wear_layer = options[new_layer] diff --git a/code/modules/mining/abandonedcrates.dm b/code/modules/mining/abandonedcrates.dm index 0cf2c047018..6b111f5883f 100644 --- a/code/modules/mining/abandonedcrates.dm +++ b/code/modules/mining/abandonedcrates.dm @@ -45,8 +45,8 @@ if(36 to 40) new /obj/item/melee/baton(src) if(41 to 45) - new /obj/item/clothing/under/shorts/athletic/red(src) - new /obj/item/clothing/under/shorts/athletic/blue(src) + new /obj/item/clothing/pants/shorts/athletic/red(src) + new /obj/item/clothing/pants/shorts/athletic/blue(src) if(46 to 50) new /obj/item/clothing/under/chameleon(src) for(var/i = 0, i < 7, i++) diff --git a/code/modules/mob/inventory.dm b/code/modules/mob/inventory.dm index 3368f25e9c7..443c3c80157 100644 --- a/code/modules/mob/inventory.dm +++ b/code/modules/mob/inventory.dm @@ -117,7 +117,8 @@ var/list/slot_equipment_priority = list( \ slot_tie,\ slot_l_store,\ slot_r_store,\ - slot_wrists\ + slot_wrists,\ + slot_pants\ ) //Checks if a given slot can be accessed at this time, either to equip or unequip I diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index 8798b5976ba..026c32c7f7a 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -49,6 +49,7 @@ var/skipeyes = skipitems & HIDEEYES var/skipears = skipitems & HIDEEARS var/skipwrists = skipitems & HIDEWRISTS + var/skippants = skipitems & HIDEPANTS var/list/msg = list("This is ") @@ -164,6 +165,10 @@ else msg += "[get_pronoun("He")] [get_pronoun("has")] [icon2html(belt, user)] \a [belt] about [get_pronoun("his")] waist.\n" + //pants + if(pants && !skippants) + msg += "[get_pronoun("He")] [get_pronoun("is")] wearing [icon2html(pants, user)] \a [pants] about [get_pronoun("his")] waist.\n" + //shoes if(shoes && !skipshoes) if(shoes.blood_color) diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm index 658b1a8474f..c1d96fd77a7 100644 --- a/code/modules/mob/living/carbon/human/human_defines.dm +++ b/code/modules/mob/living/carbon/human/human_defines.dm @@ -76,6 +76,7 @@ var/obj/item/l_store = null var/obj/item/s_store = null var/obj/item/wrists = null + var/obj/item/pants = null var/icon/stand_icon = null var/icon/lying_icon = null diff --git a/code/modules/mob/living/carbon/human/human_helpers.dm b/code/modules/mob/living/carbon/human/human_helpers.dm index 58de05c0edb..89821956852 100644 --- a/code/modules/mob/living/carbon/human/human_helpers.dm +++ b/code/modules/mob/living/carbon/human/human_helpers.dm @@ -489,6 +489,9 @@ else if(w_uniform) if(w_uniform.clean_blood()) update_inv_w_uniform(0) + if(pants) + if(pants.clean_blood()) + update_inv_pants(0) if(gloves && washgloves) if(gloves.clean_blood()) update_inv_gloves(0) diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm index e429267a418..ea0dddcfdba 100644 --- a/code/modules/mob/living/carbon/human/inventory.dm +++ b/code/modules/mob/living/carbon/human/inventory.dm @@ -93,6 +93,8 @@ This saves us from having to call add_fingerprint() any time something is put in return 1 if(slot_wrists) return has_organ(BP_L_ARM) || has_organ(BP_R_ARM) + if(slot_pants) + return has_organ(BP_GROIN) || has_organ(BP_L_LEG) || has_organ(BP_R_LEG) /mob/living/carbon/human/u_equip(obj/W as obj) if(!W) return 0 @@ -137,6 +139,9 @@ This saves us from having to call add_fingerprint() any time something is put in else if (W == wrists) wrists = null update_inv_wrists() + else if (W == pants) + pants = null + update_inv_pants() else if (W == glasses) glasses = null update_inv_glasses() @@ -314,6 +319,10 @@ This saves us from having to call add_fingerprint() any time something is put in src.wrists = W W.on_equipped(src, slot, assisted_equip) update_inv_wrists(redraw_mob) + if(slot_pants) + src.pants = W + W.on_equipped(src, slot, assisted_equip) + update_inv_pants(redraw_mob) if(slot_head) src.head = W if(head.flags_inv & (BLOCKHAIR|BLOCKHEADHAIR|HIDEMASK)) @@ -431,6 +440,7 @@ This saves us from having to call add_fingerprint() any time something is put in if(slot_l_ear) return l_ear if(slot_r_ear) return r_ear if(slot_wrists) return wrists + if(slot_pants) return pants return ..() /mob/living/carbon/human/get_equipped_items(include_flags = NONE) @@ -462,6 +472,8 @@ This saves us from having to call add_fingerprint() any time something is put in items += w_uniform if(wrists) items += wrists + if(pants) + items += pants if(legcuffed) items += legcuffed if(handcuffed) diff --git a/code/modules/mob/living/carbon/human/species/species_hud.dm b/code/modules/mob/living/carbon/human/species/species_hud.dm index 618c55ec70b..b8d7af3b36c 100644 --- a/code/modules/mob/living/carbon/human/species/species_hud.dm +++ b/code/modules/mob/living/carbon/human/species/species_hud.dm @@ -30,6 +30,7 @@ "head" = list("loc" = ui_head, "name" = "hat", "slot" = slot_head, "state" = "hair", "toggle" = 1), "shoes" = list("loc" = ui_shoes, "name" = "shoes", "slot" = slot_shoes, "state" = "shoes", "toggle" = 1), "wrists" = list("loc" = ui_wrists, "name" = "wrists", "slot" = slot_wrists, "state" = "wrists", "toggle" = 1), + "pants" = list("loc" = ui_pants, "name" = "pants", "slot" = slot_pants, "state" = "pants", "toggle" = 1), "suit storage" = list("loc" = ui_sstore1, "name" = "suit storage", "slot" = slot_s_store, "state" = "suitstore"), "back" = list("loc" = ui_back, "name" = "back", "slot" = slot_back, "state" = "back", "slot_type" = /atom/movable/screen/inventory/back), "id" = list("loc" = ui_id, "name" = "id", "slot" = slot_wear_id, "state" = "id"), @@ -65,18 +66,20 @@ has_m_intent = TRUE gear = list( "i_clothing" = list("loc" = ui_iclothing, "name" = "uniform", "slot" = slot_w_uniform, "state" = "center", "toggle" = 1), - "o_clothing" = list("loc" = ui_shoes, "name" = "suit", "slot" = slot_wear_suit, "state" = "suit", "toggle" = 1), - "l_ear" = list("loc" = ui_glasses, "name" = "left ear", "slot" = slot_l_ear, "state" = "l_ear", "toggle" = 1), - "r_ear" = list("loc" = ui_wrists, "name" = "right ear", "slot" = slot_r_ear, "state" = "r_ear", "toggle" = 1), - "head" = list("loc" = ui_mask, "name" = "hat", "slot" = slot_head, "state" = "hair", "toggle" = 1), + "o_clothing" = list("loc" = ui_oclothing, "name" = "suit", "slot" = slot_wear_suit, "state" = "suit", "toggle" = 1), + "mask" = list("loc" = ui_mask, "name" = "mask", "slot" = slot_wear_mask, "state" = "mask", "toggle" = 1), + "eyes" = list("loc" = ui_glasses, "name" = "glasses", "slot" = slot_glasses, "state" = "glasses","toggle" = 1), + "l_ear" = list("loc" = ui_l_ear, "name" = "left ear", "slot" = slot_l_ear, "state" = "l_ear", "toggle" = 1), + "r_ear" = list("loc" = ui_r_ear, "name" = "right ear", "slot" = slot_r_ear, "state" = "r_ear", "toggle" = 1), + "wrists" = list("loc" = ui_wrists, "name" = "wrists", "slot" = slot_wrists, "state" = "wrists", "toggle" = 1), + "head" = list("loc" = ui_head, "name" = "hat", "slot" = slot_head, "state" = "hair", "toggle" = 1), + "pants" = list("loc" = ui_pants, "name" = "pants", "slot" = slot_pants, "state" = "pants", "toggle" = 1), "suit storage" = list("loc" = ui_sstore1, "name" = "suit storage", "slot" = slot_s_store, "state" = "suitstore"), "back" = list("loc" = ui_back, "name" = "back", "slot" = slot_back, "state" = "back"), "id" = list("loc" = ui_id, "name" = "id", "slot" = slot_wear_id, "state" = "id"), "storage1" = list("loc" = ui_storage1, "name" = "left Pocket", "slot" = slot_l_store, "state" = "pocket"), "storage2" = list("loc" = ui_storage2, "name" = "right Pocket", "slot" = slot_r_store, "state" = "pocket"), - "belt" = list("loc" = ui_belt, "name" = "belt", "slot" = slot_belt, "state" = "belt"), - "mask" = list("loc" = ui_oclothing, "name" = "mask", "slot" = slot_wear_mask, "state" = "mask", "toggle" = 1), - "eyes" = list("loc" = ui_gloves, "name" = "glasses", "slot" = slot_glasses, "state" = "glasses","toggle" = 1) + "belt" = list("loc" = ui_belt, "name" = "belt", "slot" = slot_belt, "state" = "belt") ) /datum/hud_data/monkey diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 6d880cd85b8..9cc11c7fa5a 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -804,7 +804,7 @@ There are several things that need to be remembered: var/layer = L_EAR_LAYER var/layer_alt = L_EAR_LAYER_ALT var/obj/item/device/radio/headset/wrist/W = l_ear - if(istype(W) && W.mob_wear_layer == WRISTS_LAYER_OVER) + if(istype(W) && W.mob_wear_layer == ABOVE_SUIT_LAYER_WR) layer = L_EAR_LAYER_ALT layer_alt = L_EAR_LAYER @@ -845,7 +845,7 @@ There are several things that need to be remembered: var/layer = R_EAR_LAYER var/layer_alt = R_EAR_LAYER_ALT var/obj/item/device/radio/headset/wrist/W = r_ear - if(istype(W) && W.mob_wear_layer == WRISTS_LAYER_OVER) + if(istype(W) && W.mob_wear_layer == ABOVE_SUIT_LAYER_WR) layer = R_EAR_LAYER_ALT layer_alt = R_EAR_LAYER @@ -1288,9 +1288,9 @@ There are several things that need to be remembered: if (QDELETED(src)) return - overlays_raw[WRISTS_LAYER_UNDER] = null - overlays_raw[WRISTS_LAYER_UNIFORM] = null - overlays_raw[WRISTS_LAYER_OVER] = null + overlays_raw[UNDER_UNIFORM_LAYER_WR] = null + overlays_raw[ABOVE_UNIFORM_LAYER_WR] = null + overlays_raw[ABOVE_SUIT_LAYER_WR] = null if(check_draw_wrists()) var/mob_icon @@ -1319,7 +1319,7 @@ There are several things that need to be remembered: var/image/wrists_overlay = wrists.get_mob_overlay(src, mob_icon, mob_state, slot_wrists_str) - var/wrist_layer = WRISTS_LAYER_OVER + var/wrist_layer = ABOVE_SUIT_LAYER_WR if(istype(wrists, /obj/item/clothing/wrists) || istype(wrists, /obj/item/device/radio/headset/wrist)) var/obj/item/clothing/wrists/W = wrists wrist_layer = W.mob_wear_layer @@ -1329,6 +1329,51 @@ There are several things that need to be remembered: if(update_icons) update_icon() +/mob/living/carbon/human/update_inv_pants(var/update_icons=1) + if (QDELETED(src)) + return + + overlays_raw[UNDER_UNIFORM_LAYER_PA] = null + overlays_raw[ABOVE_UNIFORM_LAYER_PA] = null + overlays_raw[ABOVE_SUIT_LAYER_PA] = null + + if(check_draw_pants()) + var/mob_icon + var/mob_state = pants.item_state || pants.icon_state + if(pants.contained_sprite) + if(pants.icon_override) + mob_icon = pants.icon_override + else if(pants.sprite_sheets && pants.sprite_sheets[GET_BODY_TYPE]) + mob_icon = pants.sprite_sheets[GET_BODY_TYPE] + else + mob_icon = pants.icon + pants.auto_adapt_species(src) + mob_state = "[UNDERSCORE_OR_NULL(pants.icon_species_tag)][pants.item_state][WORN_PANTS]" + else + if(pants.item_state_slots && pants.item_state_slots[slot_pants_str]) + mob_state = pants.item_state_slots[slot_pants_str] + + //determine icon to use + if(pants.item_icons && (slot_pants_str in pants.item_icons)) + mob_icon = pants.item_icons[slot_pants_str] + else if(pants.icon_override) + mob_icon = pants.icon_override + mob_state += WORN_PANTS + else + mob_icon = INV_PANTS_DEF_ICON + + var/image/pants_overlay = pants.get_mob_overlay(src, mob_icon, mob_state, slot_pants_str) + + var/pants_layer = ABOVE_SUIT_LAYER_PA + if(istype(pants, /obj/item/clothing/pants)) + var/obj/item/clothing/pants/P = pants + pants_layer = P.mob_wear_layer + + overlays_raw[pants_layer] = pants_overlay + + if(update_icons) + update_icon() + /mob/living/carbon/human/proc/update_tail_showing(var/update_icons=1) if (QDELETED(src)) @@ -1611,6 +1656,18 @@ There are several things that need to be remembered: else return TRUE +/mob/living/carbon/human/proc/check_draw_pants() + SHOULD_NOT_SLEEP(TRUE) + SHOULD_BE_PURE(TRUE) + if (!pants) + return FALSE + else if (pants.flags_inv & ALWAYSDRAW) + return TRUE + else if (pants.flags_inv & HIDEPANTS) + return FALSE + else + return TRUE + #undef UNDERSCORE_OR_NULL #undef GET_BODY_TYPE #undef GET_TAIL_LAYER diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index fc1e5d68669..87a9aa220ff 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -810,6 +810,8 @@ var/list/intents = list(I_HELP,I_DISARM,I_GRAB,I_HURT) return slot_shoes else if (H.wrists == src) return slot_wrists + else if (H.pants == src) + return slot_pants else return null//We failed to find the slot diff --git a/code/modules/mob/update_icons.dm b/code/modules/mob/update_icons.dm index 65fe194ee40..86dd64229f8 100644 --- a/code/modules/mob/update_icons.dm +++ b/code/modules/mob/update_icons.dm @@ -67,5 +67,8 @@ /mob/proc/update_inv_wrists() return +/mob/proc/update_inv_pants() + return + /mob/proc/update_targeted() return diff --git a/html/changelogs/wezzy-pants_slot.yml b/html/changelogs/wezzy-pants_slot.yml new file mode 100644 index 00000000000..91b43e00412 --- /dev/null +++ b/html/changelogs/wezzy-pants_slot.yml @@ -0,0 +1,61 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: Wowzewow (Wezzy) + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Adds a pants slot. Check your loadout. Note that they are no longer a uniform slot item and you no longer attach accessories to them." + - rscadd: "Kneepads, leather chaps, and suspenders now are attached to pants rather than uniform slot items." + - rscadd: "Shirts are now a uniform slot item and are no longer accessories." + - bugfix: "Fixes accessories not properly overlaying on uniform items." diff --git a/icons/clothing/accessories/kneepads.dmi b/icons/clothing/accessories/kneepads.dmi index 20c0170f8ae..40834530c91 100644 Binary files a/icons/clothing/accessories/kneepads.dmi and b/icons/clothing/accessories/kneepads.dmi differ diff --git a/icons/clothing/kit/highvis.dmi b/icons/clothing/kit/highvis.dmi index e384bcee624..3d41c15a960 100644 Binary files a/icons/clothing/kit/highvis.dmi and b/icons/clothing/kit/highvis.dmi differ diff --git a/icons/clothing/under/shirts/armored_pullover.dmi b/icons/clothing/under/shirts/armored_pullover.dmi deleted file mode 100644 index cb8fc7725b5..00000000000 Binary files a/icons/clothing/under/shirts/armored_pullover.dmi and /dev/null differ diff --git a/icons/clothing/under/shirts/cloth_wrapped_uniform.dmi b/icons/clothing/under/shirts/cloth_wrapped_uniform.dmi deleted file mode 100644 index 8d97142b430..00000000000 Binary files a/icons/clothing/under/shirts/cloth_wrapped_uniform.dmi and /dev/null differ diff --git a/icons/clothing/under/shirts/fine_shirt.dmi b/icons/clothing/under/shirts/fine_shirt.dmi deleted file mode 100644 index d30addb6ea7..00000000000 Binary files a/icons/clothing/under/shirts/fine_shirt.dmi and /dev/null differ diff --git a/icons/clothing/under/shirts/hawaiian.dmi b/icons/clothing/under/shirts/hawaiian.dmi deleted file mode 100644 index 2e005c9f2d0..00000000000 Binary files a/icons/clothing/under/shirts/hawaiian.dmi and /dev/null differ diff --git a/icons/clothing/under/shirts/pactolus_raingarb.dmi b/icons/clothing/under/shirts/pactolus_raingarb.dmi deleted file mode 100644 index 09472d96667..00000000000 Binary files a/icons/clothing/under/shirts/pactolus_raingarb.dmi and /dev/null differ diff --git a/icons/clothing/under/shirts/pompous_shirt.dmi b/icons/clothing/under/shirts/pompous_shirt.dmi deleted file mode 100644 index f6bdd357700..00000000000 Binary files a/icons/clothing/under/shirts/pompous_shirt.dmi and /dev/null differ diff --git a/icons/clothing/under/shirts/quilted_gambeson.dmi b/icons/clothing/under/shirts/quilted_gambeson.dmi deleted file mode 100644 index 0d8ad0d322d..00000000000 Binary files a/icons/clothing/under/shirts/quilted_gambeson.dmi and /dev/null differ diff --git a/icons/clothing/under/shirts/valiant_tabbard.dmi b/icons/clothing/under/shirts/valiant_tabbard.dmi deleted file mode 100644 index af9706cbd7b..00000000000 Binary files a/icons/clothing/under/shirts/valiant_tabbard.dmi and /dev/null differ diff --git a/icons/mob/human_races/masks/blood_human.dmi b/icons/mob/human_races/masks/blood_human.dmi index 8c7eb80751c..198228dd724 100644 Binary files a/icons/mob/human_races/masks/blood_human.dmi and b/icons/mob/human_races/masks/blood_human.dmi differ diff --git a/icons/mob/human_races/masks/blood_tajara.dmi b/icons/mob/human_races/masks/blood_tajara.dmi index 380ba1c07be..85001cc8721 100644 Binary files a/icons/mob/human_races/masks/blood_tajara.dmi and b/icons/mob/human_races/masks/blood_tajara.dmi differ diff --git a/icons/mob/pants.dmi b/icons/mob/pants.dmi new file mode 100644 index 00000000000..ee1562ba8e7 Binary files /dev/null and b/icons/mob/pants.dmi differ diff --git a/icons/mob/screen/midnight.dmi b/icons/mob/screen/midnight.dmi index ca9ea0f7d71..b45c61168f0 100644 Binary files a/icons/mob/screen/midnight.dmi and b/icons/mob/screen/midnight.dmi differ diff --git a/icons/mob/screen/old-noborder.dmi b/icons/mob/screen/old-noborder.dmi index b179e6af709..a4c0a2a4881 100644 Binary files a/icons/mob/screen/old-noborder.dmi and b/icons/mob/screen/old-noborder.dmi differ diff --git a/icons/mob/screen/old.dmi b/icons/mob/screen/old.dmi index 825b95659dd..f84fd132c28 100644 Binary files a/icons/mob/screen/old.dmi and b/icons/mob/screen/old.dmi differ diff --git a/icons/mob/screen/orange.dmi b/icons/mob/screen/orange.dmi index f3d085795a3..b042bdac458 100644 Binary files a/icons/mob/screen/orange.dmi and b/icons/mob/screen/orange.dmi differ diff --git a/icons/mob/screen/white.dmi b/icons/mob/screen/white.dmi index 99375b44835..5f048f22908 100644 Binary files a/icons/mob/screen/white.dmi and b/icons/mob/screen/white.dmi differ diff --git a/icons/mob/species/bulwark/pants.dmi b/icons/mob/species/bulwark/pants.dmi new file mode 100644 index 00000000000..91f3c547ea5 Binary files /dev/null and b/icons/mob/species/bulwark/pants.dmi differ diff --git a/icons/mob/species/bulwark/uniform.dmi b/icons/mob/species/bulwark/uniform.dmi index d6434a9359e..4445f2d622f 100644 Binary files a/icons/mob/species/bulwark/uniform.dmi and b/icons/mob/species/bulwark/uniform.dmi differ diff --git a/icons/mob/ties.dmi b/icons/mob/ties.dmi index 780827bacc1..67ffa654248 100644 Binary files a/icons/mob/ties.dmi and b/icons/mob/ties.dmi differ diff --git a/icons/obj/clothing/ties.dmi b/icons/obj/clothing/ties.dmi index b0e1b842baf..a1dc4635e6a 100644 Binary files a/icons/obj/clothing/ties.dmi and b/icons/obj/clothing/ties.dmi differ diff --git a/icons/obj/item/clothing/accessory/goldendeep.dmi b/icons/obj/item/clothing/accessory/goldendeep.dmi new file mode 100644 index 00000000000..a4197049647 Binary files /dev/null and b/icons/obj/item/clothing/accessory/goldendeep.dmi differ diff --git a/icons/obj/item/clothing/accessory/halter_top.dmi b/icons/obj/item/clothing/accessory/halter_top.dmi deleted file mode 100644 index 0d32896b6f6..00000000000 Binary files a/icons/obj/item/clothing/accessory/halter_top.dmi and /dev/null differ diff --git a/icons/obj/item/clothing/accessory/polo.dmi b/icons/obj/item/clothing/accessory/polo.dmi deleted file mode 100644 index 66b3ad63aa7..00000000000 Binary files a/icons/obj/item/clothing/accessory/polo.dmi and /dev/null differ diff --git a/icons/obj/item/clothing/accessory/tank_top.dmi b/icons/obj/item/clothing/accessory/tank_top.dmi deleted file mode 100644 index bb595075ca5..00000000000 Binary files a/icons/obj/item/clothing/accessory/tank_top.dmi and /dev/null differ diff --git a/icons/obj/item/clothing/pants/pants.dmi b/icons/obj/item/clothing/pants/pants.dmi new file mode 100644 index 00000000000..91f62561f36 Binary files /dev/null and b/icons/obj/item/clothing/pants/pants.dmi differ diff --git a/icons/obj/item/clothing/under/shorts.dmi b/icons/obj/item/clothing/pants/shorts.dmi similarity index 80% rename from icons/obj/item/clothing/under/shorts.dmi rename to icons/obj/item/clothing/pants/shorts.dmi index b739110b9ec..a6379dd0773 100644 Binary files a/icons/obj/item/clothing/under/shorts.dmi and b/icons/obj/item/clothing/pants/shorts.dmi differ diff --git a/icons/obj/clothing/skirts.dmi b/icons/obj/item/clothing/pants/skirts.dmi similarity index 84% rename from icons/obj/clothing/skirts.dmi rename to icons/obj/item/clothing/pants/skirts.dmi index f4cd64e9e48..253d8556a48 100644 Binary files a/icons/obj/clothing/skirts.dmi and b/icons/obj/item/clothing/pants/skirts.dmi differ diff --git a/icons/obj/item/clothing/under/goldendeep.dmi b/icons/obj/item/clothing/under/goldendeep.dmi new file mode 100644 index 00000000000..7a55cf19d61 Binary files /dev/null and b/icons/obj/item/clothing/under/goldendeep.dmi differ diff --git a/icons/obj/item/clothing/under/pants.dmi b/icons/obj/item/clothing/under/pants.dmi deleted file mode 100644 index 6aa8dc1c5e1..00000000000 Binary files a/icons/obj/item/clothing/under/pants.dmi and /dev/null differ diff --git a/icons/obj/item/clothing/under/shirt/goldendeep.dmi b/icons/obj/item/clothing/under/shirt/goldendeep.dmi new file mode 100644 index 00000000000..1c51cd6d217 Binary files /dev/null and b/icons/obj/item/clothing/under/shirt/goldendeep.dmi differ diff --git a/icons/obj/item/clothing/under/shirt/shirts.dmi b/icons/obj/item/clothing/under/shirt/shirts.dmi new file mode 100644 index 00000000000..6229e6f5453 Binary files /dev/null and b/icons/obj/item/clothing/under/shirt/shirts.dmi differ diff --git a/icons/clothing/under/shirts/skrell_casual.dmi b/icons/obj/item/clothing/under/shirt/skrell_casual.dmi similarity index 100% rename from icons/clothing/under/shirts/skrell_casual.dmi rename to icons/obj/item/clothing/under/shirt/skrell_casual.dmi diff --git a/icons/obj/item/clothing/under/shirts.dmi b/icons/obj/item/clothing/under/shirts.dmi new file mode 100644 index 00000000000..6229e6f5453 Binary files /dev/null and b/icons/obj/item/clothing/under/shirts.dmi differ diff --git a/icons/obj/item/clothing/under/skrell_casual.dmi b/icons/obj/item/clothing/under/skrell_casual.dmi new file mode 100644 index 00000000000..0f3a0446624 Binary files /dev/null and b/icons/obj/item/clothing/under/skrell_casual.dmi differ diff --git a/icons/obj/tracksuit.dmi b/icons/obj/tracksuit.dmi index 7c4182f899c..441068e0030 100644 Binary files a/icons/obj/tracksuit.dmi and b/icons/obj/tracksuit.dmi differ diff --git a/maps/away/away_site/cult_base/cult_base.dmm b/maps/away/away_site/cult_base/cult_base.dmm index 5970dd04269..ad62989edfa 100644 --- a/maps/away/away_site/cult_base/cult_base.dmm +++ b/maps/away/away_site/cult_base/cult_base.dmm @@ -2409,7 +2409,7 @@ /obj/random/medical, /obj/random/loot, /obj/item/clothing/suit/storage/medical_chest_rig, -/obj/item/clothing/under/pants/track, +/obj/item/clothing/pants/track, /obj/item/clothing/under/dress/sailordress, /obj/random/loot, /obj/random/spacecash, @@ -5707,7 +5707,7 @@ /obj/random/loot, /obj/random/colored_jumpsuit, /obj/random/suit, -/obj/item/clothing/under/pants/mustang, +/obj/item/clothing/pants/mustang, /obj/random/dirt_75, /turf/simulated/floor/tiled/dark, /area/cult_base/crew_quarters) @@ -5746,7 +5746,7 @@ /obj/random/spacecash, /obj/random/loot, /obj/random/colored_jumpsuit, -/obj/item/clothing/under/pants/jeansblack, +/obj/item/clothing/pants/jeansblack, /obj/item/clothing/ears/skrell/chain/ebony, /turf/simulated/floor/tiled/dark, /area/cult_base/crew_quarters) @@ -7152,7 +7152,7 @@ /obj/item/clothing/suit/storage/toggle/longcoat, /obj/item/clothing/suit/storage/toggle/varsity/brown, /obj/random/medical, -/obj/item/clothing/under/pants/striped, +/obj/item/clothing/pants/striped, /obj/item/clothing/under/dress/dress_orange, /obj/random/loot, /obj/item/reagent_containers/inhaler/xuxigas, diff --git a/maps/away/away_site/konyang/point_verdant/point_verdant.dmm b/maps/away/away_site/konyang/point_verdant/point_verdant.dmm index 65ef7011271..3a13aea9798 100644 --- a/maps/away/away_site/konyang/point_verdant/point_verdant.dmm +++ b/maps/away/away_site/konyang/point_verdant/point_verdant.dmm @@ -37470,15 +37470,15 @@ pixel_y = -4; pixel_x = 6 }, -/obj/item/clothing/under/pants/black{ +/obj/item/clothing/pants/black{ pixel_y = 7; pixel_x = -6 }, -/obj/item/clothing/under/pants/black{ +/obj/item/clothing/pants/black{ pixel_y = 3; pixel_x = -6 }, -/obj/item/clothing/under/pants/black{ +/obj/item/clothing/pants/black{ pixel_y = -1; pixel_x = -6 }, diff --git a/maps/away/away_site/konyang/point_verdant/point_verdant_ghostroles.dm b/maps/away/away_site/konyang/point_verdant/point_verdant_ghostroles.dm index e59ef54064a..2a23f269618 100644 --- a/maps/away/away_site/konyang/point_verdant/point_verdant_ghostroles.dm +++ b/maps/away/away_site/konyang/point_verdant/point_verdant_ghostroles.dm @@ -128,7 +128,7 @@ /obj/outfit/admin/konyang/goon name = "5-Cheung Thug" - uniform = /obj/item/clothing/under/pants/tan + uniform = /obj/item/clothing/pants/tan shoes = /obj/item/clothing/shoes/sneakers/black id = null l_pocket = /obj/item/storage/wallet/random @@ -172,7 +172,7 @@ /obj/outfit/admin/konyang/vendor name = "Konyang Vendor" - uniform = /obj/item/clothing/under/pants/jeans + uniform = /obj/item/clothing/pants/jeans shoes = /obj/item/clothing/shoes/sneakers/black suit = /obj/item/clothing/suit/storage/toggle/konyang/akira back = /obj/item/storage/backpack/satchel diff --git a/maps/away/away_site/pirate_base/pirate_base.dmm b/maps/away/away_site/pirate_base/pirate_base.dmm index f181d3a0eee..bd31074953d 100644 --- a/maps/away/away_site/pirate_base/pirate_base.dmm +++ b/maps/away/away_site/pirate_base/pirate_base.dmm @@ -2739,7 +2739,7 @@ pixel_y = -8 }, /obj/item/clothing/under/pj/red, -/obj/item/clothing/under/pants/jeans{ +/obj/item/clothing/pants/jeans{ pixel_y = -5 }, /obj/item/clothing/suit/storage/hooded/wintercoat/mars, @@ -4429,7 +4429,7 @@ /obj/item/clothing/shoes/sneakers/hitops/brown{ pixel_y = -7 }, -/obj/item/clothing/under/pants/tacticool, +/obj/item/clothing/pants/tacticool, /obj/item/clothing/under/syndicate/tracksuit, /turf/simulated/floor/tiled, /area/piratebase/quarters) @@ -9306,7 +9306,7 @@ /obj/item/spacecash/c200, /obj/random/spacecash, /obj/random/spacecash, -/obj/item/clothing/under/pants/designer{ +/obj/item/clothing/pants/designer{ pixel_y = -3 }, /obj/item/clothing/suit/storage/toggle/leather_jacket/designer/red{ @@ -10023,7 +10023,7 @@ /obj/item/clothing/head/softcap/himeo, /obj/item/clothing/suit/storage/toggle/trench/grey, /obj/item/clothing/under/color/brown, -/obj/item/clothing/under/pants/black, +/obj/item/clothing/pants/black, /obj/item/clothing/under/tactical, /obj/item/clothing/under/syndicate/tacticool, /obj/item/clothing/accessory/longsleeve_s, @@ -10324,8 +10324,8 @@ /obj/item/clothing/under/suit_jacket/charcoal, /obj/item/clothing/suit/storage/toggle/leather_jacket/midriff, /obj/item/clothing/suit/storage/toggle/varsity, -/obj/item/clothing/under/pants/tacticool, -/obj/item/clothing/under/pants/ripped, +/obj/item/clothing/pants/tacticool, +/obj/item/clothing/pants/ripped, /obj/item/clothing/accessory/university/black, /obj/item/clothing/suit/storage/toggle/track/red, /obj/item/clothing/suit/storage/toggle/flannel/gray, diff --git a/maps/away/away_site/shady/shady.dmm b/maps/away/away_site/shady/shady.dmm index 820f05454ba..fafdfa11d7d 100644 --- a/maps/away/away_site/shady/shady.dmm +++ b/maps/away/away_site/shady/shady.dmm @@ -240,10 +240,10 @@ /area/hideout) "df" = ( /obj/structure/closet/cabinet, -/obj/item/clothing/under/pants/camo, -/obj/item/clothing/under/pants/mustang, -/obj/item/clothing/under/pants/tacticool, -/obj/item/clothing/under/pants/track, +/obj/item/clothing/pants/camo, +/obj/item/clothing/pants/mustang, +/obj/item/clothing/pants/tacticool, +/obj/item/clothing/pants/track, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/lino, /area/hideout) diff --git a/maps/away/away_site/tajara/taj_safehouse/tajara_safehouse_ghostroles.dm b/maps/away/away_site/tajara/taj_safehouse/tajara_safehouse_ghostroles.dm index 659c4e82f40..9bb2e88c856 100644 --- a/maps/away/away_site/tajara/taj_safehouse/tajara_safehouse_ghostroles.dm +++ b/maps/away/away_site/tajara/taj_safehouse/tajara_safehouse_ghostroles.dm @@ -24,7 +24,7 @@ /obj/item/clothing/under/tajaran, /obj/item/clothing/under/tajaran/nt, /obj/item/clothing/under/tajaran/summer, - /obj/item/clothing/under/pants/tajaran + /obj/item/clothing/pants/tajaran ) shoes = list( @@ -71,7 +71,7 @@ uniform = list( /obj/item/clothing/under/syndicate, /obj/item/clothing/under/tajaran/summer, - /obj/item/clothing/under/pants/tajaran + /obj/item/clothing/pants/tajaran ) shoes = list( diff --git a/maps/away/ships/coc/coc_ranger/coc_ship.dmm b/maps/away/ships/coc/coc_ranger/coc_ship.dmm index c13aee523ae..81a11e36542 100644 --- a/maps/away/ships/coc/coc_ranger/coc_ship.dmm +++ b/maps/away/ships/coc/coc_ranger/coc_ship.dmm @@ -5053,10 +5053,10 @@ /obj/item/clothing/accessory/storage/black_vest, /obj/item/clothing/accessory/storage/pouches/brown, /obj/item/clothing/accessory/storage/pouches/colour, -/obj/item/clothing/under/pants/camo, -/obj/item/clothing/under/pants/camo, -/obj/item/clothing/under/pants/camo, -/obj/item/clothing/under/pants/camo, +/obj/item/clothing/pants/camo, +/obj/item/clothing/pants/camo, +/obj/item/clothing/pants/camo, +/obj/item/clothing/pants/camo, /obj/item/clothing/under/syndicate/tracksuit, /obj/item/clothing/under/syndicate/tracksuit, /obj/item/clothing/gloves/black_leather/unathi, diff --git a/maps/away/ships/coc/coc_scarab/coc_scarab.dmm b/maps/away/ships/coc/coc_scarab/coc_scarab.dmm index b616776158c..79f69cb4d45 100644 --- a/maps/away/ships/coc/coc_scarab/coc_scarab.dmm +++ b/maps/away/ships/coc/coc_scarab/coc_scarab.dmm @@ -5636,7 +5636,7 @@ /obj/item/clothing/under/offworlder{ color = "#333a59" }, -/obj/item/clothing/under/skirt/offworlder{ +/obj/item/clothing/pants/skirt/offworlder{ color = "#333a59" }, /obj/item/clothing/gloves/offworlder{ @@ -5663,13 +5663,13 @@ /obj/item/clothing/accessory/offworlder{ color = "#333a59" }, -/obj/item/clothing/under/skirt/offworlder{ +/obj/item/clothing/pants/skirt/offworlder{ color = "#554444" }, -/obj/item/clothing/under/skirt/offworlder{ +/obj/item/clothing/pants/skirt/offworlder{ color = "#554444" }, -/obj/item/clothing/under/skirt/offworlder{ +/obj/item/clothing/pants/skirt/offworlder{ color = "#c9ced4" }, /obj/item/clothing/under/offworlder, diff --git a/maps/away/ships/freebooter/freebooter_ship_submaps.dmm b/maps/away/ships/freebooter/freebooter_ship_submaps.dmm index 1f3a7604ebd..317037f8a6c 100644 --- a/maps/away/ships/freebooter/freebooter_ship_submaps.dmm +++ b/maps/away/ships/freebooter/freebooter_ship_submaps.dmm @@ -3640,10 +3640,10 @@ /obj/structure/closet/cabinet, /obj/item/clothing/head/cowboy, /obj/item/clothing/shoes/cowboy, -/obj/item/clothing/under/pants/camo, -/obj/item/clothing/under/pants/camo, +/obj/item/clothing/pants/camo, +/obj/item/clothing/pants/camo, /obj/item/clothing/under/syndicate/tacticool, -/obj/item/clothing/under/pants/tacticool, +/obj/item/clothing/pants/tacticool, /obj/item/clothing/under/rank/sol/marine, /obj/item/clothing/head/sol/marine, /obj/item/clothing/under/rank/sol, @@ -3652,8 +3652,8 @@ /obj/item/clothing/under/dominia/fleet/armsman, /obj/item/clothing/head/dominia/fleet, /obj/item/clothing/head/dominia/fleet/armsman, -/obj/item/clothing/under/pants/jeans, -/obj/item/clothing/under/pants/jeansblack, +/obj/item/clothing/pants/jeans, +/obj/item/clothing/pants/jeansblack, /obj/item/clothing/head/beanie/random, /obj/item/clothing/head/beanie/random, /obj/item/clothing/head/headbando/random, diff --git a/maps/away/ships/golden_deep/golden_deep_ghostroles.dm b/maps/away/ships/golden_deep/golden_deep_ghostroles.dm index 3ec1d2b3e05..71d5a04fc0f 100644 --- a/maps/away/ships/golden_deep/golden_deep_ghostroles.dm +++ b/maps/away/ships/golden_deep/golden_deep_ghostroles.dm @@ -70,9 +70,9 @@ name = "Golden Deep Collective, Accredited Merchant" back = /obj/item/storage/backpack/satchel/leather r_pocket = /obj/item/storage/wallet/random - uniform = /obj/item/clothing/under/pants/dress/belt + pants = /obj/item/clothing/pants/dress/belt head = /obj/item/clothing/head/goldendeep - accessory = /obj/item/clothing/accessory/goldendeep/black + uniform = /obj/item/clothing/under/dressshirt/goldendeep/black suit = /obj/item/clothing/accessory/poncho/goldendeep/flowingcloak belt = /obj/item/gun/energy/pistol/goldendeep shoes = /obj/item/clothing/shoes/laceup diff --git a/maps/away/ships/golden_deep/golden_deep_submaps.dmm b/maps/away/ships/golden_deep/golden_deep_submaps.dmm index 0a177723d12..3aa6f77349c 100644 --- a/maps/away/ships/golden_deep/golden_deep_submaps.dmm +++ b/maps/away/ships/golden_deep/golden_deep_submaps.dmm @@ -156,10 +156,10 @@ /area/template_noop) "ji" = ( /obj/structure/closet/cabinet, -/obj/item/clothing/accessory/tshirt/skrell/nebula/black, -/obj/item/clothing/accessory/tshirt/skrell/nebula/nralakk, -/obj/item/clothing/accessory/tshirt/skrell/nebula/teal, -/obj/item/clothing/accessory/tshirt/skrell/reef, +/obj/item/clothing/under/tshirt/skrell/nebula/black, +/obj/item/clothing/under/tshirt/skrell/nebula/nralakk, +/obj/item/clothing/under/tshirt/skrell/nebula/teal, +/obj/item/clothing/under/tshirt/skrell/reef, /obj/item/clothing/ears/skrell/band, /obj/item/clothing/ears/skrell/chain/black, /obj/item/clothing/ears/skrell/chain/ebony, diff --git a/maps/away/ships/idris/idris_cruiser.dmm b/maps/away/ships/idris/idris_cruiser.dmm index b9aec7bb008..ae1a1ade8ff 100644 --- a/maps/away/ships/idris/idris_cruiser.dmm +++ b/maps/away/ships/idris/idris_cruiser.dmm @@ -1190,10 +1190,10 @@ /obj/item/clothing/under/swimsuit/green, /obj/item/clothing/under/swimsuit/purple, /obj/item/clothing/under/swimsuit/red, -/obj/item/clothing/under/shorts/athletic/black, -/obj/item/clothing/under/shorts/athletic/blue, -/obj/item/clothing/under/shorts/athletic/green, -/obj/item/clothing/under/shorts/athletic/red, +/obj/item/clothing/pants/shorts/athletic/black, +/obj/item/clothing/pants/shorts/athletic/blue, +/obj/item/clothing/pants/shorts/athletic/green, +/obj/item/clothing/pants/shorts/athletic/red, /turf/simulated/floor/tiled, /area/ship/idris_cruiser/locker_rooms/room_2) "fc" = ( @@ -5569,10 +5569,10 @@ /obj/item/clothing/under/swimsuit/green, /obj/item/clothing/under/swimsuit/purple, /obj/item/clothing/under/swimsuit/red, -/obj/item/clothing/under/shorts/athletic/black, -/obj/item/clothing/under/shorts/athletic/blue, -/obj/item/clothing/under/shorts/athletic/green, -/obj/item/clothing/under/shorts/athletic/red, +/obj/item/clothing/pants/shorts/athletic/black, +/obj/item/clothing/pants/shorts/athletic/blue, +/obj/item/clothing/pants/shorts/athletic/green, +/obj/item/clothing/pants/shorts/athletic/red, /turf/simulated/floor/tiled, /area/ship/idris_cruiser/locker_rooms/room_2) "tO" = ( @@ -8823,10 +8823,10 @@ /obj/item/clothing/under/swimsuit/green, /obj/item/clothing/under/swimsuit/purple, /obj/item/clothing/under/swimsuit/red, -/obj/item/clothing/under/shorts/athletic/black, -/obj/item/clothing/under/shorts/athletic/blue, -/obj/item/clothing/under/shorts/athletic/green, -/obj/item/clothing/under/shorts/athletic/red, +/obj/item/clothing/pants/shorts/athletic/black, +/obj/item/clothing/pants/shorts/athletic/blue, +/obj/item/clothing/pants/shorts/athletic/green, +/obj/item/clothing/pants/shorts/athletic/red, /turf/simulated/floor/tiled, /area/ship/idris_cruiser/locker_rooms/room_1) "FQ" = ( @@ -9423,10 +9423,10 @@ /obj/item/clothing/under/swimsuit/green, /obj/item/clothing/under/swimsuit/purple, /obj/item/clothing/under/swimsuit/red, -/obj/item/clothing/under/shorts/athletic/black, -/obj/item/clothing/under/shorts/athletic/blue, -/obj/item/clothing/under/shorts/athletic/green, -/obj/item/clothing/under/shorts/athletic/red, +/obj/item/clothing/pants/shorts/athletic/black, +/obj/item/clothing/pants/shorts/athletic/blue, +/obj/item/clothing/pants/shorts/athletic/green, +/obj/item/clothing/pants/shorts/athletic/red, /turf/simulated/floor/tiled, /area/ship/idris_cruiser/locker_rooms/room_1) "Iu" = ( diff --git a/maps/away/ships/konyang/ipc_refugee/ipc_refugee_ship.dmm b/maps/away/ships/konyang/ipc_refugee/ipc_refugee_ship.dmm index 844c5975c7d..41df7724e2e 100644 --- a/maps/away/ships/konyang/ipc_refugee/ipc_refugee_ship.dmm +++ b/maps/away/ships/konyang/ipc_refugee/ipc_refugee_ship.dmm @@ -2830,10 +2830,10 @@ /obj/item/clothing/suit/storage/toggle/leather_jacket/military/old/alt, /obj/item/clothing/suit/storage/toggle/bomber, /obj/item/clothing/suit/storage/toggle/highvis, -/obj/item/clothing/under/pants/track, -/obj/item/clothing/under/pants/tacticool, -/obj/item/clothing/under/pants/jeansblack, -/obj/item/clothing/under/pants/classic, +/obj/item/clothing/pants/track, +/obj/item/clothing/pants/tacticool, +/obj/item/clothing/pants/jeansblack, +/obj/item/clothing/pants/classic, /obj/item/clothing/accessory/silversun, /obj/item/clothing/under/syndicate/tracksuit, /obj/item/clothing/under/syndicate, @@ -2954,10 +2954,10 @@ /obj/item/clothing/suit/storage/toggle/leather_jacket/military/old/alt, /obj/item/clothing/suit/storage/toggle/bomber, /obj/item/clothing/suit/storage/toggle/highvis, -/obj/item/clothing/under/pants/track, -/obj/item/clothing/under/pants/tacticool, -/obj/item/clothing/under/pants/jeansblack, -/obj/item/clothing/under/pants/classic, +/obj/item/clothing/pants/track, +/obj/item/clothing/pants/tacticool, +/obj/item/clothing/pants/jeansblack, +/obj/item/clothing/pants/classic, /obj/item/clothing/accessory/silversun, /obj/item/clothing/under/syndicate/tracksuit, /obj/item/clothing/under/syndicate, @@ -3152,10 +3152,10 @@ /obj/item/clothing/suit/storage/toggle/leather_jacket/military/tan, /obj/item/clothing/suit/storage/toggle/trench, /obj/item/clothing/suit/storage/toggle/flannel, -/obj/item/clothing/under/pants/classic, -/obj/item/clothing/under/pants/jeansblack, -/obj/item/clothing/under/pants/tacticool, -/obj/item/clothing/under/pants/track, +/obj/item/clothing/pants/classic, +/obj/item/clothing/pants/jeansblack, +/obj/item/clothing/pants/tacticool, +/obj/item/clothing/pants/track, /obj/item/clothing/under/syndicate/tracksuit, /obj/item/clothing/under/syndicate/tracksuit, /obj/item/clothing/under/syndicate, diff --git a/maps/away/ships/konyang/water_barge/water_barge.dmm b/maps/away/ships/konyang/water_barge/water_barge.dmm index dc4586dd1e3..5bfad74a931 100644 --- a/maps/away/ships/konyang/water_barge/water_barge.dmm +++ b/maps/away/ships/konyang/water_barge/water_barge.dmm @@ -2872,7 +2872,7 @@ }, /obj/structure/closet, /obj/random/colored_jumpsuit, -/obj/item/clothing/accessory/silversun/random, +/obj/item/clothing/under/dressshirt/silversun/random, /turf/simulated/floor/tiled/dark, /area/water_barge/cryo) "Cz" = ( diff --git a/maps/away/ships/lone_spacer/lone_spacer.dmm b/maps/away/ships/lone_spacer/lone_spacer.dmm index ff8ea67ef6d..ecbf513286c 100644 --- a/maps/away/ships/lone_spacer/lone_spacer.dmm +++ b/maps/away/ships/lone_spacer/lone_spacer.dmm @@ -701,7 +701,7 @@ /obj/item/clothing/mask/offworlder{ color = "#7d3e6a" }, -/obj/item/clothing/under/skirt/offworlder{ +/obj/item/clothing/pants/skirt/offworlder{ color = "#604343" }, /obj/item/clothing/under/offworlder{ @@ -756,10 +756,10 @@ color = "#7B5143" }, /obj/item/clothing/gloves/fingerless, -/obj/item/clothing/accessory/tshirt/skrell/nebula/black, +/obj/item/clothing/under/tshirt/skrell/nebula/black, /obj/item/clothing/ears/skrell/scrunchy, -/obj/item/clothing/under/shorts/athletic/black, -/obj/item/clothing/under/pants/track, +/obj/item/clothing/pants/shorts/athletic/black, +/obj/item/clothing/pants/track, /obj/item/clothing/gloves/offworlder{ color = "#604343" }, @@ -774,7 +774,7 @@ /obj/item/clothing/accessory/dressshirt{ color = "#bbbbbb" }, -/obj/item/clothing/under/pants/jeansblack, +/obj/item/clothing/pants/jeansblack, /obj/item/clothing/head/helmet/pilot, /obj/item/clothing/head/sidecap{ color = "#2E2E2E"; diff --git a/maps/away/ships/orion/orion_express_ship.dmm b/maps/away/ships/orion/orion_express_ship.dmm index c872d2d8951..588860f5939 100644 --- a/maps/away/ships/orion/orion_express_ship.dmm +++ b/maps/away/ships/orion/orion_express_ship.dmm @@ -3788,8 +3788,8 @@ /obj/item/clothing/suit/storage/toggle/supply_dep_jacket, /obj/item/clothing/suit/storage/toggle/supply_dep_jacket, /obj/item/clothing/suit/storage/toggle/bomber, -/obj/item/clothing/under/shorts/khaki, -/obj/item/clothing/under/shorts/khaki/short, +/obj/item/clothing/pants/shorts/khaki, +/obj/item/clothing/pants/shorts/khaki/short, /obj/item/clothing/shoes/workboots/dark, /obj/item/clothing/shoes/workboots/toeless/dark, /obj/item/clothing/gloves/brown, diff --git a/maps/away/ships/sadar_scout/sadar_scout.dmm b/maps/away/ships/sadar_scout/sadar_scout.dmm index ed0c68a9fb5..ce9316e3b4a 100644 --- a/maps/away/ships/sadar_scout/sadar_scout.dmm +++ b/maps/away/ships/sadar_scout/sadar_scout.dmm @@ -3668,10 +3668,10 @@ /obj/item/clothing/suit/storage/toggle/leather_jacket/military/old/alt, /obj/item/clothing/suit/storage/toggle/leather_jacket/designer, /obj/item/clothing/suit/storage/toggle/bomber, -/obj/item/clothing/under/pants/tacticool, -/obj/item/clothing/under/pants/track, -/obj/item/clothing/under/pants/jeansblack, -/obj/item/clothing/under/pants/designer, +/obj/item/clothing/pants/tacticool, +/obj/item/clothing/pants/track, +/obj/item/clothing/pants/jeansblack, +/obj/item/clothing/pants/designer, /obj/item/clothing/gloves/fingerless, /obj/item/clothing/gloves/fingerless, /obj/item/clothing/gloves/brown, diff --git a/maps/away/ships/scc/scc_scout_ship.dmm b/maps/away/ships/scc/scc_scout_ship.dmm index f90f2c79393..53c799416e9 100644 --- a/maps/away/ships/scc/scc_scout_ship.dmm +++ b/maps/away/ships/scc/scc_scout_ship.dmm @@ -1201,7 +1201,7 @@ dir = 6 }, /obj/item/clothing/accessory/dressshirt/alt, -/obj/item/clothing/accessory/silversun/random, +/obj/item/clothing/under/dressshirt/silversun/random, /obj/item/clothing/accessory/kneepads, /obj/item/clothing/accessory/storage/overalls, /obj/item/clothing/accessory/tie/black, @@ -7546,13 +7546,13 @@ /obj/structure/closet, /obj/item/clothing/suit/storage/toggle/brown_jacket/scc, /obj/item/clothing/under/color/grey, -/obj/item/clothing/under/shorts/black, -/obj/item/clothing/under/pants/tan, -/obj/item/clothing/under/pants/track, +/obj/item/clothing/pants/shorts/black, +/obj/item/clothing/pants/tan, +/obj/item/clothing/pants/track, /obj/item/clothing/under/color/lightred, -/obj/item/clothing/under/pants/camo, +/obj/item/clothing/pants/camo, /obj/item/clothing/accessory/poncho, -/obj/item/clothing/under/pants/classic, +/obj/item/clothing/pants/classic, /obj/item/clothing/under/sundress, /obj/machinery/alarm/north{ req_one_access = null diff --git a/maps/away/ships/sol/sol_pirate/sfa_patrol_ship.dmm b/maps/away/ships/sol/sol_pirate/sfa_patrol_ship.dmm index f1c40d9ed61..793d87ff537 100644 --- a/maps/away/ships/sol/sol_pirate/sfa_patrol_ship.dmm +++ b/maps/away/ships/sol/sol_pirate/sfa_patrol_ship.dmm @@ -4389,15 +4389,15 @@ /obj/item/clothing/accessory/storage/webbing, /obj/item/clothing/accessory/storage/webbing, /obj/item/clothing/accessory/storage/webbing, -/obj/item/clothing/under/pants/camo, -/obj/item/clothing/under/pants/camo, +/obj/item/clothing/pants/camo, +/obj/item/clothing/pants/camo, /obj/item/clothing/head/bandana/colorable/random, /obj/item/clothing/accessory/bandanna/black, /obj/item/clothing/accessory/bandanna/black, /obj/item/clothing/head/bandana, /obj/item/clothing/under/tactical, -/obj/item/clothing/under/pants/mustang, -/obj/item/clothing/under/pants/track, +/obj/item/clothing/pants/mustang, +/obj/item/clothing/pants/track, /obj/item/clothing/under/syndicate/tracksuit, /obj/item/clothing/under/syndicate, /obj/item/clothing/under/syndicate/combat, @@ -4409,8 +4409,8 @@ /obj/item/clothing/suit/storage/toggle/leather_jacket/flight, /obj/item/clothing/head/beanie/random, /obj/item/clothing/head/bucket/boonie/blue, -/obj/item/clothing/accessory/silversun/random, -/obj/item/clothing/accessory/silversun/random, +/obj/item/clothing/under/dressshirt/silversun/random, +/obj/item/clothing/under/dressshirt/silversun/random, /turf/simulated/floor/wood, /area/ship/sfa_patrol_ship/Quarters) "mUT" = ( diff --git a/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler_ghostroles.dm b/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler_ghostroles.dm index c18b00dc4c9..fa315cc941a 100644 --- a/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler_ghostroles.dm +++ b/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler_ghostroles.dm @@ -26,7 +26,7 @@ uniform = list( /obj/item/clothing/under/tajaran, /obj/item/clothing/under/tajaran/summer, - /obj/item/clothing/under/pants/tajaran, + /obj/item/clothing/pants/tajaran, /obj/item/clothing/under/syndicate/tracksuit, /obj/item/clothing/under/tajaran/mechanic diff --git a/maps/away/ships/tirakqi_smuggler/tirakqi_smuggler.dmm b/maps/away/ships/tirakqi_smuggler/tirakqi_smuggler.dmm index 9f7bca4217d..ad06cb282bd 100644 --- a/maps/away/ships/tirakqi_smuggler/tirakqi_smuggler.dmm +++ b/maps/away/ships/tirakqi_smuggler/tirakqi_smuggler.dmm @@ -470,14 +470,14 @@ /obj/structure/closet/cabinet{ name = "wardrobe" }, -/obj/item/clothing/accessory/tshirt/skrell/nebula, -/obj/item/clothing/accessory/tshirt/skrell/maelstrom, -/obj/item/clothing/accessory/tshirt/skrell/nebula/black, -/obj/item/clothing/accessory/tshirt/skrell/nebula/nralakk, -/obj/item/clothing/accessory/tshirt/skrell/nebula/purple, -/obj/item/clothing/accessory/tshirt/skrell/nebula/teal, -/obj/item/clothing/accessory/tshirt/skrell/nebula/white, -/obj/item/clothing/accessory/tshirt/skrell/ocean, +/obj/item/clothing/under/tshirt/skrell/nebula, +/obj/item/clothing/under/tshirt/skrell/maelstrom, +/obj/item/clothing/under/tshirt/skrell/nebula/black, +/obj/item/clothing/under/tshirt/skrell/nebula/nralakk, +/obj/item/clothing/under/tshirt/skrell/nebula/purple, +/obj/item/clothing/under/tshirt/skrell/nebula/teal, +/obj/item/clothing/under/tshirt/skrell/nebula/white, +/obj/item/clothing/under/tshirt/skrell/ocean, /obj/item/clothing/accessory/poncho/skrell, /obj/item/clothing/accessory/poncho/skrell/brown, /obj/item/clothing/accessory/poncho/skrell/gray, diff --git a/maps/away/ships/tramp_freighter/tramp_freighter.dmm b/maps/away/ships/tramp_freighter/tramp_freighter.dmm index 1ce60485917..87be65199bd 100644 --- a/maps/away/ships/tramp_freighter/tramp_freighter.dmm +++ b/maps/away/ships/tramp_freighter/tramp_freighter.dmm @@ -2246,20 +2246,20 @@ /obj/structure/closet, /obj/item/clothing/suit/storage/toggle/bomber, /obj/item/clothing/suit/storage/toggle/flannel/red, -/obj/item/clothing/under/pants/jeansblack, +/obj/item/clothing/pants/jeansblack, /obj/item/clothing/head/cowboy, /obj/item/clothing/shoes/cowboy/classic, /obj/item/clothing/shoes/jackboots, /obj/item/clothing/head/softcap/himeo, /obj/item/clothing/accessory/storage/overalls, -/obj/item/clothing/under/pants/black, +/obj/item/clothing/pants/black, /obj/item/clothing/accessory/bandanna, /obj/item/clothing/accessory/bandanna/black, /obj/item/clothing/accessory/bandanna/blue, /obj/item/clothing/suit/storage/toggle/trench/green, /obj/item/clothing/glasses/fakesunglasses/aviator, /obj/item/clothing/glasses/regular/circle, -/obj/item/clothing/under/pants/tacticool, +/obj/item/clothing/pants/tacticool, /obj/item/clothing/shoes/laceup, /obj/item/clothing/shoes/laceup, /obj/item/clothing/gloves/fingerless, diff --git a/maps/away/ships/yacht_civ/yacht_civ.dmm b/maps/away/ships/yacht_civ/yacht_civ.dmm index a320cdf0ebf..d8b133599a1 100644 --- a/maps/away/ships/yacht_civ/yacht_civ.dmm +++ b/maps/away/ships/yacht_civ/yacht_civ.dmm @@ -1250,7 +1250,7 @@ color = "#4B381D"; pixel_y = -9 }, -/obj/item/clothing/accessory/silversun/random, +/obj/item/clothing/under/dressshirt/silversun/random, /obj/item/clothing/suit/storage/toggle/cardigan{ color = "#DDDDDD"; pixel_y = -6 @@ -1264,7 +1264,7 @@ /obj/item/clothing/suit/storage/toggle/konyang/akira{ pixel_y = -4 }, -/obj/item/clothing/accessory/silversun/random, +/obj/item/clothing/under/dressshirt/silversun/random, /obj/item/clothing/suit/storage/toggle/leather_jacket/designer{ pixel_y = -2 }, @@ -4852,54 +4852,54 @@ "RA" = ( /obj/effect/floor_decal/corner/blue/full, /obj/structure/closet/cabinet, -/obj/item/clothing/under/skirt/long{ +/obj/item/clothing/pants/skirt/long{ color = "#c1a61d" }, -/obj/item/clothing/under/skirt/jumper{ +/obj/item/clothing/pants/skirt/jumper{ color = "#BB3333" }, -/obj/item/clothing/under/pants/designer{ +/obj/item/clothing/pants/designer{ pixel_y = 4 }, -/obj/item/clothing/under/pants/black, -/obj/item/clothing/under/pants/jeans{ +/obj/item/clothing/pants/black, +/obj/item/clothing/pants/jeans{ pixel_y = 4 }, -/obj/item/clothing/under/pants/white, -/obj/item/clothing/under/skirt/high{ +/obj/item/clothing/pants/white, +/obj/item/clothing/pants/skirt/high{ color = "#4B381D" }, -/obj/item/clothing/under/skirt{ +/obj/item/clothing/pants/skirt{ color = "#3131B1" }, -/obj/item/clothing/under/skirt/tube{ +/obj/item/clothing/pants/skirt/tube{ color = "#333333" }, -/obj/item/clothing/under/skirt/plaid{ +/obj/item/clothing/pants/skirt/plaid{ color = "#44AA44" }, -/obj/item/clothing/under/pants/ripped{ +/obj/item/clothing/pants/ripped{ pixel_x = -2; pixel_y = 4 }, -/obj/item/clothing/under/skirt/straightlong{ +/obj/item/clothing/pants/skirt/straightlong{ color = "#DDDDDD" }, -/obj/item/clothing/under/skirt/skater{ +/obj/item/clothing/pants/skirt/skater{ color = "#2C3A7F" }, -/obj/item/clothing/under/skirt/pencil{ +/obj/item/clothing/pants/skirt/pencil{ color = "#333333" }, -/obj/item/clothing/under/pants/striped, -/obj/item/clothing/under/pants/tailoredjeans{ +/obj/item/clothing/pants/striped, +/obj/item/clothing/pants/tailoredjeans{ color = "#4B381D" }, /obj/machinery/alarm/west{ req_one_access = null }, -/obj/item/clothing/under/pants/tan, -/obj/item/clothing/under/pants/tailoredjeans{ +/obj/item/clothing/pants/tan, +/obj/item/clothing/pants/tailoredjeans{ color = "#2C3A7F"; pixel_y = 3 }, diff --git a/maps/event/halloween/halloween.dmm b/maps/event/halloween/halloween.dmm index e98b0ce0c4f..bdc96ba4779 100644 --- a/maps/event/halloween/halloween.dmm +++ b/maps/event/halloween/halloween.dmm @@ -675,34 +675,34 @@ /obj/item/clothing/accessory/chaps{ pixel_y = 10 }, -/obj/item/clothing/under/pants/jeans{ +/obj/item/clothing/pants/jeans{ pixel_x = 9 }, -/obj/item/clothing/under/pants/jeans{ +/obj/item/clothing/pants/jeans{ pixel_x = 9 }, -/obj/item/clothing/under/pants/jeans{ +/obj/item/clothing/pants/jeans{ pixel_x = 9 }, -/obj/item/clothing/under/pants/jeans{ +/obj/item/clothing/pants/jeans{ pixel_x = 9 }, -/obj/item/clothing/under/pants/jeans{ +/obj/item/clothing/pants/jeans{ pixel_x = 9 }, -/obj/item/clothing/under/pants/jeans{ +/obj/item/clothing/pants/jeans{ pixel_x = 9 }, -/obj/item/clothing/under/pants/jeans{ +/obj/item/clothing/pants/jeans{ pixel_x = 9 }, -/obj/item/clothing/under/pants/jeans{ +/obj/item/clothing/pants/jeans{ pixel_x = 9 }, -/obj/item/clothing/under/pants/jeans{ +/obj/item/clothing/pants/jeans{ pixel_x = 9 }, -/obj/item/clothing/under/pants/jeans{ +/obj/item/clothing/pants/jeans{ pixel_x = 9 }, /obj/item/clothing/accessory/wcoat{ diff --git a/maps/event/idris_cruise/idris_cruise-1.dmm b/maps/event/idris_cruise/idris_cruise-1.dmm index 41953caceda..17c39fc82df 100644 --- a/maps/event/idris_cruise/idris_cruise-1.dmm +++ b/maps/event/idris_cruise/idris_cruise-1.dmm @@ -1896,34 +1896,34 @@ /obj/machinery/light{ dir = 4 }, -/obj/item/clothing/under/shorts/athletic/red, -/obj/item/clothing/under/shorts/athletic/red, -/obj/item/clothing/under/shorts/athletic/red, -/obj/item/clothing/under/shorts/athletic/red, -/obj/item/clothing/under/shorts/athletic/red, -/obj/item/clothing/under/shorts/athletic/red, -/obj/item/clothing/under/shorts/athletic/green, -/obj/item/clothing/under/shorts/athletic/green, -/obj/item/clothing/under/shorts/athletic/green, -/obj/item/clothing/under/shorts/athletic/green, -/obj/item/clothing/under/shorts/athletic/green, -/obj/item/clothing/under/shorts/athletic/green, -/obj/item/clothing/under/shorts/athletic/grey, -/obj/item/clothing/under/shorts/athletic/grey, -/obj/item/clothing/under/shorts/athletic/grey, -/obj/item/clothing/under/shorts/athletic/grey, -/obj/item/clothing/under/shorts/athletic/grey, -/obj/item/clothing/under/shorts/athletic/blue, -/obj/item/clothing/under/shorts/athletic/blue, -/obj/item/clothing/under/shorts/athletic/blue, -/obj/item/clothing/under/shorts/athletic/blue, -/obj/item/clothing/under/shorts/athletic/blue, -/obj/item/clothing/under/shorts/athletic/blue, -/obj/item/clothing/under/shorts/athletic/black, -/obj/item/clothing/under/shorts/athletic/black, -/obj/item/clothing/under/shorts/athletic/black, -/obj/item/clothing/under/shorts/athletic/black, -/obj/item/clothing/under/shorts/athletic/black, +/obj/item/clothing/pants/shorts/athletic/red, +/obj/item/clothing/pants/shorts/athletic/red, +/obj/item/clothing/pants/shorts/athletic/red, +/obj/item/clothing/pants/shorts/athletic/red, +/obj/item/clothing/pants/shorts/athletic/red, +/obj/item/clothing/pants/shorts/athletic/red, +/obj/item/clothing/pants/shorts/athletic/green, +/obj/item/clothing/pants/shorts/athletic/green, +/obj/item/clothing/pants/shorts/athletic/green, +/obj/item/clothing/pants/shorts/athletic/green, +/obj/item/clothing/pants/shorts/athletic/green, +/obj/item/clothing/pants/shorts/athletic/green, +/obj/item/clothing/pants/shorts/athletic/grey, +/obj/item/clothing/pants/shorts/athletic/grey, +/obj/item/clothing/pants/shorts/athletic/grey, +/obj/item/clothing/pants/shorts/athletic/grey, +/obj/item/clothing/pants/shorts/athletic/grey, +/obj/item/clothing/pants/shorts/athletic/blue, +/obj/item/clothing/pants/shorts/athletic/blue, +/obj/item/clothing/pants/shorts/athletic/blue, +/obj/item/clothing/pants/shorts/athletic/blue, +/obj/item/clothing/pants/shorts/athletic/blue, +/obj/item/clothing/pants/shorts/athletic/blue, +/obj/item/clothing/pants/shorts/athletic/black, +/obj/item/clothing/pants/shorts/athletic/black, +/obj/item/clothing/pants/shorts/athletic/black, +/obj/item/clothing/pants/shorts/athletic/black, +/obj/item/clothing/pants/shorts/athletic/black, /turf/unsimulated/floor{ icon_state = "wood_birch" }, diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_amohdan.dm b/maps/random_ruins/exoplanets/adhomai/adhomai_amohdan.dm index a0d43dc5856..29186fea40c 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_amohdan.dm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_amohdan.dm @@ -36,7 +36,7 @@ /obj/outfit/admin/adhomai_amohdan name = "Amohdan Swordsman" - uniform = /obj/item/clothing/under/pants/tajaran + pants = /obj/item/clothing/pants/tajaran head = /obj/item/clothing/head/helmet/amohda suit = /obj/item/clothing/suit/armor/amohda shoes = /obj/item/clothing/shoes/combat diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_bar.dm b/maps/random_ruins/exoplanets/adhomai/adhomai_bar.dm index 2c883ceee9c..fb4e940f443 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_bar.dm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_bar.dm @@ -117,7 +117,7 @@ uniform = list( /obj/item/clothing/under/tajaran, /obj/item/clothing/under/tajaran/summer, - /obj/item/clothing/under/pants/tajaran + /obj/item/clothing/pants/tajaran ) shoes = list( diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_hunting.dm b/maps/random_ruins/exoplanets/adhomai/adhomai_hunting.dm index 3e7847da3c5..b86db631482 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_hunting.dm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_hunting.dm @@ -50,8 +50,7 @@ uniform = list( /obj/item/clothing/under/tajaran, - /obj/item/clothing/under/tajaran/summer, - /obj/item/clothing/under/pants/tajaran + /obj/item/clothing/under/tajaran/summer ) shoes = list( diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_raskariim_hideout.dm b/maps/random_ruins/exoplanets/adhomai/adhomai_raskariim_hideout.dm index 510a93e5cf4..fc3ab33c975 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_raskariim_hideout.dm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_raskariim_hideout.dm @@ -58,11 +58,15 @@ uniform = list( /obj/item/clothing/under/tajaran, - /obj/item/clothing/under/tajaran/summer, - /obj/item/clothing/under/pants/tajaran, - /obj/item/clothing/under/pants/track + /obj/item/clothing/under/tajaran/summer + ) + pants = list( + /obj/item/clothing/pants/tajaran, + /obj/item/clothing/pants/track + ) + suit = list( /obj/item/clothing/suit/storage/toggle/bomber, /obj/item/clothing/suit/storage/toggle/leather_jacket/flight, diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_sole_rock_nomad.dm b/maps/random_ruins/exoplanets/adhomai/adhomai_sole_rock_nomad.dm index 484f7bae4d8..0123f502363 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_sole_rock_nomad.dm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_sole_rock_nomad.dm @@ -39,7 +39,7 @@ /obj/outfit/admin/adhomai_sole_rock_nomad name = "Rock Nomad" - uniform = /obj/item/clothing/under/pants/tajaran + pants = /obj/item/clothing/pants/tajaran head = /obj/item/clothing/head/tajaran/fur suit = /obj/item/clothing/suit/storage/toggle/tajaran/wool shoes = /obj/item/clothing/shoes/tajara/footwraps diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_village.dm b/maps/random_ruins/exoplanets/adhomai/adhomai_village.dm index d5620754985..ba97f620e08 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_village.dm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_village.dm @@ -50,8 +50,7 @@ uniform = list( /obj/item/clothing/under/tajaran, - /obj/item/clothing/under/tajaran/summer, - /obj/item/clothing/under/pants/tajaran + /obj/item/clothing/under/tajaran/summer ) shoes = list( diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_village.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_village.dmm index ffbe6b31aff..199a1d2d290 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_village.dmm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_village.dmm @@ -265,7 +265,7 @@ /obj/item/clothing/shoes/workboots/tajara, /obj/item/clothing/shoes/workboots/tajara/adhomian_boots, /obj/item/clothing/suit/storage/toggle/tajaran/wool, -/obj/item/clothing/under/pants/tajaran, +/obj/item/clothing/pants/tajaran, /obj/item/gun/projectile/shotgun/pump/rifle/obrez, /turf/simulated/floor/exoplanet/wood, /area/adhomai_village) diff --git a/maps/random_ruins/exoplanets/biesel/biesel_crash.dmm b/maps/random_ruins/exoplanets/biesel/biesel_crash.dmm index 42c3684ba04..c1ea8acdbbf 100644 --- a/maps/random_ruins/exoplanets/biesel/biesel_crash.dmm +++ b/maps/random_ruins/exoplanets/biesel/biesel_crash.dmm @@ -484,10 +484,10 @@ /obj/item/clothing/suit/storage/toggle/leather_jacket/military/old/alt, /obj/item/clothing/suit/storage/toggle/bomber, /obj/item/clothing/suit/storage/toggle/highvis, -/obj/item/clothing/under/pants/track, -/obj/item/clothing/under/pants/tacticool, -/obj/item/clothing/under/pants/jeansblack, -/obj/item/clothing/under/pants/classic, +/obj/item/clothing/pants/track, +/obj/item/clothing/pants/tacticool, +/obj/item/clothing/pants/jeansblack, +/obj/item/clothing/pants/classic, /obj/item/clothing/accessory/silversun, /obj/item/clothing/under/syndicate/tracksuit, /obj/item/clothing/under/syndicate, diff --git a/maps/random_ruins/exoplanets/konyang/abandoned/landing_zone.dmm b/maps/random_ruins/exoplanets/konyang/abandoned/landing_zone.dmm index 03b00814922..a91f6c75a0b 100644 --- a/maps/random_ruins/exoplanets/konyang/abandoned/landing_zone.dmm +++ b/maps/random_ruins/exoplanets/konyang/abandoned/landing_zone.dmm @@ -4159,8 +4159,8 @@ dir = 8 }, /obj/structure/window/reinforced, -/obj/item/clothing/accessory/silversun/random, -/obj/item/clothing/accessory/silversun/random, +/obj/item/clothing/under/dressshirt/silversun/random, +/obj/item/clothing/under/dressshirt/silversun/random, /obj/item/clothing/accessory/armband/scc, /obj/item/clothing/accessory/armband/scc, /obj/item/flag/scc, diff --git a/maps/random_ruins/exoplanets/konyang/hivebot_burrows_2.dm b/maps/random_ruins/exoplanets/konyang/hivebot_burrows_2.dm index b040b57d2ac..970092b36f0 100644 --- a/maps/random_ruins/exoplanets/konyang/hivebot_burrows_2.dm +++ b/maps/random_ruins/exoplanets/konyang/hivebot_burrows_2.dm @@ -39,7 +39,7 @@ name = "unidentifiable corpse" corpseid = 0 corpseradio = null - corpseuniform = /obj/item/clothing/under/pants/khaki + corpseuniform = /obj/item/clothing/under/rank/medical/surgeon corpsesuit = /obj/item/clothing/suit/storage/toggle/labcoat/accent corpseback = /obj/item/storage/backpack/satchel/leather corpseshoes = /obj/item/clothing/shoes/workboots/dark @@ -50,7 +50,3 @@ M.ChangeToSkeleton() M.adjustBruteLoss(rand(200,400)) M.dir = pick(GLOB.cardinals) - - var/obj/item/clothing/under/U = M.w_uniform - var/obj/item/clothing/accessory/dressshirt/shirt = new() - U.attach_accessory(null, shirt) diff --git a/maps/random_ruins/exoplanets/konyang/landing_zone.dmm b/maps/random_ruins/exoplanets/konyang/landing_zone.dmm index 6681ea8ff1f..98b43a9178e 100644 --- a/maps/random_ruins/exoplanets/konyang/landing_zone.dmm +++ b/maps/random_ruins/exoplanets/konyang/landing_zone.dmm @@ -4060,8 +4060,8 @@ dir = 8 }, /obj/structure/window/reinforced, -/obj/item/clothing/accessory/silversun/random, -/obj/item/clothing/accessory/silversun/random, +/obj/item/clothing/under/dressshirt/silversun/random, +/obj/item/clothing/under/dressshirt/silversun/random, /obj/item/clothing/accessory/armband/scc, /obj/item/clothing/accessory/armband/scc, /obj/item/flag/scc, diff --git a/maps/random_ruins/exoplanets/konyang/ocean/naval_landing_zone.dmm b/maps/random_ruins/exoplanets/konyang/ocean/naval_landing_zone.dmm index 1bdee84effe..994f2e3ee11 100644 --- a/maps/random_ruins/exoplanets/konyang/ocean/naval_landing_zone.dmm +++ b/maps/random_ruins/exoplanets/konyang/ocean/naval_landing_zone.dmm @@ -1522,8 +1522,8 @@ dir = 8 }, /obj/structure/window/reinforced, -/obj/item/clothing/accessory/silversun/random, -/obj/item/clothing/accessory/silversun/random, +/obj/item/clothing/under/dressshirt/silversun/random, +/obj/item/clothing/under/dressshirt/silversun/random, /obj/item/clothing/accessory/armband/scc, /obj/item/clothing/accessory/armband/scc, /obj/item/flag/scc, diff --git a/maps/random_ruins/exoplanets/konyang/pirate_outpost.dmm b/maps/random_ruins/exoplanets/konyang/pirate_outpost.dmm index d0f23b77f28..0215bcbc145 100644 --- a/maps/random_ruins/exoplanets/konyang/pirate_outpost.dmm +++ b/maps/random_ruins/exoplanets/konyang/pirate_outpost.dmm @@ -52,9 +52,9 @@ /obj/item/clothing/shoes/sneakers/hitops/brown, /obj/item/clothing/shoes/workboots, /obj/item/clothing/shoes/workboots/dark, -/obj/item/clothing/under/pants/tacticool, +/obj/item/clothing/pants/tacticool, /obj/item/clothing/under/tactical, -/obj/item/clothing/under/pants/jeans, +/obj/item/clothing/pants/jeans, /obj/item/clothing/head/bandana/pirate, /obj/item/clothing/under/konyang/pirate, /obj/item/clothing/under/konyang/pirate, @@ -275,9 +275,9 @@ /obj/item/clothing/shoes/sneakers/hitops/brown, /obj/item/clothing/shoes/workboots, /obj/item/clothing/shoes/workboots/dark, -/obj/item/clothing/under/pants/tacticool, +/obj/item/clothing/pants/tacticool, /obj/item/clothing/under/tactical, -/obj/item/clothing/under/pants/jeans, +/obj/item/clothing/pants/jeans, /obj/item/clothing/head/bandana/pirate, /obj/random/spacecash, /obj/random/spacecash, diff --git a/maps/random_ruins/exoplanets/ouerea/ouerea_bar.dm b/maps/random_ruins/exoplanets/ouerea/ouerea_bar.dm index 13108b512ca..37ca2a945a4 100644 --- a/maps/random_ruins/exoplanets/ouerea/ouerea_bar.dm +++ b/maps/random_ruins/exoplanets/ouerea/ouerea_bar.dm @@ -85,9 +85,8 @@ /obj/outfit/admin/ouerea_human name = "Ouerean Human" - uniform = list(/obj/item/clothing/under/pants/tan, /obj/item/clothing/under/pants/jeans, /obj/item/clothing/under/shorts/black, /obj/item/clothing/under/shorts/jeans, /obj/item/clothing/under/tactical, - /obj/item/clothing/under/unathi) - accessory = list(/obj/item/clothing/accessory/silversun/random, /obj/item/clothing/accessory/dressshirt, /obj/item/clothing/accessory/tshirt, /obj/item/clothing/accessory/longsleeve) + uniform = list(/obj/item/clothing/under/dressshirt/silversun/random, /obj/item/clothing/under/dressshirt, /obj/item/clothing/under/tshirt, /obj/item/clothing/under/dressshirt/longsleeve) + pants = list(/obj/item/clothing/pants/tan, /obj/item/clothing/pants/jeans, /obj/item/clothing/pants/shorts/black, /obj/item/clothing/pants/shorts/jeans) suit = list(/obj/item/clothing/suit/storage/toggle/track, /obj/item/clothing/suit/storage/toggle/asymmetriccoat/izharshan, /obj/item/clothing/accessory/poncho/unathimantle, /obj/item/clothing/suit/storage/toggle/corp/heph) shoes = list(/obj/item/clothing/shoes/sandals/caligae, /obj/item/clothing/shoes/sandals, /obj/item/clothing/shoes/workboots, /obj/item/clothing/shoes/jackboots) head = list(/obj/item/clothing/head/unathi, /obj/item/clothing/head/cowboy, /obj/item/clothing/head/cowboy/wide, /obj/item/clothing/head/bandana/colorable/random) @@ -98,9 +97,8 @@ /obj/outfit/admin/ouerea_skrell name = "Ouerean Skrell" - uniform = list(/obj/item/clothing/under/skrell/wetsuit, /obj/item/clothing/under/unathi, /obj/item/clothing/under/unathi/himation) - accessory = list(/obj/item/clothing/accessory/tshirt/skrell/maelstrom, /obj/item/clothing/accessory/tshirt/skrell/nebula, /obj/item/clothing/accessory/tshirt/skrell/reef) - suit = list(/obj/item/clothing/accessory/poncho/skrell/tan, /obj/item/clothing/suit/storage/toggle/skrell/starcoat) + uniform = list(/obj/item/clothing/under/tshirt/skrell/maelstrom, /obj/item/clothing/under/tshirt/skrell/nebula, /obj/item/clothing/under/tshirt/skrell/reef) + pants = list(/obj/item/clothing/pants/tan, /obj/item/clothing/pants/jeans, /obj/item/clothing/pants/shorts/black, /obj/item/clothing/pants/shorts/jeans) shoes = list(/obj/item/clothing/shoes/sandals/caligae, /obj/item/clothing/shoes/sandals, /obj/item/clothing/shoes/workboots, /obj/item/clothing/shoes/jackboots) back = /obj/item/storage/backpack/satchel/leather l_pocket = /obj/item/storage/wallet/random diff --git a/maps/random_ruins/exoplanets/ouerea/ouerea_village.dmm b/maps/random_ruins/exoplanets/ouerea/ouerea_village.dmm index 423cc18c2e0..2bdc7226119 100644 --- a/maps/random_ruins/exoplanets/ouerea/ouerea_village.dmm +++ b/maps/random_ruins/exoplanets/ouerea/ouerea_village.dmm @@ -482,11 +482,11 @@ /obj/item/clothing/under/skrell/wetsuit{ color = "#100942" }, -/obj/item/clothing/under/pants/jeans, -/obj/item/clothing/under/pants/tan, -/obj/item/clothing/accessory/silversun/random, +/obj/item/clothing/pants/jeans, +/obj/item/clothing/pants/tan, +/obj/item/clothing/under/dressshirt/silversun/random, /obj/item/clothing/accessory/tshirt, -/obj/item/clothing/accessory/tshirt/skrell/ocean, +/obj/item/clothing/under/tshirt/skrell/ocean, /obj/item/clothing/head/cowboy, /obj/item/clothing/shoes/workboots, /turf/simulated/floor/exoplanet/wood/birch{ @@ -558,11 +558,11 @@ /obj/item/clothing/under/skrell/wetsuit{ color = "#100942" }, -/obj/item/clothing/under/pants/jeans, -/obj/item/clothing/under/pants/tan, -/obj/item/clothing/accessory/silversun/random, +/obj/item/clothing/pants/jeans, +/obj/item/clothing/pants/tan, +/obj/item/clothing/under/dressshirt/silversun/random, /obj/item/clothing/accessory/tshirt, -/obj/item/clothing/accessory/tshirt/skrell/nebula/teal, +/obj/item/clothing/under/tshirt/skrell/nebula/teal, /obj/item/clothing/head/cowboy, /obj/item/clothing/shoes/workboots, /turf/simulated/floor/exoplanet/wood/birch{