Merge branch 'ss220club:master' into donor_jobs_update

.github/CONTRIBUTING.md

@@ -163,6 +163,22 @@ eg: `/datum/thing`, not `datum/thing`
 In DM, this is optional, but omitting it makes finding definitions harder. To be specific, you can declare the path `/arbitrary`, but it
 will still be, in actuality, `/datum/arbitrary`. Write your code to reflect this.
 
+### Do not use list operators in strings
+
+The use of list operators to augment strings is not allowed. This is roughly 10 times slower than using a list with a Join() Function.
+
+```dm
+//Bad
+var/text = "text"
+text += "More text"
+to_chat(world, text)
+
+//Good
+var/list/text = list("text")
+text += "More text"
+to_chat(world, text.Join(""))
+```
+
 ### Do not use text/string based type paths
 
 It is rarely allowed to put type paths in a text format, as there are no compile errors if the type path no longer exists. Here is an example:

.github/workflows/auto_translate.yml

@@ -53,6 +53,7 @@ jobs:
 
       - name: 'Push Translation'
         run: |
+          git fetch origin translate
           git checkout origin/translate
           git config --local user.email "[email protected]"
           git config --local user.name "ss220bot"

.github/workflows/ci.yml

@@ -108,10 +108,6 @@ jobs:
           sudo apt update || true
           sudo apt install libssl1.1:i386
           ldd librust_g.so
-      - name: Start Redis
-        uses: supercharge/[email protected]
-        with:
-          redis-version: 6
       - name: Compile & Run Unit Tests
         run: |
           tools/ci/install_byond.sh '${{ matrix.byondtype }}'

_maps/map_files/MetaStation/MetaStation.dmm

@@ -55190,13 +55190,12 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
+/obj/effect/mapping_helpers/airlock/access/any/engineering/general,
 /obj/machinery/door/airlock/engineering/glass{
 	heat_proof = 1;
 	name = "Supermatter Chamber"
 	},
 /obj/effect/mapping_helpers/airlock/access/any/engineering/atmos,
-/obj/effect/mapping_helpers/airlock/access/any/engineering/general,
 /turf/simulated/floor/engine,
 /area/station/engineering/engine/supermatter)
 "gvN" = (
@@ -74829,13 +74828,12 @@
 /turf/simulated/floor/plating,
 /area/station/maintenance/xenobio_south)
 "peF" = (
-/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
+/obj/effect/mapping_helpers/airlock/access/any/engineering/general,
 /obj/machinery/door/airlock/engineering/glass{
 	heat_proof = 1;
 	name = "Supermatter Chamber"
 	},
 /obj/effect/mapping_helpers/airlock/access/any/engineering/atmos,
-/obj/effect/mapping_helpers/airlock/access/any/engineering/general,
 /turf/simulated/floor/engine,
 /area/station/engineering/engine/supermatter)
 "pfh" = (

_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm

@@ -5151,7 +5151,7 @@
 /obj/effect/decal/cleanable/cobweb2,
 /obj/effect/turf_decal/delivery/hollow,
 /obj/structure/rack,
-/obj/item/assembly/signaler/anomaly/random,
+/obj/item/paper/researchnotes,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -8441,13 +8441,13 @@
 /area/ruin/space/unpowered)
 "Fm" = (
 /obj/structure/safe,
-/obj/item/paper/researchnotes,
-/obj/item/clothing/glasses/hud/security/sunglasses/fluff/eyepro,
 /obj/machinery/light/small{
 	dir = 4
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/delivery/hollow,
+/obj/item/assembly/signaler/anomaly/random,
+/obj/item/storage/lockbox/experimental_weapon,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},

_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm

@@ -1075,6 +1075,7 @@
 /area/ruin/space/derelict/crew_quarters)
 "cK" = (
 /obj/structure/table,
+/obj/item/soap/deluxe/laundry,
 /turf/simulated/floor/plasteel{
 	dir = 5;
 	icon_state = "blue"
@@ -1191,6 +1192,7 @@
 "cZ" = (
 /obj/structure/table,
 /obj/effect/decal/cleanable/dirt,
+/obj/item/soap/deluxe/laundry,
 /turf/simulated/floor/plasteel{
 	dir = 1;
 	icon_state = "blue"

_maps/map_files/generic/Lavaland.dmm

@@ -7527,7 +7527,7 @@
 	dir = 4
 	},
 /obj/effect/mapping_helpers/airlock/access/any/supply/mining,
-/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station,
+/obj/effect/mapping_helpers/airlock/access/any/supply/mining_station,
 /turf/simulated/floor/plasteel{
 	icon_state = "darkgreencorners"
 	},
@@ -8026,11 +8026,11 @@
 	name = "Shuttle Dock"
 	},
 /obj/machinery/door/firedoor,
-/obj/effect/mapping_helpers/airlock/access/any/supply/mining,
-/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station,
 /obj/effect/mapping_helpers/airlock/unres{
 	dir = 8
 	},
+/obj/effect/mapping_helpers/airlock/access/any/supply/mining,
+/obj/effect/mapping_helpers/airlock/access/any/supply/mining_station,
 /turf/simulated/floor/plasteel{
 	dir = 8;
 	icon_state = "darkredfull"