Merge branch 'master' into master

.github/guides/AUTODOC.md

@@ -87,7 +87,7 @@ where you don't want to be tied to the formal layout of the class structure.
 On /tg/station we do this by adding markdown files inside the `code` directory
 that will also be rendered and added to the modules tree. The structure for
 these is deliberately not defined, so you can be as freeform and as wheeling as
-you would like.
+you would like. 
 
 [Here is a representative example of what you might write](http://codedocs.tgstation13.org/code/modules/keybindings/readme.html)
 

.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

.gitignore

@@ -233,3 +233,6 @@ Tracy.exe
 
 # From /tools/define_sanity/check.py - potential output file that we load onto the user's machine that we don't want to have committed.
 define_sanity_output.txt
+
+#This file contains developer-specific config overrides. These shouldn't be committed.
+config/_config_nogit.txt

_maps/RandomRuins/AnywhereRuins/fountain_hall.dmm

@@ -21,7 +21,7 @@
 /turf/open/floor/engine/cult,
 /area/ruin/unpowered)
 "g" = (
-/mob/living/simple_animal/butterfly,
+/mob/living/basic/butterfly,
 /turf/open/floor/engine/cult,
 /area/ruin/unpowered)
 "h" = (

_maps/RandomRuins/IceRuins/icemoon_surface_bughabitat.dmm

@@ -29,7 +29,7 @@
 /turf/open/floor/plastic,
 /area/ruin/bughabitat)
 "cK" = (
-/mob/living/simple_animal/hostile/ant{
+/mob/living/basic/ant{
 	environment_smash = 0
 	},
 /turf/open/floor/grass,
@@ -178,7 +178,7 @@
 /turf/open/floor/plastic,
 /area/ruin/bughabitat)
 "uB" = (
-/mob/living/simple_animal/butterfly,
+/mob/living/basic/butterfly,
 /obj/structure/chair/pew/left{
 	dir = 8
 	},
@@ -205,7 +205,7 @@
 /turf/open/floor/plastic,
 /area/ruin/bughabitat)
 "xq" = (
-/mob/living/simple_animal/butterfly,
+/mob/living/basic/butterfly,
 /obj/effect/turf_decal/siding/wideplating/light{
 	color = "#236F26"
 	},
@@ -322,7 +322,7 @@
 /obj/item/stack/ducts/fifty{
 	amount = 23
 	},
-/mob/living/simple_animal/butterfly,
+/mob/living/basic/butterfly,
 /turf/open/floor/plastic,
 /area/ruin/bughabitat)
 "Nv" = (

_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)

_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" = (

_maps/RandomRuins/IceRuins/icemoon_underground_library.dmm

@@ -178,7 +178,7 @@
 	},
 /area/ruin/unpowered/buried_library)
 "aO" = (
-/mob/living/simple_animal/pet/fox,
+/mob/living/basic/pet/fox,
 /turf/open/floor/wood{
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
@@ -298,7 +298,7 @@
 /area/ruin/unpowered/buried_library)
 "bh" = (
 /obj/effect/decal/cleanable/dirt/dust,
-/mob/living/simple_animal/pet/fox,
+/mob/living/basic/pet/fox,
 /turf/open/floor/wood{
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
@@ -384,7 +384,8 @@
 /obj/structure/fluff/paper{
 	dir = 1
 	},
-/mob/living/simple_animal/pet/fox,
+/obj/effect/decal/cleanable/dirt,
+/mob/living/basic/pet/fox,
 /turf/open/floor/wood{
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},

_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm

@@ -224,7 +224,7 @@
 /turf/open/floor/wood,
 /area/ruin/powered/beach)
 "fS" = (
-/mob/living/simple_animal/crab{
+/mob/living/basic/crab{
 	name = "Jonny"
 	},
 /turf/open/misc/beach/sand,
@@ -560,7 +560,7 @@
 /turf/closed/wall/mineral/wood/nonmetal,
 /area/ruin/powered/beach)
 "sA" = (
-/mob/living/simple_animal/crab{
+/mob/living/basic/crab{
 	name = "Jon"
 	},
 /turf/open/misc/beach/sand,
@@ -761,7 +761,7 @@
 /area/ruin/powered/beach)
 "AB" = (
 /obj/effect/turf_decal/sand,
-/mob/living/simple_animal/crab{
+/mob/living/basic/crab{
 	name = "James"
 	},
 /turf/open/misc/beach/sand,
@@ -1270,7 +1270,7 @@
 /area/ruin/powered/beach)
 "SC" = (
 /obj/machinery/light/directional/north,
-/mob/living/simple_animal/crab{
+/mob/living/basic/crab{
 	name = "Eddie"
 	},
 /turf/open/misc/beach/sand,

_maps/RandomRuins/LavaRuins/lavaland_surface_gaia.dmm

@@ -36,9 +36,7 @@
 /turf/open/misc/grass/lavaland,
 /area/ruin/unpowered/gaia)
 "j" = (
-/mob/living/simple_animal/butterfly{
-	atmos_requirements = list()
-	},
+/mob/living/basic/butterfly/lavaland,
 /turf/open/misc/grass/lavaland,
 /area/ruin/unpowered/gaia)
 "l" = (
@@ -54,8 +52,7 @@
 /turf/open/misc/grass/lavaland,
 /area/ruin/unpowered/gaia)
 "p" = (
-/mob/living/simple_animal/hostile/lightgeist{
-	AIStatus = 1;
+/mob/living/basic/lightgeist{
 	light_color = "#42ECFF"
 	},
 /turf/open/misc/grass/lavaland,
@@ -67,9 +64,7 @@
 "r" = (
 /obj/structure/flora/grass/jungle/b/style_random,
 /obj/structure/flora/bush/sparsegrass/style_random,
-/mob/living/simple_animal/butterfly{
-	atmos_requirements = list()
-	},
+/mob/living/basic/butterfly/lavaland,
 /turf/open/misc/grass/lavaland,
 /area/ruin/unpowered/gaia)
 "s" = (
@@ -93,8 +88,7 @@
 /area/ruin/unpowered/gaia)
 "B" = (
 /obj/structure/flora/grass/jungle/a/style_random,
-/mob/living/simple_animal/hostile/lightgeist{
-	AIStatus = 1;
+/mob/living/basic/lightgeist{
 	light_color = "#42ECFF"
 	},
 /turf/open/misc/grass/lavaland,

_maps/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm

@@ -496,7 +496,7 @@
 /turf/open/floor/carpet/blue/lavaland,
 /area/ruin/unpowered)
 "Fg" = (
-/mob/living/simple_animal/hostile/asteroid/goliath/beast,
+/mob/living/basic/mining/goliath,
 /obj/effect/decal/cleanable/blood/old,
 /turf/open/misc/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors)

_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm

@@ -375,8 +375,8 @@
 	dir = 8
 	},
 /obj/structure/table/reinforced,
-/obj/machinery/splicer,
 /obj/item/food/grown/poppy/lily,
+/obj/machinery/plantgenes,
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/powered/seedvault)
 "bb" = (