Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev

code/game/jobs/job_controller.dm

@@ -492,6 +492,17 @@ var/global/datum/controller/occupations/job_master
 					H.internal = H.l_hand
 				H.internals.icon_state = "internal1"
 
+		if(istype(H)) //give humans wheelchairs, if they need them.
+			var/datum/organ/external/l_foot = H.get_organ("l_foot")
+			var/datum/organ/external/r_foot = H.get_organ("r_foot")
+			if((!l_foot || l_foot.status & ORGAN_DESTROYED) && (!r_foot || r_foot.status & ORGAN_DESTROYED))
+				var/obj/structure/stool/bed/chair/wheelchair/W = new /obj/structure/stool/bed/chair/wheelchair(H.loc)
+				H.buckled = W
+				H.update_canmove()
+				W.dir = H.dir
+				W.buckled_mob = H
+				W.add_fingerprint(H)
+
 		H << "<B>You are the [alt_title ? alt_title : rank].</B>"
 		H << "<b>As the [alt_title ? alt_title : rank] you answer directly to [job.supervisors]. Special circumstances may change this.</b>"
 		H << "<b>To speak on your department's radio channel use :h. For the use of other channels, examine your headset.</b>"

code/game/machinery/ai_slipper.dm

@@ -1,7 +1,7 @@
 /obj/machinery/ai_slipper
-	name = "AI Liquid Dispenser"
+	name = "\improper AI Liquid Dispenser"
 	icon = 'icons/obj/device.dmi'
-	icon_state = "motion3"
+	icon_state = "motion0"
 	layer = 3
 	anchored = 1.0
 	var/uses = 20
@@ -13,15 +13,19 @@
 	var/cooldown_on = 0
 	req_access = list(access_ai_upload)
 
+/obj/machinery/ai_slipper/New()
+	..()
+	update_icon()
+
 /obj/machinery/ai_slipper/power_change()
 	..()
-	if(stat & BROKEN)
-		return
+	update_icon()
+
+/obj/machinery/ai_slipper/update_icon()
+	if (stat & NOPOWER || stat & BROKEN)
+		icon_state = "motion0"
 	else
-		if (stat & NOPOWER)
-			icon_state = "motion0"
-		else
-			icon_state = initial(icon_state)
+		icon_state = disabled ? "motion0" : "motion3"
 
 /obj/machinery/ai_slipper/proc/setState(var/enabled, var/uses)
 	src.disabled = disabled
@@ -90,7 +94,7 @@
 			return
 	if (href_list["toggleOn"])
 		src.disabled = !src.disabled
-		icon_state = src.disabled? "motion0":"motion3"
+		update_icon()
 	if (href_list["toggleUse"])
 		if(cooldown_on || disabled)
 			return

code/game/machinery/doors/windowdoor.dm

@@ -51,11 +51,12 @@
 					sleep(50)
 					close()
 		return
+	var/mob/M = AM // we've returned by here if M is not a mob
 	if (!( ticker ))
 		return
 	if (src.operating)
 		return
-	if (src.density && src.allowed(AM))
+	if (src.density && !M.small && src.allowed(AM))
 		open()
 		if(src.check_access(null))
 			sleep(50)

code/game/objects/items/weapons/storage/storage.dm

@@ -336,8 +336,7 @@
 				user << "\red God damnit!"
 
 	W.add_fingerprint(user)
-	handle_item_insertion(W)
-	return
+	return handle_item_insertion(W)
 
 /obj/item/weapon/storage/dropped(mob/user as mob)
 	return