Merge branch 'Wingdings' of https://github.com/Samirakis/ParadiseTest …

…into Wingdings

_maps/map_files/Delta/delta.dmm

@@ -60,6 +60,13 @@
 	pixel_x = 30
 	},
 /mob/living/simple_animal/pet/sloth/paperwork,
+/obj/machinery/requests_console{
+	announcementConsole = 1;
+	department = "Quartermaster's Desk";
+	departmentType = 5;
+	name = "Quartermaster Requests Console";
+	pixel_y = -30
+	},
 /turf/simulated/floor/plasteel{
 	dir = 6;
 	icon_state = "brown"
@@ -6800,6 +6807,8 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
+/obj/effect/turf_decal/box,
+/obj/machinery/hologram/holopad,
 /turf/simulated/floor/plasteel{
 	icon_state = "neutralfull"
 	},
@@ -7572,8 +7581,6 @@
 /turf/simulated/wall/r_wall/coated,
 /area/engine/supermatter)
 "bbh" = (
-/obj/machinery/hologram/holopad,
-/obj/effect/turf_decal/box,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 9
 	},
@@ -7583,6 +7590,9 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/structure/chair/office/dark{
+	dir = 4
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "neutralfull"
 	},
@@ -8405,10 +8415,16 @@
 /area/hallway/secondary/entry)
 "bgT" = (
 /obj/structure/table,
-/obj/item/clipboard,
-/obj/item/toy/figure/qm,
+/obj/item/folder/yellow{
+	pixel_y = 1
+	},
 /obj/item/lighter/zippo/qm{
-	pixel_x = 10
+	pixel_x = 10;
+	pixel_y = 4
+	},
+/obj/item/toy/figure/qm{
+	pixel_x = -8;
+	pixel_y = 2
 	},
 /turf/simulated/floor/plasteel{
 	dir = 1;
@@ -13829,9 +13845,6 @@
 	},
 /area/hallway/primary/port/west)
 "bGv" = (
-/obj/structure/chair/office/dark{
-	dir = 4
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/plasteel{
 	icon_state = "neutralfull"
@@ -14684,21 +14697,8 @@
 /area/bridge)
 "bLH" = (
 /obj/structure/table/reinforced,
-/obj/item/cartridge/quartermaster{
-	pixel_x = -3
-	},
-/obj/item/cartridge/quartermaster{
-	pixel_x = 5;
-	pixel_y = 3
-	},
-/obj/item/cartridge/quartermaster{
-	pixel_x = -1;
-	pixel_y = 7
-	},
-/obj/item/gps{
-	desc = "A positioning system designed to keep an eye on your fellow workers.";
-	gpstag = "CARG0";
-	icon_state = "gps-m"
+/obj/item/qm_quest_tablet{
+	pixel_y = -3
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "neutralfull"
@@ -32602,10 +32602,16 @@
 /area/medical/reception)
 "dmI" = (
 /obj/structure/table/reinforced,
-/obj/item/flashlight/lamp,
+/obj/item/flashlight/lamp{
+	pixel_x = -3;
+	pixel_y = 13
+	},
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
+/obj/item/reagent_containers/food/drinks/mug/serv{
+	pixel_x = 10
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "neutralfull"
 	},
@@ -32688,9 +32694,7 @@
 	},
 /area/quartermaster/office)
 "dmQ" = (
-/obj/machinery/computer/supplycomp{
-	dir = 8
-	},
+/obj/machinery/computer/card/minor/qm,
 /turf/simulated/floor/plasteel{
 	dir = 4;
 	icon_state = "brown"
@@ -34373,9 +34377,6 @@
 	},
 /area/quartermaster/qm)
 "duB" = (
-/obj/structure/chair/office/dark{
-	dir = 4
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/plasteel{
 	icon_state = "neutralfull"
@@ -47274,8 +47275,10 @@
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
-/obj/structure/disposalpipe/segment{
-	dir = 4
+/obj/structure/disposalpipe/junction{
+	dir = 4;
+	icon_state = "pipe-j2";
+	tag = "icon-pipe-j2 (EAST)"
 	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
@@ -51312,10 +51315,9 @@
 /turf/simulated/floor/plating,
 /area/maintenance/garden)
 "gfk" = (
-/obj/item/paper_bin,
-/obj/structure/table,
-/obj/item/pen,
-/obj/item/reagent_containers/food/drinks/mug/serv,
+/obj/machinery/computer/supplycomp{
+	dir = 8
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "brown"
 	},
@@ -68097,6 +68099,27 @@
 	pixel_y = -28
 	},
 /obj/structure/closet/secure_closet/quartermaster,
+/obj/item/fulton_core,
+/obj/item/extraction_pack,
+/obj/item/flash,
+/obj/item/megaphone,
+/obj/item/gps{
+	desc = "A positioning system designed to keep an eye on your fellow workers.";
+	gpstag = "CARG0";
+	icon_state = "gps-m"
+	},
+/obj/item/cartridge/quartermaster{
+	pixel_x = -1;
+	pixel_y = 7
+	},
+/obj/item/cartridge/quartermaster{
+	pixel_x = -3
+	},
+/obj/item/cartridge/quartermaster{
+	pixel_x = 5;
+	pixel_y = 3
+	},
+/obj/item/clipboard,
 /turf/simulated/floor/plasteel{
 	icon_state = "brown"
 	},
@@ -76426,8 +76449,8 @@
 /area/medical/medbay2)
 "mkj" = (
 /obj/item/reagent_containers/spray/cleaner/medical{
-	pixel_y = 12;
-	pixel_x = 2
+	pixel_x = 2;
+	pixel_y = 12
 	},
 /obj/item/folder/white,
 /obj/item/pen/red,
@@ -76985,8 +77008,8 @@
 	pixel_y = -9
 	},
 /obj/item/reagent_containers/spray/cleaner/brig{
-	pixel_y = 7;
-	pixel_x = 4
+	pixel_x = 4;
+	pixel_y = 7
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
@@ -103732,6 +103755,11 @@
 /obj/machinery/button/windowtint{
 	dir = 1;
 	id = "qm";
+	pixel_x = 5;
+	pixel_y = 24
+	},
+/obj/machinery/light_switch{
+	pixel_x = -5;
 	pixel_y = 24
 	},
 /turf/simulated/floor/plasteel{
@@ -112962,14 +112990,22 @@
 /area/maintenance/engineering)
 "uvF" = (
 /obj/structure/table/reinforced,
-/obj/item/folder/yellow,
-/obj/item/stamp/qm,
+/obj/item/stamp/qm{
+	pixel_x = 8;
+	pixel_y = 10
+	},
 /obj/structure/cable{
 	icon_state = "1-8"
 	},
-/obj/item/qm_quest_tablet{
-	pixel_y = -11
+/obj/item/paper_bin{
+	pixel_x = 4;
+	pixel_y = -10
 	},
+/obj/item/pen{
+	pixel_x = 4;
+	pixel_y = -10
+	},
+/obj/machinery/keycard_auth,
 /turf/simulated/floor/plasteel{
 	icon_state = "neutralfull"
 	},
@@ -121672,7 +121708,6 @@
 /obj/machinery/firealarm{
 	pixel_y = 26
 	},
-/obj/item/reagent_containers/spray/cleaner/chemical,
 /turf/simulated/floor/plasteel{
 	dir = 1;
 	icon_state = "whitepurple"