Merge pull request #3692 from PrismaticGynoid/wheelchairs

Better Wheelchairs

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

@@ -90,4 +90,13 @@
 
 /datum/gear/utility/pen
 	display_name = "Fountain Pen"
-	path = /obj/item/weapon/pen/fountain
+	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 = list(gear_tweak_free_color_choice)

code/modules/mob/living/carbon/human/human_movement.dm

@@ -35,7 +35,7 @@
 			var/obj/item/organ/external/E = get_organ(organ_name)
 			if(!E || E.is_stump())
 				tally += 4
-			if(E.splinted)
+			else if(E.splinted)
 				tally += 0.5
 			else if(E.status & ORGAN_BROKEN)
 				tally += 1.5