Skip to content

Commit

Permalink
Merge pull request #517 from Sea-of-Lost-Souls/upstreammaint
Browse files Browse the repository at this point in the history
[MDB IGNORE] [IDB IGNORE] New Computer New Maint
  • Loading branch information
ORCACommander authored Feb 17, 2024
2 parents 234d464 + cef92c7 commit 8af6c59
Show file tree
Hide file tree
Showing 850 changed files with 20,049 additions and 15,925 deletions.
1 change: 1 addition & 0 deletions .github/alternate_byond_versions.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@
# Format is version: map
# Example:
# 500.1337: runtimestation
515.1621: runtimestation
2 changes: 1 addition & 1 deletion .tgs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
version: 1
# The BYOND version to use (kept in sync with dependencies.sh by the "TGS Test Suite" CI job)
# Must be interpreted as a string, keep quoted
byond: "515.1626"
byond: "515.1630"
# Folders to create in "<instance_path>/Configuration/GameStaticFiles/"
static_files:
# Config directory should be static
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/IceRuins/icemoon_surface_engioutpost.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
/turf/open/floor/iron,
/area/ruin/planetengi)
"aA" = (
/obj/machinery/rnd/production/protolathe/department/engineering/no_tax,
/obj/machinery/rnd/production/protolathe/department/engineering,
/obj/effect/turf_decal/trimline/yellow/filled/warning{
dir = 9
},
Expand Down
Loading

0 comments on commit 8af6c59

Please sign in to comment.