Merge pull request #8805 from Linzolle/fix-2

fixes some displays being on the ground
This commit is contained in:
kevinz000
2019-07-05 06:56:47 -07:00
committed by GitHub
4 changed files with 29 additions and 14 deletions
+8 -7
View File
@@ -1688,8 +1688,7 @@
/obj/machinery/button/door{
id = "hos";
name = "HoS Office Shutters";
pixel_y = -25;
pixel_y = -25
},
/turf/open/floor/carpet,
/area/crew_quarters/heads/hos)
@@ -26228,9 +26227,7 @@
/turf/open/floor/plasteel,
/area/quartermaster/office)
"bkx" = (
/obj/machinery/status_display/supply{
pixel_y = 2
},
/obj/machinery/status_display/supply,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
@@ -31345,7 +31342,9 @@
id = "QMLoad"
},
/obj/machinery/light,
/obj/machinery/status_display/supply,
/obj/machinery/status_display/supply{
pixel_y = -32
},
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -33612,7 +33611,9 @@
name = "Station Intercom (General)";
pixel_y = -35
},
/obj/machinery/status_display/supply,
/obj/machinery/status_display/supply{
pixel_x = -32
},
/obj/machinery/computer/security/qm{
dir = 4
},
+12 -4
View File
@@ -17692,7 +17692,9 @@
pixel_x = -28;
pixel_y = 23
},
/obj/machinery/status_display/supply,
/obj/machinery/status_display/supply{
pixel_y = 32
},
/obj/machinery/conveyor{
dir = 5;
id = "QMLoad2"
@@ -21617,7 +21619,9 @@
/obj/structure/table,
/obj/item/clipboard,
/obj/item/stamp/qm,
/obj/machinery/status_display/supply,
/obj/machinery/status_display/supply{
pixel_x = 32
},
/turf/open/floor/plasteel,
/area/quartermaster/qm)
"aQu" = (
@@ -27037,7 +27041,9 @@
/area/hallway/primary/port)
"baA" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
/obj/machinery/status_display/supply,
/obj/machinery/status_display/supply{
pixel_y = 32
},
/obj/structure/table,
/obj/item/folder/yellow,
/obj/effect/turf_decal/tile/brown{
@@ -27920,7 +27926,9 @@
/area/quartermaster/office)
"bbS" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
/obj/machinery/status_display/supply,
/obj/machinery/status_display/supply{
pixel_y = 32
},
/obj/effect/turf_decal/tile/brown{
dir = 1
},
@@ -2833,7 +2833,9 @@
/turf/open/floor/plasteel/dark,
/area/crew_quarters/heads/hop)
"aeP" = (
/obj/machinery/status_display/supply,
/obj/machinery/status_display/supply{
pixel_x = -32
},
/obj/effect/turf_decal/loading_area,
/turf/open/floor/plasteel,
/area/quartermaster/storage)
@@ -21743,7 +21743,9 @@
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"aZj" = (
/obj/machinery/status_display/supply,
/obj/machinery/status_display/supply{
pixel_x = -32
},
/obj/machinery/computer/bounty{
dir = 4
},
@@ -36058,7 +36060,9 @@
/obj/item/folder/white,
/obj/item/pen,
/obj/item/stamp/rd,
/obj/machinery/status_display/ai,
/obj/machinery/status_display/ai{
pixel_y = -32
},
/obj/machinery/camera{
c_tag = "Research Director's Office";
dir = 1;