The great Aurora shoe heist

code/datums/supplypacks/costumes.dm

@@ -101,7 +101,7 @@
 			/obj/item/clothing/under/lawyer/bluesuit,
 			/obj/item/clothing/under/lawyer/purpsuit,
 			/obj/item/clothing/shoes/black = 2,
-			/obj/item/clothing/shoes/leather,
+			/obj/item/clothing/shoes/laceup/brown,
 			/obj/item/clothing/accessory/wcoat
 			)
 	name = "Formalwear (Suits)"

code/game/machinery/biogenerator.dm

@@ -262,7 +262,67 @@
 /obj/machinery/biogenerator/attack_hand(mob/user as mob)
 	if(stat & BROKEN)
 		return
+<<<<<<< HEAD
 	tgui_interact(user)
+=======
+	user.set_machine(src)
+	var/dat = "<TITLE>Biogenerator</TITLE>Biogenerator:<BR>"
+	if(processing)
+		dat += "<FONT COLOR=red>Biogenerator is processing! Please wait...</FONT>"
+	else
+		dat += "Biomass: [points] points.<HR>"
+		switch(menustat)
+			if("menu")
+				if(beaker)
+					dat += "<A href='?src=\ref[src];action=activate'>Activate Biogenerator!</A><BR>"
+					dat += "<A href='?src=\ref[src];action=detach'>Detach Container</A><BR><BR>"
+					dat += "Food Items:<BR>"
+					dat += "<A href='?src=\ref[src];action=create;item=milk;cost=20'>10 milk</A> <FONT COLOR=blue>([round(20/build_eff)])</FONT> | <A href='?src=\ref[src];action=create;item=milk5;cost=95'>x5</A><BR>"
+					dat += "<A href='?src=\ref[src];action=create;item=cream;cost=30'>10 cream</A> <FONT COLOR=blue>([round(20/build_eff)])</FONT> | <A href='?src=\ref[src];action=create;item=cream5;cost=120'>x5</A><BR>"
+					dat += "<A href='?src=\ref[src];action=create;item=meat;cost=50'>Slab of meat</A> <FONT COLOR=blue>([round(50/build_eff)])</FONT> | <A href='?src=\ref[src];action=create;item=meat5;cost=250'>x5</A><BR>"
+					dat += "Cooking Ingredient:<BR>"
+					dat += "<A href='?src=\ref[src];action=create;item=unizyme;cost=30'>Universal Enzyme</A> <FONT COLOR=yellow>([round(30/build_eff)])</FONT> | <A href='?src=\ref[src];action=create;item=unizyme50;cost=120'>x5</A><BR>"
+					dat += "<A href='?src=\ref[src];action=create;item=nutrispread;cost=30'>Nutri-Spread</A> <FONT COLOR=yellow>([round(30/build_eff)])</FONT> | <A href='?src=\ref[src];action=create;item=nutrispread5;cost=120'>x5</A><BR>"
+					// dat += "<A href='?src=\ref[src];action=create;item=unizyme;cost=50'>Universal Enzyme</A> <FONT COLOR=yellow>([round(30/build_eff)])</FONT> | <A href='?src=\ref[src];action=create;item=unizyme;cost=180'>x5</A><BR>"
+					// dat += "<A href='?src=\ref[src];action=create;item=unizyme;cost=50'>Universal Enzyme</A> <FONT COLOR=yellow>([round(30/build_eff)])</FONT> | <A href='?src=\ref[src];action=create;item=unizyme;cost=180'>x5</A><BR>"
+					dat += "Gardening Nutrients:<BR>"
+					dat += "<A href='?src=\ref[src];action=create;item=ez;cost=60'>E-Z-Nutrient</A> <FONT COLOR=green>([round(60/build_eff)])</FONT> | <A href='?src=\ref[src];action=create;item=ez5;cost=300'>x5</A><BR>"
+					dat += "<A href='?src=\ref[src];action=create;item=l4z;cost=120'>Left 4 Zed</A> <FONT COLOR=green>([round(120/build_eff)])</FONT> | <A href='?src=\ref[src];action=create;item=l4z5;cost=600'>x5</A><BR>"
+					dat += "<A href='?src=\ref[src];action=create;item=rh;cost=150'>Robust Harvest</A> <FONT COLOR=green>([round(150/build_eff)])</FONT> | <A href='?src=\ref[src];action=create;item=rh5;cost=750'>x5</A><BR>"
+					dat += "Leather Products:<BR>"
+					dat += "<A href='?src=\ref[src];action=create;item=wallet;cost=100'>Wallet</A> <FONT COLOR=brown>([round(100/build_eff)])</FONT><BR>"
+					dat += "<A href='?src=\ref[src];action=create;item=gloves;cost=250'>Botanical gloves</A> <FONT COLOR=green>([round(250/build_eff)])</FONT><BR>"
+					dat += "<A href='?src=\ref[src];action=create;item=plantbag;cost=320'>Plant bag</A> <FONT COLOR=green>([round(250/build_eff)])</FONT><BR>"
+					dat += "<A href='?src=\ref[src];action=create;item=plantbaglarge;cost=640'>Large plant bag</A> <FONT COLOR=green>([round(250/build_eff)])</FONT><BR>"
+					dat += "<A href='?src=\ref[src];action=create;item=tbelt;cost=300'>Utility belt</A> <FONT COLOR=brown>([round(300/build_eff)])</FONT><BR>"
+					dat += "<A href='?src=\ref[src];action=create;item=satchel;cost=400'>Leather Satchel</A> <FONT COLOR=brown>([round(400/build_eff)])</FONT><BR>"
+					dat += "<A href='?src=\ref[src];action=create;item=cashbag;cost=400'>Cash Bag</A> <FONT COLOR=brown>([round(400/build_eff)])</FONT><BR>"
+					dat += "<A href='?src=\ref[src];action=create;item=chembag;cost=400'>Chemistry Bag</A> <FONT COLOR=green>([round(400/build_eff)])</FONT><BR>"
+					dat += "<A href='?src=\ref[src];action=create;item=workboots;cost=400'>Workboots</A> <FONT COLOR=brown>([round(400/build_eff)])</FONT><BR>"
+					dat += "<A href='?src=\ref[src];action=create;item=leatherchaps;cost=400'>Leather Chaps</A> <FONT COLOR=brown>([round(400/build_eff)])</FONT><BR>"
+					dat += "<A href='?src=\ref[src];action=create;item=leathercoat;cost=500'>Leather Coat</A> <FONT COLOR=brown>([round(500/build_eff)])</FONT><BR>"
+					dat += "<A href='?src=\ref[src];action=create;item=leatherjacket;cost=500'>Leather Jacket</A> <FONT COLOR=brown>([round(500/build_eff)])</FONT><BR>"
+					dat += "<A href='?src=\ref[src];action=create;item=wintercoat;cost=500'>Winter Coat</A> <FONT COLOR=brown>([round(500/build_eff)])</FONT><BR>"
+					//dat += "Other<BR>"
+					//dat += "<A href='?src=\ref[src];action=create;item=monkey;cost=500'>Monkey</A> <FONT COLOR=blue>(500)</FONT><BR>"
+				else
+					dat += "<BR><FONT COLOR=red>No beaker inside. Please insert a beaker.</FONT><BR>"
+			if("nopoints")
+				dat += "You do not have biomass to create products.<BR>Please, put growns into reactor and activate it.<BR>"
+				dat += "<A href='?src=\ref[src];action=menu'>Return to menu</A>"
+			if("complete")
+				dat += "Operation complete.<BR>"
+				dat += "<A href='?src=\ref[src];action=menu'>Return to menu</A>"
+			if("void")
+				dat += "<FONT COLOR=red>Error: No growns inside.</FONT><BR>Please, put growns into reactor.<BR>"
+				dat += "<A href='?src=\ref[src];action=menu'>Return to menu</A>"
+	user << browse(dat, "window=biogenerator")
+	onclose(user, "biogenerator")
+	return
+
+/obj/machinery/biogenerator/attack_hand(mob/user as mob)
+	interact(user)
+>>>>>>> a16e6ae... Merge pull request #7456 from listerla/footwear
 
 /obj/machinery/biogenerator/proc/activate()
 	if(usr.stat)
