diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm
index 011d337cea0..c4da0fe3a19 100644
--- a/code/game/objects/items/weapons/storage/firstaid.dm
+++ b/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")
diff --git a/code/game/objects/structures/false_walls.dm b/code/game/objects/structures/false_walls.dm
index 21208b26ca6..d24a92d87b6 100644
--- a/code/game/objects/structures/false_walls.dm
+++ b/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)
diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm
index 19c2dd13ec8..f227df88ed6 100644
--- a/code/game/objects/structures/girders.dm
+++ b/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"
diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm
index 1de9e588ef1..46cad11d9c5 100644
--- a/code/game/turfs/simulated/walls.dm
+++ b/code/game/turfs/simulated/walls.dm
@@ -385,6 +385,15 @@
 			dismantle_wall()
 			visible_message("<span class='warning'>[user] drills through \the [src]!</span>","<span class='warning'>You hear the grinding of metal.</span>")
 
+	else if (istype(W, /obj/item/weapon/pickaxe/drill/jackhammer))
+
+		user << "<span class='notice'>You begin to disintegrates the wall.</span>"
+
+		if(do_after(user, mineral == "diamond" ? 60 : 30, target = src))
+			user << "<span class='notice'>Your jackhammer disintegrate the reinforced plating.</span>"
+			dismantle_wall()
+			visible_message("<span class='warning'>[user] disintegrates \the [src]!</span>","<span class='warning'>You hear the grinding of metal.</span>")
+
 	else if(istype(W, /obj/item/weapon/melee/energy/blade))
 		var/obj/item/weapon/melee/energy/blade/EB = W
 
diff --git a/code/game/turfs/simulated/walls_reinforced.dm b/code/game/turfs/simulated/walls_reinforced.dm
index 1bba122d39e..4c7f1baf020 100644
--- a/code/game/turfs/simulated/walls_reinforced.dm
+++ b/code/game/turfs/simulated/walls_reinforced.dm
@@ -202,7 +202,14 @@
 		user << "<span class='notice'>You begin to drill though the wall.</span>"
 
 		if(do_after(user, 200, target = src))
-			user << "<span class='notice'>Your drill tears though the last of the reinforced plating.</span>"
+			user << "<span class='notice'>Your drill tears through the last of the reinforced plating.</span>"
+			dismantle_wall()
+
+	if(istype(W,/obj/item/weapon/pickaxe/drill/jackhammer))
+		user << "<span class='notice'>You begin to disintegrate the wall.</span>"
+
+		if(do_after(user, 100, target = src))
+			user << "<span class='notice'>Your sonic jackhammer disintegrates the reinforced plating.</span>"
 			dismantle_wall()
 
 	//REPAIRING
diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi
index b74424a5485..8c930f53059 100644
Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