Resolved Conflicts:

code/game/gamemodes/gang/dominator.dm

code/game/objects/structures/ai_core.dm

@@ -41,11 +41,12 @@
 					anchored = 0
 					state = 0
 			if(istype(P, /obj/item/weapon/circuitboard/aicore) && !circuit)
+				if(!user.drop_item())
+					return
 				playsound(loc, 'sound/items/Deconstruct.ogg', 50, 1)
 				user << "<span class='notice'>You place the circuit board inside the frame.</span>"
 				icon_state = "1"
 				circuit = P
-				user.drop_item()
 				P.loc = src
 			if(istype(P, /obj/item/weapon/screwdriver) && circuit)
 				playsound(loc, 'sound/items/Screwdriver.ogg', 50, 1)
@@ -152,11 +153,13 @@
 					user << "<span class='warning'>This MMI is mindless!</span>"
 					return
 
+				if(!user.drop_item())
+					return
+
 				ticker.mode.remove_cultist(M.brainmob.mind, 1)
 				ticker.mode.remove_revolutionary(M.brainmob.mind, 1)
 				ticker.mode.remove_gangster(M.brainmob.mind, 1)
 
-				user.drop_item()
 				M.loc = src
 				brain = M
 				usr << "<span class='notice'>Added a brain.</span>"

code/game/objects/structures/bedsheet_bin.dm

@@ -194,7 +194,8 @@ LINEN BINS
 
 /obj/structure/bedsheetbin/attackby(obj/item/I as obj, mob/user as mob, params)
 	if(istype(I, /obj/item/weapon/bedsheet))
-		user.drop_item()
+		if(!user.drop_item())
+			return
 		I.loc = src
 		sheets.Add(I)
 		amount++

code/game/objects/structures/crates_lockers/bins.dm

@@ -84,8 +84,7 @@
 /obj/structure/closet/crate/bin/place(var/mob/user, var/obj/item/I)
 	if(contents.len >= storage_capacity)
 		return 1
-	if(!opened)
-		user.drop_item()
+	if(!opened && user.drop_item())
 		insert(I, 0, 1)
 		return 1
 	return 0

code/game/objects/structures/crates_lockers/closets/fireaxe.dm

@@ -58,8 +58,9 @@
 			if(O:wielded)
 				user << "<span class='warning'>Unwield the axe first.</span>"
 				return
+			if(!user.drop_item())
+				return
 			fireaxe = O
-			user.drop_item()
 			src.contents += O
 			user << "<span class='caution'>You place the fire axe back in the [src.name].</span>"
 			update_icon()

code/game/objects/structures/crates_lockers/crates.dm

@@ -286,8 +286,9 @@
 		return
 	else if(istype(W, /obj/item/device/electropack))
 		if(rigged)
+			if(!user.drop_item())
+				return
 			user  << "<span class='notice'>You attach [W] to [src].</span>"
-			user.drop_item()
 			W.loc = src
 			return
 	else if(istype(W, /obj/item/weapon/wirecutters))

code/game/objects/structures/door_assembly.dm

@@ -532,8 +532,9 @@
 		if(do_after(user, 40))
 			if( src.state != 1 )
 				return
+			if(!user.drop_item())
+				return
 
-			user.drop_item()
 			W.loc = src
 			user << "<span class='notice'>You install the airlock electronics.</span>"
 			src.state = 2

code/game/objects/structures/extinguisher.dm

@@ -29,7 +29,8 @@
 		return
 	if(istype(O, /obj/item/weapon/extinguisher))
 		if(!has_extinguisher && opened)
-			user.drop_item()
+			if(!user.drop_item())
+				return
 			contents += O
 			has_extinguisher = O
 			user << "<span class='notice'>You place [O] in [src].</span>"

code/game/objects/structures/girders.dm

@@ -201,7 +201,8 @@
 	else if(istype(W, /obj/item/pipe))
 		var/obj/item/pipe/P = W
 		if (P.pipe_type in list(0, 1, 5))	//simple pipes, simple bends, and simple manifolds.
-			user.drop_item()
+			if(!user.drop_item())
+				return
 			P.loc = src.loc
 			user << "<span class='notice'>You fit the pipe into \the [src].</span>"
 	else

code/game/objects/structures/guncase.dm

@@ -39,7 +39,8 @@
 		return
 	if(istype(I, gun_category))
 		if(contents.len < capacity && open)
-			user.drop_item()
+			if(!user.drop_item())
+				return
 			contents += I
 			user << "<span class='notice'>You place [I] in [src].</span>"
 			update_icon()