@@ -293,6 +353,126 @@
 		to_chat(usr, "<span class='warning'>Error: No growns inside. Please insert growns.</span>")
 	return
 
+<<<<<<< HEAD
+=======
+/obj/machinery/biogenerator/proc/create_product(var/item, var/cost)
+	cost = round(cost/build_eff)
+	if(cost > points)
+		menustat = "nopoints"
+		return 0
+	processing = 1
+	update_icon()
+	updateUsrDialog()
+	points -= cost
+	sleep(30)
+	switch(item)
+		if("milk")
+			beaker.reagents.add_reagent("milk", 10)
+		if("milk5")
+			beaker.reagents.add_reagent("milk", 50)
+		if("cream")
+			beaker.reagents.add_reagent("cream", 10)
+		if("cream5")
+			beaker.reagents.add_reagent("cream", 50)
+		if("meat")
+			new/obj/item/weapon/reagent_containers/food/snacks/meat(loc)
+		if("meat5")
+			new/obj/item/weapon/reagent_containers/food/snacks/meat(loc) //This is ugly.
+			new/obj/item/weapon/reagent_containers/food/snacks/meat(loc)
+			new/obj/item/weapon/reagent_containers/food/snacks/meat(loc)
+			new/obj/item/weapon/reagent_containers/food/snacks/meat(loc)
+			new/obj/item/weapon/reagent_containers/food/snacks/meat(loc)
+		if("unizyme")
+			beaker.reagents.add_reagent("enzyme", 10)
+		if("unizyme50")
+			beaker.reagents.add_reagent("enzyme", 50)
+		if("nutrispread")
+			new/obj/item/weapon/reagent_containers/food/snacks/spreads(loc)
+		if("nutrispread5")
+			new/obj/item/weapon/reagent_containers/food/snacks/spreads(loc)
+			new/obj/item/weapon/reagent_containers/food/snacks/spreads(loc)
+			new/obj/item/weapon/reagent_containers/food/snacks/spreads(loc)
+			new/obj/item/weapon/reagent_containers/food/snacks/spreads(loc)
+			new/obj/item/weapon/reagent_containers/food/snacks/spreads(loc)
+		if("ez")
+			new/obj/item/weapon/reagent_containers/glass/bottle/eznutrient(loc)
+		if("l4z")
+			new/obj/item/weapon/reagent_containers/glass/bottle/left4zed(loc)
+		if("rh")
+			new/obj/item/weapon/reagent_containers/glass/bottle/robustharvest(loc)
+		if("ez5") //It's not an elegant method, but it's safe and easy. -Cheridan
+			new/obj/item/weapon/reagent_containers/glass/bottle/eznutrient(loc)
+			new/obj/item/weapon/reagent_containers/glass/bottle/eznutrient(loc)
+			new/obj/item/weapon/reagent_containers/glass/bottle/eznutrient(loc)
+			new/obj/item/weapon/reagent_containers/glass/bottle/eznutrient(loc)
+			new/obj/item/weapon/reagent_containers/glass/bottle/eznutrient(loc)
+		if("l4z5")
+			new/obj/item/weapon/reagent_containers/glass/bottle/left4zed(loc)
+			new/obj/item/weapon/reagent_containers/glass/bottle/left4zed(loc)
+			new/obj/item/weapon/reagent_containers/glass/bottle/left4zed(loc)
+			new/obj/item/weapon/reagent_containers/glass/bottle/left4zed(loc)
+			new/obj/item/weapon/reagent_containers/glass/bottle/left4zed(loc)
+		if("rh5")
+			new/obj/item/weapon/reagent_containers/glass/bottle/robustharvest(loc)
+			new/obj/item/weapon/reagent_containers/glass/bottle/robustharvest(loc)
+			new/obj/item/weapon/reagent_containers/glass/bottle/robustharvest(loc)
+			new/obj/item/weapon/reagent_containers/glass/bottle/robustharvest(loc)
+			new/obj/item/weapon/reagent_containers/glass/bottle/robustharvest(loc)
+		if("wallet")
+			new/obj/item/weapon/storage/wallet(loc)
+		if("gloves")
+			new/obj/item/clothing/gloves/botanic_leather(loc)
+		if("plantbag")
+			new/obj/item/weapon/storage/bag/plants(loc)
+		if("plantbaglarge")
+			new/obj/item/weapon/storage/bag/plants/large(loc)
+		if("tbelt")
+			new/obj/item/weapon/storage/belt/utility(loc)
+		if("satchel")
+			new/obj/item/weapon/storage/backpack/satchel(loc)
+		if("cashbag")
+			new/obj/item/weapon/storage/bag/cash(loc)
+		if("chembag")
+			new/obj/item/weapon/storage/bag/chemistry(loc)
+		if("monkey")
+			new/mob/living/carbon/human/monkey(loc)
+		if("workboots")
+			new/obj/item/clothing/shoes/boots/workboots(loc)
+		if("leatherchaps")
+			new/obj/item/clothing/under/pants/chaps
+		if("leathercoat")
+			new/obj/item/clothing/suit/leathercoat(loc)
+		if("leatherjacket")
+			new/obj/item/clothing/suit/storage/toggle/brown_jacket(loc)
+		if("wintercoat")
+			new/obj/item/clothing/suit/storage/hooded/wintercoat(loc)
+	processing = 0
+	menustat = "complete"
+	update_icon()
+	return 1
+
+/obj/machinery/biogenerator/Topic(href, href_list)
+	if(stat & BROKEN) return
+	if(usr.stat || usr.restrained()) return
+	if(!in_range(src, usr)) return
+
+	usr.set_machine(src)
+
+	switch(href_list["action"])
+		if("activate")
+			activate()
+		if("detach")
+			if(beaker)
+				beaker.loc = src.loc
+				beaker = null
+				update_icon()
+		if("create")
+			create_product(href_list["item"], text2num(href_list["cost"]))
+		if("menu")
+			menustat = "menu"
+	updateUsrDialog()
+
+>>>>>>> a16e6ae... Merge pull request #7456 from listerla/footwear
 /obj/machinery/biogenerator/RefreshParts()
 	..()
 	var/man_rating = 0

