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 b5051e7b08a..e7627b9dd3b 100644 Binary files a/icons/obj/item/clothing/pants/pants.dmi and b/icons/obj/item/clothing/pants/pants.dmi differ diff --git a/icons/obj/item/clothing/pants/shorts.dmi b/icons/obj/item/clothing/pants/shorts.dmi index a6379dd0773..8957676c613 100644 Binary files a/icons/obj/item/clothing/pants/shorts.dmi and b/icons/obj/item/clothing/pants/shorts.dmi differ 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,