From e0cb5ea81e1c5eb39fa1d74eb9e7233d299f6f6f Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Fri, 12 Feb 2021 16:27:22 -0500
Subject: [PATCH 1/2] Merge pull request #9685 from Novacat/nova-basicfixes

More merc ship fixes
---
 maps/submaps/admin_use_vr/kk_mercship.dmm | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/maps/submaps/admin_use_vr/kk_mercship.dmm b/maps/submaps/admin_use_vr/kk_mercship.dmm
index 6625ae8cc7..47817bb21f 100644
--- a/maps/submaps/admin_use_vr/kk_mercship.dmm
+++ b/maps/submaps/admin_use_vr/kk_mercship.dmm
@@ -4054,10 +4054,6 @@
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/manta/hallways_port)
-"tv" = (
-/obj/item/ammo_magazine/m762m/ap,
-/turf/simulated/wall/rshull,
-/area/ship/manta/armoury_st)
 "tx" = (
 /obj/effect/floor_decal/techfloor{
 	dir = 1
@@ -8439,7 +8435,22 @@
 /turf/simulated/floor/wood,
 /area/ship/manta/barracks)
 "Ou" = (
-/obj/item/weapon/gun/projectile/automatic/bullpup,
+/obj/effect/floor_decal/techfloor{
+	dir = 8
+	},
+/obj/structure/table/rack,
+/obj/item/device/camera_film,
+/obj/item/device/camera_film,
+/obj/item/device/camera_film,
+/obj/item/device/camera_film,
+/obj/item/device/camera_film,
+/obj/item/device/camera_film,
+/obj/item/device/camera,
+/obj/item/device/camera,
+/obj/item/device/camera,
+/obj/item/device/camera,
+/obj/item/device/camera,
+/obj/item/device/camera,
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/manta/armoury_st)
 "Ox" = (
@@ -18542,7 +18553,7 @@ ZT
 ZT
 ZT
 ZT
-tv
+ZT
 ZT
 ZT
 ZT