code/game/objects/random/maintenance.dm

@@ -65,8 +65,8 @@ something, make sure it's not in one of the other lists.*/
 				prob(1);/obj/item/clothing/shoes/syndigaloshes,
 				prob(4);/obj/item/clothing/shoes/black,
 				prob(4);/obj/item/clothing/shoes/laceup,
-				prob(4);/obj/item/clothing/shoes/black,
-				prob(4);/obj/item/clothing/shoes/leather,
+				prob(4);/obj/item/clothing/shoes/laceup/grey,
+				prob(4);/obj/item/clothing/shoes/laceup/brown,
 				prob(1);/obj/item/clothing/gloves/yellow,
 				prob(3);/obj/item/clothing/gloves/botanic_leather,
 				prob(2);/obj/item/clothing/gloves/sterile/latex,

code/game/objects/structures/crates_lockers/closets/secure/scientist.dm

@@ -35,7 +35,7 @@
 		/obj/item/clothing/suit/storage/toggle/labcoat,
 		/obj/item/weapon/cartridge/rd,
 		/obj/item/clothing/shoes/white,
-		/obj/item/clothing/shoes/leather,
+		/obj/item/clothing/shoes/laceup/brown,
 		/obj/item/clothing/gloves/sterile/latex,
 		/obj/item/device/radio/headset/heads/rd,
 		/obj/item/device/radio/headset/heads/rd/alt,

