From 643ce6d3051e8b4024bdce07e86c7ef08f877607 Mon Sep 17 00:00:00 2001 From: Yobrocharlie Date: Tue, 30 Jul 2024 20:27:19 -0700 Subject: [PATCH] hopefully this will fix things --- code/datums/ruins/lavaland.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/datums/ruins/lavaland.dm b/code/datums/ruins/lavaland.dm index 1806900f6b18..6c2289387ebf 100644 --- a/code/datums/ruins/lavaland.dm +++ b/code/datums/ruins/lavaland.dm @@ -134,5 +134,4 @@ id = "crashed_star" description = "A crashed pirate ship. It would seem that it's crew died a while ago." suffix = "lavaland_crashed_starwalker.dmm" -======= ->>>>>>> parent of f11a7aaaec (THE RUINCUT [AFFRONT TO GOD] (#3026)) +