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.

Sign up for GitHub

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

[516 ONLY] NanoMap 2: Remake #1189

Merged
merged 33 commits into from
Mar 13, 2025
Merged

[516 ONLY] NanoMap 2: Remake #1189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
6e1f355
Move NanoMap to React Zoom Pan Pinch
AyIong Feb 28, 2025
be2991e
Good stuff
AyIong Mar 1, 2025
6acadc8
Some types
AyIong Mar 1, 2025
42f3cbb
Tooltip position
AyIong Mar 1, 2025
0e19a35
Image rendering mode
AyIong Mar 1, 2025
5267696
Little refactor
AyIong Mar 2, 2025
e24a43f
useLocalStorage
AyIong Mar 2, 2025
9d577fc
Better map images
AyIong Mar 3, 2025
740918c
Merge branch 'master' into 516-nanomap
AyIong Mar 3, 2025
6b818c4
Update nanomaps and smoothing
AyIong Mar 3, 2025
1a1deb8
The costyl
AyIong Mar 3, 2025
13a168e
You can center on selected target now
AyIong Mar 3, 2025
cecb30c
Update nanomap-renderer
AyIong Mar 3, 2025
63638e5
Update NanoMap.tsx
AyIong Mar 3, 2025
0a8bc10
Update nanomap-renderer
AyIong Mar 3, 2025
72158f3
Additional props
AyIong Mar 4, 2025
bce91a8
NanoPreferences
AyIong Mar 4, 2025
47f4e2b
Refactor nanomap z-leveling
AyIong Mar 4, 2025
2e7aedf
Update NanoMap.tsx
AyIong Mar 4, 2025
d1a11ae
Thx gaxeer
AyIong Mar 4, 2025
b9a98e1
Shrink map resolutions
AyIong Mar 4, 2025
da5fcb9
Enable pixelated
AyIong Mar 4, 2025
c191e6d
No more needed
AyIong Mar 4, 2025
4be26af
Little cleanup
AyIong Mar 5, 2025
8490e02
More cleanup
AyIong Mar 5, 2025
c5e9e7a
Lol
AyIong Mar 5, 2025
5a128d0
Ох и много ж вы насрали, ой-ой-ой
AyIong Mar 5, 2025
60ce0fe
Allow to remember position and share it between players
AyIong Mar 5, 2025
01bd8d2
Fix lavaland handle
AyIong Mar 5, 2025
85c9376
Fix reseting objects scale
AyIong Mar 5, 2025
acd66ee
Maybe better this
AyIong Mar 5, 2025
df51edf
Revert "Maybe better this"
AyIong Mar 5, 2025
09f86dd
Better map images
AyIong Mar 6, 2025
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
5 changes: 0 additions & 5 deletions code/game/machinery/computer/camera.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,6 @@
data["network"] = network
data["mapRef"] = cam_screen.assigned_map
data["cameras"] = GLOB.cameranet.get_available_cameras_data(network)

update_available_z_levels(data["cameras"]) // BANDASTATION ADDITION - Nanomap

return data

/obj/machinery/computer/security/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
Expand All @@ -115,8 +112,6 @@
if(isnull(active_camera))
return TRUE

current_z_level_index = z_levels.Find("[active_camera.z]") // BANDASTATION ADDITION - Nanomap

update_active_camera_screen()