code/game/objects/structures/crates_lockers/closets/secure/security.dm

@@ -53,7 +53,8 @@
 		/obj/item/clothing/under/lawyer/oldman,
 		/obj/item/clothing/shoes/brown,
 		/obj/item/clothing/shoes/black,
-		/obj/item/clothing/shoes/leather,
+		/obj/item/clothing/shoes/laceup,
+		/obj/item/clothing/shoes/laceup/brown,
 		/obj/item/clothing/shoes/white,
 		/obj/item/clothing/under/rank/head_of_personnel_whimsy,
 		/obj/item/clothing/head/caphat/hop,

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

@@ -348,7 +348,7 @@
 		/obj/item/clothing/shoes/green,
 		/obj/item/clothing/shoes/purple,
 		/obj/item/clothing/shoes/red,
-		/obj/item/clothing/shoes/leather,
+		/obj/item/clothing/shoes/laceup/brown,
 		/obj/item/clothing/under/pants/classicjeans,
 		/obj/item/clothing/under/pants/mustangjeans,
 		/obj/item/clothing/under/pants/blackjeans,

code/game/objects/structures/loot_piles.dm

@@ -156,8 +156,8 @@ Loot piles can be depleted, if loot_depleted is turned on.  Note that players wh
 		/obj/item/clothing/shoes/galoshes,
 		/obj/item/clothing/shoes/black,
 		/obj/item/clothing/shoes/laceup,
