Skip to content

Commit

Permalink
Merge remote-tracking branch 'nova/master' into upsterrrrrrrrreem,
Browse files Browse the repository at this point in the history
  • Loading branch information
SynthTwo committed Jan 16, 2025
2 parents 75c6830 + da8da4a commit ccbc171
Show file tree
Hide file tree
Showing 1,267 changed files with 20,272 additions and 12,124 deletions.
9 changes: 7 additions & 2 deletions .github/alternate_byond_versions.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,12 @@
# This is useful for making sure we maintain compatibility with both older and newer versions,
# while still having our main tests run on a guaranteed pinned version.

# Format is version: map
# Format is "version: map" or "version: map;max_required_client_version"
# Example:
# 500.1337: runtimestation
515.1636: runtimestation
# 516.1638: runtimestation;516
# Lowest supported version
# NOVA EDIT - Original: 515.1627: runtimestation
515.1637: runtimestation
# Beta version
516.1648: runtimestation;516
2 changes: 0 additions & 2 deletions .github/guides/STANDARDS.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,6 @@ var/path_type = "/obj/item/baseball_bat"

* You are expected to help maintain the code that you add, meaning that if there is a problem then you are likely to be approached in order to fix any issues, runtimes, or bugs.

* Do not divide when you can easily convert it to multiplication. (ie `4/2` should be done as `4*0.5`)

* Separating single lines into more readable blocks is not banned, however you should use it only where it makes new information more accessible, or aids maintainability. We do not have a column limit, and mass conversions will not be received well.

* If you used regex to replace code during development of your code, post the regex in your PR for the benefit of future developers and downstream users.
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/ci_suite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ jobs:
- name: Find Alternate Tests
id: alternate_test_finder
run: |
ALTERNATE_TESTS_JSON=$(jq -nRc '[inputs | capture("^(?<major>[0-9]+)\\.(?<minor>[0-9]+): (?<map>.+)$")]' .github/alternate_byond_versions.txt)
ALTERNATE_TESTS_JSON=$(jq -nRc '[inputs | capture("^(?<major>[0-9]+)\\.(?<minor>[0-9]+): (?<map>[^;]+);?(?<max_client_version>[0-9]+)?$")]' .github/alternate_byond_versions.txt)
echo "alternate_tests=$ALTERNATE_TESTS_JSON" >> $GITHUB_OUTPUT
- name: Collect byond client version configuration
id: max_required_byond_client
Expand Down Expand Up @@ -226,7 +226,7 @@ jobs:
map: ${{ matrix.setup.map }}
major: ${{ matrix.setup.major }}
minor: ${{ matrix.setup.minor }}
max_required_byond_client: ${{needs.collect_data.outputs.max_required_byond_client}}
max_required_byond_client: ${{ matrix.setup.max_client_version || needs.collect_data.outputs.max_required_byond_client }}

