From 6bf826f0f50bd17b2289eecd804308cfeff48c44 Mon Sep 17 00:00:00 2001 From: thgvr Date: Wed, 17 Apr 2024 12:10:38 -0700 Subject: [PATCH] a --- _maps/shuttles/independent/independent_tranquility.dmm | 3 --- _maps/shuttles/inteq/inteq_valor.dmm | 6 ------ _maps/shuttles/nanotrasen/nanotrasen_osprey.dmm | 3 --- 3 files changed, 12 deletions(-) diff --git a/_maps/shuttles/independent/independent_tranquility.dmm b/_maps/shuttles/independent/independent_tranquility.dmm index 9c0c2327c421..7fb7e56fc938 100644 --- a/_maps/shuttles/independent/independent_tranquility.dmm +++ b/_maps/shuttles/independent/independent_tranquility.dmm @@ -6457,9 +6457,6 @@ /obj/item/clothing/shoes/cowboy/fancy, /obj/item/clothing/under/pants/camo, /obj/item/clothing/suit/hooded/wintercoat/captain, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---",desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, /obj/structure/chair/comfy/orange/directional/south, /obj/effect/turf_decal/siding/wood{ dir = 8 diff --git a/_maps/shuttles/inteq/inteq_valor.dmm b/_maps/shuttles/inteq/inteq_valor.dmm index 96620828a0eb..9d0bdaab1585 100644 --- a/_maps/shuttles/inteq/inteq_valor.dmm +++ b/_maps/shuttles/inteq/inteq_valor.dmm @@ -379,9 +379,6 @@ dir = 8; pixel_x = 28 }, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---",desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, /obj/effect/turf_decal/siding/thinplating{ dir = 4 }, @@ -3605,9 +3602,6 @@ dir = 1; pixel_y = -28 }, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---",desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, /obj/effect/turf_decal/siding/thinplating{ dir = 6 }, diff --git a/_maps/shuttles/nanotrasen/nanotrasen_osprey.dmm b/_maps/shuttles/nanotrasen/nanotrasen_osprey.dmm index 931f504514a3..2943e61a01ac 100644 --- a/_maps/shuttles/nanotrasen/nanotrasen_osprey.dmm +++ b/_maps/shuttles/nanotrasen/nanotrasen_osprey.dmm @@ -3604,9 +3604,6 @@ /obj/item/gun/ballistic/automatic/pistol/commander/no_mag, /obj/item/gun/energy/e_gun/mini, /obj/item/gun/energy/e_gun/mini, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---",desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, /obj/structure/chair/comfy/orange/directional/north, /obj/structure/closet/secure_closet/wall/directional/west{ icon_door = "sec_wall";