merge conflict fix

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

@@ -40,6 +40,7 @@
 	max_w_class = WEIGHT_CLASS_GIGANTIC
 	max_combined_w_class = 35
 	resistance_flags = FIRE_PROOF
+	flags_2 = NO_MAT_REDEMPTION_2
 	var/pshoom = 'sound/items/pshoom.ogg'
 	var/alt_sound = 'sound/items/pshoom_2.ogg'
 	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 60, acid = 50)
@@ -289,7 +290,7 @@
 		icon_state = initial(icon_state)
 
 /obj/item/storage/backpack/satchel/flat/Initialize(mapload)
-	..()
+	. = ..()
 	SSpersistence.new_secret_satchels += src
 
 /obj/item/storage/backpack/satchel/flat/PopulateContents()
@@ -306,7 +307,7 @@
 	var/revealed = 0
 
 /obj/item/storage/backpack/satchel/flat/secret/Initialize()
-	..()
+	. = ..()
 
 	if(isfloorturf(loc) && !istype(loc, /turf/open/floor/plating/))
 		hide(1)

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

@@ -73,6 +73,7 @@
 	origin_tech = "materials=4;bluespace=4;engineering=4;plasmatech=3"
 	max_combined_w_class = 60
 	storage_slots = 60
+	flags_2 = NO_MAT_REDEMPTION_2
 
 // -----------------------------
 //        Mining Satchel

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

@@ -88,6 +88,16 @@
 	new /obj/item/device/t_scanner(src)
 	new /obj/item/extinguisher/mini(src)
 
+/obj/item/storage/belt/utility/servant/PopulateContents()
+	new /obj/item/screwdriver/brass(src)
+	new /obj/item/wirecutters/brass(src)
+	new /obj/item/wrench/brass(src)
+	new /obj/item/crowbar/brass(src)
+	new /obj/item/weldingtool/experimental/brass(src)
+	new /obj/item/device/multitool(src)
+	new /obj/item/stack/cable_coil(src, 30, "yellow")
+
+
 
 
 /obj/item/storage/belt/medical

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

@@ -156,6 +156,24 @@ GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "bible",
 			var/unholy2clean = A.reagents.get_reagent_amount("unholywater")
 			A.reagents.del_reagent("unholywater")
 			A.reagents.add_reagent("holywater",unholy2clean)
+	if(istype(A, /obj/item/twohanded/required/cult_bastard))
+		var/obj/item/twohanded/required/cult_bastard/sword = A
+		to_chat(user, "<span class='notice'>You begin to exorcise [sword].</span>")
+		playsound(src,'sound/hallucinations/veryfar_noise.ogg',40,1)
+		if(do_after(user, 40, target = sword))
+			playsound(src,'sound/effects/pray_chaplain.ogg',60,1)
+			for(var/obj/item/device/soulstone/SS in sword.contents)
+				SS.usability = TRUE
+				for(var/mob/living/simple_animal/shade/EX in SS)
+					SSticker.mode.remove_cultist(EX.mind, 1, 0)
+					EX.icon_state = "ghost1"
+					EX.name = "Purified [EX.name]"
+				SS.release_shades(user)
+				qdel(SS)
+			new /obj/item/nullrod/claymore(get_turf(sword))
+			user.visible_message("<span class='notice'>[user] has purified the [sword]!!</span>")
+			qdel(sword)
+
 
 /obj/item/storage/book/bible/booze
 	desc = "To be applied to the head repeatedly."

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

@@ -735,7 +735,7 @@
 	var/theme_name 
 
 /obj/item/storage/box/ingredients/Initialize()
-	..()
+	. = ..()
 	if(theme_name)
 		name = "[name] ([theme_name])"
 		desc = "A box containing supplementary ingredients for the aspiring chef. The box's theme is '[theme_name]'."

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

@@ -17,6 +17,7 @@
 	icon = 'icons/obj/food/containers.dmi'
 	icon_state = "donutbox6"
 	name = "donut box"
+	desc = "Mmm. Donuts."
 	resistance_flags = FLAMMABLE
 	var/icon_type = "donut"
 	var/spawn_type = null
@@ -125,13 +126,21 @@
 	icon_type = "cigarette"
 	spawn_type = /obj/item/clothing/mask/cigarette/space_cigarette
 
+/obj/item/storage/fancy/cigarettes/examine(mob/user)
+	..()
+	to_chat(user, "<span class='notice'>Alt-click to extract contents.</span>")
+
 /obj/item/storage/fancy/cigarettes/AltClick(mob/user)
-	if(user.get_active_held_item())
+	if(user.stat || user.restrained())
 		return
-	for(var/obj/item/lighter/lighter in src)
-		remove_from_storage(lighter, user.loc)
-		user.put_in_active_hand(lighter)
-		break
+	var/obj/item/clothing/mask/cigarette/W = locate(/obj/item/clothing/mask/cigarette) in contents
+	if(W && contents.len > 0)
+		remove_from_storage(W, user)
+		user.put_in_hands(W)
+		contents -= W
+		to_chat(user, "<span class='notice'>You take a [icon_type] out of the pack.</span>")
+	else
+		to_chat(user, "<span class='notice'>There are no [icon_type]s left in the pack.</span>")
 
 /obj/item/storage/fancy/cigarettes/update_icon()
 	if(fancy_open || !contents.len)

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

@@ -56,7 +56,7 @@
 	item_state = "firstaid-ointment"
 
 /obj/item/storage/firstaid/fire/Initialize(mapload)
-	..()
+	. = ..()
 	icon_state = pick("ointment","firefirstaid")
 
 /obj/item/storage/firstaid/fire/PopulateContents()

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