return TRUE
Expand Down
Binary file modified icons/_nanomaps/Birdshot Station_nanomap_z1.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified icons/_nanomaps/Cyberiad_nanomap_z1.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified icons/_nanomaps/Cyberiad_nanomap_z2.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified icons/_nanomaps/Delta Station_nanomap_z1.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified icons/_nanomaps/Ice Box Station_nanomap_z1.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified icons/_nanomaps/Ice Box Station_nanomap_z2.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified icons/_nanomaps/Ice Box Station_nanomap_z3.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified icons/_nanomaps/Lavaland_nanomap_z1.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified icons/_nanomaps/MetaStation_nanomap_z1.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified icons/_nanomaps/NebulaStation_nanomap_z1.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified icons/_nanomaps/NebulaStation_nanomap_z2.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified icons/_nanomaps/Tramstation_nanomap_z1.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified icons/_nanomaps/Tramstation_nanomap_z2.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified icons/_nanomaps/Wawastation_nanomap_z1.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified icons/_nanomaps/Wawastation_nanomap_z2.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 3 additions & 2 deletions modular_bandastation/aesthetics/_aesthetics.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
#include "clothing/centcom/code/head/hat.dm"
#include "clothing/centcom/code/head/winterhood.dm"
#include "clothing/centcom/code/mask/mask.dm"
#include "clothing/centcom/code/mod/mod_theme.dm"
#include "clothing/centcom/code/mod/mod_types.dm"
#include "clothing/centcom/code/suits/armor.dm"
#include "clothing/centcom/code/suits/jacket.dm"
#include "clothing/centcom/code/suits/wintercoats.dm"
#include "clothing/centcom/code/under/centcom.dm"
#include "clothing/centcom/code/mod/mod_theme.dm"
#include "clothing/centcom/code/mod/mod_types.dm"
#include "disposal/code/disposal.dm"
#include "dresser/code/dresser.dm"
#include "firealarm/code/firealarm.dm"
Expand All @@ -29,6 +29,7 @@
#include "radio/code/radio.dm"
#include "railings/code/railings.dm"
#include "smes/code/smes.dm"
#include "smoothing/code/smoothing.dm"
#include "soap/code/soap.dm"
#include "supply_pods/code/supply_pods.dm"
#include "vending/code/vending.dm"
Expand Down
149 changes: 149 additions & 0 deletions modular_bandastation/aesthetics/smoothing/code/smoothing.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,149 @@
/**
* Перезапись флагов у сглаживаемых объектов
*
* Используется в проде.
* При изменении флагов не забудьте обновить перезаписи перезаписей...
*/

// MARK: Windows
/obj/structure/window/fulltile
smoothing_groups = SMOOTH_GROUP_WINDOW_FULLTILE
canSmoothWith = SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WALLS

/obj/structure/window/reinforced/fulltile
smoothing_groups = SMOOTH_GROUP_WINDOW_FULLTILE
canSmoothWith = SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WALLS

/obj/structure/window/reinforced/tinted/fulltile
smoothing_groups = SMOOTH_GROUP_WINDOW_FULLTILE
canSmoothWith = SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WALLS

/obj/structure/window/plasma/fulltile
smoothing_groups = SMOOTH_GROUP_WINDOW_FULLTILE
canSmoothWith = SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WALLS

/obj/structure/window/reinforced/plasma/fulltile
smoothing_groups = SMOOTH_GROUP_WINDOW_FULLTILE
canSmoothWith = SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WALLS

/obj/structure/window/reinforced/shuttle
smoothing_groups = SMOOTH_GROUP_SHUTTLE_PARTS + SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE
canSmoothWith = SMOOTH_GROUP_SHUTTLE_PARTS + SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE + SMOOTH_GROUP_TITANIUM_WALLS

/turf/closed/indestructible/fakeglass
smoothing_groups = SMOOTH_GROUP_WINDOW_FULLTILE
canSmoothWith = SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WALLS

// MARK: Walls
/turf/closed/wall
smoothing_groups = SMOOTH_GROUP_WALLS + SMOOTH_GROUP_CLOSED_TURFS
canSmoothWith = SMOOTH_GROUP_GIRDER + SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WALLS

/turf/closed/wall/mineral/titanium
smoothing_groups = SMOOTH_GROUP_TITANIUM_WALLS + SMOOTH_GROUP_CLOSED_TURFS
canSmoothWith = SMOOTH_GROUP_SHUTTLE_PARTS + SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE + SMOOTH_GROUP_TITANIUM_WALLS

