diff --git a/code/defines/obj/storage.dm b/code/defines/obj/storage.dm
index f055bc6ffaa..014e3a80667 100644
--- a/code/defines/obj/storage.dm
+++ b/code/defines/obj/storage.dm
@@ -12,6 +12,15 @@
 	desc = "A backpack and trophy rack, useful for both carrying extra gear and proudly declaring your insanity "
 	icon_state = "cultpack"
 
+/obj/item/weapon/storage/trashbag
+	name = "trash bag"
+	desc = "for picking up all those pens"
+	icon_state = "trashbag"
+	item_state = "trashbag"
+	w_class = 4.0
+	storage_slots = 20
+	max_w_class = 1
+	max_combined_w_class = 20
 /*
 /obj/item/weapon/storage/lbe
 	name = "Load Bearing Equipment"
diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm
index ef05c7ffd34..e94cee774f7 100644
--- a/code/game/machinery/autolathe.dm
+++ b/code/game/machinery/autolathe.dm
@@ -256,6 +256,8 @@ var/global/list/autolathe_recipes = list( \
 		new /obj/item/device/radio(), \
 		new /obj/item/device/assembly/infra(), \
 		new /obj/item/device/assembly/timer(), \
+		new /obj/item/weapon/light/tube(), \
+		new /obj/item/weapon/light/bulb(), \
 	)
 
 var/global/list/autolathe_recipes_hidden = list( \
diff --git a/code/game/objects/closets/janitor.dm b/code/game/objects/closets/janitor.dm
index ecfd32476f4..f1ffd8705ad 100644
--- a/code/game/objects/closets/janitor.dm
+++ b/code/game/objects/closets/janitor.dm
@@ -13,4 +13,4 @@
 	new /obj/item/weapon/caution(src)
 	new /obj/item/weapon/caution(src)
 	new /obj/item/weapon/caution(src)
-	new /obj/item/weapon/trashbag(src)
\ No newline at end of file
+	new /obj/item/weapon/storage/trashbag(src)
\ No newline at end of file
diff --git a/html/changelog.html b/html/changelog.html
index 7325497d73a..05e8b27a236 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -60,6 +60,8 @@ should be listed in the changelog upon commit tho. Thanks. -->
   <ul>
     <li>Changeling husks are now borgable again (though not clonable) and genome requirements were lowered</li>
     <li>De-revved revolutionaries had their message clarified a bit. You remember the person who flashed you, and so can out ONE revhead</li>
+    <li>Janitors buggy trashbag replaced with a standard storage item with twenty slots (though it can only hold tiny items)</li>
+    <li>Light tubes/bulbs can now be created in the autolathe. Recycle those broken lights!</li>
   </ul>
   </li>
 </ul>
diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi
index d46c1afad05..8a03e11c9d5 100644
Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