Merge branch 'master' into tray-and-jar

code/game/objects/items/storage/bags.dm

@@ -455,3 +455,21 @@
 	STR.max_items = 3
 	STR.display_numerical_stacking = FALSE
 	STR.can_hold = typecacheof(list(/obj/item/ammo_box/magazine, /obj/item/ammo_casing))
+
+/obj/item/storage/bag/material
+	name = "material pouch"
+	desc = "A pouch for sheets and RCD ammunition that manages to hang where you would normally put things in your pocket."
+	icon = 'icons/obj/items_and_weapons.dmi'
+	icon_state = "materialpouch"
+	slot_flags = ITEM_SLOT_POCKET
+	w_class = WEIGHT_CLASS_BULKY
+	resistance_flags = FLAMMABLE
+
+/obj/item/storage/bag/material/ComponentInitialize()
+	. = ..()
+	var/datum/component/storage/STR = GetComponent(/datum/component/storage)
+	STR.max_w_class = WEIGHT_CLASS_NORMAL
+	STR.max_combined_w_class = INFINITY
+	STR.max_items = 2
+	STR.display_numerical_stacking = TRUE
+	STR.can_hold = typecacheof(list(/obj/item/rcd_ammo, /obj/item/stack/sheet))

code/game/objects/items/storage/belt.dm

@@ -586,7 +586,7 @@
 		/obj/item/key/janitor,
 		/obj/item/clothing/gloves,
 		/obj/item/melee/flyswatter,
-		/obj/item/twohanded/broom,
+		/obj/item/broom,
 		/obj/item/paint/paint_remover,
 		/obj/item/assembly/mousetrap,
 		/obj/item/screwdriver,

code/game/objects/items/storage/book.dm

@@ -173,12 +173,12 @@ GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "bible",
 			var/unholy2clean = A.reagents.get_reagent_amount(/datum/reagent/fuel/unholywater)
 			A.reagents.del_reagent(/datum/reagent/fuel/unholywater)
 			A.reagents.add_reagent(/datum/reagent/water/holywater,unholy2clean)
-	if(istype(A, /obj/item/twohanded/required/cult_bastard) || istype(A, /obj/item/melee/cultblade) && !iscultist(user))
+	if(istype(A, /obj/item/cult_bastard) || istype(A, /obj/item/melee/cultblade) && !iscultist(user))
 		to_chat(user, "<span class='notice'>You begin to exorcise [A].</span>")
 		playsound(src,'sound/hallucinations/veryfar_noise.ogg',40,1)
 		if(do_after(user, 40, target = A))
 			playsound(src,'sound/effects/pray_chaplain.ogg',60,1)
-			if(istype(A, /obj/item/twohanded/required/cult_bastard))
+			if(istype(A, /obj/item/cult_bastard))
 				for(var/obj/item/soulstone/SS in A.contents)
 					SS.usability = TRUE
 					for(var/mob/living/simple_animal/shade/EX in SS)

code/game/objects/items/storage/briefcase.dm

@@ -106,10 +106,10 @@
 /obj/item/storage/briefcase/medical
 	name = "medical briefcase"
 	icon_state = "medbriefcase"
-	desc = "A white with a blue cross brieface, this is ment to hold medical gear that would not be able to normally fit in a bag."
+	desc = "A white with a blue cross brieface, this is meant to hold medical gear that would not be able to normally fit in a bag."
 
 /obj/item/storage/briefcase/medical/PopulateContents()
 	new /obj/item/clothing/neck/stethoscope(src)
 	new /obj/item/healthanalyzer(src)
-	..() //In case of paperwork
+	..() //Incase of paperwork
 

code/game/objects/items/storage/firstaid.dm

@@ -370,6 +370,14 @@
 	for(var/i in 1 to 7)
 		new /obj/item/reagent_containers/pill/breast_enlargement(src)
 
+/obj/item/storage/pill_bottle/neurine
+	name = "bottle of neurine pills"
+	desc = "Contains pills to treat non-severe mental traumas."
+
+/obj/item/storage/pill_bottle/neurine/PopulateContents()
+	for(var/i in 1 to 5)
+		new /obj/item/reagent_containers/pill/neurine(src)
+
 /////////////
 //Organ Box//
 /////////////

code/game/objects/items/storage/toolbox.dm

@@ -25,7 +25,7 @@ GLOBAL_LIST_EMPTY(rubber_toolbox_icons)
 	icon_state = "toolbox_default"
 	item_state = "toolbox_default"
 	can_rubberify = FALSE
-	material_flags = MATERIAL_ADD_PREFIX | MATERIAL_COLOR | MATERIAL_AFFECT_STATISTICS | MATERIAL_EFFECTS
+	material_flags = MATERIAL_ADD_PREFIX | MATERIAL_COLOR | MATERIAL_AFFECT_STATISTICS
 
 /obj/item/storage/toolbox/Initialize(mapload)
 	if(has_latches)

code/game/objects/items/storage/uplink_kits.dm

@@ -117,7 +117,7 @@
 			new /obj/item/pizzabox/bomb
 
 		if("darklord") //20 tc + tk + summon item close enough for now
-			new /obj/item/twohanded/dualsaber(src)
+			new /obj/item/dualsaber(src)
 			new /obj/item/dnainjector/telemut/darkbundle(src)
 			new /obj/item/clothing/suit/hooded/chaplain_hoodie(src)
 			new /obj/item/card/id/syndicate(src)