Merge pull request #2566 from Robertha89/master

Fixes invisible wrapping paper, sonic jackhammer not breaking walls and field surgery kit not fitting its own content

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

@@ -154,6 +154,7 @@
 	icon_state = "duffel-med"
 	desc = "A kit for surgery in the field."
 	max_w_class = 4
+	max_combined_w_class = 21
 	storage_slots = 10
 	can_hold = list("/obj/item/roller","/obj/item/weapon/bonesetter","/obj/item/weapon/bonegel", "/obj/item/weapon/scalpel", "/obj/item/weapon/hemostat",
 		"/obj/item/weapon/cautery", "/obj/item/weapon/retractor", "/obj/item/weapon/FixOVein", "/obj/item/weapon/surgicaldrill", "/obj/item/weapon/circular_saw")

code/game/objects/structures/false_walls.dm

@@ -120,7 +120,7 @@
 	else
 		user << "<span class='warning'>You can't reach, close it first!</span>"
 
-	if(istype(W, /obj/item/weapon/gun/energy/plasmacutter) || istype(W, /obj/item/weapon/pickaxe/drill/diamonddrill) || istype(W, /obj/item/weapon/melee/energy/blade))
+	if(istype(W, /obj/item/weapon/gun/energy/plasmacutter) || istype(W, /obj/item/weapon/pickaxe/drill/diamonddrill) || istype(W, /obj/item/weapon/pickaxe/drill/jackhammer) || istype(W, /obj/item/weapon/melee/energy/blade))
 		dismantle(user)
 
 /obj/structure/falsewall/proc/dismantle(mob/user)
@@ -221,7 +221,7 @@
 	icon_state = ""
 	mineral = "plasma"
 	walltype = "plasma"
-	
+
 /obj/structure/falsewall/plasma/attackby(obj/item/weapon/W, mob/user, params)
 	if(is_hot(W) > 300)
 		message_admins("Plasma falsewall ignited by [key_name_admin(user)] in ([x],[y],[z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>JMP</a>)",0,1)

code/game/objects/structures/girders.dm

@@ -37,6 +37,12 @@
 		new /obj/item/stack/sheet/metal(get_turf(src))
 		qdel(src)
 
+	else if(istype(W, /obj/item/weapon/pickaxe/drill/jackhammer))
+		playsound(src.loc, 'sound/weapons/sonic_jackhammer.ogg', 100, 1)
+		user << "<span class='notice'>You Disintegrate the girder!</span>"
+		new /obj/item/stack/sheet/metal(get_turf(src))
+		qdel(src)
+
 	else if(istype(W, /obj/item/weapon/screwdriver) && state == 2 && istype(src,/obj/structure/girder/reinforced))
 		playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1)
 		user << "\blue Now unsecuring support struts"