Merge branch 'master' into 191217-sprites_mecha

code/datums/outfits/outfit_antag.dm

@@ -163,7 +163,7 @@
 		return
 
 	if(!H.shoes)
-		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots/unathi(H), slot_shoes)
+		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots/toeless(H), slot_shoes)
 
 /datum/outfit/admin/syndicate/raider
 	name = "Raider"

code/game/jobs/job/outsider/merchant.dm

@@ -55,7 +55,7 @@
 		/obj/item/clothing/under/blazer
 		)
 	shoes = list(
-		/obj/item/clothing/shoes/leather,
+		/obj/item/clothing/shoes/laceup/brown,
 		/obj/item/clothing/shoes/laceup,
 		/obj/item/clothing/shoes/workboots,
 		/obj/item/clothing/shoes/black,

code/game/machinery/adv_med.dm

@@ -538,11 +538,10 @@
 	if (!occupant || !istype(occupant, /mob/living/carbon/human))
 		return
 	var/mob/living/carbon/human/H = occupant
-	var/brain_result = H.get_brain_status()
 
 	var/list/occupant_data = list(
 		"stationtime" = worldtime2text(),
-		"brain_activity" = brain_result,
+		"brain_activity" = H.get_brain_status(),
 		"virus_present" = H.virus2.len,
 		"blood_volume" = H.get_blood_volume(),
 		"blood_oxygenation" = H.get_blood_oxygenation(),
@@ -577,7 +576,7 @@
 /obj/machinery/body_scanconsole/proc/format_occupant_data(var/list/occ)
 	var/dat = "<font color='blue'><b>Scan performed at [occ["stationtime"]]</b></font><br>"
 	dat += "<font color='blue'><b>Occupant Statistics:</b></font><br>"
-	dat += text("Brain Activity: []<br>", occ["brain_result"])
+	dat += text("Brain Activity: []<br>", occ["brain_activity"])
 	if (occ["virus_present"])
 		dat += "<font color='red'>Viral pathogen detected in blood stream.</font><br>"
 	dat += text("Blood Pressure: []<br>", occ["blood_pressure"])

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

@@ -1,69 +1,69 @@
-/obj/structure/closet/secure_closet/scientist
-	name = "scientist's locker"
-	req_access = list(access_tox_storage)
-	icon_state = "secureres1"
-	icon_closed = "secureres"
-	icon_locked = "secureres1"
-	icon_opened = "secureresopen"
-	icon_broken = "secureresbroken"
-	icon_off = "secureresoff"
-
-/obj/structure/closet/secure_closet/scientist/fill()
-	new /obj/item/clothing/under/rank/scientist(src)
-	new /obj/item/clothing/suit/storage/toggle/labcoat(src)
-	new /obj/item/clothing/shoes/science(src)
-	new /obj/item/device/radio/headset/headset_sci(src)
-	new /obj/item/device/radio/headset/headset_sci/alt(src)
-	new /obj/item/tank/air(src)
-	new /obj/item/clothing/mask/gas(src)
-
-
-/obj/structure/closet/secure_closet/RD
-	name = "research director's locker"
-	req_access = list(access_rd)
-	icon_state = "rdsecure1"
-	icon_closed = "rdsecure"
-	icon_locked = "rdsecure1"
-	icon_opened = "rdsecureopen"
-	icon_broken = "rdsecurebroken"
-	icon_off = "rdsecureoff"
-
-/obj/structure/closet/secure_closet/RD/fill()
-	new /obj/item/clothing/suit/bio_suit/scientist(src)
-	new /obj/item/clothing/head/bio_hood/scientist(src)
-	new /obj/item/clothing/under/rank/research_director(src)
-	new /obj/item/clothing/under/rank/research_director/rdalt(src)
-	new /obj/item/clothing/under/rank/research_director/dress_rd(src)
-	new /obj/item/clothing/suit/storage/toggle/labcoat(src)
-	new /obj/item/cartridge/rd(src)
-	new /obj/item/clothing/shoes/science(src)
-	new /obj/item/clothing/shoes/leather(src)
-	new /obj/item/clothing/gloves/latex/nitrile(src)
-	new /obj/item/device/radio/headset/heads/rd(src)
-	new /obj/item/device/radio/headset/heads/rd/alt(src)
-	new /obj/item/tank/air(src)
-	new /obj/item/clothing/mask/gas(src)
-	new /obj/item/device/flash(src)
-	new /obj/item/storage/box/firingpinsRD(src)
-	new /obj/item/device/pin_extractor(src)
-
-/obj/structure/closet/secure_closet/RD2
-	name = "research director's attire"
-	req_access = list(access_rd)
-	icon_state = "rdsecure1"
-	icon_closed = "rdsecure"
-	icon_locked = "rdsecure1"
-	icon_opened = "rdsecureopen"
-	icon_broken = "rdsecurebroken"
-	icon_off = "rdsecureoff"
-
-/obj/structure/closet/secure_closet/RD2/fill()
-	new /obj/item/clothing/under/rank/research_director(src)
-	new /obj/item/clothing/under/rank/research_director/rdalt(src)
-	new /obj/item/clothing/under/rank/research_director/dress_rd(src)
-	new /obj/item/clothing/suit/storage/toggle/labcoat(src)
-	new /obj/item/clothing/shoes/science(src)
-	new /obj/item/clothing/shoes/leather(src)
-	new /obj/item/clothing/gloves/latex/nitrile(src)
-	new /obj/item/device/radio/headset/heads/rd(src)
-	new /obj/item/device/radio/headset/heads/rd/alt(src)
+/obj/structure/closet/secure_closet/scientist
+	name = "scientist's locker"
+	req_access = list(access_tox_storage)
+	icon_state = "secureres1"
+	icon_closed = "secureres"
+	icon_locked = "secureres1"
+	icon_opened = "secureresopen"
+	icon_broken = "secureresbroken"
+	icon_off = "secureresoff"
+
+/obj/structure/closet/secure_closet/scientist/fill()
+	new /obj/item/clothing/under/rank/scientist(src)
+	new /obj/item/clothing/suit/storage/toggle/labcoat(src)
+	new /obj/item/clothing/shoes/science(src)
+	new /obj/item/device/radio/headset/headset_sci(src)
+	new /obj/item/device/radio/headset/headset_sci/alt(src)
+	new /obj/item/tank/air(src)
+	new /obj/item/clothing/mask/gas(src)
+
+
+/obj/structure/closet/secure_closet/RD
+	name = "research director's locker"
+	req_access = list(access_rd)
+	icon_state = "rdsecure1"
+	icon_closed = "rdsecure"
+	icon_locked = "rdsecure1"
+	icon_opened = "rdsecureopen"
+	icon_broken = "rdsecurebroken"
+	icon_off = "rdsecureoff"
+
+/obj/structure/closet/secure_closet/RD/fill()
+	new /obj/item/clothing/suit/bio_suit/scientist(src)
+	new /obj/item/clothing/head/bio_hood/scientist(src)
+	new /obj/item/clothing/under/rank/research_director(src)
+	new /obj/item/clothing/under/rank/research_director/rdalt(src)
+	new /obj/item/clothing/under/rank/research_director/dress_rd(src)
+	new /obj/item/clothing/suit/storage/toggle/labcoat(src)
+	new /obj/item/cartridge/rd(src)
+	new /obj/item/clothing/shoes/science(src)
+	new /obj/item/clothing/shoes/laceup/brown(src)
+	new /obj/item/clothing/gloves/latex/nitrile(src)
+	new /obj/item/device/radio/headset/heads/rd(src)
+	new /obj/item/device/radio/headset/heads/rd/alt(src)
+	new /obj/item/tank/air(src)
+	new /obj/item/clothing/mask/gas(src)
+	new /obj/item/device/flash(src)
+	new /obj/item/storage/box/firingpinsRD(src)
+	new /obj/item/device/pin_extractor(src)
+
+/obj/structure/closet/secure_closet/RD2
+	name = "research director's attire"
+	req_access = list(access_rd)
+	icon_state = "rdsecure1"
+	icon_closed = "rdsecure"
+	icon_locked = "rdsecure1"
+	icon_opened = "rdsecureopen"
+	icon_broken = "rdsecurebroken"
+	icon_off = "rdsecureoff"
+
+/obj/structure/closet/secure_closet/RD2/fill()
+	new /obj/item/clothing/under/rank/research_director(src)
+	new /obj/item/clothing/under/rank/research_director/rdalt(src)
+	new /obj/item/clothing/under/rank/research_director/dress_rd(src)
+	new /obj/item/clothing/suit/storage/toggle/labcoat(src)
+	new /obj/item/clothing/shoes/science(src)
+	new /obj/item/clothing/shoes/laceup/brown(src)
+	new /obj/item/clothing/gloves/latex/nitrile(src)
+	new /obj/item/device/radio/headset/heads/rd(src)
+	new /obj/item/device/radio/headset/heads/rd/alt(src)

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

@@ -106,7 +106,7 @@
 	new /obj/item/clothing/under/rank/head_of_personnel_whimsy(src)
 	new /obj/item/clothing/shoes/brown(src)
 	new /obj/item/clothing/shoes/black(src)
-	new /obj/item/clothing/shoes/leather(src)
+	new /obj/item/clothing/shoes/laceup/brown(src)
 	new /obj/item/clothing/shoes/white(src)
 	new /obj/item/clothing/head/caphat/hop(src)
 

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

@@ -35,7 +35,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/unathi(src)
+	new /obj/item/clothing/shoes/jackboots/toeless(src)
 
 	return
 
@@ -399,7 +399,6 @@
 	new /obj/item/clothing/shoes/orange(src)
 	new /obj/item/clothing/shoes/purple(src)
 	new /obj/item/clothing/shoes/red(src)
-	new /obj/item/clothing/shoes/leather(src)
 	return
 
 /obj/structure/closet/wardrobe/tactical

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

@@ -6,9 +6,17 @@
 	sort_category = "Shoes and Footwear"
 
 /datum/gear/shoes/workboots
-	display_name = "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
@@ -37,12 +45,16 @@
 	gear_tweaks += new/datum/gear_tweak/path(shoes)
 
 /datum/gear/shoes/dress
-	display_name = "shoes, dress"
+	display_name = "oxford shoe selection"
 	path = /obj/item/clothing/shoes/laceup
 
-/datum/gear/shoes/leather
-	display_name = "shoes, leather"
-	path = /obj/item/clothing/shoes/leather
+/datum/gear/shoes/dress/New()
+	..()
+	var/shoes = list()
+	shoes["black oxford shoes"] = /obj/item/clothing/shoes/laceup
+	shoes["grey oxford shoes"] = /obj/item/clothing/shoes/laceup/grey
+	shoes["brown oxford shoes"] = /obj/item/clothing/shoes/laceup/brown
+	gear_tweaks += new/datum/gear_tweak/path(shoes)
 
 /datum/gear/shoes/flats
 	display_name = "flats selection"

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

@@ -16,18 +16,26 @@
 
 /datum/gear/shoes/toeless
 	display_name = "toe-less jackboots"
-	path = /obj/item/clothing/shoes/jackboots/unathi
+	path = /obj/item/clothing/shoes/jackboots/toeless
 	sort_category = "Xenowear"
 	whitelisted = list("Vaurca Worker", "Vaurca Warrior", "Unathi", "Aut'akh Unathi", "Tajara", "Zhan-Khazan Tajara", "M'sai Tajara")
 
 /datum/gear/shoes/workboots_toeless
-	display_name = "toeless workboots"
+	display_name = "toeless workboots selection"
 	path = /obj/item/clothing/shoes/workboots/toeless
 	sort_category = "Xenowear"
 	whitelisted = list("Vaurca Worker", "Vaurca Warrior", "Unathi", "Aut'akh 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"
+	display_name = "caligae selection"
 	path = /obj/item/clothing/shoes/caligae
 	whitelisted = list("Unathi", "Aut'akh Unathi", "Tajara", "Zhan-Khazan Tajara", "M'sai Tajara")
 	sort_category = "Xenowear"

code/modules/clothing/shoes/colour.dm

@@ -87,12 +87,6 @@
 	permeability_coefficient = 0.01
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 90, rad = 0)
 
-/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 = "A pair of overly colorful shoes."
@@ -104,6 +98,33 @@
 	icon_state = "orange"
 	var/obj/item/handcuffs/chained = null
 
+/obj/item/clothing/shoes/orange/proc/attach_cuffs(var/obj/item/handcuffs/cuffs, mob/user)
+	if (src.chained) return
+
+	user.drop_from_inventory(cuffs,src)
+	src.chained = cuffs
+	src.slowdown = 15
+	src.icon_state = "orange1"
+
+/obj/item/clothing/shoes/orange/proc/remove_cuffs(mob/user as mob)
+	if (!src.chained) return
+
+	user.put_in_hands(src.chained)
+	src.chained.add_fingerprint(user)
+
+	src.slowdown = initial(slowdown)
+	src.icon_state = "orange"
+	src.chained = null
+
+/obj/item/clothing/shoes/orange/attack_self(mob/user as mob)
+	..()
+	remove_cuffs(user)
+
+/obj/item/clothing/shoes/orange/attackby(H as obj, mob/user as mob)
+	..()
+	if (istype(H, /obj/item/handcuffs))
+		attach_cuffs(H, user)
+
 /obj/item/clothing/shoes/flats
 	desc = "A pair of black, low-heeled women's flats."
 	name = "black dress flats"
@@ -144,33 +165,6 @@
 	icon_state = "dressflatswhite"
 	item_state = "dressflatswhite"
 
-/obj/item/clothing/shoes/orange/proc/attach_cuffs(var/obj/item/handcuffs/cuffs, mob/user as mob)
-	if (src.chained) return
-
-	user.drop_from_inventory(cuffs,src)
-	src.chained = cuffs
-	src.slowdown = 15
-	src.icon_state = "orange1"
-
-/obj/item/clothing/shoes/orange/proc/remove_cuffs(mob/user as mob)
-	if (!src.chained) return
-
-	user.put_in_hands(src.chained)
-	src.chained.add_fingerprint(user)
-
-	src.slowdown = initial(slowdown)
-	src.icon_state = "orange"
-	src.chained = null
-
-/obj/item/clothing/shoes/orange/attack_self(mob/user as mob)
-	..()
-	remove_cuffs(user)
-
-/obj/item/clothing/shoes/orange/attackby(H as obj, mob/user as mob)
-	..()
-	if (istype(H, /obj/item/handcuffs))
-		attach_cuffs(H, user)
-
 /obj/item/clothing/shoes/hitops
 	name = "white high-tops"
 	desc = "A pair of shoes that extends past the ankle. Based on a centuries-old, timeless design."
@@ -215,4 +209,4 @@
 /obj/item/clothing/shoes/hitops/yellow
 	name = "yellow high-tops"
 	icon_state = "yellowhi"
-	item_state = "yellowhi"
+	item_state = "yellowhi"

code/modules/clothing/shoes/jobs.dm

@@ -1,5 +1,5 @@
 /obj/item/clothing/shoes/galoshes
-	desc = "Rubber boots"
+	desc = "A waterproof overshoe, made of rubber."
 	name = "galoshes"
 	icon_state = "galoshes"
 	permeability_coefficient = 0.05
@@ -19,11 +19,11 @@
 	can_hold_knife = 1
 	drop_sound = 'sound/items/drop/boots.ogg'
 
-/obj/item/clothing/shoes/jackboots/unathi
+/obj/item/clothing/shoes/jackboots/toeless
 	name = "toe-less jackboots"
 	desc = "Modified pair of jackboots, particularly friendly to those species whose toes hold claws."
-	item_state = "digiboots"
-	icon_state = "digiboots"
+	item_state = "jackboots_toeless"
+	icon_state = "jackboots_toeless"
 	species_restricted = null
 
 /obj/item/clothing/shoes/workboots
@@ -40,6 +40,31 @@
 /obj/item/clothing/shoes/workboots/toeless
 	name = "toe-less workboots"
 	desc = "A pair of toeless work boots designed for use in industrial settings. Modified for species whose toes have claws."
-	icon_state = "workbootstoeless"
-	item_state = "workbootstoeless"
+	icon_state = "workboots_toeless"
+	item_state = "workboots_toeless"
 	species_restricted = null
+
+/obj/item/clothing/shoes/workboots/grey
+	name = "grey workboots"
+	desc = "A pair of grey steel-toed work boots designed for use in industrial settings. Safety first."
+	icon_state = "workboots_grey"
+	item_state = "workboots_grey"
+
+/obj/item/clothing/shoes/workboots/toeless/grey
+	name = "toe-less grey workboots"
+	desc = "A pair of toeless work boots designed for use in industrial settings. Modified for species whose toes have claws."
+	icon_state = "workboots_grey_toeless"
+	item_state = "workboots_grey_toeless"
+
+/obj/item/clothing/shoes/workboots/dark
+	name = "dark workboots"
+	desc = "A pair of dark steel-toed work boots designed for use in industrial settings. Safety first."
+	icon_state = "workboots_dark"
+	item_state = "workboots_dark"
+
+/obj/item/clothing/shoes/workboots/toeless/dark
+	name = "toe-less dark workboots"
+	desc = "A pair of toeless dark work boots designed for use in industrial settings. Modified for species whose toes have claws."
+	icon_state = "workboots_dark_toeless"
+	item_state = "workboots_dark_toeless"
+

code/modules/clothing/shoes/miscellaneous.dm

@@ -13,7 +13,7 @@
 
 /obj/item/clothing/shoes/mime
 	name = "mime shoes"
-	icon_state = "mime"
+	icon_state = "white"
 
 /obj/item/clothing/shoes/swat
 	name = "\improper SWAT shoes"
@@ -46,7 +46,7 @@
 /obj/item/clothing/shoes/sandal
 	desc = "A pair of rather plain, wooden sandals."
 	name = "sandals"
-	icon_state = "wizard"
+	icon_state = "sandals"
 	species_restricted = null
 	body_parts_covered = 0
 
@@ -125,9 +125,17 @@
 	silent = 1
 
 /obj/item/clothing/shoes/laceup
-	name = "laceup shoes"
+	name = "black oxford shoes"
 	desc = "The height of fashion, and they're pre-polished!"
-	icon_state = "laceups"
+	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."
@@ -146,15 +154,6 @@
 	silent = 1
 	drop_sound = 'sound/items/drop/clothing.ogg'
 
-/obj/item/clothing/shoes/winter_old
-	name = "winter boots"
-	desc = "Boots lined with 'synthetic' animal fur."
-	icon_state = "winterboots_old"
-	cold_protection = FEET|LEGS
-	min_cold_protection_temperature = SHOE_MIN_COLD_PROTECTION_TEMPERATURE
-	heat_protection = FEET|LEGS
-	max_heat_protection_temperature = SHOE_MAX_HEAT_PROTECTION_TEMPERATURE
-
 /obj/item/clothing/shoes/cowboy
 	name = "cowboy boots"
 	desc = "Lacking a durasteel horse to ride."
@@ -201,11 +200,17 @@
 	siemens_coefficient = 0.75
 	can_hold_knife = 1
 
+/obj/item/clothing/shoes/winter/toeless
+	name = "toe-less winter boots"
+	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"
+	item_state = "winterboots_toeless"
+
 /obj/item/clothing/shoes/black_boots
 	name = "black boots"
 	desc = "A pair of tough looking black boots."
-	icon_state = "blackboots"
-	item_state = "blackboots"
+	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
 

code/modules/customitems/item_defines.dm

@@ -483,7 +483,7 @@ All custom items with worn sprites must follow the contained sprite system: http
 	contained_sprite = TRUE
 
 
-/obj/item/clothing/shoes/jackboots/unathi/fluff/yinzr_sandals //Marching Sandals - Sslazhir Yinzr - alberyk
+/obj/item/clothing/shoes/jackboots/toeless/fluff/yinzr_sandals //Marching Sandals - Sslazhir Yinzr - alberyk
 	name = "marching sandals"
 	desc = "A pair of sturdy marching sandals made of layers of leather and with a reinforced sole, they are also rather big."
 	icon = 'icons/obj/custom_items/yinzr_sandals.dmi'

code/modules/ghostroles/spawner/human/pra.dm

@@ -39,7 +39,7 @@
 	name = "Kosmostrelki"
 
 	uniform = /obj/item/clothing/under/tajaran/cosmonaut
-	shoes = /obj/item/clothing/shoes/jackboots/unathi
+	shoes = /obj/item/clothing/shoes/jackboots/toeless
 	belt = /obj/item/storage/belt/military
 	back = /obj/item/gun/projectile/shotgun/pump/rifle
 	id = /obj/item/card/id/syndicate

html/changelog.html

@@ -35,6 +35,18 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">20 December 2019</h2>
+			<h3 class="author">MattAtlas updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixed the advanced scanner not printing a brain activity result.</li>
+			</ul>
+			<h3 class="author">Wowzewow (Wezzy), AmoryBlaine updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Tweaks various shoes sprites.</li>
+				<li class="rscadd">New Oxford shoes selection and Workboots selection : Check your loadout!</li>
+				<li class="rscadd">New toeless workboots.</li>
+			</ul>
+
 			<h2 class="date">19 December 2019</h2>
 			<h3 class="author">Alberyk updated:</h3>
 			<ul class="changes bgimages16">

html/changelogs/.all_changelog.yml

@@ -10756,3 +10756,10 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   Wowzewow (Wezzy):
   - rscadd: You can now wear the wet floor sign in your suit slot.
   - tweak: Adjusts the wet floor sign sprite.
+2019-12-20:
+  MattAtlas:
+  - bugfix: Fixed the advanced scanner not printing a brain activity result.
+  Wowzewow (Wezzy), AmoryBlaine:
+  - tweak: Tweaks various shoes sprites.
+  - rscadd: 'New Oxford shoes selection and Workboots selection : Check your loadout!'
+  - rscadd: New toeless workboots.

maps/space_ruins/scrapheap.dmm

@@ -1506,7 +1506,7 @@
 /turf/simulated/floor/tiled/dark,
 /area/derelict/ship)
 "er" = (
-/obj/item/robot_parts/robot_component/armor/combat,
+/obj/item/robot_parts/robot_component/armor/mech/combat,
 /obj/machinery/mech_recharger,
 /turf/simulated/floor/tiled/dark,
 /area/derelict/ship)