cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-30 00:35:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1309 from CHOMPStationBot/upstream-merge-9685

Browse Source 
[MIRROR] More merc ship fixes
This commit is contained in:
Nadyr
2021-02-14 07:14:24 -05:00
committed by GitHub
parent 83861014e7 51334dce4b
commit 5a9bfb4263
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maps/submaps/admin_use_vr/kk_mercship.dmm
+17 -6
View File
@@ -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