/turf/closed/wall/mineral/cult
canSmoothWith = SMOOTH_GROUP_GIRDER + SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WALLS

/turf/closed/wall/material
smoothing_groups = SMOOTH_GROUP_WALLS + SMOOTH_GROUP_CLOSED_TURFS
canSmoothWith = SMOOTH_GROUP_GIRDER + SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WALLS

/turf/closed/indestructible/riveted
smoothing_groups = SMOOTH_GROUP_WALLS + SMOOTH_GROUP_CLOSED_TURFS
canSmoothWith = SMOOTH_GROUP_GIRDER + SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WALLS

/turf/closed/indestructible/reinforced
canSmoothWith = SMOOTH_GROUP_GIRDER + SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WALLS

/turf/closed/indestructible/cult
canSmoothWith = SMOOTH_GROUP_GIRDER + SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WALLS

/obj/structure/falsewall
canSmoothWith = SMOOTH_GROUP_GIRDER + SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WALLS

/obj/structure/girder
canSmoothWith = SMOOTH_GROUP_GIRDER + SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WALLS

// MARK: Other
/obj/structure/lattice
smoothing_groups = SMOOTH_GROUP_LATTICE
canSmoothWith = SMOOTH_GROUP_LATTICE + SMOOTH_GROUP_WALLS + SMOOTH_GROUP_OPEN_FLOOR

/**
* Это перезаписи перезаписей для рендера наномап и интерактивных карт.
*
* Я рот блять ебал этой хуйни, но это единственный способ который я вижу,
* дабы сделать хорошее, красивое сглаживание на рендерах.
*/
#ifndef CBT
// MARK: Windows
/obj/structure/window/fulltile
smoothing_groups = list(SMOOTH_GROUP_WINDOW_FULLTILE)
canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_WINDOW_FULLTILE, SMOOTH_GROUP_WALLS)

/obj/structure/window/reinforced/fulltile
smoothing_groups = list(SMOOTH_GROUP_WINDOW_FULLTILE)
canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_WINDOW_FULLTILE, SMOOTH_GROUP_WALLS)

/obj/structure/window/reinforced/tinted/fulltile
smoothing_groups = list(SMOOTH_GROUP_WINDOW_FULLTILE)
canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_WINDOW_FULLTILE, SMOOTH_GROUP_WALLS)

/obj/structure/window/plasma/fulltile
smoothing_groups = list(SMOOTH_GROUP_WINDOW_FULLTILE)
canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_WINDOW_FULLTILE, SMOOTH_GROUP_WALLS)

/obj/structure/window/reinforced/plasma/fulltile
smoothing_groups = list(SMOOTH_GROUP_WINDOW_FULLTILE)
canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_WINDOW_FULLTILE, SMOOTH_GROUP_WALLS)

/obj/structure/window/reinforced/shuttle
smoothing_groups = list(SMOOTH_GROUP_SHUTTLE_PARTS, SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE)
canSmoothWith = list(SMOOTH_GROUP_SHUTTLE_PARTS, SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE, SMOOTH_GROUP_TITANIUM_WALLS)

/turf/closed/indestructible/fakeglass
smoothing_groups = list(SMOOTH_GROUP_WINDOW_FULLTILE)
canSmoothWith = list(SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_WINDOW_FULLTILE, SMOOTH_GROUP_WALLS)

// MARK: Walls
/turf/closed/wall
smoothing_groups = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_CLOSED_TURFS)
canSmoothWith = list(SMOOTH_GROUP_GIRDER, SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_WINDOW_FULLTILE, SMOOTH_GROUP_WALLS)

/turf/closed/wall/mineral/titanium
smoothing_groups = list(SMOOTH_GROUP_TITANIUM_WALLS, SMOOTH_GROUP_CLOSED_TURFS)
canSmoothWith = list(SMOOTH_GROUP_SHUTTLE_PARTS, SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE, SMOOTH_GROUP_TITANIUM_WALLS)

