From b5ccfbd3280c7a05dfcd92f54cac70cd90587dab Mon Sep 17 00:00:00 2001
From: PrismaticGynoid <PrismaticGynoid@gmail.com>
Date: Wed, 9 Aug 2017 18:43:13 -0700
Subject: [PATCH] Also allows people to take their wheelchairs with them
 instead of leaving them behind, and fixes a runtime with wheelchair users who
 are missing hands or arms.

---
 code/game/machinery/cryopod.dm                      | 13 ++++++++++++-
 .../mob/living/carbon/human/human_movement.dm       |  2 +-
 html/changelogs/PrismaticGynoid-wheelchairs.yml     |  1 +
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm
index 08a1282e52..846f62c729 100644
--- a/code/game/machinery/cryopod.dm
+++ b/code/game/machinery/cryopod.dm
@@ -430,6 +430,10 @@
 			else
 				W.forceMove(src.loc)
 
+	for(var/obj/structure/B in items)
+		if(istype(B,/obj/structure/bed))
+			qdel(B)
+
 	//Update any existing objectives involving this mob.
 	for(var/datum/objective/O in all_objectives)
 		// We don't want revs to get objectives that aren't for heads of staff. Letting
@@ -521,6 +525,9 @@
 	for(var/obj/item/W in items)
 		W.forceMove(get_turf(src))
 
+	for(var/obj/structure/bed/S in src.contents)
+		S.forceMove(get_turf(src))
+
 	go_out()
 	add_fingerprint(usr)
 
@@ -563,6 +570,8 @@
 		if(ishuman(usr) && applies_stasis)
 			var/mob/living/carbon/human/H = occupant
 			H.Stasis(1000)
+		if(usr.buckled && istype(usr.buckled, /obj/structure/bed/chair/wheelchair))
+			usr.buckled.loc = usr.loc
 
 		icon_state = occupied_icon_state
 
@@ -660,6 +669,8 @@
 		if(ishuman(M) && applies_stasis)
 			var/mob/living/carbon/human/H = M
 			H.Stasis(1000)
+		if(M.buckled && istype(M.buckled, /obj/structure/bed/chair/wheelchair))
+			M.buckled.loc = M.loc
 
 		// Book keeping!
 		var/turf/location = get_turf(src)
@@ -667,4 +678,4 @@
 		message_admins("<span class='notice'>[key_name_admin(M)] has entered a stasis pod.</span>")
 
 		//Despawning occurs when process() is called with an occupant without a client.
-		add_fingerprint(M)
\ No newline at end of file
+		add_fingerprint(M)
diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm
index 98f8f81d9c..7720016611 100644
--- a/code/modules/mob/living/carbon/human/human_movement.dm
+++ b/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
diff --git a/html/changelogs/PrismaticGynoid-wheelchairs.yml b/html/changelogs/PrismaticGynoid-wheelchairs.yml
index 3e37225596..cebda68e5a 100644
--- a/html/changelogs/PrismaticGynoid-wheelchairs.yml
+++ b/html/changelogs/PrismaticGynoid-wheelchairs.yml
@@ -3,3 +3,4 @@ delete-after: True
 changes: 
   - rscadd: "Wheelchairs can now be collapsed like rollerbeds for ease of storage and movement. Too big to put in backpacks though."
   - rscadd: "Wheelchairs are now available in a color-customizable form via the loadout, under utility. Now you can ride in style, and keep your feet too."
+  - bugfix: "Wheelchair users can now enter the gateway and residential elevator without being forced to leave behind their mobility aid."