Skip to content

Commit

Permalink
Merge branch 'main' into so-many-of-these-are-broken
Browse files Browse the repository at this point in the history
  • Loading branch information
@carpotoxin
carpotoxin committed Dec 17, 2024
2 parents ac839bf + d3852bb commit adc2ee3
Show file tree
Hide file tree
Showing 1,835 changed files with 28,970 additions and 375,021 deletions.
4 changes: 2 additions & 2 deletions .github/guides/ISSUE_MANAGER.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ If an issue reports a runtime, it must have the actual runtime call stack provid
- usr.loc: the floor (150,25,4) (/turf/open/floor/circuit)
- call stack:
- Camera Net (/datum/cameranet): visibility(/list (/list), null, /list (/list), 1)
- AI (/mob/living/silicon/ai): camera visibility(Inactive AI Eye (/mob/eye/ai_eye))
- Inactive AI Eye (/mob/eye/ai_eye): setLoc(the floor (150,25,4) (/turf/open/floor/circuit), 0)
- AI (/mob/living/silicon/ai): camera visibility(Inactive AI Eye (/mob/eye/camera/ai))
- Inactive AI Eye (/mob/eye/camera/ai): setLoc(the floor (150,25,4) (/turf/open/floor/circuit), 0)
- AI (/mob/living/silicon/ai): create eye()
- AI (/mob/living/silicon/ai): Initialize(0, null, TagGamerGame2 (/mob/dead/new_player))
- Atoms (/datum/controller/subsystem/atoms): InitAtom(AI (/mob/living/silicon/ai), 0, /list (/list))
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/ci_suite.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -288,10 +288,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/generate_documentation.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
touch dmdoc/.nojekyll
echo codedocs.tgstation13.org > dmdoc/CNAME
- name: Deploy
uses: JamesIves/github-pages-deploy-action@v4.6.9
uses: JamesIves/github-pages-deploy-action@v4.7.2
with:
branch: gh-pages
clean: true
Expand Down
62 changes: 31 additions & 31 deletions _maps/RandomRuins/IceRuins/doppler/icemoon_underground_icewalker_lower.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@
dir = 1
},
/obj/structure/chair/sofa/bamboo/left,
/turf/open/water/hot_spring,
/turf/open/water/hot_spring/icemoon,
/area/ruin/unpowered/primitive_genemod_den)
"dj" = (
/obj/structure/flora/bush/snow/style_random,
Expand Down Expand Up @@ -275,7 +275,7 @@
"fK" = (
/obj/effect/turf_decal/siding/wood,
/obj/structure/wall_torch/spawns_lit/directional/north,
/turf/open/water/hot_spring,
/turf/open/water/hot_spring/icemoon,
/area/ruin/unpowered/primitive_genemod_den)
"fV" = (
/obj/effect/turf_decal/siding/wood{
Expand All @@ -302,7 +302,7 @@
/obj/effect/turf_decal/weather/dirt{
dir = 4
},
/turf/open/water/hot_spring,
/turf/open/water/hot_spring/icemoon,
/area/ruin/unpowered/primitive_genemod_den)
"gz" = (
/obj/effect/turf_decal/weather/snow/corner{
Expand All @@ -317,7 +317,7 @@
/obj/effect/turf_decal/weather/dirt{
dir = 9
},
/turf/open/water/hot_spring,
/turf/open/water/hot_spring/icemoon,
/area/ruin/unpowered/primitive_genemod_den)
"gU" = (
/obj/structure/rack/wooden,
Expand Down Expand Up @@ -589,7 +589,7 @@
/obj/effect/turf_decal/siding/wood/corner{
dir = 1
},
/turf/open/water/hot_spring,
/turf/open/water/hot_spring/icemoon,
/area/ruin/unpowered/primitive_genemod_den)
"mr" = (
/obj/structure/wall_torch/spawns_lit/directional/west,
Expand Down Expand Up @@ -646,7 +646,7 @@
/obj/effect/turf_decal/weather/dirt{
dir = 1
},
/turf/open/water/hot_spring,
/turf/open/water/hot_spring/icemoon,
/area/ruin/unpowered/primitive_genemod_den)
"nG" = (
/obj/machinery/griddle/stone,
Expand Down Expand Up @@ -704,7 +704,7 @@
/obj/effect/turf_decal/weather/dirt{
dir = 8
},
/turf/open/water/hot_spring,
/turf/open/water/hot_spring/icemoon,
/area/ruin/unpowered/primitive_genemod_den)
"ol" = (
/obj/structure/railing/wooden_fencing{
Expand Down Expand Up @@ -740,7 +740,7 @@
/area/ruin/unpowered/primitive_genemod_den)
"oJ" = (
/obj/effect/turf_decal/weather/dirt,
/turf/open/water/hot_spring,
/turf/open/water/hot_spring/icemoon,
/area/ruin/unpowered/primitive_genemod_den)
"oL" = (
/obj/machinery/smartfridge/wooden/seed_shelf,
Expand Down Expand Up @@ -788,7 +788,7 @@
/obj/effect/turf_decal/weather/dirt{
dir = 6
},
/turf/open/water/hot_spring,
/turf/open/water/hot_spring/icemoon,
/area/ruin/unpowered/primitive_genemod_den)
"po" = (
/obj/effect/turf_decal/siding/wood/corner{
Expand All @@ -804,7 +804,7 @@
/area/ruin/unpowered/primitive_genemod_den)
"pW" = (
/obj/effect/turf_decal/weather/snow/corner,
/turf/open/water/hot_spring,
/turf/open/water/hot_spring/icemoon,
/area/ruin/unpowered/primitive_genemod_den)
"qb" = (
/obj/effect/turf_decal/siding/wood{
Expand All @@ -816,7 +816,7 @@
/obj/effect/turf_decal/weather/dirt{
dir = 8
},
/turf/open/water/hot_spring,
/turf/open/water/hot_spring/icemoon,
/area/ruin/unpowered/primitive_genemod_den)
"qr" = (
/obj/structure/rack/wooden,
Expand Down Expand Up @@ -877,7 +877,7 @@
/obj/structure/chair/sofa/bamboo{
dir = 1
},
/turf/open/water/hot_spring,
/turf/open/water/hot_spring/icemoon,
/area/ruin/unpowered/primitive_genemod_den)
"sj" = (
/obj/structure/spacevine{
Expand Down Expand Up @@ -1010,7 +1010,7 @@
/obj/effect/turf_decal/siding/wood{
dir = 6
},
/turf/open/water/hot_spring,
/turf/open/water/hot_spring/icemoon,
/area/ruin/unpowered/primitive_genemod_den)
"vy" = (
/obj/effect/turf_decal/siding/wood{
Expand Down Expand Up @@ -1063,7 +1063,7 @@
/area/ruin/unpowered/primitive_genemod_den)
"wU" = (
/obj/structure/wall_torch/spawns_lit/directional/south,
/turf/open/water/hot_spring,
/turf/open/water/hot_spring/icemoon,
/area/ruin/unpowered/primitive_genemod_den)
"xc" = (
/obj/structure/wall_torch/spawns_lit/directional/west,
Expand Down Expand Up @@ -1149,22 +1149,22 @@
/obj/structure/chair/sofa/bamboo/right{
dir = 1
},
/turf/open/water/hot_spring,
/turf/open/water/hot_spring/icemoon,
/area/ruin/unpowered/primitive_genemod_den)
"yx" = (
/obj/effect/turf_decal/weather/dirt{
dir = 9
},
/obj/structure/wall_torch/spawns_lit/directional/south,
/turf/open/water/hot_spring,
/turf/open/water/hot_spring/icemoon,
/area/ruin/unpowered/primitive_genemod_den)
"yy" = (
/obj/effect/mob_spawn/ghost_role/human/primitive_genemod,
/turf/open/misc/dirt/icemoon,
/area/ruin/unpowered/primitive_genemod_den)
"yE" = (
/obj/effect/turf_decal/siding/wood,
/turf/open/water/hot_spring,
/turf/open/water/hot_spring/icemoon,
/area/ruin/unpowered/primitive_genemod_den)
"yN" = (
/obj/structure/rack/wooden,
Expand All @@ -1182,7 +1182,7 @@
/obj/effect/turf_decal/siding/wood{
dir = 1
},
/turf/open/water/hot_spring,
/turf/open/water/hot_spring/icemoon,
/area/ruin/unpowered/primitive_genemod_den)
"yU" = (
/obj/structure/window/green_glass_pane,
Expand All @@ -1193,7 +1193,7 @@
/obj/effect/turf_decal/weather/snow/corner{
dir = 8
},
/turf/open/water/hot_spring,
/turf/open/water/hot_spring/icemoon,
/area/ruin/unpowered/primitive_genemod_den)
"zu" = (
/obj/effect/turf_decal/siding/wood{
Expand Down Expand Up @@ -1543,7 +1543,7 @@
dir = 1
},
/obj/structure/chair/sofa/bamboo/right,
/turf/open/water/hot_spring,
/turf/open/water/hot_spring/icemoon,
/area/ruin/unpowered/primitive_genemod_den)
"Fj" = (
/obj/structure/chair/wood,
Expand Down Expand Up @@ -1631,7 +1631,7 @@
/turf/open/floor/wood/icemoon,
/area/ruin/unpowered/primitive_genemod_den)
"Hd" = (
/turf/open/water/hot_spring,
/turf/open/water/hot_spring/icemoon,
/area/ruin/unpowered/primitive_genemod_den)
"Hv" = (
/obj/structure/rack/wooden,
Expand Down Expand Up @@ -1690,7 +1690,7 @@
/obj/effect/turf_decal/weather/dirt{
dir = 1
},
/turf/open/water/hot_spring,
/turf/open/water/hot_spring/icemoon,
/area/ruin/unpowered/primitive_genemod_den)
"IJ" = (
/obj/structure/wall_torch/spawns_lit/directional/east,
Expand Down Expand Up @@ -1746,7 +1746,7 @@
name = "thick vines";
opacity = 1
},
/turf/open/water/hot_spring,
/turf/open/water/hot_spring/icemoon,
/area/ruin/unpowered/primitive_genemod_den)
"Jn" = (
/obj/effect/turf_decal/weather/snow/corner{
Expand All @@ -1755,7 +1755,7 @@
/obj/effect/turf_decal/weather/snow/corner{
dir = 8
},
/turf/open/water/hot_spring,
/turf/open/water/hot_spring/icemoon,
/area/ruin/unpowered/primitive_genemod_den)
"Jq" = (
/turf/open/misc/hay/icemoon,
Expand Down Expand Up @@ -1845,7 +1845,7 @@
dir = 1
},
/obj/structure/chair/sofa/bamboo,
/turf/open/water/hot_spring,
/turf/open/water/hot_spring/icemoon,
/area/ruin/unpowered/primitive_genemod_den)
"Ku" = (
/obj/effect/turf_decal/siding/wood{
Expand Down Expand Up @@ -1960,7 +1960,7 @@
/obj/effect/turf_decal/weather/dirt{
dir = 8
},
/turf/open/water/hot_spring,
/turf/open/water/hot_spring/icemoon,
/area/ruin/unpowered/primitive_genemod_den)
"Mr" = (
/obj/structure/wall_torch/spawns_lit/directional/north,
Expand Down Expand Up @@ -2000,7 +2000,7 @@
/obj/effect/turf_decal/weather/snow/corner{
dir = 1
},
/turf/open/water/hot_spring,
/turf/open/water/hot_spring/icemoon,
/area/ruin/unpowered/primitive_genemod_den)
"Nr" = (
/obj/effect/turf_decal/siding/wood{
Expand Down Expand Up @@ -2165,7 +2165,7 @@
/obj/effect/turf_decal/siding/wood{
dir = 4
},
/turf/open/water/hot_spring,
/turf/open/water/hot_spring/icemoon,
/area/ruin/unpowered/primitive_genemod_den)
"RZ" = (
/obj/structure/closet/crate/wooden/storage_barrel,
Expand Down Expand Up @@ -2229,7 +2229,7 @@
/obj/effect/turf_decal/weather/snow/corner{
dir = 4
},
/turf/open/water/hot_spring,
/turf/open/water/hot_spring/icemoon,
/area/ruin/unpowered/primitive_genemod_den)
"TW" = (
/obj/effect/turf_decal/weather/dirt{
Expand Down Expand Up @@ -2277,7 +2277,7 @@
/area/ruin/unpowered/primitive_genemod_den)
"Vc" = (
/obj/structure/fluff/minepost,
/turf/open/water/hot_spring,
/turf/open/water/hot_spring/icemoon,
/area/ruin/unpowered/primitive_genemod_den)
"Vp" = (
/obj/structure/table/wood,
Expand Down Expand Up @@ -2402,7 +2402,7 @@
/obj/effect/turf_decal/weather/dirt{
dir = 10
},
/turf/open/water/hot_spring,
/turf/open/water/hot_spring/icemoon,
/area/ruin/unpowered/primitive_genemod_den)
"YO" = (
/obj/structure/wall_torch/spawns_lit/directional/north,
Expand Down
Loading

0 comments on commit adc2ee3

Please sign in to comment.