Jackboot and black glove resprite (#14564)

code/datums/outfits/outfit_antag.dm

@@ -271,7 +271,7 @@
 		/obj/item/clothing/shoes/laceup/all_species,
 		/obj/item/clothing/shoes/combat,
 		/obj/item/clothing/shoes/cowboy,
-		/obj/item/clothing/shoes/jackboots/knee,
+		/obj/item/clothing/shoes/jackboots/cavalry,
 		/obj/item/clothing/shoes/lyodsuit,
 		/obj/item/clothing/shoes/winter,
 		/obj/item/clothing/shoes/hitops/black,

code/game/objects/structures/crates_lockers/closets/wardrobe.dm

@@ -33,8 +33,7 @@
 	new /obj/item/clothing/shoes/jackboots(src)
 	new /obj/item/clothing/shoes/jackboots(src)
 	new /obj/item/clothing/shoes/jackboots(src)
-	new /obj/item/clothing/shoes/jackboots/knee(src)
-	new /obj/item/clothing/shoes/jackboots/knee(src)
+	new /obj/item/clothing/shoes/jackboots/cavalry(src)
 	new /obj/item/clothing/shoes/jackboots/toeless(src)
 
 	return

code/modules/client/preference_setup/loadout/loadout_shoes.dm

@@ -96,9 +96,8 @@
 /datum/gear/shoes/boots/New()
 	..()
 	var/list/shoes = list()
-	shoes["black boots, short"] = /obj/item/clothing/shoes/jackboots
-	shoes["black boots, knee"] = /obj/item/clothing/shoes/jackboots/knee
-	shoes["black boots, thigh"] = /obj/item/clothing/shoes/jackboots/thigh
+	shoes["jackboots"] = /obj/item/clothing/shoes/jackboots
+	shoes["cavalry boots"] = /obj/item/clothing/shoes/jackboots/cavalry
 	shoes["cowboy boots"] = /obj/item/clothing/shoes/cowboy
 	shoes["classic cowboy boots"] = /obj/item/clothing/shoes/cowboy/classic
 	shoes["snakeskin cowboy boots"] = /obj/item/clothing/shoes/cowboy/snakeskin

code/modules/client/preference_setup/loadout/loadout_xeno.dm

@@ -46,8 +46,7 @@
 	shoes["brown toeless workboots"] = /obj/item/clothing/shoes/workboots/toeless
 	shoes["grey toeless workboots"] = /obj/item/clothing/shoes/workboots/toeless/grey
 	shoes["dark toeless workboots"] = /obj/item/clothing/shoes/workboots/toeless/dark
-	shoes["toeless black boots, short"] = /obj/item/clothing/shoes/jackboots/toeless
-	shoes["toeless black boots, knee"] = /obj/item/clothing/shoes/jackboots/toeless/knee
-	shoes["toeless black boots, thigh"] = /obj/item/clothing/shoes/jackboots/toeless/thigh
+	shoes["black toeless jackboots"] = /obj/item/clothing/shoes/jackboots/toeless
+	shoes["black toeless cavalry boots"] = /obj/item/clothing/shoes/jackboots/toeless/cavalry
 	shoes["toeless winterboots"] = /obj/item/clothing/shoes/winter/toeless
 	gear_tweaks += new /datum/gear_tweak/path(shoes)

code/modules/client/preference_setup/loadout/loadout_xeno/tajara.dm

@@ -8,9 +8,8 @@
 /datum/gear/shoes/tajara/boots/New()
 	..()
 	var/list/boots = list()
-	boots["black boots, short"] = /obj/item/clothing/shoes/tajara/jackboots
-	boots["black boots, knee"] = /obj/item/clothing/shoes/tajara/jackboots/knee
-	boots["black boots, thigh"] = /obj/item/clothing/shoes/tajara/jackboots/thigh
+	boots["jackboots"] = /obj/item/clothing/shoes/tajara/jackboots
+	boots["cavalry boots"] = /obj/item/clothing/shoes/tajara/jackboots/cavalry
 	boots["brown workboots"] = /obj/item/clothing/shoes/tajara/workboots
 	boots["grey workboots"] = /obj/item/clothing/shoes/tajara/workboots/grey
 	boots["dark workboots"] = /obj/item/clothing/shoes/tajara/workboots/dark

code/modules/clothing/shoes/jobs.dm

@@ -15,10 +15,13 @@
 	sprite_sheets = list("Tajara" = 'icons/mob/species/tajaran/shoes.dmi')
 
 /obj/item/clothing/shoes/jackboots
-	name = "black boots"
+	name = "jackboots"
 	desc = "Tall synthleather boots with an artificial shine."
 	icon_state = "jackboots"
 	item_state = "jackboots"
+	sprite_sheets = list(
+		BODYTYPE_VAURCA_BULWARK = 'icons/mob/species/bulwark/shoes.dmi'
+	)
 	force = 3
 	armor = list(
 		melee = ARMOR_MELEE_KNIVES
@@ -29,39 +32,24 @@
 	drop_sound = 'sound/items/drop/boots.ogg'
 	pickup_sound = 'sound/items/pickup/boots.ogg'
 
-/obj/item/clothing/shoes/jackboots/knee
-	name = "knee-length black boots"
-	desc = "Taller synthleather boots with an artificial shine."
+/obj/item/clothing/shoes/jackboots/cavalry
+	name = "black cavalry boots"
+	desc = "Good old-fashioned calf-length cavalry boots. If only you had a horse to ride."
 	icon_state = "kneeboots"
 	item_state = "kneeboots"
-	sprite_sheets = list(
-		BODYTYPE_VAURCA_BULWARK = 'icons/mob/species/bulwark/shoes.dmi'
-	)
-
-/obj/item/clothing/shoes/jackboots/thigh
-	name = "thigh-length black boots"
-	desc = "Even taller synthleather boots with an artificial shine."
-	icon_state = "thighboots"
-	item_state = "thighboots"
 
 /obj/item/clothing/shoes/jackboots/toeless
-	name = "toe-less black boots"
+	name = "toeless jackboots"
 	desc = "Modified pair of boots, particularly friendly to those species whose toes hold claws."
 	icon_state = "jackboots_toeless"
 	species_restricted = null
 	sprite_sheets = list(BODYTYPE_TAJARA = 'icons/mob/species/tajaran/shoes.dmi', BODYTYPE_VAURCA_BULWARK = 'icons/mob/species/bulwark/shoes.dmi')
 
-/obj/item/clothing/shoes/jackboots/toeless/knee
-	name = "knee-high toeless black boots"
-	desc = "Modified pair of taller boots, particularly friendly to those species whose toes hold claws."
-	icon_state = "kneeboots_toeless"
-	item_state = "kneeboots_toeless"
-
-/obj/item/clothing/shoes/jackboots/toeless/thigh
-	name = "thigh-high toeless black boots"
-	desc = "Modified pair of even taller boots, particularly friendly to those species whose toes hold claws."
-	icon_state = "thighboots_toeless"
-	item_state = "thighboots_toeless"
+/obj/item/clothing/shoes/jackboots/toeless/cavalry
+	name = "toeless cavalry boots"
+	desc = "Modified calf-length cavarly boots. Friendly to species whose toes hold claws. Better not ride a horse in these - it's for their sake."
+	icon_state = "cavalryboots_toeless"
+	item_state = "cavalryboots_toeless"
 
 /obj/item/clothing/shoes/workboots
 	name = "workboots"

code/modules/clothing/shoes/xeno/tajara.dm

@@ -56,7 +56,7 @@
 	item_state = "twhitedf"
 
 /obj/item/clothing/shoes/tajara/jackboots // Because yes, Tajara don't leave their toes out all the time.
-	name = "black boots"
+	name = "jackboots"
 	desc = "Tall synthleather boots with an artificial shine. Fitted for Tajara."
 	icon = 'icons/mob/species/tajaran/shoes.dmi'
 	icon_state = "taj_jackboots"
@@ -73,17 +73,11 @@
 	pickup_sound = 'sound/items/pickup/boots.ogg'
 	contained_sprite = TRUE
 
-/obj/item/clothing/shoes/tajara/jackboots/knee
-	name = "knee-length black boots"
-	desc = "Taller synthleather boots with an artificial shine. Fitted for Tajara."
-	icon_state = "taj_kneeboots"
-	item_state = "taj_kneeboots"
-
-/obj/item/clothing/shoes/tajara/jackboots/thigh
-	name = "thigh-length black boots"
-	desc = "Even taller synthleather boots with an artificial shine. Fitted for Tajara."
-	icon_state = "taj_thighboots"
-	item_state = "taj_thighboots"
+/obj/item/clothing/shoes/tajara/jackboots/cavalry
+	name = "cavalry boots"
+	desc = "Good old-fashioned calf-length cavalry boots. Adhomai doesn't have horses, but one can appreciate a good, tall boot."
+	icon_state = "taj_cavalryboots"
+	item_state = "taj_cavalryboots"
 
 /obj/item/clothing/shoes/tajara/workboots
 	name = "workboots"
@@ -180,4 +174,4 @@
 	item_state = "fancy_shoes"
 	body_parts_covered = FEET
 	species_restricted = list(BODYTYPE_TAJARA)
-	contained_sprite = TRUE
+	contained_sprite = TRUE

html/changelogs/wezzy_jackgloves.yml

@@ -0,0 +1,41 @@
+################################
+# 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
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.
+author: Wowzewow (Wezzy), Imaginos16
+
+# 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, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - imageadd: "Resprites black gloves and jackboots. Thigh-high boots have been rebranded as cavalry boots, and kneeboots have been removed."