From d30c585bd6cdf5d073d9e5d9dac465e1518b264d Mon Sep 17 00:00:00 2001 From: AmoryBlaine Date: Sat, 14 Sep 2024 03:41:43 -0400 Subject: [PATCH] chinook fix --- maps/map_files/chapaev/chapaev.dmm | 10 +--------- maps/templates/Chinook.dmm | 4 ---- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/maps/map_files/chapaev/chapaev.dmm b/maps/map_files/chapaev/chapaev.dmm index 4efcc1007b..1e096bba91 100644 --- a/maps/map_files/chapaev/chapaev.dmm +++ b/maps/map_files/chapaev/chapaev.dmm @@ -1211,14 +1211,6 @@ }, /turf/open/floor/strata/multi_tiles/southeast, /area/golden_arrow/canteen) -"kh" = ( -/obj/item/weapon/gun/shotgun/pump/type23, -/obj/structure/closet/secure_closet/guncabinet{ - req_access = null - }, -/obj/item/weapon/gun/shotgun/pump/type23, -/turf/open/floor/strata/floor3, -/area/golden_arrow/hangar) "kp" = ( /obj/structure/prop/invuln/overhead_pipe{ dir = 4; @@ -13446,7 +13438,7 @@ vp vp Jf Jf -kh +Jf yH Al by diff --git a/maps/templates/Chinook.dmm b/maps/templates/Chinook.dmm index 48bb5e34d7..4f2b786b02 100644 --- a/maps/templates/Chinook.dmm +++ b/maps/templates/Chinook.dmm @@ -7691,10 +7691,6 @@ /obj/structure/surface/table/almayer, /obj/effect/spawner/random/tool, /obj/item/clothing/gloves/marine, -/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/spawner/random/tool, /obj/item/clothing/gloves/marine, /obj/structure/surface/table/reinforced/black,