diff --git a/code/game/objects/items/shields.dm b/code/game/objects/items/shields.dm
index 1171bd7bf7..30c7115346 100644
--- a/code/game/objects/items/shields.dm
+++ b/code/game/objects/items/shields.dm
@@ -153,3 +153,16 @@
 		slot_flags = null
 		to_chat(user, "<span class='notice'>[src] can now be concealed.</span>")
 	add_fingerprint(user)
+
+/obj/item/shield/makeshift
+	name = "metal shield"
+	desc = "A large shield made of wired and welded sheets of metal. The handle is made of cloth and leather making it unwieldy."
+	armor = list("melee" = 25, "bullet" = 25, "laser" = 5, "energy" = 0, "bomb" = 30, "bio" = 0, "rad" = 0, "fire" = 70, "acid" = 80)
+	lefthand_file = 'icons/mob/inhands/equipment/shields_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/equipment/shields_righthand.dmi'
+	item_state = "makeshift_shield"
+	materials = list(MAT_METAL = 18000)
+	slot_flags = null
+	block_chance = 25
+	force = 5
+	throwforce = 7
diff --git a/code/modules/crafting/recipes.dm b/code/modules/crafting/recipes.dm
index c3858da6ad..ca10d5092f 100644
--- a/code/modules/crafting/recipes.dm
+++ b/code/modules/crafting/recipes.dm
@@ -54,6 +54,18 @@
 	category = CAT_WEAPONRY
 	subcategory = CAT_WEAPON
 
+/datum/crafting_recipe/makeshiftshield
+	name = "Makeshift Metal Shield"
+	result = /obj/item/shield/makeshift
+	reqs = list(/obj/item/stack/cable_coil = 30,
+				/obj/item/stack/sheet/metal = 10,
+				/obj/item/stack/sheet/cloth = 2,
+				/obj/item/stack/sheet/leather = 3)
+	tools = list(TOOL_WELDER, TOOL_SCREWDRIVER, TOOL_WIRECUTTER)
+	time = 100
+	category = CAT_WEAPONRY
+	subcategory = CAT_WEAPON
+
 /datum/crafting_recipe/molotov
 	name = "Molotov"
 	result = /obj/item/reagent_containers/food/drinks/bottle/molotov
diff --git a/icons/obj/items_and_weapons.dmi b/icons/obj/items_and_weapons.dmi
index 543d57ff56..655d37d4a6 100644
Binary files a/icons/obj/items_and_weapons.dmi and b/icons/obj/items_and_weapons.dmi differ