Merge branch 'master' of https://github.com/tgstation/TerraGov-Marine…

…-Corps
Xander3359 · Apr 6, 2024 · b31e9a4 · b31e9a4
2 parents fed5482 + 9f0da10
commit b31e9a4
Show file tree

Hide file tree

Showing 274 changed files with 54,501 additions and 19,909 deletions.
diff --git a/_maps/map_files/Campaign maps/jungle_outpost/jungle_outpost.dmm b/_maps/map_files/Campaign maps/jungle_outpost/jungle_outpost.dmm
@@ -571,18 +571,6 @@
 	dir = 9
 	},
 /area/campaign/jungle_outpost/outpost/req)
-"cO" = (
-/obj{
-	name = "---Merge conflict marker---"
-	},
-/obj/structure/table,
-/obj/item/clothing/suit/storage/apron,
-/obj/item/clothing/gloves/botanic_leather,
-/obj/machinery/light{
-	dir = 8
-	},
-/turf/open/space/basic,
-/area/space)
 "cP" = (
 /obj/effect/landmark/campaign_structure/phoron_crate,
 /turf/open/floor/tile/green/greentaupe{
@@ -15478,7 +15466,7 @@ ZC
 ZC
 ZC
 ZC
-cO
+ZC
 ZC
 ZC
 ZC