/turf/closed/wall/mineral/cult
canSmoothWith = list(SMOOTH_GROUP_GIRDER, SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_WINDOW_FULLTILE, SMOOTH_GROUP_WALLS)

/turf/closed/wall/material
smoothing_groups = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_CLOSED_TURFS)
canSmoothWith = list(SMOOTH_GROUP_GIRDER, SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_WINDOW_FULLTILE, SMOOTH_GROUP_WALLS)

/turf/closed/indestructible/riveted
smoothing_groups = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_CLOSED_TURFS)
canSmoothWith = list(SMOOTH_GROUP_GIRDER, SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_WINDOW_FULLTILE, SMOOTH_GROUP_WALLS)

/turf/closed/indestructible/reinforced
canSmoothWith = list(SMOOTH_GROUP_GIRDER, SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_WINDOW_FULLTILE, SMOOTH_GROUP_WALLS)

/turf/closed/indestructible/cult
canSmoothWith = list(SMOOTH_GROUP_GIRDER, SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_WINDOW_FULLTILE, SMOOTH_GROUP_WALLS)

/obj/structure/falsewall
canSmoothWith = list(SMOOTH_GROUP_GIRDER, SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_WINDOW_FULLTILE, SMOOTH_GROUP_WALLS)

/obj/structure/girder
canSmoothWith = list(SMOOTH_GROUP_GIRDER, SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_WINDOW_FULLTILE, SMOOTH_GROUP_WALLS)

// MARK: Other
/obj/machinery/door/airlock
smoothing_groups = list(SMOOTH_GROUP_AIRLOCK)

/obj/structure/lattice
smoothing_groups = list(SMOOTH_GROUP_LATTICE)
canSmoothWith = list(SMOOTH_GROUP_LATTICE, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_OPEN_FLOOR)
#endif
7 changes: 7 additions & 0 deletions modular_bandastation/aesthetics/walls/code/rocks.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,13 @@
color = rock_color(ROCK_COLOR)
transform = null

/turf/closed/mineral/minimap
name = "DO NOT USE!!!"
icon = DEFAULT_ROCKS
icon_state = "smoothrocks-0"
base_icon_state = "smoothrocks"
color = ROCK_COLOR

/turf/closed/mineral/strong
icon = MAP_SWITCH(CONTRAST_ROCKS, MAPPING_ROCKS)
icon_state = rock_icon_state("rock2")
Expand Down
17 changes: 0 additions & 17 deletions modular_bandastation/aesthetics/walls/code/walls.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
icon = 'icons/bandastation/walls/wall.dmi'
icon_state = "wall-0"
base_icon_state = "wall"
canSmoothWith = SMOOTH_GROUP_GIRDER + SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WALLS

/turf/closed/wall/rust
icon = 'icons/bandastation/walls/wall.dmi'
Expand All @@ -20,50 +19,38 @@
icon_state = "reinforced_wall-0"
base_icon_state = "reinforced_wall"

/turf/closed/wall/mineral/titanium
smoothing_groups = SMOOTH_GROUP_TITANIUM_WALLS + SMOOTH_GROUP_CLOSED_TURFS
canSmoothWith = SMOOTH_GROUP_SHUTTLE_PARTS + SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE + SMOOTH_GROUP_TITANIUM_WALLS

/turf/closed/wall/mineral/cult
icon = 'icons/bandastation/walls/cult_wall.dmi'
icon_state = "cult_wall-0"
base_icon_state = "cult_wall"
canSmoothWith = SMOOTH_GROUP_GIRDER + SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WALLS

/turf/closed/wall/material
icon = 'icons/bandastation/walls/material_wall.dmi'
icon_state = "material_wall-0"
base_icon_state = "material_wall"
smoothing_groups = SMOOTH_GROUP_WALLS + SMOOTH_GROUP_CLOSED_TURFS
canSmoothWith = SMOOTH_GROUP_GIRDER + SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WALLS

