Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move see through darkness to the lighting plane backdrops #11465

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions code/_onclick/hud/fullscreen.dm
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,7 @@
show_when_dead = TRUE

/atom/movable/screen/fullscreen/see_through_darkness
invisibility = INVISIBILITY_LIGHTING
icon_state = "nightvision"
plane = LIGHTING_PLANE
blend_mode = BLEND_ADD
Expand Down
2 changes: 1 addition & 1 deletion code/_onclick/hud/hud.dm
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ GLOBAL_LIST_INIT(available_ui_styles, list(
var/hud_version = HUD_STYLE_STANDARD //Current displayed version of the HUD
var/inventory_shown = FALSE //Equipped item inventory
var/hotkey_ui_hidden = FALSE //This is to hide the buttons that can be used via hotkeys. (hotkeybuttons list of buttons)
/// Should the mob be able to see in the darkness immediately surrounding their mob?

var/atom/movable/screen/ling/chems/lingchemdisplay
var/atom/movable/screen/ling/sting/lingstingdisplay
Expand Down Expand Up @@ -91,7 +92,6 @@ GLOBAL_LIST_INIT(available_ui_styles, list(
var/atom/movable/plane_master_controller/controller_instance = new mytype(null, src)
plane_master_controllers[controller_instance.name] = controller_instance


/datum/hud/Destroy()
if(mymob?.hud_used == src)
mymob.hud_used = null
Expand Down
2 changes: 0 additions & 2 deletions code/_onclick/hud/human.dm
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,6 @@

/datum/hud/human/New(mob/living/carbon/human/owner)
..()
owner.overlay_fullscreen("see_through_darkness", /atom/movable/screen/fullscreen/see_through_darkness)

var/atom/movable/screen/using
var/atom/movable/screen/inventory/inv_box

Expand Down
2 changes: 2 additions & 0 deletions code/_onclick/hud/rendering/plane_master.dm
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,8 @@
. = ..()
mymob.overlay_fullscreen("lighting_backdrop_lit", /atom/movable/screen/fullscreen/lighting_backdrop/lit)
mymob.overlay_fullscreen("lighting_backdrop_unlit", /atom/movable/screen/fullscreen/lighting_backdrop/unlit)
if (isliving(mymob))
mymob.overlay_fullscreen("lighting_backdrop_seenear", /atom/movable/screen/fullscreen/see_through_darkness)

/atom/movable/screen/plane_master/lighting/Initialize(mapload)
. = ..()
Expand Down
2 changes: 0 additions & 2 deletions code/_onclick/hud/robot.dm
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,6 @@
..()
var/mob/living/silicon/robot/mymobR = mymob

mymobR.overlay_fullscreen("see_through_darkness", /atom/movable/screen/fullscreen/see_through_darkness)

var/atom/movable/screen/using

using = new/atom/movable/screen/language_menu
Expand Down
Loading