From 2a2d0798b9875989538f781bf54d683008829b7d Mon Sep 17 00:00:00 2001 From: ElorgRHG <71735193+ElorgRHG@users.noreply.github.com> Date: Tue, 17 Feb 2026 16:35:34 +0100 Subject: [PATCH] Pants (but mostly jeans) resprite (#21863) pant. How I forgot how pants should look like: the PR. From the changelog: > - imageadd: "Resprited all jeans, black pants and colorable dress pants." > - rscdel: "Removed tan, khaki, red, white pants due to the existance of colorable dress pants. All maps and outfits where these were used now use black pants (I did not want to put in the effort)." Images, as always, in the details below. Old (current) sprites on the top, new on the bottom unless stated otherwise. jeans Do yell at me if these don't look like jeans. Also imagine these but shorter, now you have jean shorts, which were also resprited. --- code/game/jobs/job/outsider/representative.dm | 2 +- code/game/machinery/vending/clothing.dm | 1 - code/game/machinery/vending/wardrobe.dm | 2 +- .../crates_lockers/crates/gear_loadout.dm | 4 +-- .../preference_setup/loadout/items/pants.dm | 6 ---- code/modules/clothing/pants/pants.dm | 28 ++---------------- code/modules/clothing/pants/shorts.dm | 10 ------- html/changelogs/ElorgRHG-pant-resprite.yml | 14 +++++++++ icons/obj/item/clothing/pants/pants.dmi | Bin 11412 -> 3401 bytes icons/obj/item/clothing/pants/shorts.dmi | Bin 3226 -> 2796 bytes .../point_verdant/point_verdant_ghostroles.dm | 2 +- .../orion_express_ship/orion_express_ship.dmm | 4 +-- maps/away/ships/scc/scc_scout_ship.dmm | 2 +- maps/away/ships/yacht_civ/yacht_civ.dmm | 4 +-- .../exoplanets/ouerea/ouerea_bar.dm | 4 +-- .../exoplanets/ouerea/ouerea_village.dmm | 4 +-- 16 files changed, 30 insertions(+), 57 deletions(-) create mode 100644 html/changelogs/ElorgRHG-pant-resprite.yml diff --git a/code/game/jobs/job/outsider/representative.dm b/code/game/jobs/job/outsider/representative.dm index fb23f6f92da..8c4d6673721 100644 --- a/code/game/jobs/job/outsider/representative.dm +++ b/code/game/jobs/job/outsider/representative.dm @@ -429,7 +429,7 @@ head = /obj/item/clothing/head/beret/corporate uniform = /obj/item/clothing/under/dressshirt suit = /obj/item/clothing/suit/storage/toggle/corp/nt - pants = /obj/item/clothing/pants/khaki + pants = /obj/item/clothing/pants/black tab_pda = /obj/item/modular_computer/handheld/pda/civilian/lawyer wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/civilian/lawyer diff --git a/code/game/machinery/vending/clothing.dm b/code/game/machinery/vending/clothing.dm index 6225b49d370..cae0dc5819d 100644 --- a/code/game/machinery/vending/clothing.dm +++ b/code/game/machinery/vending/clothing.dm @@ -29,7 +29,6 @@ /obj/item/clothing/under/dressshirt/silversun = 8, // Pants /obj/item/clothing/pants/black = 8, - /obj/item/clothing/pants/tan = 4, /obj/item/clothing/pants/jeans = 4, /obj/item/clothing/pants/jeansblack = 4, /obj/item/clothing/pants/striped = 4, diff --git a/code/game/machinery/vending/wardrobe.dm b/code/game/machinery/vending/wardrobe.dm index c9afe027096..e5a8ef23094 100644 --- a/code/game/machinery/vending/wardrobe.dm +++ b/code/game/machinery/vending/wardrobe.dm @@ -768,7 +768,7 @@ /obj/item/clothing/suit/storage/toggle/highvis/alt = 3, /obj/item/clothing/suit/storage/toggle/highvis/orange = 3, /obj/item/clothing/suit/storage/toggle/highvis/red = 3, - /obj/item/clothing/pants/shorts/khaki = 24, + /obj/item/clothing/pants/shorts/black = 24, /obj/item/clothing/pants/highvis = 3, /obj/item/clothing/pants/highvis/alt = 3, /obj/item/clothing/pants/highvis/orange = 3, 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 25d4f7384ab..684012c549b 100644 --- a/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm +++ b/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm @@ -233,7 +233,7 @@ /obj/structure/closet/crate/secure/gear_loadout/frontier_cowboys/fill() for(var/i in 1 to 6) - var/obj/item/clothing/pants/shorts/khaki/pants = new(src) + var/obj/item/clothing/pants/shorts/black/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) @@ -255,7 +255,7 @@ 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/pants/shorts/khaki/pants = new(src) + var/obj/item/clothing/pants/shorts/black/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) diff --git a/code/modules/client/preference_setup/loadout/items/pants.dm b/code/modules/client/preference_setup/loadout/items/pants.dm index 52a99739f6c..e5fa56ccf68 100644 --- a/code/modules/client/preference_setup/loadout/items/pants.dm +++ b/code/modules/client/preference_setup/loadout/items/pants.dm @@ -16,11 +16,7 @@ ABSTRACT_TYPE(/datum/gear/pants) 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["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 @@ -35,8 +31,6 @@ ABSTRACT_TYPE(/datum/gear/pants) // 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 diff --git a/code/modules/clothing/pants/pants.dm b/code/modules/clothing/pants/pants.dm index 52689fb9fcd..c8f6e653005 100644 --- a/code/modules/clothing/pants/pants.dm +++ b/code/modules/clothing/pants/pants.dm @@ -54,36 +54,12 @@ ABSTRACT_TYPE(/obj/item/clothing/pants) /********** Pants Start **********/ // Pants -/obj/item/clothing/pants/white - name = "white pants" - desc = "Plain boring white pants." - icon_state = "whitepants" - item_state = "whitepants" - /obj/item/clothing/pants/black name = "black pants" desc = "A pair of plain black pants." icon_state = "blackpants" item_state = "blackpants" -/obj/item/clothing/pants/red - name = "red pants" - desc = "Bright red pants." - icon_state = "redpants" - item_state = "redpants" - -/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/pants/khaki - name = "tan pants" - desc = "A pair of dust beige khaki pants." - icon_state = "khaki" - item_state = "khaki" - /obj/item/clothing/pants/camo name = "camouflage pants" desc = "A pair of woodland camouflage pants. Probably not the best choice for a space station." @@ -99,8 +75,8 @@ ABSTRACT_TYPE(/obj/item/clothing/pants) /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" + build_from_parts = TRUE + worn_overlay = "belt" /obj/item/clothing/pants/striped name = "striped pants" diff --git a/code/modules/clothing/pants/shorts.dm b/code/modules/clothing/pants/shorts.dm index 0005631b5c6..6315c9e33fb 100644 --- a/code/modules/clothing/pants/shorts.dm +++ b/code/modules/clothing/pants/shorts.dm @@ -35,16 +35,6 @@ icon_state = "shorts_s_black" item_state = "shorts_s_black" -/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/pants/shorts/khaki/short - name = "khaki short shorts" - icon_state = "shorts_s_khaki" - item_state = "shorts_s_khaki" /********** Shorts End **********/ /********** Jeans Shorts Start **********/ diff --git a/html/changelogs/ElorgRHG-pant-resprite.yml b/html/changelogs/ElorgRHG-pant-resprite.yml new file mode 100644 index 00000000000..6a75e59e29c --- /dev/null +++ b/html/changelogs/ElorgRHG-pant-resprite.yml @@ -0,0 +1,14 @@ +# Your name. +author: ElorgRHG + +# 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: + - imageadd: "Resprited all jeans, black pants and colorable dress pants." + - rscdel: "Removed tan, khaki, red, white pants due to the existance of colorable dress pants. All maps and outfits where these were used now use black pants (I did not want to put in the effort)." diff --git a/icons/obj/item/clothing/pants/pants.dmi b/icons/obj/item/clothing/pants/pants.dmi index b5051e7b08a62ecbdb1438848f64fcbdb5c45253..e7627b9dd3b274143a8d55a1986c571cba47a202 100644 GIT binary patch literal 3401 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 F{s)<|{p$b# diff --git a/icons/obj/item/clothing/pants/shorts.dmi b/icons/obj/item/clothing/pants/shorts.dmi index a6379dd0773a7e46ac9c14fa514b3b6d2bc6656c..8957676c613b8c52d0f61da5177872e7ee03cfba 100644 GIT binary patch literal 2796 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 I%Rb3}2j;#J$^ZZW 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 768caf530db..19c42f5a2e9 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/pants/tan + uniform = /obj/item/clothing/pants/jeans shoes = /obj/item/clothing/shoes/sneakers/black id = null l_pocket = /obj/item/storage/wallet/random diff --git a/maps/away/ships/orion/orion_express_ship/orion_express_ship.dmm b/maps/away/ships/orion/orion_express_ship/orion_express_ship.dmm index 313767b7f87..0d97a60194c 100644 --- a/maps/away/ships/orion/orion_express_ship/orion_express_ship.dmm +++ b/maps/away/ships/orion/orion_express_ship/orion_express_ship.dmm @@ -3799,8 +3799,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/pants/shorts/khaki, -/obj/item/clothing/pants/shorts/khaki/short, +/obj/item/clothing/pants/shorts/black, +/obj/item/clothing/pants/shorts/black/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/scc/scc_scout_ship.dmm b/maps/away/ships/scc/scc_scout_ship.dmm index 83da9dfca46..d84e4cc72d7 100644 --- a/maps/away/ships/scc/scc_scout_ship.dmm +++ b/maps/away/ships/scc/scc_scout_ship.dmm @@ -7546,7 +7546,7 @@ /obj/item/clothing/suit/storage/toggle/brown_jacket/scc, /obj/item/clothing/under/color/grey, /obj/item/clothing/pants/shorts/black, -/obj/item/clothing/pants/tan, +/obj/item/clothing/pants/black, /obj/item/clothing/pants/track, /obj/item/clothing/under/color/lightred, /obj/item/clothing/pants/camo, diff --git a/maps/away/ships/yacht_civ/yacht_civ.dmm b/maps/away/ships/yacht_civ/yacht_civ.dmm index 962055f112a..c0ccb834bf5 100644 --- a/maps/away/ships/yacht_civ/yacht_civ.dmm +++ b/maps/away/ships/yacht_civ/yacht_civ.dmm @@ -4865,7 +4865,7 @@ /obj/item/clothing/pants/jeans{ pixel_y = 4 }, -/obj/item/clothing/pants/white, +/obj/item/clothing/pants/black, /obj/item/clothing/pants/skirt/high{ color = "#4B381D" }, @@ -4898,7 +4898,7 @@ /obj/machinery/alarm/west{ req_one_access = null }, -/obj/item/clothing/pants/tan, +/obj/item/clothing/pants/black, /obj/item/clothing/pants/tailoredjeans{ color = "#2C3A7F"; pixel_y = 3 diff --git a/maps/random_ruins/exoplanets/ouerea/ouerea_bar.dm b/maps/random_ruins/exoplanets/ouerea/ouerea_bar.dm index 6eb1a708131..24a638a8e39 100644 --- a/maps/random_ruins/exoplanets/ouerea/ouerea_bar.dm +++ b/maps/random_ruins/exoplanets/ouerea/ouerea_bar.dm @@ -85,7 +85,7 @@ /obj/outfit/admin/ouerea_human name = "Ouerean Human" uniform = list(/obj/item/clothing/under/dressshirt/silversun/random, /obj/item/clothing/under/dressshirt, /obj/item/clothing/under/dressshirt/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) + pants = list(/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) @@ -97,7 +97,7 @@ /obj/outfit/admin/ouerea_skrell name = "Ouerean Skrell" uniform = list(/obj/item/clothing/under/dressshirt/tshirt/skrell/maelstrom, /obj/item/clothing/under/dressshirt/tshirt/skrell/nebula, /obj/item/clothing/under/dressshirt/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) + pants = list(/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 f76b4bc66f0..33ab6063a1a 100644 --- a/maps/random_ruins/exoplanets/ouerea/ouerea_village.dmm +++ b/maps/random_ruins/exoplanets/ouerea/ouerea_village.dmm @@ -483,7 +483,7 @@ color = "#100942" }, /obj/item/clothing/pants/jeans, -/obj/item/clothing/pants/tan, +/obj/item/clothing/pants/black, /obj/item/clothing/under/dressshirt/silversun/random, /obj/item/clothing/accessory/tshirt, /obj/item/clothing/under/dressshirt/tshirt/skrell/ocean, @@ -559,7 +559,7 @@ color = "#100942" }, /obj/item/clothing/pants/jeans, -/obj/item/clothing/pants/tan, +/obj/item/clothing/pants/black, /obj/item/clothing/under/dressshirt/silversun/random, /obj/item/clothing/accessory/tshirt, /obj/item/clothing/under/dressshirt/tshirt/skrell/nebula/teal,