-		/obj/item/clothing/shoes/black,
-		/obj/item/clothing/shoes/leather,
+		/obj/item/clothing/shoes/laceup/grey,
+		/obj/item/clothing/shoes/laceup/brown,
 		/obj/item/clothing/gloves/botanic_leather,
 		/obj/item/clothing/gloves/sterile/latex,
 		/obj/item/clothing/gloves/white,

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

@@ -1,13 +1,21 @@
 // Shoelocker
 /datum/gear/shoes
-	display_name = "jackboots"
-	path = /obj/item/clothing/shoes/boots/jackboots
+	display_name = "sandals"
+	path = /obj/item/clothing/shoes/sandal
 	slot = slot_shoes
 	sort_category = "Shoes and Footwear"
 
-/datum/gear/shoes/toeless
-	display_name = "toe-less jackboots"
-	path = /obj/item/clothing/shoes/boots/jackboots/toeless
+/datum/gear/shoes/jackboots
+	display_name = "jackboots"
+	path = /obj/item/clothing/shoes/boots/jackboots
+
+/datum/gear/shoes/kneeboots
+	display_name = "jackboots, knee-length"
+	path = /obj/item/clothing/shoes/boots/jackboots/knee
+
+/datum/gear/shoes/thighboots
+	display_name = "jackboots. thigh-length"
+	path = /obj/item/clothing/shoes/boots/jackboots/thigh
 
 /datum/gear/shoes/workboots
 	display_name = "workboots"
@@ -17,10 +25,6 @@
 	display_name = "toe-less workboots"
 	path = /obj/item/clothing/shoes/boots/workboots/toeless
 
-/datum/gear/shoes/sandals
-	display_name = "sandals"
-	path = /obj/item/clothing/shoes/sandal
-
 /datum/gear/shoes/black
 	display_name = "shoes, black"
 	path = /obj/item/clothing/shoes/black
@@ -34,21 +38,21 @@
 	path = /obj/item/clothing/shoes/brown
 
 /datum/gear/shoes/lacey
-	display_name = "shoes, classy"
+	display_name = "shoes, oxford selection"
 	path = /obj/item/clothing/shoes/laceup
 
-/datum/gear/shoes/dress
-	display_name = "shoes, dress"
-	path = /obj/item/clothing/shoes/laceup
+/datum/gear/shoes/lacey/New()
+    ..()
+    var/list/laces = list()
+    for(var/lace in typesof(/obj/item/clothing/shoes/laceup))
+        var/obj/item/clothing/shoes/laceup/lace_type = lace
+        laces[initial(lace_type.name)] = lace_type
+    gear_tweaks += new/datum/gear_tweak/path(sortAssoc(laces))
 
 /datum/gear/shoes/green
 	display_name = "shoes, green"
 	path = /obj/item/clothing/shoes/green
 
