cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11073 from VOREStation/Arokha/connless

Browse Source 
Make connections lists lazy
This commit is contained in:
Aronai Sieyes
2021-07-14 14:36:58 -04:00
committed by Chompstation Bot
parent b246cfd374
commit bb6f219db6
5 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
_build_dependencies.sh
View File

@@ -4,8 +4,8 @@ export SPACEMAN_DMM_VERSION=suite-1.7
# For NanoUI + TGUI # For NanoUI + TGUI
export NODE_VERSION=12 export NODE_VERSION=12
# Byond Major # Byond Major
export BYOND_MAJOR=513 export BYOND_MAJOR=514
# Byond Minor # Byond Minor
export BYOND_MINOR=1542 export BYOND_MINOR=1557
# Macro Count # Macro Count
export MACRO_COUNT=4 export MACRO_COUNT=4

4
code/game/objects/structures.dm
View File

@@ -10,8 +10,8 @@
var/list/climbers var/list/climbers
var/block_turf_edges = FALSE // If true, turf edge icons will not be made on the turf this occupies. var/block_turf_edges = FALSE // If true, turf edge icons will not be made on the turf this occupies.
var/list/connections = list("0", "0", "0", "0") var/list/connections
var/list/other_connections = list("0", "0", "0", "0") var/list/other_connections
var/list/blend_objects = newlist() // Objects which to blend with var/list/blend_objects = newlist() // Objects which to blend with
var/list/noblend_objects = newlist() //Objects to avoid blending with (such as children of listed blend objects. var/list/noblend_objects = newlist() //Objects to avoid blending with (such as children of listed blend objects.

3
code/game/objects/structures/barricades.dm
View File

@@ -144,7 +144,8 @@
var/image/I var/image/I
for(var/i = 1 to 4) for(var/i = 1 to 4)
I = image('icons/obj/sandbags.dmi', "sandbags[connections[i]]", dir = 1<<(i-1)) var/connect = connections?[i] || 0
I = image('icons/obj/sandbags.dmi', "sandbags[connect]", dir = 1<<(i-1))
I.color = material.icon_colour I.color = material.icon_colour
add_overlay(I) add_overlay(I)

3
code/game/objects/structures/catwalk.dm
View File

@@ -51,7 +51,8 @@
var/image/I var/image/I
if(!hatch_open) if(!hatch_open)
for(var/i = 1 to 4) for(var/i = 1 to 4)
I = image(icon, "catwalk[connections[i]]", dir = 1<<(i-1)) var/connect = connections?[i] || 0
I = image(icon, "catwalk[connect]", dir = 1<<(i-1))
add_overlay(I) add_overlay(I)
if(plating_color) if(plating_color)
I = image(icon, "plated") I = image(icon, "plated")

11
code/modules/tables/tables.dm
View File

@@ -359,24 +359,27 @@ var/list/table_icon_cache = list()
// Base frame shape. Mostly done for glass/diamond tables, where this is visible. // Base frame shape. Mostly done for glass/diamond tables, where this is visible.
for(var/i = 1 to 4) for(var/i = 1 to 4)
var/image/I = get_table_image(icon, connections[i], 1<<(i-1)) var/image/I = get_table_image(icon, connections?[i] || 0, 1<<(i-1))
add_overlay(I) add_overlay(I)
// Standard table image // Standard table image
if(material) if(material)
for(var/i = 1 to 4) for(var/i = 1 to 4)
var/image/I = get_table_image(icon, "[material.icon_base]_[connections[i]]", 1<<(i-1), material.icon_colour, 255 * material.opacity) var/connect = connections?[i] || 0
var/image/I = get_table_image(icon, "[material.icon_base]_[connect]", 1<<(i-1), material.icon_colour, 255 * material.opacity)
add_overlay(I) add_overlay(I)
// Reinforcements // Reinforcements
if(reinforced) if(reinforced)
for(var/i = 1 to 4) for(var/i = 1 to 4)
var/image/I = get_table_image(icon, "[reinforced.icon_reinf]_[connections[i]]", 1<<(i-1), reinforced.icon_colour, 255 * reinforced.opacity) var/connect = connections?[i] || 0
var/image/I = get_table_image(icon, "[reinforced.icon_reinf]_[connect]", 1<<(i-1), reinforced.icon_colour, 255 * reinforced.opacity)
add_overlay(I) add_overlay(I)
if(carpeted) if(carpeted)
for(var/i = 1 to 4) for(var/i = 1 to 4)
var/image/I = get_table_image(icon, "carpet_[connections[i]]", 1<<(i-1)) var/connect = connections?[i] || 0
var/image/I = get_table_image(icon, "carpet_[connect]", 1<<(i-1))
add_overlay(I) add_overlay(I)
else else
cut_overlays() cut_overlays()