From c8e8bf65e6fd749d38818133ac786a3037d46679 Mon Sep 17 00:00:00 2001
From: Chompstation Bot <chompstation2bot@gmail.com>
Date: Wed, 12 May 2021 14:10:01 +0000
Subject: [PATCH] Fix wrong radio path for talon

---
 maps/offmap_vr/talon/talon_v2.dmm | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/maps/offmap_vr/talon/talon_v2.dmm b/maps/offmap_vr/talon/talon_v2.dmm
index df1ce5dc03..caf18b4dbd 100644
--- a/maps/offmap_vr/talon/talon_v2.dmm
+++ b/maps/offmap_vr/talon/talon_v2.dmm
@@ -11113,9 +11113,18 @@
 	pixel_y = 24
 	},
 /obj/structure/table/rack/shelf/steel,
+<<<<<<< HEAD
 /obj/item/device/radio/off{
 	channels = list("Talon" = 1)
 	},
+||||||| parent of 270364da74... Merge pull request #10304 from Very-Soft/talontweak
+/obj/item/device/radio/off/talon,
+=======
+/obj/item/device/radio/off{
+	channels = list("Talon" = 1);
+	pixel_y = 6
+	},
+>>>>>>> 270364da74... Merge pull request #10304 from Very-Soft/talontweak
 /turf/simulated/floor/tiled/techfloor,
 /area/talon_v2/armory)
 "Nw" = (