From e2c02b64161a0759d487d21ed1126771dc1e1e84 Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 10 Feb 2021 19:32:37 -0500 Subject: [PATCH] More merc ship fixes I derped. --- 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 6625ae8cc79..47817bb21f2 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