cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 01:49:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #37206 from AutomaticFrenzy/patch/pixel-z

Browse Source 
Correct some pixel_z issues
This commit is contained in:
Jordan Brown
2018-04-15 23:22:38 -04:00
committed by CitadelStationBot
parent f98040513a
commit de896c2929
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
_maps/shuttles/whiteship_delta.dmm
View File

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

3
_maps/templates/pirate_ship.dmm
View File

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

2
code/modules/hydroponics/hydroponics.dm
View File

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