-/datum/gear/shoes/leather
-	display_name = "shoes, leather"
-	path = /obj/item/clothing/shoes/leather
-
 /datum/gear/shoes/orange
 	display_name = "shoes, orange"
 	path = /obj/item/clothing/shoes/orange
@@ -74,36 +78,16 @@
 	path = /obj/item/clothing/shoes/yellow
 
 /datum/gear/shoes/hitops/
-	display_name = "high-top, white"
+	display_name = "high-top selection"
 	path = /obj/item/clothing/shoes/hitops/
 
-/datum/gear/shoes/hitops/red
-	display_name = "high-top, red"
-	path = /obj/item/clothing/shoes/hitops/red
-
-/datum/gear/shoes/hitops/black
-	display_name = "high-top, black"
-	path = /obj/item/clothing/shoes/hitops/black
-
-/datum/gear/shoes/hitops/orange
-	display_name = "high-top, orange"
-	path = /obj/item/clothing/shoes/hitops/orange
-
-/datum/gear/shoes/hitops/blue
-	display_name = "high-top, blue"
-	path = /obj/item/clothing/shoes/hitops/blue
-
-/datum/gear/shoes/hitops/green
-	display_name = "high-top, green"
-	path = /obj/item/clothing/shoes/hitops/green
-
-/datum/gear/shoes/hitops/purple
-	display_name = "high-top, purple"
-	path = /obj/item/clothing/shoes/hitops/purple
-
-/datum/gear/shoes/hitops/yellow
-	display_name = "high-top, yellow"
-	path = /obj/item/clothing/shoes/hitops/yellow
+/datum/gear/shoes/hitops/New()
+    ..()
+    var/list/hitops = list()
+    for(var/hitop in typesof(/obj/item/clothing/shoes/hitops))
+        var/obj/item/clothing/shoes/hitops/hitop_type = hitop
+        hitops[initial(hitop_type.name)] = hitop_type
+    gear_tweaks += new/datum/gear_tweak/path(sortAssoc(hitops))
 
 /datum/gear/shoes/flipflops
 	display_name = "flip flops"

code/modules/clothing/shoes/boots.dm

@@ -17,13 +17,11 @@
 	name = "classic cowboy boots"
 	desc = "A classic looking pair of durable cowboy boots."
 	icon_state = "cowboy_classic"
-	item_state_slots = list(slot_r_hand_str = "leather", slot_l_hand_str = "leather")
 
 /obj/item/clothing/shoes/boots/cowboy/snakeskin
 	name = "snakeskin cowboy boots"
 	desc = "A pair of cowboy boots made from python skin."
 	icon_state = "cowboy_snakeskin"
-	item_state_slots = list(slot_r_hand_str = "white", slot_l_hand_str = "white")
 
 /obj/item/clothing/shoes/boots/jackboots
 	name = "jackboots"
@@ -39,6 +37,32 @@
 	item_state_slots = list(slot_r_hand_str = "jackboots", slot_l_hand_str = "jackboots")
 	species_restricted = null
 
