cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-13 17:14:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Minor plane cube cleanup [MDB IGNORE] (#18223)

Browse Source 
* Minor plane cube cleanup (#72038)

## About The Pull Request

[Fixes area lighting not working on turf change in multiz
cases](https://github.com/tgstation/tgstation/commit/7b92deffbca92a834cb0a361fd685de51a12ea53)

If you modify a area lit turf when using multiz, it'd end up using the
wrong plane for its light, because of stupid shit on my part.
Stupid shit resolved

[Fixes some uses of plane masters that only specified one rather then
all](https://github.com/tgstation/tgstation/commit/a59ec96d29710b967bf8b3ffe8210b230cb194b3)

We almost never only want to show SOME hidden planes.
Should really make a helper for this someday

* Minor plane cube cleanup

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
This commit is contained in:
SkyratBot
2022-12-20 01:18:41 +01:00
committed by GitHub
parent c8e9c7181e
commit 4cce4bcf10
5 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/components/seethrough.dm
+7 -6
View File
@@ -99,8 +99,8 @@
///Apply the trickery image and animation
/datum/component/seethrough/proc/trick_mob(mob/fool)
var/datum/hud/our_hud = fool.hud_used
var/atom/movable/screen/plane_master/seethrough = our_hud.get_plane_master(SEETHROUGH_PLANE)
seethrough.unhide_plane(fool)
for(var/atom/movable/screen/plane_master/seethrough in our_hud.get_true_plane_masters(SEETHROUGH_PLANE))
seethrough.unhide_plane(fool)
var/image/user_overlay = new(parent)
user_overlay.loc = parent
@@ -145,8 +145,9 @@
fool.client?.images -= trickery_image
UnregisterSignal(fool, COMSIG_MOB_LOGOUT)
var/datum/hud/our_hud = fool.hud_used
var/atom/movable/screen/plane_master/seethrough = our_hud.get_plane_master(SEETHROUGH_PLANE)
seethrough.hide_plane(fool)
for(var/atom/movable/screen/plane_master/seethrough in our_hud.get_true_plane_masters(SEETHROUGH_PLANE))
seethrough.hide_plane(fool)
tricked_mobs.Cut()
@@ -158,5 +159,5 @@
UnregisterSignal(fool, COMSIG_MOB_LOGOUT)
RegisterSignal(fool, COMSIG_MOB_LOGIN, PROC_REF(trick_mob))
var/datum/hud/our_hud = fool.hud_used
var/atom/movable/screen/plane_master/seethrough = our_hud.get_plane_master(SEETHROUGH_PLANE)
seethrough.hide_plane(fool)
for(var/atom/movable/screen/plane_master/seethrough in our_hud.get_true_plane_masters(SEETHROUGH_PLANE))
seethrough.hide_plane(fool)
code/game/machinery/computer/camera_advanced.dm
+3 -4
View File
@@ -92,8 +92,8 @@
user.remote_control = null
current_user = null
user.unset_machine()
var/atom/movable/screen/plane_master/plane_static = user.hud_used?.get_plane_master(CAMERA_STATIC_PLANE)
if(plane_static)
for(var/atom/movable/screen/plane_master/plane_static in user.hud_used?.get_true_plane_masters(CAMERA_STATIC_PLANE))
plane_static.hide_plane(user)
playsound(src, 'sound/machines/terminal_off.ogg', 25, FALSE)
@@ -180,8 +180,7 @@
if(should_supress_view_changes)
user.client.view_size.supress()
// Who passes control like this god I hate static code
var/atom/movable/screen/plane_master/plane_static = user.hud_used?.get_plane_master(CAMERA_STATIC_PLANE)
if(plane_static)
for(var/atom/movable/screen/plane_master/plane_static in user.hud_used?.get_true_plane_masters(CAMERA_STATIC_PLANE))
plane_static.unhide_plane(user)
/mob/camera/ai_eye/remote
code/game/turfs/change_turf.dm
+1 -1
View File
@@ -178,7 +178,7 @@ GLOBAL_LIST_INIT(blacklisted_automated_baseturfs, typecacheof(list(
if(SSmapping.z_level_to_plane_offset[z])
var/area/thisarea = get_area(W)
if(thisarea.lighting_effects)
W.add_overlay(thisarea.lighting_effects[SSmapping.z_level_to_plane_offset[z]])
W.add_overlay(thisarea.lighting_effects[SSmapping.z_level_to_plane_offset[z] + 1])
QUEUE_SMOOTH_NEIGHBORS(src)
QUEUE_SMOOTH(src)
code/modules/lighting/lighting_turf.dm
+1 -1
View File
@@ -103,7 +103,7 @@
// We will only run this logic on turfs off the prime z layer
// Since on the prime z layer, we use an overlay on the area instead, to save time
if(SSmapping.z_level_to_plane_offset[z])
var/index = SSmapping.z_level_to_plane_offset[z]
var/index = SSmapping.z_level_to_plane_offset[z] + 1
//Inherit overlay of new area
if(old_area.lighting_effects)
cut_overlay(old_area.lighting_effects[index])
code/modules/mod/modules/modules_supply.dm
+1 -1
View File
@@ -237,7 +237,7 @@
. = ..()
if(!.)
return
var/atom/game_renderer = mod.wearer.hud_used.get_plane_master(RENDER_PLANE_GAME)
var/atom/game_renderer = mod.wearer.hud_used.get_plane_master(MUTATE_PLANE(RENDER_PLANE_GAME, mod.wearer))
var/matrix/render_matrix = matrix(game_renderer.transform)
render_matrix.Scale(1.25, 1.25)
animate(game_renderer, launch_time, transform = render_matrix)