diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 51faa02691d..c2eeed79fbb 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -135,7 +135,6 @@ new /obj/item/clothing/head/helmet/hos(src) new /obj/item/clothing/head/beret/sec/hos(src) new /obj/item/clothing/accessory/badge/hos(src) - new /obj/item/clothing/shoes/black_boots(src) new /obj/item/clothing/gloves/black_leather(src) //Tools new /obj/item/cartridge/hos(src) @@ -216,7 +215,6 @@ new /obj/item/clothing/head/helmet/warden/commissar(src) new /obj/item/clothing/head/helmet(src) new /obj/item/clothing/accessory/badge/warden(src) - new /obj/item/clothing/shoes/black_boots(src) new /obj/item/clothing/gloves/black_leather(src) //Tools new /obj/item/cartridge/security(src) diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm index 663ce617d93..5e0af6d673b 100644 --- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm +++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm @@ -17,9 +17,6 @@ new /obj/item/clothing/under/rank/cadet(src) new /obj/item/clothing/under/rank/cadet(src) new /obj/item/clothing/under/rank/cadet(src) - new /obj/item/clothing/shoes/black_boots(src) - new /obj/item/clothing/shoes/black_boots(src) - new /obj/item/clothing/shoes/black_boots(src) new /obj/item/clothing/gloves/black_leather(src) new /obj/item/clothing/gloves/black_leather(src) new /obj/item/clothing/gloves/black_leather(src) @@ -35,6 +32,8 @@ 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/toeless(src) return diff --git a/code/modules/client/preference_setup/loadout/loadout_shoes.dm b/code/modules/client/preference_setup/loadout/loadout_shoes.dm index 96743ff5cf4..caa8dd65500 100644 --- a/code/modules/client/preference_setup/loadout/loadout_shoes.dm +++ b/code/modules/client/preference_setup/loadout/loadout_shoes.dm @@ -1,30 +1,14 @@ // Shoelocker /datum/gear/shoes - display_name = "jackboots" - path = /obj/item/clothing/shoes/jackboots + display_name = "sandals" + path = /obj/item/clothing/shoes/sandal slot = slot_shoes sort_category = "Shoes and Footwear" -/datum/gear/shoes/workboots - display_name = "workboots selection" - path = /obj/item/clothing/shoes/workboots - -/datum/gear/shoes/workboots/New() - ..() - var/shoes = list() - shoes["brown workboots"] = /obj/item/clothing/shoes/workboots - shoes["grey workboots"] = /obj/item/clothing/shoes/workboots/grey - shoes["dark workboots"] = /obj/item/clothing/shoes/workboots/dark - gear_tweaks += new/datum/gear_tweak/path(shoes) - /datum/gear/shoes/winterboots display_name = "winter boots" path = /obj/item/clothing/shoes/winter -/datum/gear/shoes/sandals - display_name = "sandals" - path = /obj/item/clothing/shoes/sandal - /datum/gear/shoes/color display_name = "shoe selection" path = /obj/item/clothing/shoes/black @@ -111,9 +95,24 @@ shoes["high-tops, yellow"] = /obj/item/clothing/shoes/hitops/yellow gear_tweaks += new/datum/gear_tweak/path(shoes) -/datum/gear/shoes/black_boots - display_name = "black boots" - path = /obj/item/clothing/shoes/black_boots +/datum/gear/shoes/boots + display_name = "boot selection" + description = "Boots, in a variety of styles." + path = /obj/item/clothing/shoes/jackboots + +/datum/gear/shoes/boots/New() + ..() + var/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["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 + shoes["brown workboots"] = /obj/item/clothing/shoes/workboots + shoes["grey workboots"] = /obj/item/clothing/shoes/workboots/grey + shoes["dark workboots"] = /obj/item/clothing/shoes/workboots/dark + gear_tweaks += new/datum/gear_tweak/path(shoes) /datum/gear/shoes/lyodsuit_boots display_name = "lyodsuit boots" diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno.dm b/code/modules/client/preference_setup/loadout/loadout_xeno.dm index b0ce7611c30..c3c4f8d67bb 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno.dm @@ -17,20 +17,6 @@ sort_category = "Xenowear" whitelisted = list("Vaurca Worker", "Vaurca Warrior", "Unathi", "Tajara", "Zhan-Khazan Tajara", "M'sai Tajara") -/datum/gear/shoes/workboots_toeless - display_name = "toeless workboots selection" - path = /obj/item/clothing/shoes/workboots/toeless - sort_category = "Xenowear" - whitelisted = list("Vaurca Worker", "Vaurca Warrior", "Unathi", "Tajara", "Zhan-Khazan Tajara", "M'sai Tajara") - -/datum/gear/shoes/workboots_toeless/New() - ..() - var/shoes = list() - 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 - gear_tweaks += new/datum/gear_tweak/path(shoes) - /datum/gear/shoes/caligae display_name = "caligae selection" path = /obj/item/clothing/shoes/caligae @@ -46,3 +32,19 @@ caligae["white sock"] = /obj/item/clothing/shoes/caligae/white caligae["leather"] = /obj/item/clothing/shoes/caligae/armor gear_tweaks += new/datum/gear_tweak/path(caligae) + +/datum/gear/shoes/toeless + display_name = "toeless boot selection" + path = /obj/item/clothing/shoes/jackboots/toeless + whitelisted = list("Vaurca Worker", "Vaurca Warrior", "Unathi", "Tajara", "Zhan-Khazan Tajara", "M'sai Tajara") + sort_category = "Xenowear" + +/datum/gear/shoes/toeless/New() + ..() + var/shoes = list() + 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 \ No newline at end of file diff --git a/code/modules/clothing/shoes/jobs.dm b/code/modules/clothing/shoes/jobs.dm index ba132528ef3..748b7d7a8fc 100644 --- a/code/modules/clothing/shoes/jobs.dm +++ b/code/modules/clothing/shoes/jobs.dm @@ -11,23 +11,47 @@ pickup_sound = 'sound/items/pickup/rubber.ogg' /obj/item/clothing/shoes/jackboots - name = "jackboots" + name = "black boots" desc = "Tall synthleather boots with an artificial shine." icon_state = "jackboots" item_state = "jackboots" force = 3 - armor = list(melee = 30, bullet = 10, laser = 10, energy = 15, bomb = 20, bio = 0, rad = 0) + armor = list(melee = 20, bullet = 5, laser = 5, energy = 0, bomb = 0, bio = 0, rad = 0) siemens_coefficient = 0.75 can_hold_knife = 1 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." + icon_state = "kneeboots" + item_state = "kneeboots" + +/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 jackboots" - desc = "Modified pair of jackboots, particularly friendly to those species whose toes hold claws." + name = "toe-less black boots" + desc = "Modified pair of boots, particularly friendly to those species whose toes hold claws." icon_state = "jackboots_toeless" species_restricted = null +/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 = "kneeboots_toeless" + item_state = "kneeboots_toeless" + /obj/item/clothing/shoes/workboots name = "workboots" desc = "A pair of steel-toed work boots designed for use in industrial settings. Safety first." diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm index 2f4b19f0a25..68abe98becb 100644 --- a/code/modules/clothing/shoes/miscellaneous.dm +++ b/code/modules/clothing/shoes/miscellaneous.dm @@ -232,14 +232,6 @@ obj/item/clothing/shoes/sandal/clogs desc = "A pair of toe-less heavy winter boots made out of animal furs, reaching up to the knee. Modified for species whose toes have claws." icon_state = "winterboots_toeless" -/obj/item/clothing/shoes/black_boots - name = "black boots" - desc = "A pair of tough looking black boots." - icon_state = "jackboots" - item_state = "jackboots" - armor = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0) - can_hold_knife = 1 - /obj/item/clothing/shoes/caligae name = "caligae" desc = "The standard Unathi marching footwear. Made of leather and rubber, with heavy hob-nailed soles, their unique design allows for improved traction and protection, leading to them catching on with other species." diff --git a/html/changelogs/snakebittenn-madeforwalking.yml b/html/changelogs/snakebittenn-madeforwalking.yml new file mode 100644 index 00000000000..1870162bb98 --- /dev/null +++ b/html/changelogs/snakebittenn-madeforwalking.yml @@ -0,0 +1,44 @@ +################################ +# 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: Snakebittenn + +# 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: + - rscdel: "Deletes superfluous Black Boots from the loadout. These had the same exact sprite as jackboots, did you know?" + - rscadd: "Adds knee high and thigh high jackboots. Also toeless versions." + - tweak: "Renames Jackboots to Black Boots." + - rscdel: "Nerfs Jackboot protection a bit." diff --git a/icons/mob/feet.dmi b/icons/mob/feet.dmi index 808b6d3a2bb..f149cc42bcc 100644 Binary files a/icons/mob/feet.dmi and b/icons/mob/feet.dmi differ diff --git a/icons/obj/clothing/shoes.dmi b/icons/obj/clothing/shoes.dmi index c46d3d363a6..2c83728893f 100644 Binary files a/icons/obj/clothing/shoes.dmi and b/icons/obj/clothing/shoes.dmi differ