Fix pubby conflict marker + bot sprites

Kush1Push1 · Sep 4, 2024 · 665044f · 665044f
1 parent 09bce1b
commit 665044f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 15 deletions.
diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm
@@ -59223,20 +59223,6 @@
 /obj/machinery/piratepad/civilian,
 /turf/open/floor/plasteel,
 /area/cargo/office)
-"pHz" = (
-/obj{
-	name = "---Merge conflict marker---"
-	},
-/obj/docking_port/stationary{
-	dwidth = 2;
-	height = 6;
-	shuttle_id = "monastery_shuttle_station";
-	name = "Station";
-	roundstart_template = /datum/map_template/shuttle/escape_pod/large;
-	width = 5
-	},
-/turf/closed/wall,
-/area/commons/dorms)
 "pHI" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
@@ -106611,7 +106597,7 @@ aaa
 apX
 apX
 apX
-pHz
+apX
 apX
 apX
 azA

diff --git a/icons/mob/aibots.dmi b/icons/mob/aibots.dmi