diff --git a/code/game/objects/structures/bonfire.dm b/code/game/objects/structures/bonfire.dm
index 6f60cbab28..7a5c3d7770 100644
--- a/code/game/objects/structures/bonfire.dm
+++ b/code/game/objects/structures/bonfire.dm
@@ -433,4 +433,21 @@
 
 /obj/structure/fireplace/water_act(amount)
 	if(prob(amount * 10))
-		extinguish()
\ No newline at end of file
+		extinguish()
+
+
+/obj/structure/fireplace/barrel
+	name = "barrel fire pit"
+	desc = "Seems like this barrel might make an ideal fire pit."
+	icon_state = "barrelfire"
+	density = TRUE
+	anchored = FALSE
+
+/obj/structure/fireplace/barrel/update_icon()
+	if(burning)
+		icon_state = "[initial(icon_state)]1"
+		var/light_strength = max(get_fuel_amount() / 2, 2)
+		set_light(light_strength, light_strength, "#FF9933")
+	else
+		icon_state = initial(icon_state)
+		set_light(0)
diff --git a/icons/obj/structures.dmi b/icons/obj/structures.dmi
index 750cf75768..565190a6dd 100644
Binary files a/icons/obj/structures.dmi and b/icons/obj/structures.dmi differ