compare_screenshots:
if: needs.collect_data.outputs.alternate_tests == '[]' || needs.run_alternate_tests.result == 'success'
Expand Down Expand Up @@ -294,10 +294,11 @@ jobs:
completion_gate: # Serves as a non-moving target for branch rulesets
if: always() && !cancelled()
name: Completion Gate
needs: [ test_windows, compare_screenshots, compile_all_maps, run_linters ]
needs: [ test_windows, compare_screenshots, compile_all_maps, run_all_tests, run_alternate_tests, run_linters ]
runs-on: ubuntu-latest
steps:
- name: Decide whether the needed jobs succeeded or failed
uses: re-actors/alls-green@release/v1
with:
jobs: ${{ toJSON(needs) }}
allowed-skips: compare_screenshots
2 changes: 1 addition & 1 deletion .github/workflows/run_integration_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ on:
jobs:
run_integration_tests:
runs-on: ubuntu-latest
timeout-minutes: 15
timeout-minutes: 20 # NOVA EDIT CHANGE - Original: timeout-minutes: 15
services:
mysql:
image: mysql:latest
Expand Down
102 changes: 61 additions & 41 deletions _maps/RandomRuins/IceRuins/icemoon_surface_phonebooth.dmm
Original file line number Diff line number Diff line change
@@ -1,99 +1,119 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/obj/machinery/holopad,
/turf/open/floor/iron/dark/smooth_edge{
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 4
},
/turf/open/floor/iron/dark/smooth_large,
/area/ruin/powered/icemoon_phone_booth)
"c" = (
/obj/machinery/door/window/left/directional/north,
/obj/machinery/door/window/left/directional/south,
/turf/open/floor/iron/dark/smooth_edge{
dir = 4
},
/area/ruin/powered/icemoon_phone_booth)
/turf/open/floor/plating/snowed/smoothed/icemoon,
/area/icemoon/underground/explored)
"e" = (
/obj/structure/lattice,
/turf/open/misc/asteroid/snow/icemoon,
/area/ruin/powered/icemoon_phone_booth)
/area/icemoon/underground/explored)
"k" = (
/obj/machinery/vending/coffee,
/obj/machinery/vending/cigarette{
all_products_free = 0
},
/obj/structure/window/reinforced/spawner/directional/east,
/turf/open/floor/plating/icemoon,
/area/ruin/powered/icemoon_phone_booth)
"q" = (
/obj/machinery/airalarm/directional/south,
/obj/effect/turf_decal/tile/yellow/half/contrasted{
dir = 4
dir = 8
},
/obj/machinery/atmospherics/components/tank/air/layer4{
/obj/effect/turf_decal/weather/snow/corner{
dir = 8
},
/obj/structure/window/reinforced/spawner/directional/west,
/obj/effect/turf_decal/weather/snow,
/turf/open/floor/plating/icemoon,
/area/ruin/powered/icemoon_phone_booth)
"v" = (
"q" = (
/obj/structure/lattice,
/obj/structure/billboard/Phone_booth,
/turf/open/misc/asteroid/snow/icemoon,
/area/ruin/powered/icemoon_phone_booth)
"z" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
/area/icemoon/underground/explored)
"v" = (
/obj/structure/window/reinforced/spawner/directional/west,
/obj/machinery/light/small/directional/north,
/obj/effect/turf_decal/tile/yellow/half/contrasted{
dir = 4
},
/obj/item/gps/spaceruin{
gpstag = "Public Holophone"
},
/obj/effect/turf_decal/weather/snow/corner{
dir = 5
},
/obj/effect/turf_decal/weather/snow,
/turf/open/floor/plating/icemoon,
/area/ruin/powered/icemoon_phone_booth)
"z" = (
/obj/machinery/door/window/left/directional/north,
/obj/machinery/door/window/left/directional/south,
/obj/effect/turf_decal/weather/snow/corner,
/turf/open/floor/iron/dark/smooth_edge{
dir = 4
dir = 1
},
/area/ruin/powered/icemoon_phone_booth)
"J" = (
/obj/effect/turf_decal/tile/yellow/half/contrasted{
dir = 4
},
/obj/item/gps/spaceruin{
gpstag = "Public Holophone"
},
/obj/machinery/light/small{
dir = 1
/obj/machinery/atmospherics/components/tank/air/layer4{
dir = 8
},
/obj/structure/window/reinforced/spawner/directional/west,
/obj/effect/turf_decal/weather/snow/corner{
dir = 4
},
/obj/effect/turf_decal/weather/snow,
/turf/open/floor/plating/icemoon,
/area/ruin/powered/icemoon_phone_booth)
"M" = (
/turf/closed/wall/ice,
/area/ruin/powered/icemoon_phone_booth)
"R" = (
/obj/effect/spawner/structure/window/hollow/reinforced,
/turf/open/floor/plating/icemoon,
/obj/machinery/holopad,
/obj/machinery/airalarm/directional/north,
/obj/effect/mapping_helpers/airalarm/all_access,
/turf/open/floor/iron/dark/smooth_large,
/area/ruin/powered/icemoon_phone_booth)
"V" = (
/obj/structure/lattice,
/turf/open/misc/asteroid/snow/icemoon,
/area/ruin/powered/icemoon_phone_booth)
"W" = (
/obj/machinery/vending/cigarette{
all_products_free = 0
},
/obj/machinery/vending/coffee,
/obj/structure/window/reinforced/spawner/directional/east,
/obj/effect/turf_decal/tile/yellow/half/contrasted{
dir = 8
},
/obj/effect/turf_decal/weather/snow/corner{
dir = 8
},
/obj/effect/turf_decal/weather/snow,
/turf/open/floor/plating/icemoon,
/area/ruin/powered/icemoon_phone_booth)
"W" = (
/turf/open/misc/asteroid/snow/icemoon,
/area/icemoon/underground/explored)

(1,1,1) = {"
v
q
M
V
k
W
M
c
"}
(2,1,1) = {"
e
W
M
R
a
z
c
"}
(3,1,1) = {"
V
e
M
v
J
q
M
c
"}
Original file line number Diff line number Diff line change
Expand Up @@ -993,9 +993,6 @@
/area/ruin/comms_agent)
"UI" = (
/obj/structure/table/reinforced,
/obj/machinery/computer/records/security/laptop/syndie{
dir = 1
},
/obj/item/paper/monitorkey{
pixel_x = -15;
pixel_y = 7
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@
},
/obj/structure/rack,
/obj/item/wrench,
/obj/item/crowbar/large/heavy,
/obj/item/crowbar/large/twenty_force,
/obj/machinery/light/small/built/directional/south,
/turf/open/floor/plating/icemoon,
/area/ruin/powered/shuttle)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3503,7 +3503,7 @@
/area/ruin/syndibiodome)
"Pw" = (
/obj/structure/table/reinforced/plastitaniumglass,
/obj/item/surgery_tray/full,
/obj/effect/spawner/surgery_tray/full,
/obj/effect/turf_decal/siding/wideplating/dark{
dir = 5
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2005,7 +2005,7 @@
/area/ruin/interdyne_planetary_base/eng)
"qw" = (
/obj/structure/table/reinforced/rglass,
/obj/item/surgery_tray/full/morgue,
/obj/effect/spawner/surgery_tray/full/morgue,
/obj/machinery/camera/autoname/directional/east{
network = list("intd13")
},
Expand Down
1 change: 0 additions & 1 deletion _maps/RandomRuins/SpaceRuins/DJstation/kitchen_1.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
/area/ruin/space/djstation)
"t" = (
/obj/structure/closet/secure_closet/freezer/fridge/all_access,
/obj/machinery/light/directional/south,
/obj/effect/turf_decal/tile/bar/opposingcorners,
/obj/machinery/light/small/directional/south,
/turf/open/floor/iron,
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/SpaceRuins/anomaly_research.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@
"kp" = (
/obj/effect/spawner/random/environmentally_safe_anomaly/immobile,
/turf/template_noop,
/area/space)
/area/space/nearstation)
"kt" = (
/obj/effect/turf_decal/tile/purple/half/contrasted{
dir = 1
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/SpaceRuins/bigderelict1.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -584,7 +584,7 @@
name = "dried blood trail"
},
/mob/living/basic/creature{
desc = "Awh its so sm-OH GOD WHAT THE FUCK.";
desc = "Awh, it's so sm-OH GOD, WHAT THE FUCK.";
health = 25;
maxHealth = 25;
name = "hatchling";
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/SpaceRuins/bus.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@
/turf/open/misc/asteroid/airless,
/area/ruin/space)
"ET" = (
/mob/living/basic/lizard,
/mob/living/basic/lizard/space,
/turf/open/misc/asteroid/airless,
/area/ruin/space)
"Fo" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/SpaceRuins/dangerous_research.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
/turf/open/floor/iron/white,
/area/ruin/space/has_grav/dangerous_research/medical)
"aZ" = (
/obj/item/surgery_tray/full,
/obj/effect/spawner/surgery_tray/full,
/obj/structure/table,
/turf/open/floor/plating/rust,
/area/ruin/space/has_grav/dangerous_research/medical)
Expand Down
2 changes: 0 additions & 2 deletions _maps/RandomRuins/SpaceRuins/garbagetruck4.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,6 @@
/area/ruin/space/has_grav/garbagetruck/toystore)
"lm" = (
/obj/structure/spider/stickyweb,
/obj/structure/spider/stickyweb/very_sticky,
/turf/open/floor/plating,
/area/ruin/space/has_grav/garbagetruck/toystore)
"mf" = (
Expand Down Expand Up @@ -182,7 +181,6 @@
/turf/open/floor/plating,
/area/ruin/space/has_grav/garbagetruck/toystore)
"qX" = (
/obj/structure/spider/stickyweb/very_sticky,
/obj/item/food/badrecipe/moldy,
/obj/structure/spider/stickyweb,
/obj/item/food/spidereggs{
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/SpaceRuins/interdyne.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1015,7 +1015,7 @@
/turf/open/floor/mineral/plastitanium/red,
/area/ruin/space/has_grav/interdyne)
"PD" = (
/obj/item/surgery_tray/full,
/obj/effect/spawner/surgery_tray/full,
/obj/structure/table/reinforced/rglass,
/turf/open/floor/mineral/plastitanium,
/area/ruin/space/has_grav/interdyne)
Expand Down
14 changes: 7 additions & 7 deletions _maps/RandomRuins/SpaceRuins/meatderelict.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -484,7 +484,7 @@
/obj/effect/turf_decal/siding/blue{
dir = 6
},
/obj/item/surgery_tray/full/deployed,
/obj/effect/spawner/surgery_tray/full/deployed,
/turf/open/indestructible/white,
/area/ruin/space/has_grav/powered/biooutpost)
"kh" = (
Expand Down Expand Up @@ -728,8 +728,8 @@
/obj/effect/turf_decal/siding/purple{
dir = 1
},
/obj/item/ammo_casing/a357/spent,
/obj/item/ammo_casing/a357/spent,
/obj/item/ammo_casing/c357/spent,
/obj/item/ammo_casing/c357/spent,
/turf/open/indestructible/white,
/area/ruin/space/has_grav/powered/biooutpost)
"oQ" = (
Expand Down Expand Up @@ -887,7 +887,7 @@
/obj/effect/turf_decal/siding/purple{
dir = 1
},
/obj/item/ammo_casing/a357/spent,
/obj/item/ammo_casing/c357/spent,
/turf/open/indestructible/white,
/area/ruin/space/has_grav/powered/biooutpost)
"rl" = (
Expand Down Expand Up @@ -1561,9 +1561,9 @@
/turf/open/indestructible/plating,
/area/ruin/space/has_grav/powered/biooutpost)
"DC" = (
/obj/item/ammo_casing/a357/spent,
/obj/item/ammo_casing/a357/spent,
/obj/item/ammo_casing/a357/spent,
/obj/item/ammo_casing/c357/spent,
/obj/item/ammo_casing/c357/spent,
/obj/item/ammo_casing/c357/spent,
/turf/open/indestructible/white,
/area/ruin/space/has_grav/powered/biooutpost)
"DJ" = (
Expand Down
Loading

0 comments on commit ccbc171

Please sign in to comment.