diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm
index e090455a96..8e9066b5a1 100644
--- a/code/game/machinery/autolathe.dm
+++ b/code/game/machinery/autolathe.dm
@@ -178,6 +178,8 @@
 		container.layer = initial(container.layer)
 	if(href_list["modifyOutputAmount"])
 		outputAmount = text2num(input(usr,"Amount:","Enter new quantity to create",""))
+		if(outputAmount < 1)
+			outputAmount = 1
 	if (!busy)
 		if(href_list["make"])
 			makeDir = get_dir(src,usr)
diff --git a/code/game/machinery/walllockers.dm b/code/game/machinery/walllockers.dm
new file mode 100644
index 0000000000..e3373f7b21
--- /dev/null
+++ b/code/game/machinery/walllockers.dm
@@ -0,0 +1,37 @@
+/obj/walllocker
+	name = "Wall Locker"
+	icon = 'lockwall.dmi'
+	icon_state = "emerg"
+	var/list/spawnitems = list()
+	anchored = 1
+	var/amount = 3 // spawns each items X times.
+/obj/walllocker/attack_hand(mob/user as mob)
+	if (istype(user, /mob/living/silicon/ai))	//Added by Strumpetplaya - AI shouldn't be able to
+		return									//activate emergency lockers.  This fixes that.  (Does this make sense, the AI can't call attack_hand, can it? --Mloc)
+	if(!amount)
+		usr << "It's empty.."
+		return
+	if(amount)
+		for(var/path in spawnitems)
+			new path(src.loc)
+		amount--
+	return
+/obj/walllocker/emerglocker
+	name = "Emergency Locker"
+	spawnitems = list(/obj/item/weapon/tank/emergency_oxygen,/obj/item/clothing/mask/breath,/obj/item/weapon/crowbar)
+/obj/walllocker/emerglocker/north
+	pixel_y = 32
+	dir = SOUTH
+/obj/walllocker/emerglocker/south
+	pixel_y = -32
+	dir = NORTH
+/obj/walllocker/emerglocker/west
+	pixel_x = -32
+	dir = WEST
+/obj/walllocker/emerglocker/east
+	pixel_x = 32
+	dir = EAST
+
+
+
+
diff --git a/icons/obj/lockwall.dmi b/icons/obj/lockwall.dmi
new file mode 100644
index 0000000000..25d96436d1
Binary files /dev/null and b/icons/obj/lockwall.dmi differ