// MARK: Indestructible walls
/turf/closed/indestructible/riveted
icon = 'icons/bandastation/walls/reinforced_wall.dmi'
icon_state = "reinforced_wall-0"
base_icon_state = "reinforced_wall"
smoothing_groups = SMOOTH_GROUP_WALLS + SMOOTH_GROUP_CLOSED_TURFS
canSmoothWith = SMOOTH_GROUP_GIRDER + SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WALLS

/turf/closed/indestructible/reinforced
icon = 'icons/bandastation/walls/reinforced_wall.dmi'
icon_state = "reinforced_wall-0"
base_icon_state = "reinforced_wall"
canSmoothWith = SMOOTH_GROUP_GIRDER + SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WALLS

/turf/closed/indestructible/cult
icon = 'icons/bandastation/walls/cult_wall.dmi'
icon_state = "cult_wall-0"
base_icon_state = "cult_wall"
canSmoothWith = SMOOTH_GROUP_GIRDER + SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WALLS

// MARK: Falsewalls
/obj/structure/falsewall
icon = 'modular_bandastation/aesthetics/walls/icons/false_walls.dmi'
base_icon_state = "wall"
icon_state = "wall-open"
fake_icon = 'icons/bandastation/walls/wall.dmi'
canSmoothWith = SMOOTH_GROUP_GIRDER + SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WALLS

/obj/structure/falsewall/reinforced
icon_state = "reinforced_wall-open"
Expand Down Expand Up @@ -112,7 +99,3 @@

/obj/structure/falsewall/material
icon = 'icons/turf/walls/false_walls.dmi'

// MARK: Girder
/obj/structure/girder
canSmoothWith = SMOOTH_GROUP_GIRDER + SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WALLS
47 changes: 38 additions & 9 deletions modular_bandastation/aesthetics/windows/code/full_tile_windows.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,28 +22,45 @@
edge_overlay.color = edge_overlay_color
. += edge_overlay

/**
* Рамки окон но как отдельный объект.
* НЕ ИСПОЛЬЗОВАТЬ!!!
*
* Только для рендера карт.
*/
/obj/structure/window/fulltile/frame
name = "DONT USE THIS"
icon = 'icons/bandastation/windows/window_edges.dmi'
icon_state = "edge-0"
base_icon_state = "edge"
color = EDGE_OVERLAY_COLOR

/obj/structure/window/reinforced/fulltile/frame
name = "DONT USE THIS"
icon = 'icons/bandastation/windows/reinforced_window_edges.dmi'
icon_state = "edge-0"
base_icon_state = "edge"
color = EDGE_OVERLAY_COLOR

Comment on lines +31 to +44
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Может тогда дать minimap название?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Может тогда дать minimap название?

можно, но это по факту рамка, так шо хз

/obj/structure/window/fulltile
icon = 'icons/bandastation/windows/window.dmi'
edge_overlay_file = 'icons/bandastation/windows/window_edges.dmi'
icon_state = "window-0"
base_icon_state = "window"
canSmoothWith = SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WALLS
color = WINDOW_COLOR

/obj/structure/window/reinforced/fulltile
icon = 'icons/bandastation/windows/reinforced_window.dmi'
edge_overlay_file = 'icons/bandastation/windows/reinforced_window_edges.dmi'
icon_state = "reinforced_window-0"
base_icon_state = "reinforced_window"
canSmoothWith = SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WALLS
color = WINDOW_COLOR

/obj/structure/window/reinforced/tinted/fulltile
icon = 'icons/bandastation/windows/reinforced_window.dmi'
edge_overlay_file = 'icons/bandastation/windows/reinforced_window_edges.dmi'
icon_state = "reinforced_window-0"
base_icon_state = "reinforced_window"
canSmoothWith = SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WALLS
flags_1 = UNPAINTABLE_1
color = TINTED_WINDOW_COLOR

