Merge branch 'Monkestation:master' into stream-events

Monkestation · Jul 28, 2023 · cd9139f · cd9139f
2 parents e997c88 + 090a5da
commit cd9139f
Show file tree

Hide file tree

Showing 858 changed files with 45,522 additions and 5,030 deletions.
diff --git a/.github/workflows/ci_suite.yml b/.github/workflows/ci_suite.yml
@@ -169,6 +169,41 @@ jobs:
     steps:
       - run: echo Alternate tests passed.
 
+  compare_screenshots:
+    if: "!contains(github.event.head_commit.message, '[ci skip]') && (success() || failure())"
+    needs: [run_all_tests, run_alternate_tests]
+    name: Compare Screenshot Tests
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v3
+      # If we ever add more artifacts, this is going to break, but it'll be obvious.
+      - name: Download screenshot tests
+        uses: actions/download-artifact@v3
+        with:
+          path: artifacts
+      - name: ls -R
+        run: ls -R artifacts
+      - name: Setup screenshot comparison
+        run: npm i
+        working-directory: tools/screenshot-test-comparison
+      - name: Run screenshot comparison
+        run: node tools/screenshot-test-comparison/index.js artifacts code/modules/unit_tests/screenshots artifacts/screenshot_comparisons
+      # workflow_run does not give you the PR it ran on,
+      # even through the thing literally named "matching pull requests".
+      # However, in GraphQL, you can check if the check suite was ran
+      # by a specific PR, so trusting the (user controlled) action here is okay,
+      # as long as we check it later in show_screenshot_test_results
+      - name: Save PR ID
+        if: failure() && github.event.pull_request
+        run: |
+          echo ${{ github.event.pull_request.number }} > artifacts/screenshot_comparisons/pull_request_number.txt
+      - name: Upload bad screenshots
+        if: failure()
+        uses: actions/upload-artifact@v3
+        with:
+          name: bad-screenshots
+          path: artifacts/screenshot_comparisons
+
   test_windows:
     if: "!contains(github.event.head_commit.message, '[ci skip]')"
     name: Windows Build

diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_lust.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_lust.dmm
@@ -16,7 +16,7 @@
 "e" = (
 /obj/item/greentext{
 	light_color = "#64C864";
-	light_range = 1
+	light_outer_range = 1
 	},
 /turf/open/floor/mineral/diamond,
 /area/icemoon/surface/outdoors)

diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_plasma_facility.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_plasma_facility.dmm
@@ -1325,7 +1325,7 @@
 /area/ruin/plasma_facility/operations)
 "vz" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/floor,
+/obj/machinery/light/floor/has_bulb,
 /turf/open/floor/plating/snowed/icemoon,
 /area/icemoon/underground/explored)
 "vI" = (

diff --git a/_maps/RandomRuins/SpaceRuins/anomaly_research.dmm b/_maps/RandomRuins/SpaceRuins/anomaly_research.dmm
@@ -1099,7 +1099,7 @@
 /turf/open/floor/iron/smooth,
 /area/misc/anomaly_research)
 "BK" = (
-/obj/machinery/light/floor,
+/obj/machinery/light/floor/has_bulb,
 /turf/open/misc/asteroid/snow/icemoon,
 /area/misc/anomaly_research)
 "Cc" = (
@@ -1504,7 +1504,7 @@
 /area/misc/anomaly_research)
 "MN" = (
 /obj/structure/flora/grass/green/style_random,
-/obj/machinery/light/floor,
+/obj/machinery/light/floor/has_bulb,
 /turf/open/misc/asteroid/snow/icemoon,
 /area/misc/anomaly_research)
 "Nc" = (

diff --git a/_maps/RandomRuins/SpaceRuins/gondolaasteroid.dmm b/_maps/RandomRuins/SpaceRuins/gondolaasteroid.dmm
@@ -14,7 +14,7 @@
 "e" = (
 /obj/structure/marker_beacon{
 	light_color = "#FFE8AA";
-	light_range = 20
+	light_outer_range = 20
 	},
 /turf/open/floor/grass,
 /area/ruin/space/has_grav)

diff --git a/_maps/RandomRuins/SpaceRuins/hellfactory.dmm b/_maps/RandomRuins/SpaceRuins/hellfactory.dmm
@@ -850,7 +850,7 @@
 /turf/open/floor/iron/checker,
 /area/ruin/space/has_grav/hellfactory)
 "lR" = (
-/obj/machinery/light/floor,
+/obj/machinery/light/floor/has_bulb,
 /obj/effect/turf_decal/bot_white/right,
 /turf/open/floor/iron/dark,
 /area/ruin/space/has_grav/hellfactory)
@@ -889,7 +889,7 @@
 /area/ruin/space/has_grav/hellfactory)
 "ry" = (
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/light/floor,
+/obj/machinery/light/floor/has_bulb,
 /obj/effect/turf_decal/bot_white/left,
 /turf/open/floor/iron/dark,
 /area/ruin/space/has_grav/hellfactory)
@@ -899,7 +899,7 @@
 /area/ruin/space/has_grav/hellfactory)
 "uL" = (
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/light/floor,
+/obj/machinery/light/floor/has_bulb,
 /obj/effect/turf_decal/bot_white/right,
 /turf/open/floor/iron/dark,
 /area/ruin/space/has_grav/hellfactory)
