From 378fd085fc091a3fe4e4443b9e19464ae14cc278 Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Wed, 7 Jul 2021 17:14:35 -0400 Subject: [PATCH] Merge pull request #10953 from VOREStation/Arokha/seccamera Fix security cameras showing weird space thing --- code/__defines/_planes+layers.dm | 3 + code/_onclick/hud/map_popups.dm | 8 +- code/_onclick/hud/skybox.dm | 3 +- code/modules/mob/mob_planes.dm | 1 + interface/skin.dmf | 204 ------------------------------- 5 files changed, 10 insertions(+), 209 deletions(-) diff --git a/code/__defines/_planes+layers.dm b/code/__defines/_planes+layers.dm index 6221409788..54d168667c 100644 --- a/code/__defines/_planes+layers.dm +++ b/code/__defines/_planes+layers.dm @@ -54,6 +54,9 @@ What is the naming convention for planes or layers? #define OPENSPACE_LAYER 600 // Above every other layer #define OPENSPACE_BACKDROP_PLANE -50 // Black square has to be above openspace turfs +#define MAP_VIEW_PLANE -48 // Plane for 'embedded' maps in consoles and such + #define MAP_VIEW_LAYER 0 + // Turf Planes #define PLATING_PLANE -44 // Plating #define DISPOSAL_LAYER 2.1 // Under objects, even when planeswapped diff --git a/code/_onclick/hud/map_popups.dm b/code/_onclick/hud/map_popups.dm index aae5c808c9..53ce6b6aa9 100644 --- a/code/_onclick/hud/map_popups.dm +++ b/code/_onclick/hud/map_popups.dm @@ -29,8 +29,8 @@ /obj/screen/map_view icon_state = "blank" // Map view has to be on the lowest plane to enable proper lighting - layer = SPACE_PLANE - plane = SPACE_PLANE + layer = MAP_VIEW_LAYER + plane = MAP_VIEW_PLANE /** * A generic background object. @@ -41,8 +41,8 @@ name = "background" icon = 'icons/mob/map_backgrounds.dmi' icon_state = "clear" - layer = SPACE_PLANE - plane = SPACE_PLANE + layer = MAP_VIEW_LAYER + plane = MAP_VIEW_PLANE /** * Sets screen_loc of this screen object, in form of point coordinates, diff --git a/code/_onclick/hud/skybox.dm b/code/_onclick/hud/skybox.dm index 268e4e6518..97f3999b7e 100644 --- a/code/_onclick/hud/skybox.dm +++ b/code/_onclick/hud/skybox.dm @@ -6,12 +6,13 @@ /obj/screen/skybox name = "skybox" icon = null + vis_flags = NONE appearance_flags = TILE_BOUND|PIXEL_SCALE mouse_opacity = 0 anchored = TRUE simulated = FALSE screen_loc = "CENTER,CENTER" - layer = OBJ_LAYER + layer = BACKGROUND_LAYER plane = SKYBOX_PLANE blend_mode = BLEND_MULTIPLY // You actually need to do it this way or you see it in occlusion. diff --git a/code/modules/mob/mob_planes.dm b/code/modules/mob/mob_planes.dm index 49d90a5a95..7b1fbd6f7e 100644 --- a/code/modules/mob/mob_planes.dm +++ b/code/modules/mob/mob_planes.dm @@ -122,6 +122,7 @@ screen_loc = "CENTER" plane = -100 //Dodge just in case someone instantiates one of these accidentally, don't end up on 0 with plane_master appearance_flags = PLANE_MASTER + vis_flags = NONE mouse_opacity = MOUSE_OPACITY_TRANSPARENT //Normally unclickable alpha = 0 //Hidden from view var/desired_alpha = 255 //What we go to when we're enabled diff --git a/interface/skin.dmf b/interface/skin.dmf index 936208c2f3..62b0341cae 100644 --- a/interface/skin.dmf +++ b/interface/skin.dmf @@ -980,210 +980,6 @@ menu "menu" category = "&Help" saved-params = "is-checked" - -window "Telecomms IDE" - elem "Telecomms IDE" - type = MAIN - pos = 281,0 - size = 569x582 - anchor1 = -1,-1 - anchor2 = -1,-1 - background-color = #ffffff - is-visible = false - saved-params = "pos;size;is-minimized;is-maximized" - title = "TCS IDE" - statusbar = false - on-close = "exittcs" - elem "button5" - type = BUTTON - pos = 209,464 - size = 70x20 - anchor1 = 37,80 - anchor2 = 49,83 - saved-params = "is-checked" - text = "Clear Memory" - command = "tcsclearmem" - elem "button4" - type = BUTTON - pos = 157,464 - size = 52x20 - anchor1 = 28,80 - anchor2 = 37,83 - saved-params = "is-checked" - text = "Revert" - command = "tcsrevert" - elem "button3" - type = BUTTON - pos = 105,464 - size = 52x20 - anchor1 = 18,80 - anchor2 = 28,83 - saved-params = "is-checked" - text = "Execute" - command = "tcsrun" - elem "tcserror" - type = OUTPUT - pos = 0,488 - size = 566x94 - anchor1 = 0,84 - anchor2 = 99,100 - font-family = "sans-serif" - font-size = 9 - saved-params = "max-lines" - elem "button2" - type = BUTTON - pos = 53,464 - size = 52x20 - anchor1 = 9,80 - anchor2 = 18,83 - saved-params = "is-checked" - text = "Compile" - command = "tcscompile" - elem "button1" - type = BUTTON - pos = 0,464 - size = 53x20 - anchor1 = 0,80 - anchor2 = 9,83 - saved-params = "is-checked" - text = "Apply" - command = "tcssave" - elem "tcscode" - type = INPUT - pos = 0,0 - size = 569x464 - anchor1 = 0,0 - anchor2 = 100,80 - font-family = "Courier" - font-size = 10 - saved-params = "" - command = "cancel" - multi-line = true - no-command = true - -window "chemdispenser" - elem "chemdispenser" - type = MAIN - pos = 281,0 - size = 340x480 - anchor1 = -1,-1 - anchor2 = -1,-1 - is-visible = false - saved-params = "pos;size;is-minimized;is-maximized" - title = "Chem Dispenser" - statusbar = false - elem "energy" - type = LABEL - pos = 8,24 - size = 56x16 - anchor1 = -1,-1 - anchor2 = -1,-1 - saved-params = "" - text = "Energy: 25" - elem "eject" - type = BUTTON - pos = 264,4 - size = 72x20 - anchor1 = -1,-1 - anchor2 = -1,-1 - saved-params = "is-checked" - text = "[Insert beaker]" - command = "skincmd \"chemdispenser;eject\"" - elem "amountc" - type = BUTTON - pos = 208,4 - size = 48x20 - anchor1 = -1,-1 - anchor2 = -1,-1 - saved-params = "is-checked" - text = "[Other]" - command = "skincmd \"chemdispenser;amountc\"" - elem "amount3" - type = BUTTON - pos = 176,4 - size = 24x20 - anchor1 = -1,-1 - anchor2 = -1,-1 - saved-params = "is-checked" - text = "[30]" - command = "skincmd \"chemdispenser;amount30\"" - elem "amount2" - type = BUTTON - pos = 144,4 - size = 24x20 - anchor1 = -1,-1 - anchor2 = -1,-1 - saved-params = "is-checked" - text = "[20]" - command = "skincmd \"chemdispenser;amount20\"" - elem "amount1" - type = BUTTON - pos = 112,4 - size = 24x20 - anchor1 = -1,-1 - anchor2 = -1,-1 - saved-params = "is-checked" - text = "[10]" - command = "skincmd \"chemdispenser;amount10\"" - elem "amount" - type = LABEL - pos = 4,4 - size = 100x20 - anchor1 = -1,-1 - anchor2 = -1,-1 - font-size = 12 - saved-params = "" - text = "Amount: 30" - elem "child1" - type = CHILD - pos = 0,40 - size = 340x440 - anchor1 = -1,-1 - anchor2 = -1,-1 - saved-params = "splitter" - left = "chemdispenser_reagents" - is-vert = false - -window "chemdispenser_reagents" - elem "chemdispenser_reagents" - type = MAIN - pos = 281,0 - size = 340x448 - anchor1 = -1,-1 - anchor2 = -1,-1 - saved-params = "pos;size;is-minimized;is-maximized" - titlebar = false - statusbar = false - can-close = false - can-minimize = false - can-resize = false - is-pane = true - can-scroll = vertical - elem "template_dispense" - type = BUTTON - pos = 256,8 - size = 64x32 - anchor1 = -1,-1 - anchor2 = -1,-1 - is-visible = false - saved-params = "is-checked" - text = "Dispense" - image = 'icons\\dispensebutton_bg.png' - command = "" - is-flat = true - elem "template_name" - type = LABEL - pos = 18,8 - size = 230x32 - anchor1 = -1,-1 - anchor2 = -1,-1 - font-size = 15 - is-visible = false - saved-params = "" - text = "Chloral Hydrate" - image = 'icons\\reagentname_bg.png' - image-mode = stretch - window "mainwindow" elem "mainwindow" type = MAIN