Merge pull request #6426 from Citadel-Station-13/upstream-merge-37206

[MIRROR] Correct some pixel_z issues

_maps/shuttles/whiteship_delta.dmm

@@ -243,7 +243,7 @@
 /area/shuttle/abandoned)
 "az" = (
 /obj/structure/sink/kitchen{
-	pixel_z = 30
+	pixel_y = 30
 	},
 /obj/effect/decal/cleanable/dirt{
 	desc = "A thin layer of dust coating the floor.";

_maps/templates/pirate_ship.dmm

@@ -961,8 +961,7 @@
 	},
 /obj/item/melee/transforming/energy/sword/pirate{
 	pixel_x = 12;
-	pixel_y = 7;
-	pixel_z = 0
+	pixel_y = 7
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,

code/modules/hydroponics/hydroponics.dm

@@ -4,7 +4,7 @@
 	icon_state = "hydrotray"
 	density = TRUE
 	anchored = TRUE
-	pixel_y = 8
+	pixel_z = 8
 	obj_flags = CAN_BE_HIT | UNIQUE_RENAME
 	circuit = /obj/item/circuitboard/machine/hydroponics
 	var/waterlevel = 100	//The amount of water in the tray (max 100)