@@ -123,6 +123,11 @@
 	icon_broken = "medalbox+b"
 	can_hold = list(/obj/item/clothing/accessory/medal)
 
+/obj/item/storage/lockbox/medal/examine(mob/user)
+	..()
+	if(!locked)
+		to_chat(user, "<span class='notice'>Alt-click to [open ? "close":"open"] it.</span>")
+
 /obj/item/storage/lockbox/medal/AltClick()
 	if(!locked)
 		open = (open ? FALSE : TRUE)
@@ -172,6 +177,14 @@
 	for(var/i in 1 to 3)
 		new /obj/item/clothing/accessory/medal/silver/security(src)
 
+/obj/item/storage/lockbox/medal/cargo
+	name = "cargo award box"
+	desc = "A locked box used to store awards to be given to members of the cargo department."
+	req_access = list(ACCESS_QM)
+
+/obj/item/storage/lockbox/medal/cargo/PopulateContents()
+		new /obj/item/clothing/accessory/medal/ribbon/cargo(src)
+
 /obj/item/storage/lockbox/medal/sci
 	name = "science medal box"
 	desc = "A locked box used to store medals to be given to members of the science department."
@@ -179,4 +192,4 @@
 
 /obj/item/storage/lockbox/medal/sci/PopulateContents()
 	for(var/i in 1 to 3)
-		new /obj/item/clothing/accessory/medal/plasma/nobel_science(src)
+		new /obj/item/clothing/accessory/medal/plasma/nobel_science(src)

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

@@ -25,34 +25,33 @@
 	w_class = WEIGHT_CLASS_NORMAL
 	max_w_class = WEIGHT_CLASS_SMALL
 	max_combined_w_class = 14
+	desc = "This shouldn't exist. If it does, create an issue report."
 
 /obj/item/storage/secure/examine(mob/user)
 	..()
-	to_chat(user, text("The service panel is [src.open ? "open" : "closed"]."))
+	to_chat(user, text("The service panel is currently <b>[open ? "unscrewed" : "screwed shut"]</b>."))
 
 /obj/item/storage/secure/attackby(obj/item/W, mob/user, params)
 	if(locked)
 		if (istype(W, /obj/item/screwdriver))
-			if (do_after(user, 20*W.toolspeed, target = src))
-				src.open =! src.open
-				user.show_message("<span class='notice'>You [open ? "open" : "close"] the service panel.</span>", 1)
+			if (do_after(user, 20*W.toolspeed, target = user))
+				open =! open
+				to_chat(user, "<span class='notice'>You [open ? "open" : "close"] the service panel.</span>")
 			return
-		if ((istype(W, /obj/item/device/multitool)) && (src.open == 1)&& (!src.l_hacking))
-			user.show_message("<span class='danger'>Now attempting to reset internal memory, please hold.</span>", 1)
-			src.l_hacking = 1
-			if (do_after(usr, 100*W.toolspeed, target = src))
-				if (prob(33))
-					src.l_setshort = 1
+		if (istype(W, /obj/item/wirecutters) || istype(W, /obj/item/card/emag))
+			to_chat(user, "<span class='danger'>[src] is protected from this sort of tampering, yet it appears the internal memory wires can still be <b>pulsed</b>.</span>")
+		if ((istype(W, /obj/item/device/multitool)) && (!l_hacking))
+			if(src.open == 1)
+				to_chat(user, "<span class='danger'>Now attempting to reset internal memory, please hold.</span>")
+				src.l_hacking = 1
+				if (do_after(usr, 400*W.toolspeed, target = user))
+					to_chat(user, "<span class='danger'>Internal memory reset - lock has been disengaged.</span>")
 					src.l_set = 0
-					user.show_message("<span class='danger'>Internal memory reset.  Please give it a few seconds to reinitialize.</span>", 1)
-					sleep(80)
-					src.l_setshort = 0
 					src.l_hacking = 0
 				else
-					user.show_message("<span class='danger'>Unable to reset internal memory.</span>", 1)
 					src.l_hacking = 0
 			else
-				src.l_hacking = 0
+				to_chat(user, "<span class='notice'>You must <b>unscrew</b> the service panel before you can pulse the wiring.</span>")
 			return
 		//At this point you have exhausted all the special things to do when locked
 		// ... but it's still locked.
@@ -179,6 +178,7 @@
 	icon_opened = "safe0"
 	icon_locking = "safeb"
 	icon_sparking = "safespark"
+	desc = "Excellent for securing things away from grubby hands."
 	force = 8
 	w_class = WEIGHT_CLASS_GIGANTIC
 	max_w_class = 8

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

@@ -34,7 +34,7 @@
 		if(!over_object)
 			return
 
-		if (istype(usr.loc, /obj/mecha)) // stops inventory actions in a mech
+		if (ismecha(M.loc)) // stops inventory actions in a mech
 			return
 
 		// this must come before the screen objects only block, dunno why it wasn't before

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

@@ -19,7 +19,7 @@
 	var/has_latches = TRUE
 
 /obj/item/storage/toolbox/Initialize()
-	..()
+	. = ..()
 	if(has_latches)
 		if(prob(10))
 			latches = "double_latch"
@@ -152,6 +152,10 @@
 	new /obj/item/crowbar/brass(src)
 	new /obj/item/weldingtool/experimental/brass(src)
 
+/obj/item/storage/toolbox/brass/prefilled/servant
+	slot_flags = SLOT_BELT
+	fabricator_type = null
+
 /obj/item/storage/toolbox/brass/prefilled/ratvar
 	var/slab_type = /obj/item/clockwork/slab