Revert "Merge branch 'master' into Yeehaw"

This reverts commit 972c03f79f, reversing changes made to 8ebd698763.
2020-01-08 12:26:45 +13:00
parent 972c03f79f
commit 05a644cc41
256 changed files with 12890 additions and 18839 deletions
@@ -66,7 +66,7 @@
 /datum/component/storage/concrete/_insert_physical_item(obj/item/I, override = FALSE)
 	. = TRUE
 	var/atom/real_location = real_location()
-	if(I.loc != real_location && real_location)
+	if(I.loc != real_location)
 		I.forceMove(real_location)
 	refresh_mob_views()

@@ -87,12 +87,3 @@
 /datum/component/storage/concrete/pockets/pocketprotector/real_location()
 	// if the component is reparented to a jumpsuit, the items still go in the protector
 	return original_parent
-
-/datum/component/storage/concrete/pockets/small/rushelmet
-	max_items = 1
-	quickdraw = TRUE
-
-/datum/component/storage/concrete/pockets/small/rushelmet/Initialize()
-	. = ..()
-	can_hold = typecacheof(list(/obj/item/reagent_containers/glass/bottle,
-								/obj/item/ammo_box/a762))