From 74076eb351f829b230534586722fc0b871b56d35 Mon Sep 17 00:00:00 2001 From: ZeroMan Date: Sun, 15 Mar 2020 01:23:23 -0400 Subject: [PATCH] and maybe thisll work --- _maps/map_files/BoxStation/BoxStation.dmm | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index d4ac0de65c..204ab3f353 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -261,8 +261,7 @@ /turf/open/floor/plasteel, /area/security/prison) "aaK" = ( -<<<<<<< HEAD -/obj/machinery/computer/arcade/battle{ +<<<<<<< HEAD/obj/machinery/computer/arcade/battle{ dir = 4 }, /turf/open/floor/plasteel, @@ -293,12 +292,6 @@ }, /turf/open/floor/plating, /area/crew_quarters/heads/hos) -======= -/obj/structure/table/wood, -/mob/living/simple_animal/pet/fox/Renault, -/turf/open/floor/carpet, -/area/crew_quarters/heads/captain) ->>>>>>> 2de1395e6bc9f920a9a445047f296be03e0ffb97 "aaN" = ( /obj/structure/chair/sofa/right, /turf/open/floor/plasteel,