Merge branch 'master' into upstream-merge-37582

2018-05-22 07:22:42 -05:00
parent e57cf81636 b3e5513185
commit 5f27ac30c7
302 changed files with 2217 additions and 1980 deletions
@@ -10,7 +10,7 @@ LINEN BINS
 	icon = 'icons/obj/bedsheets.dmi'
 	icon_state = "sheetwhite"
 	item_state = "bedsheet"
-	slot_flags = SLOT_NECK
+	slot_flags = ITEM_SLOT_NECK
 	layer = MOB_LAYER
 	throwforce = 0
 	throw_speed = 1
@@ -24,5 +24,4 @@
 	new /obj/item/assembly/flash/handheld(src)
 	new /obj/item/laser_pointer(src)
 	new /obj/item/door_remote/research_director(src)
-	new /obj/item/storage/box/firingpins(src)
 	new /obj/item/circuitboard/machine/techfab/department/science(src)