Revert "Revert "12/10/23 - Map swap update" (#15593)" (#15594)

This reverts commit f00d13da66.

code/game/objects/items/weapons/gift_wrappaper.dm

@@ -132,13 +132,14 @@
 		to_chat(user, "<span class='warning'>You MUST put the paper on a table!</span>")
 	if (W.w_class < ITEMSIZE_LARGE)
 		var/obj/item/I = user.get_inactive_hand()
-		if(I.has_tool_quality(TOOL_WIRECUTTER))
+		if(I && I.has_tool_quality(TOOL_WIRECUTTER))
 			var/a_used = 2 ** (src.w_class - 1)
 			if (src.amount < a_used)
 				to_chat(user, "<span class='warning'>You need more paper!</span>")
 				return
 			else
 				if(istype(W, /obj/item/smallDelivery) || istype(W, /obj/item/weapon/gift)) //No gift wrapping gifts!
+					to_chat(user, "<span class='warning'>You can't wrap something that's already wrapped!</span>")
 					return
 
 				src.amount -= a_used

code/game/objects/items/weapons/tools/transforming.dm

@@ -55,6 +55,7 @@
 			desc = initial(desc) + " It's fitted with a prying head."
 			icon_state = "jaws_pry"
 			usesound = 'sound/items/jaws_pry.ogg'
+			pry = 1
 			tool_qualities = list(TOOL_CROWBAR)
 			if(user)
 				playsound(src, 'sound/items/change_jaws.ogg', 50, 1)
@@ -63,6 +64,7 @@
 			desc = initial(desc) + " It's fitted with a cutting head."
 			icon_state = "jaws_cutter"
 			usesound = 'sound/items/jaws_cut.ogg'
+			pry = 0
 			tool_qualities = list(TOOL_WIRECUTTER)
 			if(user)
 				playsound(src, 'sound/items/change_jaws.ogg', 50, 1)