code/game/objects/structures/janicart.dm

@@ -29,7 +29,8 @@
 		playsound(loc, 'sound/effects/slosh.ogg', 25, 1)
 
 /obj/structure/janitorialcart/proc/put_in_cart(obj/item/I, mob/user)
-	user.drop_item()
+	if(!user.drop_item())
+		return
 	I.loc = src
 	updateUsrDialog()
 	user << "<span class='notice'>You put [I] into [src].</span>"
@@ -199,8 +200,9 @@
 		user << "Hold [I] in one of your hands while you drive this [callme]."
 	else if(istype(I, /obj/item/weapon/storage/bag/trash))
 		if(keytype == /obj/item/key/janitor)
+			if(!user.drop_item())
+				return
 			user << "<span class='notice'>You hook the trashbag onto the [callme].</span>"
-			user.drop_item()
 			I.loc = src
 			mybag = I
 	else if(istype(I, /obj/item/janiupgrade))

code/game/objects/structures/noticeboard.dm

@@ -19,9 +19,10 @@
 /obj/structure/noticeboard/attackby(var/obj/item/weapon/O as obj, var/mob/user as mob, params)
 	if(istype(O, /obj/item/weapon/paper))
 		if(notices < 5)
+			if(!user.drop_item())
+				return
 			O.add_fingerprint(user)
 			add_fingerprint(user)
-			user.drop_item()
 			O.loc = src
 			notices++
 			icon_state = "nboard0[notices]"	//update sprite

code/game/objects/structures/stool_bed_chair_nest/chairs.dm

@@ -17,8 +17,9 @@
 /obj/structure/stool/bed/chair/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	..()
 	if(istype(W, /obj/item/assembly/shock_kit))
+		if(!user.drop_item())
+			return
 		var/obj/item/assembly/shock_kit/SK = W
-		user.drop_item()
 		var/obj/structure/stool/bed/chair/e_chair/E = new /obj/structure/stool/bed/chair/e_chair(src.loc)
 		playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
 		E.dir = dir

code/game/objects/structures/tables_racks.dm

@@ -625,8 +625,9 @@
 /obj/item/weapon/rack_parts/attack_self(mob/user as mob)
 	user << "<span class='notice'>You start constructing rack...</span>"
 	if (do_after(user, 50))
+		if(!user.drop_item())
+			return
 		var/obj/structure/rack/R = new /obj/structure/rack( user.loc )
 		R.add_fingerprint(user)
-		user.drop_item()
 		qdel(src)
 		return

code/game/objects/structures/tank_dispenser.dm

@@ -50,7 +50,8 @@
 /obj/structure/dispenser/attackby(obj/item/I as obj, mob/user as mob, params)
 	if(istype(I, /obj/item/weapon/tank/internals/oxygen) || istype(I, /obj/item/weapon/tank/internals/air) || istype(I, /obj/item/weapon/tank/internals/anesthetic))
 		if(oxygentanks < 10)
-			user.drop_item()
+			if(!user.drop_item())
+				return
 			I.loc = src
 			oxytanks.Add(I)
 			oxygentanks++
@@ -59,7 +60,8 @@
 			user << "<span class='notice'>[src] is full.</span>"
 	if(istype(I, /obj/item/weapon/tank/internals/plasma))
 		if(plasmatanks < 10)
-			user.drop_item()
+			if(!user.drop_item())
+				return
 			I.loc = src
 			platanks.Add(I)
 			plasmatanks++

code/game/objects/structures/target_stake.dm

@@ -23,11 +23,10 @@
 /obj/structure/target_stake/attackby(obj/item/target/T, mob/user)
 	if(pinned_target)
 		return
-	if(istype(T))
+	if(istype(T) && user.drop_item())
 		pinned_target = T
 		T.pinnedLoc = src
 		T.density = 1
-		user.drop_item()
 		T.layer = OBJ_LAYER + 0.1
 		T.loc = loc
 		user << "<span class='notice'>You slide the target into the stake.</span>"

code/game/objects/structures/windoor_assembly.dm

@@ -190,9 +190,10 @@
 
 			//Adding airlock electronics for access. Step 6 complete.
 			else if(istype(W, /obj/item/weapon/airlock_electronics))
+				if(!user.drop_item())
+					return
 				playsound(loc, 'sound/items/Screwdriver.ogg', 100, 1)
 				user.visible_message("[user] installs the electronics into the airlock assembly.", "<span class='notice'>You start to install electronics into the airlock assembly...</span>")
-				user.drop_item()
 				W.loc = src
 
 				if(do_after(user, 40))