Expand All @@ -52,7 +69,6 @@
edge_overlay_file = 'icons/bandastation/windows/window_edges.dmi'
icon_state = "window-0"
base_icon_state = "window"
canSmoothWith = SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WALLS
flags_1 = UNPAINTABLE_1
color = PLASMA_WINDOW_COLOR

Expand All @@ -61,20 +77,34 @@
edge_overlay_file = 'icons/bandastation/windows/reinforced_window_edges.dmi'
icon_state = "reinforced_window-0"
base_icon_state = "reinforced_window"
canSmoothWith = SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WALLS
flags_1 = UNPAINTABLE_1
color = PLASMA_WINDOW_COLOR

/obj/structure/window/reinforced/shuttle
canSmoothWith = SMOOTH_GROUP_SHUTTLE_PARTS + SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE + SMOOTH_GROUP_TITANIUM_WALLS

/obj/structure/window/reinforced/fulltile/ice
edge_overlay_file = null

// MARK: Spawners
/obj/effect/spawner/structure/window
icon = 'modular_bandastation/aesthetics/windows/icons/spawners.dmi'

/obj/effect/spawner/structure/window
spawn_list = MAP_SWITCH(list(/obj/structure/grille, /obj/structure/window/fulltile), list(/obj/structure/grille, /obj/structure/window/fulltile, /obj/structure/window/fulltile/frame))

/obj/effect/spawner/structure/window/reinforced
spawn_list = MAP_SWITCH(list(/obj/structure/grille, /obj/structure/window/reinforced/fulltile), list(/obj/structure/grille, /obj/structure/window/reinforced/fulltile, /obj/structure/window/reinforced/fulltile/frame))

/obj/effect/spawner/structure/window/reinforced/tinted
spawn_list = MAP_SWITCH(list(/obj/structure/grille, /obj/structure/window/reinforced/tinted/fulltile), list(/obj/structure/grille, /obj/structure/window/reinforced/tinted/fulltile, /obj/structure/window/reinforced/fulltile/frame))

/obj/effect/spawner/structure/window/plasma
spawn_list = MAP_SWITCH(list(/obj/structure/grille, /obj/structure/window/plasma/fulltile), list(/obj/structure/grille, /obj/structure/window/plasma/fulltile, /obj/structure/window/fulltile/frame))

/obj/effect/spawner/structure/window/reinforced/plasma
spawn_list = MAP_SWITCH(list(/obj/structure/grille, /obj/structure/window/reinforced/plasma/fulltile), list(/obj/structure/grille, /obj/structure/window/reinforced/plasma/fulltile, /obj/structure/window/reinforced/fulltile/frame))

/obj/effect/spawner/structure/window/reinforced/indestructible
spawn_list = MAP_SWITCH(list(/obj/structure/grille/indestructible, /obj/structure/window/reinforced/fulltile/indestructible), list(/obj/structure/grille/indestructible, /obj/structure/window/reinforced/fulltile/indestructible, /obj/structure/window/reinforced/fulltile/frame))

// Override to original
/obj/effect/spawner/structure/window/bronze
icon = 'icons/obj/structures_spawners.dmi'
Expand All @@ -99,7 +129,6 @@
icon = 'icons/bandastation/windows/reinforced_window.dmi'
icon_state = "reinforced_window-0"
base_icon_state = "reinforced_window"
canSmoothWith = SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WALLS
color = WINDOW_COLOR
/// Used to define what file the edging sprite is contained within
var/edge_overlay_file = 'icons/bandastation/windows/reinforced_window_edges.dmi'
Expand Down
5 changes: 3 additions & 2 deletions modular_bandastation/nanomap/_nanomap.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#include "_nanomap.dm"

#include "code/camera.dm"
#include "code/nanomaps_asset.dm"
#include "code/camera_console.dm"
#include "code/nanomap_assets.dm"
#include "code/nanomap_datum.dm"
Loading
Loading