515 Compat (#17465)

* ONLY SKYRAT CHANGES

* ACTUALLY SKYRAT CHANGES

* yolo, revert later

* Update alternate_byond_versions.txt

Co-authored-by: AnturK <AnturK@users.noreply.github.com>
This commit is contained in:
Zonespace
2022-11-14 22:59:06 -08:00
committed by GitHub
parent 5b56f43ff5
commit f7c26bbf25
1577 changed files with 5030 additions and 4847 deletions

View File

@@ -155,7 +155,7 @@ SUBSYSTEM_DEF(materials)
for(var/x in materials_declaration)
var/datum/material/mat = x
combo_params += "[istype(mat) ? mat.id : mat]=[materials_declaration[mat] * multiplier]"
sortTim(combo_params, /proc/cmp_text_asc) // We have to sort now in case the declaration was not in order
sortTim(combo_params, GLOBAL_PROC_REF(cmp_text_asc)) // We have to sort now in case the declaration was not in order
var/combo_index = combo_params.Join("-")
var/list/combo = material_combos[combo_index]
if(!combo)