@@ -922,7 +922,7 @@
 /turf/open/floor/holofloor/wood,
 /area/ruin/space/has_grav/hellfactory)
 "BC" = (
-/obj/machinery/light/floor,
+/obj/machinery/light/floor/has_bulb,
 /obj/effect/turf_decal/bot_white/left,
 /turf/open/floor/iron/dark,
 /area/ruin/space/has_grav/hellfactory)

diff --git a/_maps/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm b/_maps/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm
@@ -139,8 +139,7 @@
 /turf/open/floor/plating,
 /area/ruin/space/has_grav/powered/hilbertresearchfacility)
 "dS" = (
-/obj/machinery/light/floor{
-	brightness = 2;
+/obj/machinery/light/floor/has_bulb{
 	bulb_colour = "#deefff";
 	bulb_power = 0.6
 	},
@@ -155,7 +154,7 @@
 /obj/effect/turf_decal/siding/wood{
 	dir = 1
 	},
-/obj/machinery/light/floor,
+/obj/machinery/light/floor/has_bulb,
 /turf/open/floor/wood,
 /area/ruin/space/has_grav/powered/hilbertresearchfacility)
 "el" = (
@@ -312,7 +311,7 @@
 /obj/structure/spawner/nether{
 	light_color = "#FF0000";
 	light_power = 2;
-	light_range = 2;
+	light_outer_range = 2;
 	max_mobs = 2
 	},
 /obj/effect/gibspawner/human,
@@ -347,8 +346,7 @@
 /turf/open/floor/mineral/titanium/tiled/yellow,
 /area/ruin/space/has_grav/powered/hilbertresearchfacility)
 "iS" = (
-/obj/machinery/light/floor{
-	brightness = 2;
+/obj/machinery/light/floor/has_bulb{
 	bulb_colour = "#deefff";
 	bulb_power = 0.6
 	},
@@ -832,7 +830,7 @@
 /obj/effect/turf_decal/siding/wood{
 	dir = 1
 	},
-/obj/machinery/light/floor,
+/obj/machinery/light/floor/has_bulb,
 /turf/open/floor/wood,
 /area/ruin/space/has_grav/powered/hilbertresearchfacility)
 "vz" = (
@@ -922,8 +920,7 @@
 /obj/structure/displaycase{
 	start_showpiece_type = /obj/item/hilbertshotel
 	},
-/obj/machinery/light/floor{
-	brightness = 2;
+/obj/machinery/light/floor/has_bulb{
 	bulb_colour = "#deefff";
 	bulb_power = 0.6
 	},
@@ -1436,7 +1433,7 @@
 	dir = 8
 	},
 /obj/effect/turf_decal/siding/wood,
-/obj/machinery/light/floor,
+/obj/machinery/light/floor/has_bulb,
 /turf/open/floor/wood,
 /area/ruin/space/has_grav/powered/hilbertresearchfacility)
 "GP" = (
@@ -1881,7 +1878,7 @@
 	dir = 1
 	},
 /obj/effect/decal/cleanable/food/tomato_smudge,
-/obj/machinery/light/floor,
+/obj/machinery/light/floor/has_bulb,
 /turf/open/floor/wood,
 /area/ruin/space/has_grav/powered/hilbertresearchfacility)
 "QV" = (
@@ -2268,7 +2265,7 @@
 	dir = 1
 	},
 /obj/effect/turf_decal/siding/wood,
-/obj/machinery/light/floor,
+/obj/machinery/light/floor/has_bulb,
 /turf/open/floor/wood,
 /area/ruin/space/has_grav/powered/hilbertresearchfacility)
 "Yg" = (
@@ -2304,7 +2301,7 @@
 	dir = 1
 	},
 /obj/effect/turf_decal/siding/wood,
-/obj/machinery/light/floor,
+/obj/machinery/light/floor/has_bulb,
 /turf/open/floor/wood,
 /area/ruin/space/has_grav/powered/hilbertresearchfacility)
 "YG" = (

diff --git a/_maps/RandomRuins/SpaceRuins/infested_frigate.dmm b/_maps/RandomRuins/SpaceRuins/infested_frigate.dmm
@@ -1744,7 +1744,7 @@
 	name = "relatively interesting news";
 	desc = "It's been live this whole time, news from Nanotrasen core space, just an hour ago.";
 	light_power = 0.5;
-	light_range = 3
+	light_outer_range = 3
 	},
 /turf/closed/wall/mineral/plastitanium,
 /area/ruin/space/has_grav/infested_frigate)

diff --git a/_maps/RandomZLevels/SnowCabin.dmm b/_maps/RandomZLevels/SnowCabin.dmm
@@ -4277,7 +4277,7 @@
 "Ml" = (
 /mob/living/simple_animal/hostile/bear/russian{
 	desc = "He'll hold the line against you!";
-	light_range = 3;
+	light_outer_range = 3;
 	melee_damage_upper = 25;
 	name = "Artyom";
 	speak = list("Blyat!","Rawr!","GRR!","Growl!");

diff --git a/_maps/RandomZLevels/snowdin.dmm b/_maps/RandomZLevels/snowdin.dmm
@@ -7898,7 +7898,7 @@
 	},
 /obj/effect/light_emitter{
 	light_color = "#FAA019";
-	light_range = 4;
+	light_outer_range = 4;
 	name = "fire light"
 	},
 /turf/open/floor/wood,
@@ -8320,7 +8320,7 @@
 	},
 /obj/effect/light_emitter{
 	light_color = "#FAA019";
-	light_range = 4;
+	light_outer_range = 4;
 	name = "fire light"
 	},
 /turf/open/misc/asteroid/snow{