Merge branch 'release' of https://github.com/VOREStation/VOREStation into uppstream-update

This commit is contained in:
izac112
2024-01-22 05:18:14 +01:00
111 changed files with 2563 additions and 2522 deletions
@@ -6,7 +6,7 @@
/datum/design/item/gps/AssembleDesignName()
..()
name = "Triangulating device design ([name])"
name = "Triangulating device design (GPS - [name])"
/datum/design/item/gps/generic
name = "GEN"
@@ -77,4 +77,4 @@
req_tech = list(TECH_BLUESPACE = 1)
materials = list (MAT_STEEL = 20, MAT_GLASS = 10)
build_path = /obj/item/device/radio/beacon
sort_string = "DBABA"
sort_string = "DBABA"