shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i should have just ported from baystation instead of reinventing the fricking wheel

Browse Source
This commit is contained in:
kevinz000
2020-04-10 01:23:36 -07:00
parent e2440034f5
commit 36cd3b4c35
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/_onclick/hud/screen_objects/storage.dm
+5 -4
View File
@@ -76,15 +76,16 @@
/obj/screen/storage/volumetric_box/proc/on_screen_objects()
return list(src, left, right)
#define BOX_ICON_PIXELS 32
/obj/screen/storage/volumetric_box/proc/set_pixel_size(pixels)
cut_overlays()
//our icon size is 32 pixels.
transform = matrix(32 / pixels, 0, 0, 0, 1, 0)
left.pixel_x = -(pixels * 0.5) - 4
right.pixel_x = (pixels * 0.5) + 4
transform = matrix(pixels / BOX_ICON_PIXELS, 0, 0, 0, 1, 0)
left.pixel_x = -((BOX_ICON_PIXELS - pixels) * 0.5) - 4
right.pixel_x = ((BOX_ICON_PIXELS - pixels) * 0.5) + 4
add_overlay(left)
add_overlay(right)
pixel_x = (pixels - 32) * 0.5
#undef BOX_ICON_PIXELS
/obj/screen/storage/stored_left
icon_state = "stored_start"
code/datums/components/storage/ui.dm
+4 -4
View File
@@ -124,7 +124,7 @@
// now that we have pixels_to_use, place our thing and add it to the returned list.
B.screen_loc = I.screen_loc = "[screen_start_x]:[current_pixel],[screen_start_y]:[screen_pixel_y]"
B.screen_loc = I.screen_loc = "[screen_start_x]:[current_pixel + (pixels_to_use * 0.5)],[screen_start_y]:[screen_pixel_y]"
// add the used pixels to pixel after we place the object
current_pixel += pixels_to_use
@@ -149,14 +149,14 @@
. += ui_continuous
// Then, left and right.
ui_left = get_ui_left()
ui_left.screen_loc = "[screen_start_x]:[screen_pixel_x - 2],[screen_start_y]:[screen_pixel_y] to [screen_start_x]:[screen_pixel_x - 2],[screen_start_y]:[screen_pixel_y]"
ui_left.screen_loc = "[screen_start_x]:[screen_pixel_x - 2],[screen_start_y]:[screen_pixel_y]"
. += ui_left
ui_right = get_ui_right()
ui_right.screen_loc = "[screen_start_x+maxcolumns-1]:[screen_pixel_x + 2],[screen_start_y]:[screen_pixel_y] to [screen_start_x+maxcolumns-1]:[screen_pixel_x + 2],[screen_start_y]:[screen_pixel_y]"
ui_right.screen_loc = "[screen_start_x + maxcolumns]:[screen_pixel_x],[screen_start_y]:[screen_pixel_y]"
. += ui_right
// Then, closer.
ui_close = get_ui_close()
ui_close.screen_loc = "[screen_start_x + maxcolumns]:[screen_pixel_x],[screen_start_y]:[screen_pixel_y]"
ui_close.screen_loc = "[screen_start_x + maxcolumns]:[screen_pixel_x + 2],[screen_start_y]:[screen_pixel_y]"
. += ui_close
/**