+/obj/item/clothing/shoes/boots/jackboots/knee
+	name = "knee-length jackboots"
+	desc = "Taller synthleather boots with an artificial shine."
+	icon_state = "kneeboots"
+	item_state_slots = list(slot_r_hand_str = "jackboots", slot_l_hand_str = "jackboots")
+
+/obj/item/clothing/shoes/boots/jackboots/toeless/knee
+	name = "toe-less knee-length jackboots"
+	desc = "Modified pair of taller boots, particularly friendly to those species whose toes hold claws."
+	icon_state = "digikneeboots"
+	item_state_slots = list(slot_r_hand_str = "jackboots", slot_l_hand_str = "jackboots")
+	species_restricted = null
+
+/obj/item/clothing/shoes/boots/jackboots/thigh
+	name = "thigh-length jackboots"
+	desc = "Even taller synthleather boots with an artificial shine."
+	icon_state = "thighboots"
+	item_state_slots = list(slot_r_hand_str = "jackboots", slot_l_hand_str = "jackboots")
+
+/obj/item/clothing/shoes/boots/jackboots/toeless/thigh
+	name = "toe-less thigh-length jackboots"
+	desc = "Modified pair of even taller boots, particularly friendly to those species whose toes hold claws."
+	icon_state = "digithighboots"
+	item_state_slots = list(slot_r_hand_str = "jackboots", slot_l_hand_str = "jackboots")
+	species_restricted = null
+
 /obj/item/clothing/shoes/boots/workboots
 	name = "workboots"
 	desc = "A pair of steel-toed work boots designed for use in industrial settings. Safety first."

code/modules/clothing/shoes/colour.dm

@@ -35,12 +35,6 @@
 	icon_state = "white"
 	permeability_coefficient = 0.01
 
-/obj/item/clothing/shoes/leather
-	name = "leather shoes"
-	desc = "A sturdy pair of leather shoes."
-	icon_state = "leather"
-	drop_sound = 'sound/items/drop/leather.ogg'
-
 /obj/item/clothing/shoes/rainbow
 	name = "rainbow shoes"
 	desc = "Very colourful shoes."

code/modules/clothing/shoes/miscellaneous.dm

@@ -45,6 +45,11 @@
 
 	wizard_garb = 1
 
+obj/item/clothing/shoes/sandal/clogs
+	name = "plastic clogs"
+	desc = "A pair of plastic clog shoes."
+	icon_state = "clogs"
+
 /obj/item/clothing/shoes/sandal/marisa
 	desc = "A pair of magic, black shoes."
 	name = "magic shoes"
@@ -101,18 +106,23 @@
 	w_class = ITEMSIZE_SMALL
 	drop_sound = 'sound/items/drop/clothing.ogg'
 
-/obj/item/clothing/shoes/slippers_worn
+/obj/item/clothing/shoes/slippers/worn
 	name = "worn bunny slippers"
 	desc = "Fluffy..."
 	icon_state = "slippers_worn"
 	item_state_slots = list(slot_r_hand_str = "slippers", slot_l_hand_str = "slippers")
-	force = 0
-	w_class = ITEMSIZE_SMALL
 
 /obj/item/clothing/shoes/laceup
-	name = "laceup shoes"
-	desc = "The height of fashion, and they're pre-polished!"
-	icon_state = "laceups"
+	name = "black oxford  shoes"
+	icon_state = "oxford_black"
+
+/obj/item/clothing/shoes/laceup/grey
+	name = "grey oxford shoes"
+	icon_state = "oxford_grey"
+
+/obj/item/clothing/shoes/laceup/brown
+	name = "brown oxford shoes"
+	icon_state = "oxford_brown"
 
 /obj/item/clothing/shoes/swimmingfins
 	desc = "Help you swim good."

html/changelogs/Lorilili - footwear.yml

@@ -0,0 +1,38 @@
+################################
+# 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
+#################################
+
+# Your name.  
+author: Lorilili (Port from Aurora)
+
+# 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: 
+  - rscadd: "Added knee-high and thigh-high jackboots."
+  - imageadd: "Replaced laceup and leather shoes with oxford shoes."
+  - imageadd: "Replaced standard shoe and high-top sprites with newer ones."

maps/southern_cross/structures/closets/research.dm

@@ -15,6 +15,6 @@
 		/obj/item/clothing/suit/storage/toggle/labcoat,
 		/obj/item/weapon/cartridge/rd,
 		/obj/item/clothing/shoes/white,
-		/obj/item/clothing/shoes/leather,
+		/obj/item/clothing/shoes/laceup/brown,
 		/obj/item/clothing/gloves/sterile/latex,
 		/obj/item/device/radio/headset/heads/rd)