From 55e5dfdf78e04f675f5155bdb0b1f3af25d6b2f4 Mon Sep 17 00:00:00 2001 From: MrMelbert <51863163+MrMelbert@users.noreply.github.com> Date: Sat, 20 Jan 2024 00:14:40 -0600 Subject: [PATCH] Fix heretic rune layering by using pixel_z (#80990) ## About The Pull Request Fix items layering above heretic runes by making it use pixel_z rather than pixel_y. ![image](https://github.com/tgstation/tgstation/assets/51863163/302d60df-cf4e-4a0d-b00e-7d6e42fb741a) ## Changelog :cl: Melbert fix: Items and mobs no longer hide behind big runes (heretic, cult, wizard) /:cl: --- code/modules/antagonists/cult/runes.dm | 6 ++++-- code/modules/antagonists/heretic/transmutation_rune.dm | 10 ++++++---- .../antagonists/wizard/grand_ritual/grand_ritual.dm | 5 +++-- .../antagonists/wizard/grand_ritual/grand_rune.dm | 5 +++-- 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/code/modules/antagonists/cult/runes.dm b/code/modules/antagonists/cult/runes.dm index bed29dbefd5..bf5d64d7e83 100644 --- a/code/modules/antagonists/cult/runes.dm +++ b/code/modules/antagonists/cult/runes.dm @@ -574,7 +574,8 @@ structure_check() searches for nearby cultist structures required for the invoca color = RUNE_COLOR_DARKRED icon_state = "rune_large" pixel_x = -32 //So the big ol' 96x96 sprite shows up right - pixel_y = -32 + pixel_y = 16 + pixel_z = -48 scribe_delay = 50 SECONDS //how long the rune takes to create scribe_damage = 40.1 //how much damage you take doing it log_when_erased = TRUE @@ -1074,7 +1075,8 @@ GLOBAL_VAR_INIT(narsie_summon_count, 0) icon = 'icons/effects/96x96.dmi' icon_state = "apoc" pixel_x = -32 - pixel_y = -32 + pixel_y = 16 + pixel_z = -48 color = RUNE_COLOR_DARKRED req_cultists = 3 scribe_delay = 100 diff --git a/code/modules/antagonists/heretic/transmutation_rune.dm b/code/modules/antagonists/heretic/transmutation_rune.dm index 0ae0c8180bd..619e7d25295 100644 --- a/code/modules/antagonists/heretic/transmutation_rune.dm +++ b/code/modules/antagonists/heretic/transmutation_rune.dm @@ -204,8 +204,9 @@ /obj/effect/heretic_rune/big icon = 'icons/effects/96x96.dmi' icon_state = "transmutation_rune" - pixel_x = -33 //So the big ol' 96x96 sprite shows up right - pixel_y = -32 + pixel_x = -30 + pixel_y = 18 + pixel_z = -48 greyscale_config = /datum/greyscale_config/heretic_rune /obj/effect/heretic_rune/big/Initialize(mapload, path_colour) @@ -217,8 +218,9 @@ duration = 30 SECONDS icon = 'icons/effects/96x96.dmi' icon_state = "transmutation_rune" - pixel_x = -33 - pixel_y = -32 + pixel_x = -30 + pixel_y = 18 + pixel_z = -48 plane = GAME_PLANE layer = SIGIL_LAYER greyscale_config = /datum/greyscale_config/heretic_rune diff --git a/code/modules/antagonists/wizard/grand_ritual/grand_ritual.dm b/code/modules/antagonists/wizard/grand_ritual/grand_ritual.dm index f3ac9b01071..a2f25863a4b 100644 --- a/code/modules/antagonists/wizard/grand_ritual/grand_ritual.dm +++ b/code/modules/antagonists/wizard/grand_ritual/grand_ritual.dm @@ -295,8 +295,9 @@ /obj/effect/temp_visual/wizard_rune icon = 'icons/effects/96x96.dmi' icon_state = null - pixel_x = -28 - pixel_y = -33 + pixel_x = -33 + pixel_y = 16 + pixel_z = -48 anchored = TRUE layer = SIGIL_LAYER plane = GAME_PLANE diff --git a/code/modules/antagonists/wizard/grand_ritual/grand_rune.dm b/code/modules/antagonists/wizard/grand_ritual/grand_rune.dm index d1b01912ae9..f75da5f8557 100644 --- a/code/modules/antagonists/wizard/grand_ritual/grand_rune.dm +++ b/code/modules/antagonists/wizard/grand_ritual/grand_rune.dm @@ -15,8 +15,9 @@ desc = "A flowing circle of shapes and runes is etched into the floor, the lines twist and move before your eyes." icon = 'icons/effects/96x96.dmi' icon_state = "wizard_rune" - pixel_x = -28 - pixel_y = -33 + pixel_x = -33 + pixel_y = 16 + pixel_z = -48 anchored = TRUE interaction_flags_atom = INTERACT_ATOM_ATTACK_HAND resistance_flags = FIRE_PROOF | UNACIDABLE | ACID_PROOF