Merge pull request #1530 from CHOMPStationBot/upstream-merge-9882

[MIRROR] [MIRROR] Adds some new wheelchair types

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

@@ -119,15 +119,6 @@
 	display_name = "Fountain Pen"
 	path = /obj/item/weapon/pen/fountain
 
-/datum/gear/utility/wheelchair/color
-	display_name = "wheelchair"
-	path = /obj/item/wheelchair
-	cost = 4
-
-/datum/gear/utility/wheelchair/color/New()
-	..()
-	gear_tweaks += gear_tweak_free_color_choice
-
 /datum/gear/utility/umbrella
 	display_name = "Umbrella"
 	path = /obj/item/weapon/melee/umbrella
@@ -137,6 +128,20 @@
 	..()
 	gear_tweaks += gear_tweak_free_color_choice
 
+/datum/gear/utility/wheelchair
+	display_name = "wheelchair selection"
+	path = /obj/item/wheelchair
+	cost = 4
+	
+/datum/gear/utility/wheelchair/New()
+	..()
+	gear_tweaks += gear_tweak_free_color_choice
+	var/list/wheelchairs = list(
+		"wheelchair" = /obj/item/wheelchair,
+		"motorized wheelchair" = /obj/item/wheelchair/motor
+	)
+	gear_tweaks += new/datum/gear_tweak/path(wheelchairs)
+
 /****************
 modular computers
 ****************/

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

@@ -670,3 +670,10 @@
 	path = /obj/item/clothing/glasses/aerogelgoggles
 	whitelisted = SPECIES_TESHARI
 	sort_category = "Xenowear"
+
+/datum/gear/utility/teshchair
+	display_name = "small electric wheelchair (Teshari)"
+	path = /obj/item/wheelchair/motor/small
+	whitelisted = SPECIES_TESHARI
+	sort_category = "Xenowear"
+	cost = 4