Merge remote-tracking branch 'upstream/master' into universal-damage

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

@@ -272,7 +272,6 @@
 	new /obj/item/sensor_device(src)
 	new /obj/item/key/ambulance(src)
 	new /obj/item/pinpointer/crew(src)
-	new /obj/item/clothing/shoes/magboots(src)
 	new /obj/item/handheld_defibrillator(src)
 
 /obj/structure/closet/secure_closet/reagents

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

@@ -26,7 +26,6 @@
 	new /obj/item/clothing/mask/gas/syndicate(src)
 	new /obj/item/clothing/suit/space/hardsuit/syndi(src)
 	new /obj/item/tank/jetpack/oxygen/harness(src)
-	new /obj/item/clothing/shoes/magboots/syndie(src)
 
 /obj/structure/closet/syndicate/nuclear
 	desc = "It's a storage unit for a Syndicate boarding party."

code/game/objects/structures/stool_bed_chair_nest/chairs.dm

@@ -133,6 +133,9 @@
 
 // Chair types
 /obj/structure/chair/wood
+	name = "wooden chair"
+	desc = "Old is never too old to not be in fashion."
+	icon_state = "wooden_chair"
 	burn_state = FLAMMABLE
 	burntime = 20
 	buildstackamount = 3
@@ -142,15 +145,8 @@
 /obj/structure/chair/wood/narsie_act()
 	return
 
-/obj/structure/chair/wood/normal
-	icon_state = "wooden_chair"
-	name = "wooden chair"
-	desc = "Old is never too old to not be in fashion."
-
 /obj/structure/chair/wood/wings
 	icon_state = "wooden_chair_wings"
-	name = "wooden chair"
-	desc = "Old is never too old to not be in fashion."
 	item_chair = /obj/item/chair/wood/wings
 
 /obj/structure/chair/comfy