cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-11 18:22:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix lighting on CameraConsole and Spy Bug (#50669)

Browse Source
This commit is contained in:
Aleksej Komarov
2020-04-26 20:14:33 +03:00
committed by GitHub
parent 0a0fd927df
commit ce4f7ea6b2
4 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
code/_onclick/hud/map_popups.dm
View File

@@ -7,10 +7,6 @@
*/ */
var/list/screen_maps = list() var/list/screen_maps = list()
/**
* A screen object, which acts as a container for turfs and other things
* you want to show on the map, which you usually attach to "vis_contents".
*/
/obj/screen /obj/screen
/** /**
* Map name assigned to this object. * Map name assigned to this object.
@@ -26,6 +22,15 @@
*/ */
var/del_on_map_removal = TRUE var/del_on_map_removal = TRUE
/**
* A screen object, which acts as a container for turfs and other things
* you want to show on the map, which you usually attach to "vis_contents".
*/
/obj/screen/map_view
// Map view has to be on the lowest plane to enable proper lighting
layer = GAME_PLANE
plane = GAME_PLANE
/** /**
* A generic background object. * A generic background object.
* It is also implicitly used to allocate a rectangle on the map, which will * It is also implicitly used to allocate a rectangle on the map, which will

2
code/game/machinery/computer/camera.dm
View File

@@ -15,7 +15,7 @@
// Stuff needed to render the map // Stuff needed to render the map
var/map_name var/map_name
var/const/default_map_size = 15 var/const/default_map_size = 15
var/obj/screen/cam_screen var/obj/screen/map_view/cam_screen
var/obj/screen/plane_master/lighting/cam_plane_master var/obj/screen/plane_master/lighting/cam_plane_master
var/obj/screen/background/cam_background var/obj/screen/background/cam_background

2
code/game/objects/items/devices/spyglasses.dm
View File

@@ -46,7 +46,7 @@
desc = "an advanced peice of espionage equipment in the shape of a pocket protector. it has a built in 360 degree camera for all your nefarious needs. Microphone not included." desc = "an advanced peice of espionage equipment in the shape of a pocket protector. it has a built in 360 degree camera for all your nefarious needs. Microphone not included."
var/obj/item/clothing/glasses/regular/spy/linked_glasses var/obj/item/clothing/glasses/regular/spy/linked_glasses
var/obj/screen/cam_screen var/obj/screen/map_view/cam_screen
var/obj/screen/plane_master/lighting/cam_plane_master var/obj/screen/plane_master/lighting/cam_plane_master
// Ranges higher than one can be used to see through walls. // Ranges higher than one can be used to see through walls.
var/cam_range = 1 var/cam_range = 1

6
tgui/packages/tgui/interfaces/manually-routed/KitchenSink.js
View File

@@ -117,7 +117,7 @@ const KitchenSinkButton = props => {
<Button fluid content="Fluid" /> <Button fluid content="Fluid" />
<Button <Button
my={1} my={1}
lineHeight={1} lineHeight={2}
minWidth={15} minWidth={15}
textAlign="center" textAlign="center"
content="With Box props" /> content="With Box props" />
@@ -307,7 +307,7 @@ const KitchenSinkInput = (props, context) => {
<LabeledList.Item label="NumberInput (onChange)"> <LabeledList.Item label="NumberInput (onChange)">
<NumberInput <NumberInput
animated animated
width="30px" width="40px"
step={1} step={1}
stepPixelSize={5} stepPixelSize={5}
value={number} value={number}
@@ -318,7 +318,7 @@ const KitchenSinkInput = (props, context) => {
<LabeledList.Item label="NumberInput (onDrag)"> <LabeledList.Item label="NumberInput (onDrag)">
<NumberInput <NumberInput
animated animated
width="30px" width="40px"
step={1} step={1}
stepPixelSize={5} stepPixelSize={5}
value={number} value={number}