From de896c2929d1440ed796ac9bc1c58611d44d45d9 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Sun, 15 Apr 2018 23:22:38 -0400 Subject: [PATCH 1/2] Merge pull request #37206 from AutomaticFrenzy/patch/pixel-z Correct some pixel_z issues --- _maps/shuttles/whiteship_delta.dmm | 2 +- _maps/templates/pirate_ship.dmm | 3 +-- code/modules/hydroponics/hydroponics.dm | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/_maps/shuttles/whiteship_delta.dmm b/_maps/shuttles/whiteship_delta.dmm index 8c95b8dad5..ccf2a544d4 100644 --- a/_maps/shuttles/whiteship_delta.dmm +++ b/_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."; diff --git a/_maps/templates/pirate_ship.dmm b/_maps/templates/pirate_ship.dmm index 08b73cd8bf..a635cac326 100644 --- a/_maps/templates/pirate_ship.dmm +++ b/_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, diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm index c3d1b725b8..bd228bd4d1 100644 --- a/code/modules/hydroponics/hydroponics.dm +++ b/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)