cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-27 23:27:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Fixes layering issues brought by the FoV PR. [MDB IGNORE] (#11411)

Browse Source 
* Fixes layering issues brought by the FoV PR.

* Update code/__DEFINES/layers.dm

* Update code/modules/mob/living/living_defines.dm

* Update code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
This commit is contained in:
SkyratBot
2022-02-10 02:51:52 +00:00
committed by GitHub
co-authored by Ghom Tom
parent 4b4ee2465c
commit b2cc74a77e
111 changed files with 240 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/flufftext/Hallucination.dm
+6 -3
View File
@@ -103,6 +103,7 @@ GLOBAL_LIST_INIT(hallucination_list, list(
var/col_mod = null
var/image/current_image = null
var/image_layer = MOB_LAYER
var/image_plane = GAME_PLANE
var/active = TRUE //qdelery
/obj/effect/hallucination/singularity_pull()
@@ -123,6 +124,7 @@ GLOBAL_LIST_INIT(hallucination_list, list(
/obj/effect/hallucination/simple/proc/GetImage()
var/image/I = image(image_icon,src,image_state,image_layer,dir=src.dir)
I.plane = image_plane
I.pixel_x = px
I.pixel_y = py
if(col_mod)
@@ -168,7 +170,7 @@ GLOBAL_LIST_INIT(hallucination_list, list(
icon_state = "nothing"
anchored = TRUE
layer = FLY_LAYER
plane = GAME_PLANE
plane = ABOVE_GAME_PLANE
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
/datum/hallucination/fake_flood
@@ -195,7 +197,7 @@ GLOBAL_LIST_INIT(hallucination_list, list(
var/obj/effect/plasma_image_holder/pih = new(center)
var/image/plasma_image = image(image_icon, pih, image_state, FLY_LAYER)
plasma_image.alpha = 50
plasma_image.plane = GAME_PLANE
plasma_image.plane = ABOVE_GAME_PLANE
flood_images += plasma_image
flood_image_holders += pih
flood_turfs += center
@@ -226,7 +228,7 @@ GLOBAL_LIST_INIT(hallucination_list, list(
var/obj/effect/plasma_image_holder/pih = new(T)
var/image/new_plasma = image(image_icon, pih, image_state, FLY_LAYER)
new_plasma.alpha = 50
new_plasma.plane = GAME_PLANE
new_plasma.plane = ABOVE_GAME_PLANE
flood_images += new_plasma
flood_image_holders += pih
flood_turfs += T
@@ -790,6 +792,7 @@ GLOBAL_LIST_INIT(hallucination_list, list(
/obj/effect/hallucination/fake_door_lock
layer = CLOSED_DOOR_LAYER + 1 //for Bump priority
plane = GAME_PLANE
var/image/bolt_light
var/obj/machinery/door/airlock/airlock