Merge branch 'master' into SentientDisease

.github/workflows/generate_documentation.yml

@@ -27,7 +27,7 @@ jobs:
           touch dmdoc/.nojekyll
           echo codedocs.tgstation13.org > dmdoc/CNAME
       - name: Deploy
-        uses: JamesIves/[email protected].1
+        uses: JamesIves/[email protected].2
         with:
           branch: gh-pages
           clean: true

_maps/ark_map_files/ark_maps/DeltaStation2.dmm

@@ -40945,7 +40945,7 @@
 "jRK" = (
 /obj/machinery/door/airlock/church{
 	name = "Toilet";
-	id = "Toilet12"
+	id_tag = "Toilet12"
 	},
 /turf/open/floor/iron/dark,
 /area/station/service/chapel/monastery)
@@ -73182,7 +73182,7 @@
 "rRu" = (
 /obj/machinery/door/airlock/church{
 	name = "Toilet";
-	id = "Toilet11"
+	id_tag = "Toilet11"
 	},
 /turf/open/floor/iron/dark,
 /area/station/service/chapel/monastery)
@@ -133347,9 +133347,9 @@ ccA
 nYg
 nnG
 lNB
-qWw
-kNY
 fmN
+kNY
+qWw
 kIr
 sYU
 sYU

_maps/ark_map_files/ark_maps/IceBoxStation.dmm

@@ -5151,7 +5151,9 @@
 /obj/structure/disposalpipe/segment{
 	dir = 10
 	},
-/obj/structure/chair/stool/directional/north,
+/obj/structure/chair{
+	dir = 1
+	},
 /turf/open/floor/carpet,
 /area/station/command/heads_quarters/qm)
 "bAk" = (
@@ -13263,6 +13265,19 @@
 	},
 /turf/open/floor/plating/snowed/icemoon,
 /area/icemoon/surface/outdoors/nospawn)
+"dPY" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment,
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/effect/turf_decal/trimline/green/filled/warning{
+	dir = 4
+	},
+/turf/open/floor/iron/white,
+/area/station/medical/medbay/aft)
 "dQd" = (
 /obj/machinery/door/airlock/maintenance{
 	name = "Mining Station Maintenance"
@@ -18627,10 +18642,13 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
 	dir = 1
 	},
-/obj/machinery/firealarm/directional/west,
 /obj/effect/turf_decal/tile/green/anticorner/contrasted{
 	dir = 8
 	},
+/obj/machinery/light_switch/directional/south{
+	pixel_x = -21;
+	pixel_y = -25
+	},
 /turf/open/floor/iron/white,
 /area/station/medical/surgery/fore)
 "fzv" = (
@@ -36920,6 +36938,10 @@
 	dir = 1
 	},
 /area/station/service/chapel/office)
+"kTm" = (
+/obj/machinery/holopad,
+/turf/open/floor/carpet,
+/area/station/command/heads_quarters/qm)
 "kTz" = (
 /turf/open/floor/iron/smooth_half,
 /area/station/security/brig/upper)
@@ -41209,6 +41231,7 @@
 /obj/effect/turf_decal/tile/green/half/contrasted{
 	dir = 4
 	},
+/obj/machinery/firealarm/directional/east,
 /turf/open/floor/iron/white,
 /area/station/medical/surgery/fore)
 "mjI" = (
@@ -45052,6 +45075,7 @@
 /obj/effect/turf_decal/tile/green/half/contrasted{
 	dir = 4
 	},
+/obj/machinery/firealarm/directional/east,
 /turf/open/floor/iron/white,
 /area/station/medical/surgery/aft)
 "nqn" = (
@@ -54433,10 +54457,12 @@
 /area/station/maintenance/starboard/fore)
 "qaU" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
-/obj/machinery/firealarm/directional/west,
 /obj/effect/turf_decal/tile/green/anticorner/contrasted{
 	dir = 1
 	},
+/obj/machinery/light_switch/directional/north{
+	pixel_x = -23
+	},
 /turf/open/floor/iron/white,
 /area/station/medical/surgery/aft)
 "qbb" = (
@@ -58565,19 +58591,6 @@
 "rkL" = (
 /turf/open/floor/carpet/blue,
 /area/station/medical/psychology)
-"rkM" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment,
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/obj/effect/turf_decal/trimline/green/filled/warning{
-	dir = 4
-	},
-/turf/open/floor/iron/white,
-/area/station/medical/medbay/aft)
 "rkN" = (
 /turf/closed/wall,
 /area/station/engineering/atmos/hfr_room)
@@ -61837,6 +61850,7 @@
 /obj/effect/turf_decal/tile/brown/anticorner/contrasted{
 	dir = 1
 	},
+/obj/effect/mapping_helpers/requests_console/ore_update,
 /turf/open/floor/iron,
 /area/station/command/heads_quarters/qm)
 "skx" = (
@@ -76760,7 +76774,6 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/holopad,
 /obj/structure/disposalpipe/segment,
 /obj/structure/cable,
 /turf/open/floor/iron,
@@ -234253,7 +234266,7 @@ alT
 dcs
 kin
 dsU
-alT
+kTm
 lbg
 ikO
 ikd
@@ -253036,11 +253049,11 @@ tVB
 klc
 sHd
 jih
-rkM
+dPY
 eHU
 iYs
 eHU
-rkM
+dPY
 eHU
 pko
 gsT

_maps/ark_map_files/ark_maps/KiloStation2.dmm

@@ -55394,7 +55394,6 @@
 /obj/item/clothing/gloves/latex,
 /obj/item/clothing/mask/surgical,
 /obj/item/clothing/suit/apron/surgical,
-/obj/machinery/firealarm/directional/east,
 /obj/effect/turf_decal/tile/neutral/half/contrasted,
 /turf/open/floor/iron/dark,
 /area/station/medical/surgery/aft)
@@ -70163,7 +70162,9 @@
 /turf/open/floor/plating,
 /area/station/engineering/atmos/pumproom)
 "vVy" = (
-/obj/machinery/door/window/brigdoor/right/directional/west,
+/obj/machinery/door/window/brigdoor/right/directional/west{
+	req_access = list("engineering")
+	},
 /obj/structure/table/reinforced,
 /obj/structure/cable,
 /obj/item/paper_bin,
@@ -75953,6 +75954,7 @@
 /obj/effect/turf_decal/tile/neutral/half/contrasted{
 	dir = 1
 	},
+/obj/machinery/firealarm/directional/south,
 /turf/open/floor/iron/dark,
 /area/station/medical/surgery/aft)
 "xLk" = (