Merge branch 'master' into upstream-merge-37476

2018-05-06 07:07:02 +00:00
parent 892cb0a1be 11c1e8fbf7
commit 6a07a66cb3
738 changed files with 10463 additions and 18840 deletions
@@ -18,7 +18,7 @@
 		/obj/item/stack/spacecash,
 		/obj/item/card,
 		/obj/item/clothing/mask/cigarette,
-		/obj/item/device/flashlight/pen,
+		/obj/item/flashlight/pen,
 		/obj/item/seeds,
 		/obj/item/stack/medical,
 		/obj/item/toy/crayon,