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

Merge pull request #3733 from Mewchild/MC-CargoFixes

Browse Source 
Cargo fixes
This commit is contained in:
Spades
2018-05-20 20:47:46 -04:00
committed by GitHub
parent 622a0dd1fa 6e1096a53a
commit 5f41dca7dc
1 changed files with 44 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maps/tether/tether-07-station3.dmm
+44 -27
View File
@@ -6893,9 +6893,6 @@
/turf/simulated/floor,
/area/quartermaster/delivery)
"lR" = (
/obj/machinery/alarm{
pixel_y = 22
},
/obj/structure/disposalpipe/segment{
dir = 4;
icon_state = "pipe-c"
@@ -8472,6 +8469,12 @@
/obj/effect/floor_decal/corner/brown/border{
dir = 4
},
/obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos{
external_pressure_bound = 101.3;
external_pressure_bound_default = 101.3;
pressure_checks = 1;
pressure_checks_default = 1
},
/turf/simulated/floor/tiled,
/area/quartermaster/delivery)
"oo" = (
@@ -8809,6 +8812,10 @@
/obj/effect/floor_decal/corner/brown/border{
dir = 4
},
/obj/item/weapon/packageWrap,
/obj/item/weapon/packageWrap,
/obj/item/weapon/packageWrap,
/obj/machinery/atmospherics/pipe/simple/hidden/universal,
/turf/simulated/floor/tiled,
/area/quartermaster/delivery)
"oU" = (
@@ -9361,25 +9368,28 @@
/turf/simulated/floor/tiled,
/area/quartermaster/delivery)
"pI" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8
},
/turf/simulated/floor/tiled,
/area/quartermaster/delivery)
"pJ" = (
/obj/structure/table/steel,
/obj/item/weapon/packageWrap,
/obj/item/weapon/packageWrap,
/obj/item/weapon/packageWrap,
/obj/item/weapon/packageWrap,
/obj/item/weapon/packageWrap,
/obj/effect/floor_decal/borderfloor{
dir = 4
},
/obj/effect/floor_decal/corner/brown/border{
dir = 4
},
/obj/machinery/photocopier/faxmachine{
department = "Mailing-Room"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
},
/turf/simulated/floor/tiled,
/area/quartermaster/delivery)
"pK" = (
@@ -9650,6 +9660,10 @@
dir = 1
},
/obj/effect/floor_decal/rust,
/obj/machinery/conveyor{
dir = 1;
id = "packageSort1"
},
/turf/simulated/floor/plating,
/area/quartermaster/delivery)
"qn" = (
@@ -10075,9 +10089,13 @@
/turf/simulated/floor/tiled,
/area/quartermaster/foyer)
"rc" = (
/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
/obj/machinery/hologram/holopad,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 4
},
/turf/simulated/floor/tiled,
/area/quartermaster/foyer)
"rd" = (
@@ -14764,14 +14782,8 @@
/area/maintenance/station/cargo)
"yz" = (
/obj/structure/table/standard,
/obj/item/weapon/cartridge/quartermaster{
pixel_x = 6;
pixel_y = 5
},
/obj/item/weapon/cartridge/quartermaster,
/obj/item/weapon/cartridge/quartermaster{
pixel_x = -4;
pixel_y = 7
/obj/machinery/photocopier/faxmachine{
department = "Quartermaster-Office"
},
/turf/simulated/floor/tiled,
/area/quartermaster/qm)
@@ -14788,6 +14800,15 @@
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 1
},
/obj/item/weapon/cartridge/quartermaster{
pixel_x = 6;
pixel_y = 5
},
/obj/item/weapon/cartridge/quartermaster{
pixel_x = -4;
pixel_y = 7
},
/obj/item/weapon/cartridge/quartermaster,
/turf/simulated/floor/tiled,
/area/quartermaster/qm)
"yB" = (
@@ -22940,8 +22961,7 @@
"Nn" = (
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
dir = 9;
icon_state = "intact";
icon_state = "intact"
},
/turf/simulated/floor/plating,
/area/maintenance/station/ai)
@@ -23097,8 +23117,7 @@
"Qi" = (
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
dir = 5;
icon_state = "intact";
icon_state = "intact"
},
/turf/simulated/floor,
/area/maintenance/station/ai)
@@ -23111,8 +23130,7 @@
"Qq" = (
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
dir = 10;
icon_state = "intact";
icon_state = "intact"
},
/turf/simulated/floor,
/area/maintenance/station/ai)
@@ -23120,8 +23138,7 @@
/obj/machinery/meter,
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
dir = 10;
icon_state = "intact";
icon_state = "intact"
},
/turf/simulated/floor/plating,
/area/maintenance/station/ai)