Merge branch 'master' into communication-hotkeys

_maps/RandomRuins/StationRuins/Lavaland/Mining_Station/Mining_Station_Public_01.dmm

@@ -153,10 +153,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/mine/living_quarters)
-"cX" = (
-/obj/structure/closet/secure_closet/miner,
-/turf/open/floor/plasteel,
-/area/mine/living_quarters)
 "dk" = (
 /obj/structure/table,
 /obj/item/stack/packageWrap,
@@ -398,6 +394,13 @@
 	},
 /turf/open/floor/plating,
 /area/mine/laborcamp/security)
+"he" = (
+/obj/machinery/door/airlock/external/glass,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/mine/living_quarters)
 "hf" = (
 /obj/item/kirbyplants/random,
 /turf/open/floor/plasteel,
@@ -417,16 +420,6 @@
 	},
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors)
-"hH" = (
-/obj/effect/turf_decal/tile/brown,
-/obj/effect/turf_decal/tile/brown{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/brown{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
-/area/mine/living_quarters)
 "hP" = (
 /obj/structure/lattice/catwalk,
 /obj/machinery/atmospherics/components/unary/outlet_injector/atmos/atmos_waste{
@@ -503,6 +496,14 @@
 	},
 /turf/open/floor/plasteel,
 /area/mine/production)
+"ja" = (
+/obj/item/bikehorn{
+	color = "#000";
+	desc = "A horn off of a bicycle. This one has been charred to hell and back, yet somehow it still honks.";
+	name = "charred bike horn"
+	},
+/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors)
 "jf" = (
 /obj/structure/table,
 /obj/item/storage/firstaid/regular,
@@ -769,11 +770,6 @@
 /obj/effect/turf_decal/tile/red,
 /turf/open/floor/plasteel,
 /area/mine/laborcamp/security)
-"nH" = (
-/obj/machinery/light,
-/obj/structure/closet/wardrobe/miner,
-/turf/open/floor/plasteel,
-/area/mine/living_quarters)
 "nI" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
@@ -841,6 +837,12 @@
 /obj/effect/turf_decal/bot,
 /turf/open/floor/plasteel,
 /area/mine/production)
+"nS" = (
+/obj/machinery/computer/shuttle/mining/common{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/mine/living_quarters)
 "nX" = (
 /obj/effect/spawner/structure/window/reinforced,
 /obj/structure/cable{
@@ -1275,8 +1277,12 @@
 /turf/open/floor/plasteel,
 /area/mine/production)
 "uG" = (
-/obj/structure/ore_box,
-/obj/effect/turf_decal/box,
+/obj/structure/table,
+/obj/item/clothing/glasses/meson,
+/obj/item/storage/bag/ore,
+/obj/item/pickaxe,
+/obj/item/mining_scanner,
+/obj/item/flashlight,
 /turf/open/floor/plasteel,
 /area/mine/living_quarters)
 "uI" = (
@@ -1439,6 +1445,15 @@
 	},
 /turf/open/floor/plasteel,
 /area/mine/living_quarters)
+"wQ" = (
+/obj/structure/table,
+/obj/item/tank/internals/emergency_oxygen{
+	pixel_x = 5;
+	pixel_y = 3
+	},
+/obj/item/tank/internals/emergency_oxygen,
+/turf/open/floor/plasteel,
+/area/mine/living_quarters)
 "wV" = (
 /turf/closed/mineral/random/volcanic,
 /area/lavaland/surface/outdoors/explored)
@@ -1536,6 +1551,14 @@
 	},
 /turf/open/floor/plasteel/freezer,
 /area/mine/living_quarters)
+"yZ" = (
+/obj/docking_port/stationary/public_mining_dock{
+	dir = 8;
+	id = "lavaland_common_away";
+	name = "Mining Station Public Wing"
+	},
+/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors)
 "zh" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden{
 	dir = 1
@@ -1644,6 +1667,13 @@
 	},
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/mine/production)
+"AC" = (
+/obj/machinery/door/airlock/external/glass,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/mine/living_quarters)
 "AH" = (
 /obj/machinery/cryopod{
 	dir = 4
@@ -1719,6 +1749,12 @@
 /obj/structure/reagent_dispensers/fueltank,
 /turf/open/floor/plating,
 /area/mine/living_quarters)
+"By" = (
+/obj/structure/chair{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/mine/living_quarters)
 "BD" = (
 /obj/machinery/door/airlock/maintenance{
 	name = "Mining Station Maintenance";
@@ -1843,6 +1879,7 @@
 /turf/open/floor/plasteel,
 /area/mine/living_quarters)
 "Dr" = (
+/obj/structure/chair,
 /obj/structure/extinguisher_cabinet{
 	pixel_x = -5;
 	pixel_y = 30
@@ -1850,9 +1887,6 @@
 /obj/effect/turf_decal/tile/purple{
 	dir = 4
 	},
-/obj/machinery/light{
-	dir = 1
-	},
 /turf/open/floor/plasteel,
 /area/mine/living_quarters)
 "Dv" = (
@@ -2695,17 +2729,12 @@
 /turf/open/floor/plasteel,
 /area/mine/living_quarters)
 "Pp" = (
-/obj/machinery/camera{
-	c_tag = "Public Shuttle Lobby";
-	network = list("mine")
-	},
-/obj/effect/turf_decal/tile/brown{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/brown,
-/obj/effect/turf_decal/tile/brown{
-	dir = 4
+/obj/structure/table,
+/obj/item/gps/mining{
+	pixel_x = 3;
+	pixel_y = 5
 	},
+/obj/item/gps/mining,
 /turf/open/floor/plasteel,
 /area/mine/living_quarters)
 "Pq" = (
@@ -2750,6 +2779,10 @@
 /obj/effect/turf_decal/delivery,
 /turf/open/floor/plasteel/white,
 /area/mine/laborcamp)
+"Qd" = (
+/obj/structure/displaycase,
+/turf/open/floor/plasteel,
+/area/mine/living_quarters)
 "Qi" = (
 /obj/structure/table,
 /obj/machinery/reagentgrinder,
@@ -2825,9 +2858,13 @@
 /turf/open/floor/plasteel,
 /area/mine/laborcamp)
 "Ru" = (
+/obj/structure/chair,
 /obj/machinery/newscaster{
 	pixel_y = 32
 	},
+/obj/machinery/light{
+	dir = 1
+	},
 /turf/open/floor/plasteel,
 /area/mine/living_quarters)
 "Rv" = (
@@ -3019,13 +3056,13 @@
 /obj/effect/turf_decal/tile/red{
 	dir = 1
 	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
 /mob/living/simple_animal/bot/secbot/beepsky{
 	desc = "Powered by the tears and sweat of laborers.";
 	name = "Prison Ofitser"
 	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
 /turf/open/floor/plasteel,
 /area/mine/laborcamp/security)
 "Un" = (
@@ -3241,10 +3278,6 @@
 	},
 /turf/open/floor/plating,
 /area/mine/living_quarters)
-"XX" = (
-/obj/effect/spawner/structure/window/reinforced,
-/turf/closed/wall,
-/area/mine/living_quarters)
 "Ya" = (
 /turf/closed/wall/r_wall,
 /area/mine/laborcamp)
@@ -4211,9 +4244,9 @@ VT
 VT
 VT
 VT
-VT
-VT
-VT
+Lm
+Lm
+Lm
 VT
 VT
 VT
@@ -4266,12 +4299,12 @@ VT
 VT
 VT
 VT
-VT
-VT
-VT
-VT
-VT
-VT
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
 VT
 VT
 VT
@@ -4322,15 +4355,15 @@ VT
 VT
 VT
 VT
-VT
-VT
-VT
-VT
-VT
-VT
-VT
-VT
-VT
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
 VT
 VT
 VT
@@ -4379,16 +4412,16 @@ VT
 VT
 VT
 VT
-VT
-VT
-VT
-VT
 Lm
 Lm
-VT
-VT
 Lm
-VT
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
 VT
 VT
 VT
@@ -4435,17 +4468,17 @@ wz
 wz
 VT
 VT
-VT
-VT
 Lm
-VT
-VT
-VT
 Lm
-VT
-VT
-VT
-VT
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
 Lm
 VT
 VT
@@ -4492,18 +4525,18 @@ wz
 wz
 Lm
 VT
-VT
-VT
 Lm
 Lm
 Lm
 Lm
 Lm
-VT
-VT
-VT
-VT
-VT
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
 VT
 VT
 VT
@@ -4549,7 +4582,6 @@ VT
 wz
 Lm
 VT
-VT
 Lm
 Lm
 Lm
@@ -4558,8 +4590,9 @@ Lm
 Lm
 Lm
 Lm
-VT
-VT
+Lm
+Lm
+Lm
 VT
 VT
 VT
@@ -4615,7 +4648,7 @@ Lm
 Lm
 Lm
 Lm
-VT
+Lm
 VT
 VT
 VT
@@ -4662,11 +4695,11 @@ VT
 VT
 VT
 VT
-VT
 Lm
 Lm
-VT
-VT
+Lm
+Lm
+Lm
 Lm
 Lm
 Lm
@@ -4722,10 +4755,10 @@ wz
 Lm
 Lm
 Lm
-VT
 Lm
 Lm
 Lm
+yZ
 Lm
 Lm
 Lm
@@ -4772,18 +4805,18 @@ Gt
 Dv
 my
 VT
+ja
 VT
 VT
-VT
+wz
 wz
 Lm
 Lm
 Lm
-VT
-Lm
-Lm
-Lm
 Lm
+KV
+he
+KV
 Lm
 Lm
 Lm
@@ -4833,14 +4866,14 @@ VT
 VT
 Lm
 Lm
+wz
+wz
 Lm
 Lm
 Lm
-Lm
-Lm
-Lm
-Lm
-Lm
+KV
+Ag
+KV
 Lm
 Lm
 VT
@@ -4893,11 +4926,11 @@ Lm
 VN
 VN
 VN
-XX
-VN
-VN
-VN
+KV
 VN
+KV
+AC
+KV
 VT
 VT
 VT
@@ -4949,12 +4982,12 @@ pu
 bn
 VN
 zy
-Ag
-Ag
-Ag
+By
+nS
+By
 Ag
 qZ
-VN
+KV
 VT
 VT
 VT
@@ -5010,8 +5043,8 @@ Ag
 Ag
 Ag
 Ag
-cX
-VN
+Ag
+KV
 VT
 VT
 VT
@@ -5067,8 +5100,8 @@ Ag
 uG
 uG
 Ag
-cX
-VN
+eS
+KV
 VT
 VT
 VT
@@ -5124,8 +5157,8 @@ KO
 uG
 uG
 Ag
-cX
-VN
+Ag
+KV
 VT
 VT
 VT
@@ -5181,7 +5214,7 @@ RP
 Ag
 Ag
 Ag
-nH
+oy
 VN
 VT
 VT
@@ -5235,10 +5268,10 @@ oy
 VN
 Pp
 sx
-eS
-Ag
-Ag
-hH
+Pp
+wQ
+Qd
+Qd
 VN
 wz
 Lm

_maps/cogstation.dm

@@ -1 +1 @@
-#define FORCE_MAP "_maps/cogstation.json"
+#define FORCE_MAP "_maps/cogstation.json"

_maps/kilostation.dm

@@ -1 +1 @@
-#define FORCE_MAP "_maps/kilostation.json"
+#define FORCE_MAP "_maps/kilostation.json"

_maps/map_files/BoxStation/BoxStation.dmm

@@ -51206,15 +51206,6 @@
 	},
 /turf/open/floor/plating,
 /area/hallway/secondary/exit)
-"cyt" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
-	dir = 1
-	},
-/obj/machinery/door/airlock/external{
-	name = "Port Docking Bay 4"
-	},
-/turf/open/floor/plating,
-/area/hallway/secondary/entry)
 "cyu" = (
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 1
@@ -55560,6 +55551,18 @@
 /obj/item/coin/silver,
 /turf/open/floor/plating,
 /area/maintenance/starboard/fore)
+"iWK" = (
+/obj/effect/turf_decal/tile/blue{
+	dir = 4
+	},
+/obj/structure/extinguisher_cabinet{
+	pixel_x = -5;
+	pixel_y = 30
+	},
+/turf/open/floor/plasteel/white/corner{
+	dir = 1
+	},
+/area/hallway/secondary/entry)
 "iYE" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
@@ -56101,11 +56104,15 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/hallway/primary/central)
-"kls" = (
-/obj/structure/lattice,
-/obj/structure/lattice,
-/turf/open/space,
-/area/space/nearstation)
+"kiY" = (
+/obj/machinery/door/airlock/external{
+	name = "Port Docking Bay 4"
+	},
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/hallway/secondary/entry)
 "kmw" = (
 /obj/structure/chair/comfy/black{
 	dir = 1
@@ -56616,6 +56623,15 @@
 	},
 /turf/open/floor/plasteel,
 /area/security/processing)
+"lBd" = (
+/obj/effect/turf_decal/tile/blue{
+	dir = 4
+	},
+/obj/structure/chair,
+/turf/open/floor/plasteel/white/corner{
+	dir = 1
+	},
+/area/hallway/secondary/entry)
 "lBz" = (
 /obj/effect/turf_decal/tile/red,
 /obj/effect/turf_decal/tile/red{
@@ -56901,6 +56917,17 @@
 	icon_state = "wood-broken5"
 	},
 /area/maintenance/bar)
+"mqo" = (
+/obj/effect/turf_decal/tile/blue{
+	dir = 4
+	},
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/open/floor/plasteel/white/corner{
+	dir = 1
+	},
+/area/hallway/secondary/entry)
 "mqZ" = (
 /obj/item/reagent_containers/glass/beaker,
 /turf/open/floor/plating,
@@ -58149,6 +58176,15 @@
 /obj/effect/spawner/lootdrop/maintenance,
 /turf/open/floor/plating,
 /area/maintenance/starboard/aft)
+"pFY" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 6
+	},
+/obj/item/kirbyplants{
+	icon_state = "plant-06"
+	},
+/turf/open/floor/plasteel,
+/area/hallway/secondary/entry)
 "pHl" = (
 /obj/structure/table,
 /obj/item/storage/box/beakers{
@@ -58391,6 +58427,16 @@
 	},
 /turf/open/floor/mineral/titanium/blue,
 /area/crew_quarters/toilet)
+"qtw" = (
+/obj/machinery/door/airlock/external{
+	dir = 2;
+	name = "Port Docking Bay 4"
+	},
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+	dir = 8
+	},
+/turf/open/floor/plating,
+/area/hallway/secondary/entry)
 "qtH" = (
 /obj/machinery/atmospherics/pipe/heat_exchanging/simple{
 	dir = 4
@@ -58754,6 +58800,12 @@
 /obj/item/clothing/under/dress/sundress,
 /turf/open/floor/plasteel,
 /area/crew_quarters/fitness)
+"rsp" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/structure/table,
+/obj/item/flashlight,
+/turf/open/floor/plasteel,
+/area/hallway/secondary/entry)
 "rtl" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
@@ -59012,6 +59064,18 @@
 	},
 /turf/open/floor/plasteel,
 /area/engine/gravity_generator)
+"rZQ" = (
+/obj/docking_port/stationary{
+	dir = 8;
+	dwidth = 3;
+	height = 5;
+	id = "commonmining_home";
+	name = "SS13: Common Mining Dock";
+	roundstart_template = /datum/map_template/shuttle/mining_common/meta;
+	width = 7
+	},
+/turf/open/space/basic,
+/area/space)
 "saK" = (
 /obj/structure/closet/crate,
 /obj/item/target/alien,
@@ -59260,6 +59324,19 @@
 	},
 /turf/open/floor/plasteel,
 /area/hydroponics)
+"sJw" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 10
+	},
+/obj/machinery/computer/shuttle/mining/common{
+	dir = 1
+	},
+/obj/machinery/camera{
+	c_tag = "Arrivals Bay Mining Dock";
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/hallway/secondary/entry)
 "sJx" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
@@ -59602,6 +59679,20 @@
 	},
 /turf/open/floor/plasteel,
 /area/security/brig)
+"tHy" = (
+/obj/effect/turf_decal/tile/blue{
+	dir = 4
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 9
+	},
+/obj/item/kirbyplants{
+	icon_state = "applebush"
+	},
+/turf/open/floor/plasteel/white/corner{
+	dir = 1
+	},
+/area/hallway/secondary/entry)
 "tJi" = (
 /obj/machinery/airalarm{
 	dir = 4;
@@ -60163,8 +60254,8 @@
 /turf/closed/wall/r_wall,
 /area/engine/gravity_generator)
 "uRn" = (
-/mob/living/simple_animal/opossum,
 /obj/structure/chair/stool,
+/mob/living/simple_animal/opossum,
 /turf/open/floor/carpet/royalblue,
 /area/maintenance/starboard/aft)
 "uRS" = (
@@ -60783,6 +60874,14 @@
 	},
 /turf/open/floor/plasteel,
 /area/crew_quarters/fitness/pool)
+"wjd" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/structure/table,
+/obj/item/gps/mining{
+	gpstag = "MINE_PUB"
+	},
+/turf/open/floor/plasteel,
+/area/hallway/secondary/entry)
 "wje" = (
 /obj/structure/rack,
 /obj/item/instrument/banjo,
@@ -68460,7 +68559,7 @@ aaa
 aaa
 aaa
 aaa
-aaa
+gDl
 aaa
 aaa
 aaa
@@ -68969,10 +69068,10 @@ aaa
 aaa
 aaa
 aaa
+rZQ
 aaa
 aaa
-aaa
-aae
+aoV
 aaa
 aaa
 aaa
@@ -69224,11 +69323,11 @@ aaa
 aaa
 aaa
 aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+aaf
+awW
+kiY
+awW
+aaf
 aaa
 aaa
 aaa
@@ -69481,11 +69580,11 @@ aaa
 aaa
 aaa
 aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+aaf
+awW
+auP
+awW
+aaf
 aaa
 aaa
 aaa
@@ -69738,11 +69837,11 @@ aaa
 aaa
 aaa
 aaa
-aoV
-aaa
-aaa
-aaa
-aaa
+arB
+awW
+qtw
+awW
+arB
 aaa
 aaa
 aaa
@@ -69995,12 +70094,12 @@ aaa
 aaa
 aaa
 aaa
-aoV
-aaa
-aaa
-aaa
-aaa
-aoV
+arB
+tHy
+ayl
+sJw
+arB
+aaf
 aaa
 aaa
 aaa
@@ -70252,12 +70351,12 @@ aaa
 aaa
 aaa
 aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aoV
+awW
+lBd
+ayl
+rsp
+awW
+aaf
 aaa
 aaa
 aaa
@@ -70509,15 +70608,15 @@ aaa
 aaa
 aaa
 aaa
+awW
+lBd
+ayl
+wjd
+awW
 aaf
 aaa
 aaa
 aaa
-aaf
-kls
-aaa
-aaa
-aaa
 aaa
 aaa
 aaa
@@ -70767,9 +70866,9 @@ aaa
 aaa
 aaa
 arB
-arB
-arB
-arB
+mqo
+ayn
+pFY
 aAC
 aaf
 aaa
@@ -71024,7 +71123,7 @@ aaa
 aaa
 aaa
 arB
-awZ
+iWK
 ayk
 awW
 aAD
@@ -71285,7 +71384,7 @@ awZ
 ayl
 beK
 auP
-cyt
+cyu
 cyd
 aaa
 aaa

_maps/map_files/CogStation/job_changes.dm

@@ -26,4 +26,4 @@
 	..()
 	MAP_JOB_CHECK
 	access += ACCESS_MAINT_TUNNELS
-	minimal_access += ACCESS_MAINT_TUNNELS
+	minimal_access += ACCESS_MAINT_TUNNELS

_maps/map_files/Deltastation/DeltaStation2.dmm

@@ -660,6 +660,7 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plasteel,
 /area/hallway/secondary/entry)
 "abr" = (
@@ -1484,9 +1485,6 @@
 /obj/machinery/light{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 10
-	},
 /obj/machinery/camera{
 	c_tag = "Arrivals Dock - Fore";
 	dir = 8;
@@ -1495,6 +1493,9 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+	dir = 4
+	},
 /turf/open/floor/plasteel,
 /area/hallway/secondary/entry)
 "acX" = (
@@ -66630,6 +66631,13 @@
 /obj/item/kirbyplants/random,
 /turf/open/floor/wood,
 /area/library)
+"chT" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plasteel,
+/area/hallway/secondary/entry)
 "chV" = (
 /obj/machinery/newscaster{
 	pixel_x = -32
@@ -125416,6 +125424,12 @@
 	},
 /turf/open/floor/plasteel/white,
 /area/science/misc_lab)
+"fer" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/hallway/secondary/entry)
 "fhE" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/medical{
@@ -125528,6 +125542,12 @@
 	},
 /turf/open/floor/engine,
 /area/science/mixing)
+"gfJ" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 10
+	},
+/turf/open/floor/plasteel,
+/area/hallway/secondary/entry)
 "gmj" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/closed/wall/r_wall,
@@ -125689,6 +125709,14 @@
 /obj/effect/landmark/start/cyborg,
 /turf/open/floor/plasteel/dark,
 /area/ai_monitored/turret_protected/aisat_interior)
+"hzR" = (
+/obj/effect/turf_decal/delivery,
+/obj/structure/table,
+/obj/item/gps/mining{
+	gpstag = "MINE_PUB"
+	},
+/turf/open/floor/plasteel,
+/area/hallway/secondary/entry)
 "hAf" = (
 /obj/structure/cable/white{
 	icon_state = "4-8"
@@ -125847,6 +125875,21 @@
 	},
 /turf/open/floor/plating,
 /area/engine/atmos)
+"iCO" = (
+/obj/effect/turf_decal/delivery,
+/obj/structure/chair{
+	dir = 8
+	},
+/obj/machinery/camera{
+	c_tag = "Arrivals Dock - Public Mining";
+	dir = 8;
+	name = "arrivals camera"
+	},
+/obj/machinery/light{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/hallway/secondary/entry)
 "iIl" = (
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
@@ -125943,6 +125986,13 @@
 	},
 /turf/open/floor/plasteel,
 /area/maintenance/solars/port/aft)
+"iUI" = (
+/obj/effect/turf_decal/delivery,
+/obj/structure/chair{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/hallway/secondary/entry)
 "jdx" = (
 /obj/structure/lattice,
 /obj/structure/grille,
@@ -126193,6 +126243,10 @@
 	},
 /turf/open/space,
 /area/engine/atmos)
+"kmz" = (
+/obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
+/area/hallway/secondary/entry)
 "kqo" = (
 /obj/structure/cable/white{
 	icon_state = "4-8"
@@ -126624,6 +126678,18 @@
 	},
 /turf/open/floor/plasteel,
 /area/engine/atmos)
+"mVW" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/machinery/door/airlock/external{
+	name = "External Docking Port"
+	},
+/turf/open/floor/plasteel,
+/area/hallway/secondary/entry)
 "mWZ" = (
 /obj/machinery/atmospherics/components/binary/pump,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -126635,6 +126701,17 @@
 	},
 /turf/open/floor/engine,
 /area/science/mixing)
+"naC" = (
+/obj/docking_port/stationary{
+	dwidth = 3;
+	height = 5;
+	id = "commonmining_home";
+	name = "SS13: Common Mining Dock";
+	roundstart_template = /datum/map_template/shuttle/mining_common/meta;
+	width = 7
+	},
+/turf/open/space/basic,
+/area/space)
 "nbi" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/closed/wall/r_wall,
@@ -126962,6 +127039,14 @@
 /obj/effect/landmark/start/paramedic,
 /turf/open/floor/plasteel/white,
 /area/medical/storage)
+"pIl" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plasteel,
+/area/hallway/secondary/entry)
 "pQm" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -127061,6 +127146,13 @@
 /obj/effect/spawner/lootdrop/keg,
 /turf/open/floor/plating,
 /area/crew_quarters/abandoned_gambling_den)
+"qEF" = (
+/obj/effect/turf_decal/delivery,
+/obj/machinery/computer/shuttle/mining/common{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/hallway/secondary/entry)
 "qUn" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/effect/turf_decal/tile/neutral{
@@ -127633,6 +127725,15 @@
 /obj/effect/turf_decal/stripes/line,
 /turf/open/floor/plasteel,
 /area/science/circuit)
+"wlT" = (
+/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plasteel,
+/area/hallway/secondary/entry)
 "wmL" = (
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
@@ -127654,6 +127755,15 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/chapel/office)
+"wpx" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 10
+	},
+/turf/open/floor/plasteel,
+/area/hallway/secondary/entry)
 "wum" = (
 /obj/machinery/atmospherics/pipe/simple/yellow/visible{
 	dir = 4
@@ -127738,6 +127848,15 @@
 	},
 /turf/open/floor/plasteel,
 /area/crew_quarters/fitness/recreation)
+"xaL" = (
+/obj/effect/turf_decal/delivery,
+/obj/structure/table,
+/obj/machinery/light{
+	dir = 8
+	},
+/obj/item/flashlight,
+/turf/open/floor/plasteel,
+/area/hallway/secondary/entry)
 "xcU" = (
 /obj/effect/spawner/structure/window/reinforced,
 /obj/machinery/atmospherics/pipe/simple/cyan/visible{
@@ -159602,13 +159721,13 @@ hZh
 hZh
 hZh
 aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+aad
+aad
+aaO
+aaO
+abf
+aaO
+aaO
 aad
 aad
 aad
@@ -159859,13 +159978,13 @@ hZh
 hZh
 hZh
 aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-qgU
 aad
+aaa
+aaO
+qEF
+xaL
+hzR
+aaO
 aad
 aaa
 aaa
@@ -160116,13 +160235,13 @@ hZh
 hZh
 hZh
 aaa
-aaa
-aaa
-aaa
-aaa
-aaa
 aaO
 aaO
+aaO
+abe
+abC
+gfJ
+aaO
 abf
 aaO
 aaO
@@ -160372,18 +160491,18 @@ hZh
 hZh
 hZh
 hZh
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaO
-abe
+naC
+mVW
+kmz
+mVW
+acb
+fer
+aiT
+abZ
 abp
 abC
 abC
-abZ
+abC
 abC
 abC
 acV
@@ -160630,19 +160749,19 @@ hZh
 hZh
 hZh
 aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+aaO
+aaO
 aaO
 vcs
+wpx
+pIl
+wlT
 abq
-abD
-abD
-abZ
-abD
-abD
+chT
+chT
+chT
+chT
+chT
 acW
 adr
 adr
@@ -160887,12 +161006,12 @@ hZh
 hZh
 hZh
 aaa
-aaa
-aaa
-aaa
-aaa
+aad
 aaa
 aaO
+agk
+iCO
+iUI
 aaO
 abf
 aaO
@@ -161144,14 +161263,14 @@ hZh
 hZh
 hZh
 aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-qgU
 aad
 aad
+aaO
+aaO
+abf
+aaO
+aaO
+aad
 aaa
 aaa
 aad
@@ -161402,12 +161521,12 @@ hZh
 hZh
 aaa
 aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+aad
+aad
+aad
+aad
+aad
+aad
 aad
 aad
 aad

_maps/map_files/LambdaStation/lambda.dmm

@@ -63034,6 +63034,19 @@
 /obj/item/assembly/flash/handheld,
 /turf/open/floor/plating,
 /area/storage/tech)
+"cYI" = (
+/obj/docking_port/stationary{
+	dir = 2;
+	dwidth = 3;
+	height = 5;
+	icon_state = "pinonfar";
+	id = "commonmining_home";
+	name = "SS13: Common Mining Dock";
+	roundstart_template = /datum/map_template/shuttle/mining_common/meta;
+	width = 7
+	},
+/turf/open/space/basic,
+/area/space)
 "dcB" = (
 /obj/effect/turf_decal/trimline/neutral/filled/line{
 	dir = 4
@@ -63774,6 +63787,14 @@
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plating,
 /area/maintenance/department/cargo)
+"etv" = (
+/obj/machinery/door/airlock/external/glass,
+/obj/structure/fans/tiny,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+	dir = 1
+	},
+/turf/open/floor/plating,
+/area/hallway/secondary/entry)
 "euD" = (
 /obj/machinery/door/airlock/hatch{
 	name = "Telecomms Server Room"
@@ -68221,6 +68242,20 @@
 /obj/machinery/power/grounding_rod,
 /turf/open/floor/plating/airless,
 /area/engine/engineering)
+"mnL" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 6
+	},
+/obj/machinery/computer/shuttle/mining/common{
+	dir = 8
+	},
+/obj/machinery/camera{
+	c_tag = "Arrivals Dock Public Mining";
+	dir = 1;
+	name = "arrivals camera"
+	},
+/turf/open/floor/plasteel,
+/area/hallway/secondary/entry)
 "mqh" = (
 /obj/effect/turf_decal/tile/blue,
 /obj/effect/turf_decal/tile/blue{
@@ -69098,16 +69133,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/crew_quarters/toilet/auxiliary)
-"ohk" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 10
-	},
-/obj/structure/chair{
-	dir = 4
-	},
-/obj/machinery/light,
-/turf/open/floor/plasteel,
-/area/hallway/secondary/entry)
 "ojZ" = (
 /obj/effect/spawner/structure/window/reinforced,
 /obj/structure/cable{
@@ -69418,6 +69443,11 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/port)
+"oTI" = (
+/obj/machinery/door/airlock/external/glass,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper,
+/turf/open/floor/plating,
+/area/hallway/secondary/entry)
 "oUp" = (
 /obj/structure/closet/crate,
 /obj/item/stack/sheet/metal/fifty,
@@ -69460,6 +69490,16 @@
 	},
 /turf/open/floor/plasteel,
 /area/crew_quarters/toilet/auxiliary)
+"oVP" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/structure/table,
+/obj/item/gps/mining{
+	gpstag = "MINE_PUB"
+	},
+/turf/open/floor/plasteel,
+/area/hallway/secondary/entry)
 "oXg" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -69905,6 +69945,14 @@
 	},
 /turf/open/floor/plasteel,
 /area/engine/break_room)
+"pPG" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/structure/table,
+/obj/item/flashlight,
+/turf/open/floor/plasteel,
+/area/hallway/secondary/entry)
 "pRv" = (
 /obj/machinery/air_sensor{
 	id_tag = "tox_sensor"
@@ -103741,10 +103789,10 @@ nNI
 ngo
 bQW
 nNI
-aav
-aav
-aab
-aab
+nNI
+xMt
+xMt
+nNI
 aab
 aab
 aab
@@ -103996,15 +104044,15 @@ gLI
 ifC
 jEO
 uYv
-ohk
+uYv
+uYv
+jEO
+jEO
+cIu
+nNI
+xMt
+xMt
 nNI
-aab
-aav
-aab
-aab
-aab
-aab
-aab
 aab
 aab
 aab
@@ -104253,16 +104301,16 @@ rEw
 iiC
 jMW
 rEw
+rEw
+rEw
+rEw
+rEw
 cwD
-xMt
-aab
-aav
-aab
-aab
-aab
-aab
-aab
-aab
+oTI
+cxe
+cVf
+etv
+cYI
 aab
 aab
 aab
@@ -104510,15 +104558,15 @@ cvp
 iqD
 jto
 jto
-cvI
+jto
+jto
+pPG
+oVP
+mnL
+nNI
 xMt
-aab
-aav
-aab
-aab
-aab
-aab
-aab
+xMt
+nNI
 aab
 aab
 aab
@@ -104769,10 +104817,10 @@ xMt
 cWd
 nNI
 nNI
-aab
-aav
-aab
-aab
+nNI
+xMt
+xMt
+nNI
 aab
 aab
 aab
@@ -105027,7 +105075,7 @@ cJk
 nNI
 aab
 aab
-aav
+aab
 aab
 aab
 aab

_maps/map_files/MetaStation/MetaStation.dmm

@@ -24164,12 +24164,12 @@
 /turf/open/floor/plating,
 /area/hallway/secondary/entry)
 "aVt" = (
-/obj/item/kirbyplants{
-	icon_state = "plant-13"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
+/obj/item/kirbyplants{
+	icon_state = "plant-20"
+	},
 /turf/open/floor/plasteel,
 /area/hallway/secondary/entry)
 "aVu" = (
@@ -24941,10 +24941,9 @@
 /turf/open/floor/plasteel,
 /area/hallway/secondary/entry)
 "aWV" = (
-/obj/structure/sign/warning/vacuum/external{
-	pixel_y = -32
+/obj/effect/turf_decal/stripes/corner{
+	dir = 2
 	},
-/obj/effect/turf_decal/stripes/line,
 /turf/open/floor/plasteel,
 /area/hallway/secondary/entry)
 "aWW" = (
@@ -81819,6 +81818,16 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/engine/break_room)
+"kHw" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 6
+	},
+/obj/structure/table,
+/obj/item/gps{
+	gpstag = "MINE_PUB"
+	},
+/turf/open/floor/plasteel,
+/area/hallway/secondary/entry)
 "kJW" = (
 /obj/machinery/atmospherics/components/binary/pump{
 	dir = 1;
@@ -81876,6 +81885,15 @@
 	},
 /turf/open/floor/plasteel,
 /area/science/circuit)
+"lcv" = (
+/obj/machinery/door/airlock/external{
+	name = "Public Mining Dock"
+	},
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+	dir = 8
+	},
+/turf/open/floor/plating,
+/area/hallway/secondary/entry)
 "llb" = (
 /obj/structure/table/reinforced,
 /obj/item/integrated_circuit_printer,
@@ -81895,6 +81913,13 @@
 /obj/item/multitool,
 /turf/open/floor/plasteel/white,
 /area/science/circuit)
+"lvm" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/computer/shuttle/mining/common{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/hallway/secondary/entry)
 "lws" = (
 /obj/structure/chair/office/dark{
 	dir = 8
@@ -82009,6 +82034,12 @@
 	},
 /turf/open/floor/plasteel/white/corner,
 /area/hallway/secondary/entry)
+"mdt" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/hallway/secondary/entry)
 "mjJ" = (
 /obj/machinery/nuclearbomb/beer{
 	pixel_x = 2;
@@ -82379,6 +82410,21 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/port/fore)
+"pAD" = (
+/turf/open/floor/plating,
+/area/hallway/secondary/entry)
+"pBY" = (
+/obj/docking_port/stationary{
+	dir = 8;
+	dwidth = 3;
+	height = 5;
+	id = "commonmining_home";
+	name = "SS13: Common Mining Dock";
+	roundstart_template = /datum/map_template/shuttle/mining_common/meta;
+	width = 7
+	},
+/turf/open/space,
+/area/space)
 "pCV" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
@@ -82594,6 +82640,16 @@
 	},
 /turf/open/floor/plasteel,
 /area/engine/atmos)
+"rta" = (
+/obj/machinery/door/airlock/external{
+	dir = 2;
+	name = "Public Mining Dock"
+	},
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/hallway/secondary/entry)
 "rzX" = (
 /obj/structure/chair/office/light{
 	dir = 1;
@@ -82892,6 +82948,12 @@
 /obj/machinery/atmospherics/pipe/manifold4w/general/visible,
 /turf/open/floor/plasteel,
 /area/engine/atmos)
+"ulG" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/structure/table,
+/obj/item/flashlight,
+/turf/open/floor/plasteel,
+/area/hallway/secondary/entry)
 "upN" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
@@ -83040,6 +83102,15 @@
 /obj/structure/lattice,
 /turf/open/space/basic,
 /area/space)
+"vMG" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 10
+	},
+/obj/item/kirbyplants{
+	icon_state = "plant-05"
+	},
+/turf/open/floor/plasteel,
+/area/hallway/secondary/entry)
 "vYs" = (
 /obj/structure/lattice,
 /obj/machinery/atmospherics/pipe/heat_exchanging/simple,
@@ -91679,13 +91750,13 @@ aaf
 aaf
 aaa
 aaa
+aaf
 aaa
 aaa
-aaf
-aaf
-aaf
-aaf
-aaf
+aaa
+aaa
+aaa
+pBY
 aaa
 aaa
 aaa
@@ -91936,16 +92007,16 @@ aaa
 aaa
 aaa
 aaa
-aaa
-aaa
-aaf
-aaa
-aaa
-aaa
 aaf
 aaf
 aaf
 aaf
+aaf
+aVs
+rta
+aVs
+aaf
+aaf
 aaa
 aaa
 aaa
@@ -92195,12 +92266,12 @@ aaa
 aaa
 aaa
 aaa
-aaa
-aaa
-aaa
-aaa
+aaf
 aaa
 aaf
+aVs
+pAD
+aVs
 aaa
 aaf
 aaa
@@ -92456,7 +92527,7 @@ aRA
 aRA
 aRA
 aVs
-aVs
+lcv
 aVs
 aVs
 aaf
@@ -92713,10 +92784,10 @@ wOY
 aSH
 aUb
 aVt
-aWT
+mdt
+vMG
 aVs
 aaf
-aaf
 aaa
 aaa
 aaa
@@ -92970,9 +93041,9 @@ abu
 bsk
 aUc
 aVu
-aWU
-aYC
-aaa
+bvF
+lvm
+aVs
 aaf
 aaa
 aaa
@@ -93227,10 +93298,10 @@ wOY
 aSI
 aRA
 aVv
-aWU
+bvF
+ulG
 aVs
 aaf
-aaf
 aaa
 aaa
 aaa
@@ -93485,8 +93556,8 @@ aRA
 aRA
 cZf
 aWV
-aRA
-aaa
+kHw
+aVs
 aaa
 aaa
 aaa

_maps/map_files/PubbyStation/PubbyStation.dmm

@@ -32021,23 +32021,6 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/department/science)
-"bwq" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/public/glass{
-	name = "Monastery Transit"
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
-/area/hallway/secondary/entry)
-"bwr" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/public/glass{
-	name = "Monastery Transit"
-	},
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
-/obj/effect/turf_decal/tile/neutral,
-/turf/open/floor/plasteel,
-/area/hallway/secondary/entry)
 "bws" = (
 /obj/structure/closet,
 /obj/item/stack/cable_coil/random,
@@ -32812,9 +32795,6 @@
 /turf/open/floor/plasteel,
 /area/science/xenobiology)
 "bxY" = (
-/obj/machinery/light/small{
-	dir = 1
-	},
 /turf/open/floor/plasteel/white,
 /area/hallway/secondary/entry)
 "bxZ" = (
@@ -33559,6 +33539,9 @@
 	network = list("monastery");
 	pixel_x = 28
 	},
+/obj/machinery/light{
+	dir = 4
+	},
 /turf/open/floor/plasteel/white,
 /area/hallway/secondary/entry)
 "bzC" = (
@@ -53109,6 +53092,16 @@
 /obj/structure/barricade/wooden,
 /turf/open/floor/plating,
 /area/maintenance/department/security/brig)
+"deJ" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/structure/table,
+/obj/item/gps/mining{
+	gpstag = "MINE_PUB"
+	},
+/turf/open/floor/plasteel,
+/area/hallway/secondary/entry)
 "dgg" = (
 /obj/structure/disposalpipe/segment{
 	dir = 6
@@ -56534,12 +56527,6 @@
 	},
 /turf/open/floor/plating,
 /area/hallway/secondary/entry)
-"kIc" = (
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plasteel/white{
-	heat_capacity = 1e+006
-	},
-/area/hallway/secondary/entry)
 "kIo" = (
 /obj/structure/table,
 /obj/item/paper_bin{
@@ -58350,6 +58337,18 @@
 	},
 /turf/open/floor/plating,
 /area/quartermaster/miningdock)
+"oQm" = (
+/obj/docking_port/stationary{
+	dir = 8;
+	dwidth = 3;
+	height = 5;
+	id = "commonmining_home";
+	name = "SS13: Common Mining Dock";
+	roundstart_template = /datum/map_template/shuttle/mining_common/meta;
+	width = 7
+	},
+/turf/open/space/basic,
+/area/space)
 "oRX" = (
 /obj/structure/closet,
 /turf/open/floor/plating,
@@ -58645,6 +58644,15 @@
 	},
 /turf/open/floor/plasteel/white/corner,
 /area/hallway/secondary/exit/departure_lounge)
+"pqP" = (
+/obj/machinery/door/airlock/external{
+	name = "Port Docking Bay 2"
+	},
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/hallway/secondary/entry)
 "prQ" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on{
 	dir = 4
@@ -58707,9 +58715,6 @@
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plating,
 /area/medical/chemistry)
-"pyw" = (
-/turf/open/space/basic,
-/area/hallway/secondary/entry)
 "pzF" = (
 /mob/living/simple_animal/opossum,
 /turf/open/floor/wood,
@@ -58751,6 +58756,15 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/science/explab)
+"pEH" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/structure/chair/comfy{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/hallway/secondary/entry)
 "pEL" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on{
 	dir = 1
@@ -59281,6 +59295,15 @@
 	},
 /turf/open/floor/engine,
 /area/engine/engineering)
+"qRm" = (
+/obj/machinery/door/airlock/external{
+	name = "Port Docking Bay 2"
+	},
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+	dir = 8
+	},
+/turf/open/floor/plating,
+/area/hallway/secondary/entry)
 "qTV" = (
 /obj/item/radio/intercom{
 	name = "Station Intercom (General)";
@@ -59997,6 +60020,14 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/department/security/brig)
+"sIK" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/structure/table,
+/obj/item/flashlight,
+/turf/open/floor/plasteel,
+/area/hallway/secondary/entry)
 "sJp" = (
 /obj/machinery/atmospherics/pipe/simple/general/visible,
 /obj/effect/turf_decal/stripes/line,
@@ -61493,6 +61524,18 @@
 	},
 /turf/open/floor/plasteel,
 /area/engine/engineering)
+"wjQ" = (
+/obj/machinery/computer/shuttle/mining/common{
+	dir = 4
+	},
+/obj/machinery/light{
+	dir = 8
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/hallway/secondary/entry)
 "wkZ" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on{
 	dir = 1
@@ -80466,7 +80509,7 @@ aaa
 aaa
 aaa
 aaa
-pyw
+aaa
 bsl
 btL
 aZx
@@ -80723,7 +80766,7 @@ aaa
 aaa
 aaa
 aaa
-pyw
+aaa
 aZx
 bcX
 aZx
@@ -81759,7 +81802,7 @@ aaa
 aaa
 aaa
 aaa
-aaa
+oQm
 aaa
 aaa
 aaa
@@ -82015,9 +82058,9 @@ aZx
 aaa
 aaa
 aaa
-aaa
-aaa
-aaa
+aZx
+pqP
+aZx
 aaa
 aaa
 aaa
@@ -82272,9 +82315,9 @@ aZx
 aaa
 aaa
 aaa
-aaa
-aaa
-aaa
+aZx
+bcX
+aZx
 aaa
 aaa
 aaa
@@ -82526,12 +82569,12 @@ aZx
 bno
 bon
 aZx
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+aZx
+aZx
+aZx
+aZx
+qRm
+aZx
 aaa
 aaa
 aht
@@ -82781,15 +82824,15 @@ bbQ
 bcX
 bdV
 bnp
-bon
+baK
+pEH
+deJ
+sIK
+wjQ
+pEH
+bbR
 aZx
 aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
 aht
 bBV
 bDf
@@ -83038,15 +83081,15 @@ jzz
 aZx
 jzz
 bnp
-bon
-aZx
-aZx
-aZx
-aZx
-aZx
+baK
+baK
+baK
+baK
+baK
+baK
+baK
 aZx
 aaa
-aht
 bAI
 abI
 abI
@@ -83296,14 +83339,14 @@ bbR
 bbR
 bnp
 baK
-bbR
-bbR
-bbR
-bbR
-bbR
+baK
+baK
+baK
+baK
+baK
+baK
+aZx
 aZx
-kIc
-kIc
 bAJ
 bBX
 bBX
@@ -83558,7 +83601,7 @@ baK
 baK
 baK
 baK
-aZx
+baK
 bxY
 bzz
 kGe
@@ -83815,7 +83858,7 @@ bbT
 bbT
 bbT
 bbT
-bwq
+bbT
 bxZ
 bzA
 bAK
@@ -84072,7 +84115,7 @@ bqS
 bsm
 btN
 bfY
-bwr
+bfY
 bya
 bzB
 bAL

_maps/multiz_debug.dm

@@ -1 +1 @@
-#define FORCE_MAP "_maps/multiz_debug.json"
+#define FORCE_MAP "_maps/multiz_debug.json"

_maps/shuttles/mining_common_kilo.dmm

@@ -0,0 +1,180 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/closed/wall/mineral/titanium,
+/area/shuttle/mining)
+"b" = (
+/obj/effect/spawner/structure/window/shuttle,
+/turf/open/floor/plating,
+/area/shuttle/mining)
+"c" = (
+/obj/structure/table,
+/obj/item/storage/toolbox/emergency,
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/mining)
+"d" = (
+/obj/machinery/computer/shuttle/mining/common,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/mining)
+"e" = (
+/obj/structure/table,
+/obj/item/radio,
+/obj/item/radio/intercom{
+	pixel_y = 22
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/mining)
+"f" = (
+/obj/effect/turf_decal/stripes/end{
+	dir = 8
+	},
+/turf/open/floor/mineral/titanium/yellow,
+/area/shuttle/mining)
+"g" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/corner{
+	dir = 8
+	},
+/turf/open/floor/mineral/titanium/yellow,
+/area/shuttle/mining)
+"h" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 5
+	},
+/turf/open/floor/mineral/titanium/yellow,
+/area/shuttle/mining)
+"i" = (
+/obj/structure/sign/nanotrasen,
+/turf/closed/wall/mineral/titanium,
+/area/shuttle/mining)
+"j" = (
+/obj/machinery/light{
+	dir = 8
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+	dir = 4
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/mining)
+"k" = (
+/obj/machinery/atmospherics/pipe/simple/general/visible{
+	dir = 4
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 10
+	},
+/turf/open/floor/mineral/titanium/yellow,
+/area/shuttle/mining)
+"l" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/corner{
+	dir = 4
+	},
+/obj/machinery/atmospherics/components/binary/valve{
+	dir = 8
+	},
+/turf/open/floor/mineral/titanium/yellow,
+/area/shuttle/mining)
+"m" = (
+/obj/machinery/door/airlock/titanium{
+	name = "Lavaland Shuttle Airlock"
+	},
+/obj/docking_port/mobile{
+	dir = 8;
+	dwidth = 3;
+	height = 5;
+	id = "mining_common";
+	name = "lavaland shuttle";
+	port_direction = 4;
+	width = 7
+	},
+/obj/machinery/atmospherics/pipe/simple/general/visible{
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/shuttle/mining)
+"n" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
+	},
+/obj/effect/turf_decal/bot,
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/mining)
+"o" = (
+/obj/structure/closet/crate,
+/obj/effect/turf_decal/delivery,
+/obj/machinery/airalarm{
+	dir = 4;
+	pixel_x = -22
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/mining)
+"p" = (
+/obj/effect/spawner/structure/window/shuttle,
+/obj/structure/shuttle/engine/heater,
+/turf/open/floor/plating,
+/area/shuttle/mining)
+"q" = (
+/obj/structure/ore_box,
+/obj/effect/turf_decal/delivery,
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/mining)
+"r" = (
+/obj/structure/sign/warning/fire,
+/turf/closed/wall/mineral/titanium,
+/area/shuttle/mining)
+"s" = (
+/obj/structure/shuttle/engine/propulsion/burst,
+/turf/open/floor/plating/airless,
+/area/shuttle/mining)
+
+(1,1,1) = {"
+a
+a
+b
+i
+b
+a
+a
+"}
+(2,1,1) = {"
+a
+c
+f
+j
+n
+o
+r
+"}
+(3,1,1) = {"
+b
+d
+g
+k
+n
+p
+s
+"}
+(4,1,1) = {"
+a
+e
+h
+l
+n
+q
+r
+"}
+(5,1,1) = {"
+a
+a
+b
+m
+b
+a
+a
+"}

_maps/shuttles/mining_common_meta.dmm

@@ -0,0 +1,124 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/closed/wall/mineral/titanium,
+/area/shuttle/mining)
+"b" = (
+/obj/effect/spawner/structure/window/shuttle,
+/turf/open/floor/plating,
+/area/shuttle/mining)
+"c" = (
+/obj/structure/table,
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/mining)
+"d" = (
+/obj/machinery/computer/shuttle/mining/common,
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/mining)
+"e" = (
+/turf/open/floor/mineral/titanium,
+/area/shuttle/mining)
+"f" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
+	},
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/mining)
+"g" = (
+/obj/machinery/light{
+	dir = 8
+	},
+/turf/open/floor/mineral/titanium,
+/area/shuttle/mining)
+"h" = (
+/obj/machinery/door/airlock/titanium{
+	name = "Lavaland Shuttle Airlock"
+	},
+/obj/docking_port/mobile{
+	dir = 8;
+	dwidth = 3;
+	height = 5;
+	id = "mining_common";
+	name = "lavaland shuttle";
+	port_direction = 4;
+	width = 7
+	},
+/turf/open/floor/plating,
+/area/shuttle/mining)
+"i" = (
+/obj/structure/closet/crate,
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/mining)
+"j" = (
+/obj/structure/shuttle/engine/heater,
+/obj/structure/window/reinforced{
+	dir = 1;
+	layer = 2.9
+	},
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/shuttle/mining)
+"k" = (
+/obj/structure/ore_box,
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/mining)
+"l" = (
+/obj/structure/shuttle/engine/propulsion/burst,
+/turf/open/floor/plating/airless,
+/area/shuttle/mining)
+"Q" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
+	},
+/turf/open/floor/mineral/titanium,
+/area/shuttle/mining)
+
+(1,1,1) = {"
+a
+a
+b
+a
+b
+a
+a
+"}
+(2,1,1) = {"
+a
+c
+e
+g
+f
+i
+a
+"}
+(3,1,1) = {"
+b
+d
+Q
+e
+f
+j
+l
+"}
+(4,1,1) = {"
+a
+c
+e
+e
+f
+k
+a
+"}
+(5,1,1) = {"
+a
+a
+b
+h
+b
+a
+a
+"}

code/__DEFINES/DNA.dm

@@ -171,6 +171,7 @@
 #define ORGAN_SLOT_HEART_AID "heartdrive"
 #define ORGAN_SLOT_BRAIN_ANTIDROP "brain_antidrop"
 #define ORGAN_SLOT_BRAIN_ANTISTUN "brain_antistun"
+#define ORGAN_SLOT_BRAIN_ROBOT_RADSHIELDING "brain_robot_radshielding"
 #define ORGAN_SLOT_TAIL "tail"
 #define ORGAN_SLOT_PENIS "penis"
 #define ORGAN_SLOT_WOMB "womb"

code/__DEFINES/_protect.dm

@@ -7,4 +7,4 @@
 }\
 ##Path/CanProcCall(procname){\
 	return FALSE;\
-}
+}

code/__DEFINES/_readme.dm

@@ -11,4 +11,4 @@
 	and most importantly,
 	how to undo your changes if you screw it up.
 	- Sayu
-*/
+*/

code/__DEFINES/cinematics.dm

@@ -10,4 +10,4 @@
 #define CINEMATIC_NUKE_NO_CORE 10
 #define CINEMATIC_NUKE_FAR 11
 #define CINEMATIC_NUKE_CLOWNOP 12
-#define CINEMATIC_CULT_NUKE 13
+#define CINEMATIC_CULT_NUKE 13

code/__DEFINES/citadel_defines.dm

@@ -114,3 +114,17 @@
 
 //special species definitions
 #define MINIMUM_MUTANT_COLOR	"#202020" //this is how dark players mutant parts and skin can be
+
+//defines for different matrix sections
+#define MATRIX_RED			"red"
+#define MATRIX_GREEN		"green"
+#define MATRIX_BLUE			"blue"
+#define MATRIX_RED_GREEN	"red_green"
+#define MATRIX_RED_BLUE		"red_blue"
+#define MATRIX_GREEN_BLUE	"green_blue"
+#define MATRIX_ALL			"red_green_blue"
+#define MATRIX_NONE			"none"
+
+//defines for the two colour schemes, advanced and old
+#define OLD_CHARACTER_COLORING			"old_color_system"
+#define ADVANCED_CHARACTER_COLORING		"advanced_color_system"

code/__DEFINES/clockcult.dm

@@ -96,4 +96,4 @@ GLOBAL_LIST_EMPTY(all_clockwork_rites) //a list containing all clockwork rites.
 
 #define ARK_SCREAM_COOLDOWN 300 //This much time has to pass between instances of the Ark taking damage before it will "scream" again
 
-#define PRISM_DELAY_DURATION 1200 //how long prolonging prisms delay the shuttle for; defaults to 2 minutes
+#define PRISM_DELAY_DURATION 1200 //how long prolonging prisms delay the shuttle for; defaults to 2 minutes

code/__DEFINES/combat.dm

@@ -11,6 +11,12 @@
 #define STAMINA 	"stamina"
 #define BRAIN		"brain"
 
+//Toxins damage 'typeflag' - is this normal toxins damage or does it have to do with systems corruption (ROBOTIC_ORGANISM species trait)
+
+#define TOX_DEFAULT 1 //For normal toxins damage / healing (toxins, etc), adjustToxLoss() defaults to this
+#define TOX_SYSCORRUPT 2 //For toxins damage causing adverse effects to robotic organisms, up to and including fatal corruption, or healing that damage
+#define TOX_OMNI 3 //For tox damage / healing that affects both organics and robotic organisms. Used by very few things, e.g. aheals / by default setToxLoss()
+
 //bitflag damage defines used for suicide_act
 #define BRUTELOSS 		(1<<0)
 #define FIRELOSS 		(1<<1)

code/__DEFINES/contracts.dm

@@ -41,4 +41,4 @@
 #define BANISH_FUNERAL_GARB "funeral"
 
 #define LORE 1
-#define LAW 2
+#define LAW 2

code/__DEFINES/cult.dm

@@ -20,4 +20,4 @@
 #define DEFAULT_TOOLTIP "6:-29,5:-2"
 //misc
 #define SOULS_TO_REVIVE 3
-#define BLOODCULT_EYE "f00"
+#define BLOODCULT_EYE "f00"

code/__DEFINES/dcs/flags.dm

@@ -82,4 +82,4 @@
 /// combat mode is active.
 #define COMBAT_MODE_ACTIVE					(1<<1)
 /// combat mode is not active
-#define COMBAT_MODE_INACTIVE				(1<<2)
+#define COMBAT_MODE_INACTIVE				(1<<2)

code/__DEFINES/dcs/helpers.dm

@@ -13,4 +13,4 @@
 #define RemoveElement(arguments...) _RemoveElement(list(##arguments))
 
 /// A wrapper for _AddComponent that allows us to pretend we're using normal named arguments
-#define AddComponent(arguments...) _AddComponent(list(##arguments))
+#define AddComponent(arguments...) _AddComponent(list(##arguments))

code/__DEFINES/exports.dm

@@ -1,4 +1,4 @@
 #define EXPORT_CARGO 1
 #define EXPORT_EMAG 2
 #define EXPORT_CONTRABAND 4
-#define EXPORT_PIRATE 8
+#define EXPORT_PIRATE 8

code/__DEFINES/fantasy_affixes.dm

@@ -2,4 +2,4 @@
 #define AFFIX_SUFFIX 		(1 << 1)
 
 #define AFFIX_GOOD 			(1 << 0)
-#define AFFIX_EVIL 			(1 << 1)
+#define AFFIX_EVIL 			(1 << 1)

code/__DEFINES/is_helpers.dm

@@ -188,6 +188,8 @@ GLOBAL_LIST_INIT(turfs_without_ground, typecacheof(list(
 
 #define islandmine(A) (istype(A, /obj/effect/mine))
 
+#define issupplypod(A) (istype(A, /obj/structure/closet/supplypod))
+
 #define isammocasing(A) (istype(A, /obj/item/ammo_casing))
 
 #define isidcard(I) (istype(I, /obj/item/card/id))

code/__DEFINES/loadout.dm

@@ -66,4 +66,4 @@
 #define LOADOUT_LIMB_PROSTHETIC		"Prosthetic"
 #define LOADOUT_LIMB_AMPUTATED		"Amputated"
 
-#define LOADOUT_LIMBS		 		list(LOADOUT_LIMB_NORMAL,LOADOUT_LIMB_PROSTHETIC,LOADOUT_LIMB_AMPUTATED) //you can amputate your legs/arms though
+#define LOADOUT_LIMBS		 		list(LOADOUT_LIMB_NORMAL,LOADOUT_LIMB_PROSTHETIC,LOADOUT_LIMB_AMPUTATED) //you can amputate your legs/arms though

code/__DEFINES/machines.dm

@@ -120,4 +120,4 @@
 
 #define CLONEPOD_GET_MIND		1
 #define CLONEPOD_POLL_MIND		2
-#define CLONEPOD_NO_MIND		3
+#define CLONEPOD_NO_MIND		3

code/__DEFINES/materials.dm

@@ -12,4 +12,4 @@
 #define MATERIAL_ADD_PREFIX (1<<1)
 #define MATERIAL_AFFECT_STATISTICS (1<<2)
 
-#define MATERIAL_SOURCE(mat) "[mat.name]_material"
+#define MATERIAL_SOURCE(mat) "[mat.name]_material"

code/__DEFINES/medal.dm

@@ -26,4 +26,4 @@
 //Misc medals
 #define MEDAL_METEOR 	"Your Life Before Your Eyes"
 #define MEDAL_PULSE 	"Jackpot"
-#define MEDAL_TIMEWASTE "Overextended The Joke"
+#define MEDAL_TIMEWASTE "Overextended The Joke"

code/__DEFINES/melee.dm

@@ -8,4 +8,4 @@
 #define MARTIALART_KRAVMAGA "krav maga"
 #define MARTIALART_CQC "CQC"
 #define MARTIALART_PLASMAFIST "plasma fist"
-#define MARTIALART_RISINGBASS "rising bass"
+#define MARTIALART_RISINGBASS "rising bass"

code/__DEFINES/menu.dm

@@ -1,3 +1,3 @@
 #define CHECKBOX_NONE 0
 #define CHECKBOX_GROUP 1
-#define CHECKBOX_TOGGLE 2
+#define CHECKBOX_TOGGLE 2

code/__DEFINES/radiation.dm

@@ -18,6 +18,8 @@ Ask ninjanomnom if they're around
 #define RAD_BURN_THRESHOLD 1000						// Applied radiation must be over this to burn
 
 #define RAD_MOB_SAFE 500							// How much stored radiation in a mob with no ill effects
+#define RAD_DEFAULT_ROBOT_SAFE 250					// Like above, except for robotic carbons. Far more susceptible to corruption from radiation.
+#define RAD_UPGRADED_ROBOT_SAFE 750					// If the robot has been upgraded via an implant, their radiation threshold is raised to be somewhat above that of organics.
 
 #define RAD_MOB_HAIRLOSS 800						// How much stored radiation to check for hair loss
 

code/__DEFINES/rockpaperscissors.dm

@@ -4,4 +4,4 @@
 #define ROCKPAPERSCISSORS_LOSE				"lose"
 #define ROCKPAPERSCISSORS_WIN				"win"
 #define ROCKPAPERSCISSORS_TIE				"tie"
-#define ROCKPAPERSCISSORS_NOT_DECIDED		"not_decided"
+#define ROCKPAPERSCISSORS_NOT_DECIDED		"not_decided"

code/__DEFINES/tgs.dm

@@ -1,6 +1,6 @@
 // tgstation-server DMAPI
 
-#define TGS_DMAPI_VERSION "5.2.7"
+#define TGS_DMAPI_VERSION "5.2.8"
 
 // All functions and datums outside this document are subject to change with any version and should not be relied on.
 

code/__DEFINES/tgui.dm

@@ -32,4 +32,4 @@
 	url_encode(json_encode(list( \
 		"type" = type, \
 		"payload" = payload, \
-	))))
+	))))

code/__DEFINES/traits.dm

@@ -118,6 +118,8 @@
 #define TRAIT_NOLIMBDISABLE		"no_limb_disable"
 #define TRAIT_EASYLIMBDISABLE	"easy_limb_disable"
 #define TRAIT_TOXINLOVER		"toxinlover"
+#define TRAIT_ROBOTIC_ORGANISM	"robotic_organism"
+#define TRAIT_ROBOT_RADSHIELDING	"robot_radshielding"
 #define TRAIT_NOBREATH			"no_breath"
 #define TRAIT_ANTIMAGIC			"anti_magic"
 #define TRAIT_HOLY				"holy"
@@ -307,6 +309,7 @@
 #define LOCKED_HELMET_TRAIT "locked-helmet"
 #define NINJA_SUIT_TRAIT "ninja-suit"
 #define ANTI_DROP_IMPLANT_TRAIT "anti-drop-implant"
+#define ROBOT_RADSHIELDING_IMPLANT_TRAIT "robot-radshielding-implant"
 #define MARTIAL_ARTIST_TRAIT "martial_artist"
 #define SLEEPING_CARP_TRAIT "sleeping_carp"
 #define RISING_BASS_TRAIT "rising_bass"
@@ -318,6 +321,7 @@
 #define MEGAFAUNA_TRAIT "megafauna"
 #define DEATHSQUAD_TRAIT "deathsquad"
 #define SLIMEPUDDLE_TRAIT "slimepuddle"
+#define CORRUPTED_SYSTEM "corrupted-system"
 /// This trait is added by the active directional block system.
 #define ACTIVE_BLOCK_TRAIT				"active_block"
 /// This trait is added by the parry system.

code/__DEFINES/turf_flags.dm

@@ -3,4 +3,4 @@
 #define CHANGETURF_FORCEOP			4
 #define CHANGETURF_SKIP				8 // A flag for PlaceOnTop to just instance the new turf instead of calling ChangeTurf. Used for uninitialized turfs NOTHING ELSE
 #define CHANGETURF_INHERIT_AIR 16 // Inherit air from previous turf. Implies CHANGETURF_IGNORE_AIR
-#define CHANGETURF_RECALC_ADJACENT 32 //Immediately recalc adjacent atmos turfs instead of queuing.
+#define CHANGETURF_RECALC_ADJACENT 32 //Immediately recalc adjacent atmos turfs instead of queuing.

code/__DEFINES/vehicles.dm

@@ -6,4 +6,4 @@
 
 
 //Car trait flags
-#define CAN_KIDNAP 1
+#define CAN_KIDNAP 1

code/__HELPERS/matrices.dm

@@ -176,4 +176,4 @@ round(cos_inv_third+sqrt3_sin, 0.001), round(cos_inv_third-sqrt3_sin, 0.001), ro
 		offset = (y-1)*4
 		for(x in 1 to 4)
 			output[offset+x] = round(A[offset+1]*B[x] + A[offset+2]*B[x+4] + A[offset+3]*B[x+8] + A[offset+4]*B[x+12]+(y==5?B[x+16]:0), 0.001)
-	return output
+	return output

code/__HELPERS/reagents.dm

@@ -94,4 +94,4 @@
 			chosen_id = input(user, "Choose a reagent to add.", "Choose a reagent.") as null|anything in subtypesof(/datum/reagent)
 		if("I'm feeling lucky")
 			chosen_id = pick(subtypesof(/datum/reagent))
-	return chosen_id
+	return chosen_id

code/__HELPERS/sorts/InsertSort.dm

@@ -16,4 +16,4 @@
 		SI.associative = associative
 
 		SI.binarySort(fromIndex, toIndex, fromIndex)
-	return L
+	return L

code/__HELPERS/sorts/MergeSort.dm

@@ -16,4 +16,4 @@
 		SI.associative = associative
 
 		SI.mergeSort(fromIndex, toIndex)
-	return L
+	return L

code/__HELPERS/sorts/TimSort.dm

@@ -17,4 +17,4 @@
 		SI.associative = associative
 
 		SI.timSort(fromIndex, toIndex)
-	return L
+	return L

code/__HELPERS/text_vr.dm

@@ -29,4 +29,4 @@ GLOBAL_LIST_EMPTY(whitelisted_species_list)
 
 /proc/log_looc(text)
 	if (CONFIG_GET(flag/log_ooc))
-		WRITE_FILE(GLOB.world_game_log, "\[[TIME_STAMP("hh:mm:ss", FALSE)]]LOOC: [text]")
+		WRITE_FILE(GLOB.world_game_log, "\[[TIME_STAMP("hh:mm:ss", FALSE)]]LOOC: [text]")

code/__HELPERS/typelists.dm

@@ -40,4 +40,4 @@ GLOBAL_LIST_EMPTY(typelistkeys)
 
 	for (var/saving in savings)
 		to_chat(world, "Savings for [saving]: [savings[saving]] lists, [saveditems[saving]] items")
-#endif
+#endif

code/__HELPERS/vector.dm

@@ -54,4 +54,4 @@
 	return locate(T.x + V.x, T.y + V.y, z)
 
 /proc/atoms2vector(var/atom/A, var/atom/B)
-	return new /datum/vector((B.x - A.x), (B.y - A.y)) // Vector from A -> B
+	return new /datum/vector((B.x - A.x), (B.y - A.y)) // Vector from A -> B

code/_globalvars/lists/maintenance_loot.dm

@@ -131,4 +131,4 @@ GLOBAL_LIST_INIT(ratking_coins, list(//Coins: Used by the regal rat mob when spa
 			/obj/item/coin/iron,
 			/obj/item/coin/silver,
 			/obj/item/coin/plastic,
-			/obj/item/coin/titanium))
+			/obj/item/coin/titanium))

code/_globalvars/lists/medals.dm

@@ -1 +1 @@
-GLOBAL_LIST_EMPTY(commendations)
+GLOBAL_LIST_EMPTY(commendations)

code/_globalvars/traits.dm

@@ -52,6 +52,8 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_NOLIMBDISABLE" = TRAIT_NOLIMBDISABLE,
 		"TRAIT_EASYLIMBDISABLE" = TRAIT_EASYLIMBDISABLE,
 		"TRAIT_TOXINLOVER" = TRAIT_TOXINLOVER,
+		"TRAIT_ROBOTIC_ORGANISM" = TRAIT_ROBOTIC_ORGANISM,
+		"TRAIT_ROBOT_RADSHIELDING" = TRAIT_ROBOT_RADSHIELDING,
 		"TRAIT_NOBREATH" = TRAIT_NOBREATH,
 		"TRAIT_ANTIMAGIC" = TRAIT_ANTIMAGIC,
 		"TRAIT_HOLY" = TRAIT_HOLY,

code/_js/menus.dm

@@ -34,4 +34,4 @@ function dropdowns() {
 		}
 	}
 }
-"}
+"}

code/_onclick/click.dm

@@ -24,7 +24,7 @@
   * Common mob click code
   */
 /mob/proc/CommonClickOn(atom/A, params)
-	SHOULD_NOT_SLEEP(TRUE)
+	//SHOULD_NOT_SLEEP(TRUE)
 	if(mob_transforming)
 		return
 	if(SEND_SIGNAL(src, COMSIG_MOB_CLICKON, A, params) & COMSIG_MOB_CANCEL_CLICKON)
@@ -34,7 +34,7 @@
 		FlushCurrentAction()
 	else
 		DiscardCurrentAction()
-	
+
 /*
 	Standard mob ClickOn()
 	Handles exceptions: Buildmode, middle click, modified clicks, mech actions
@@ -49,7 +49,6 @@
 	* mob/RangedAttack(atom,params) - used only ranged, only used for tk and laser eyes but could be changed
 */
 /mob/proc/ClickOn(atom/A, params)
-	SHOULD_NOT_SLEEP(TRUE)
 	if(check_click_intercept(params,A))
 		return
 

code/_onclick/hud/movable_screen_objects.dm

@@ -87,4 +87,4 @@
 
 	S.screen_loc = screen_l
 
-	screen += S
+	screen += S

code/_onclick/other_mobs.dm

@@ -36,7 +36,7 @@
 	return . | A.attack_hand(src, intent, .)
 
 /atom/proc/attack_hand(mob/user, act_intent = user.a_intent, attackchain_flags)
-	SHOULD_NOT_SLEEP(TRUE)
+	//SHOULD_NOT_SLEEP(TRUE)
 	if(!(interaction_flags_atom & INTERACT_ATOM_NO_FINGERPRINT_ATTACK_HAND))
 		add_fingerprint(user)
 	if(SEND_SIGNAL(src, COMSIG_ATOM_ATTACK_HAND, user) & COMPONENT_NO_ATTACK_HAND)

code/controllers/configuration_citadel.dm

@@ -5,4 +5,4 @@
 	var/discord_url = "hfdksjhfa.com"
 	var/discord_password
 	var/announce_watchlist = 0
-	var/announce_adminhelps = 0
+	var/announce_adminhelps = 0

code/controllers/failsafe.dm

@@ -97,4 +97,4 @@ GLOBAL_REAL(Failsafe, /datum/controller/failsafe)
 
 /datum/controller/failsafe/stat_entry(msg)
 	msg = "Defcon: [defcon_pretty()] (Interval: [Failsafe.processing_interval] | Iteration: [Failsafe.master_iteration])"
-	return msg
+	return msg

code/controllers/subsystem/adjacent_air.dm

@@ -33,4 +33,4 @@ SUBSYSTEM_DEF(adjacent_air)
 			if(MC_TICK_CHECK)
 				break
 		else
-			CHECK_TICK
+			CHECK_TICK

code/controllers/subsystem/autotransfer.dm

@@ -37,4 +37,4 @@ SUBSYSTEM_DEF(autotransfer)
 	else
 		SSshuttle.autoEnd()
 
-#undef NO_MAXVOTES_CAP
+#undef NO_MAXVOTES_CAP

code/controllers/subsystem/minor_mapping.dm

@@ -35,4 +35,4 @@ SUBSYSTEM_DEF(minor_mapping)
 		if(locate(/obj/structure/cable) in T)
 			exposed_wires += T
 
-	return shuffle(exposed_wires)
+	return shuffle(exposed_wires)

code/controllers/subsystem/processing/nanites.dm

@@ -19,4 +19,4 @@ PROCESSING_SUBSYSTEM_DEF(nanites)
 		if(!force && !check_hardware(backup))
 			return
 		if(backup.cloud_id == cloud_id)
-			return backup
+			return backup

code/controllers/subsystem/radiation.dm

@@ -14,4 +14,4 @@ PROCESSING_SUBSYSTEM_DEF(radiation)
 	var/atom/master = contamination.parent
 	SSblackbox.record_feedback("tally", "contaminated", 1, master.type)
 	var/msg = "has become contamintaed with enough radiation to contaminate other objects. || Source: [contamination.source] || Strength: [contamination.strength]"
-	master.investigate_log(msg, INVESTIGATE_RADIATION)
+	master.investigate_log(msg, INVESTIGATE_RADIATION)

code/datums/brain_damage/mild.dm

@@ -263,4 +263,4 @@
 			popleft(speak_dejavu) //Remove the oldest
 			speak_dejavu += speech_args[SPEECH_MESSAGE]
 	else
-		speak_dejavu += speech_args[SPEECH_MESSAGE]
+		speak_dejavu += speech_args[SPEECH_MESSAGE]

code/datums/components/crafting/glassware/glassware.dm

@@ -451,4 +451,4 @@
 	if(istype(I, /obj/item/stack/sheet/glass))
 		if(do_after(user,10, target = src))
 			new next_step(user.loc, 1)
-			qdel(src)
+			qdel(src)

code/datums/components/crafting/glassware/lens_crafting.dm

@@ -95,4 +95,4 @@
 	name = "Handmade Glasses"
 	desc = "Handmade glasses that have not been polished at all making them useless. Selling them could still be worth a few credits."
 	icon = 'icons/obj/glass_ware.dmi'
-	icon_state = "frames_2"
+	icon_state = "frames_2"

code/datums/components/crafting/recipes/recipes_robot.dm

@@ -40,7 +40,7 @@
 /datum/crafting_recipe/floorbot
 	name = "Floorbot"
 	result = /mob/living/simple_animal/bot/floorbot
-	reqs = list(/obj/item/storage/toolbox/mechanical = 1,
+	reqs = list(/obj/item/storage/toolbox = 1,
 				/obj/item/stack/tile/plasteel = 1,
 				/obj/item/assembly/prox_sensor = 1,
 				/obj/item/bodypart/r_arm/robot = 1)
@@ -95,4 +95,4 @@
 	reqs = list(/obj/item/aicard = 1,
 					/obj/item/reagent_containers/food/snacks/grown/pumpkin = 1,
 					/obj/item/stack/cable_coil = 5)
-	category = CAT_ROBOT
+	category = CAT_ROBOT

code/datums/components/fantasy/prefixes.dm

@@ -67,4 +67,4 @@
 /datum/fantasy_affix/vampiric/apply(datum/component/fantasy/comp, newName)
 	var/obj/item/master = comp.parent
 	comp.appliedComponents += master.AddComponent(/datum/component/lifesteal, comp.quality)
-	return "vampiric [newName]"
+	return "vampiric [newName]"

code/datums/components/igniter.dm

@@ -36,4 +36,4 @@
 	if(isliving(target))
 		var/mob/living/L = target
 		L.adjust_fire_stacks(fire_stacks)
-		L.IgniteMob()
+		L.IgniteMob()

code/datums/components/knockoff.dm

@@ -41,4 +41,4 @@
 	RegisterSignal(H, COMSIG_HUMAN_DISARM_HIT, .proc/Knockoff, TRUE)
 
 /datum/component/knockoff/proc/OnDropped(datum/source, mob/living/M)
-	UnregisterSignal(M, COMSIG_HUMAN_DISARM_HIT)
+	UnregisterSignal(M, COMSIG_HUMAN_DISARM_HIT)

code/datums/components/magnetic_catch.dm

@@ -31,4 +31,4 @@
 	UnregisterSignal(thing, COMSIG_MOVABLE_PRE_THROW)
 
 /datum/component/magnetic_catch/proc/throw_react(datum/source, list/arguments)
-	return COMPONENT_CANCEL_THROW
+	return COMPONENT_CANCEL_THROW

code/datums/components/pellet_cloud.dm

@@ -55,7 +55,7 @@
 	var/mob/living/shooter
 
 /datum/component/pellet_cloud/Initialize(projectile_type=/obj/item/shrapnel, magnitude=5)
-	if(!isammocasing(parent) && !isgrenade(parent) && !islandmine(parent))
+	if(!isammocasing(parent) && !isgrenade(parent) && !islandmine(parent) && !issupplypod(parent))
 		return COMPONENT_INCOMPATIBLE
 
 	if(magnitude < 1)
@@ -66,7 +66,7 @@
 
 	if(isammocasing(parent))
 		num_pellets = magnitude
-	else if(isgrenade(parent) || islandmine(parent))
+	else if(isgrenade(parent) || islandmine(parent) || issupplypod(parent))
 		radius = magnitude
 
 /datum/component/pellet_cloud/Destroy(force, silent)
@@ -86,9 +86,11 @@
 		RegisterSignal(parent, COMSIG_GRENADE_PRIME, .proc/create_blast_pellets)
 	else if(islandmine(parent))
 		RegisterSignal(parent, COMSIG_MINE_TRIGGERED, .proc/create_blast_pellets)
+	else if(issupplypod(parent))
+		RegisterSignal(parent, COMSIG_SUPPLYPOD_LANDED, .proc/create_blast_pellets)
 
 /datum/component/pellet_cloud/UnregisterFromParent()
-	UnregisterSignal(parent, list(COMSIG_PARENT_PREQDELETED, COMSIG_PELLET_CLOUD_INIT, COMSIG_GRENADE_PRIME, COMSIG_GRENADE_ARMED, COMSIG_MOVABLE_MOVED, COMSIG_MOVABLE_UNCROSSED, COMSIG_MINE_TRIGGERED, COMSIG_ITEM_DROPPED))
+	UnregisterSignal(parent, list(COMSIG_PARENT_PREQDELETED, COMSIG_PELLET_CLOUD_INIT, COMSIG_GRENADE_PRIME, COMSIG_GRENADE_ARMED, COMSIG_MOVABLE_MOVED, COMSIG_MOVABLE_UNCROSSED, COMSIG_MINE_TRIGGERED, COMSIG_ITEM_DROPPED, COMSIG_SUPPLYPOD_LANDED))
 
 /**
   * create_casing_pellets() is for directed pellet clouds for ammo casings that have multiple pellets (buckshot and scatter lasers for instance)

code/datums/components/shrink.dm

@@ -39,4 +39,4 @@
 		if(ishuman(L))
 			var/mob/living/carbon/human/H = L
 			H.physiology.damage_resistance += 100
-	..()
+	..()

code/datums/components/sizzle.dm

@@ -22,4 +22,4 @@
 	grill_marks.Blend(icon('icons/obj/kitchen.dmi', "grillmarks"), ICON_MULTIPLY) //adds grill marks and the remaining white areas become transparent
 	sizzling = new(grill_marks)
 	sizzling.alpha = sizzlealpha
-	food.add_overlay(sizzling)
+	food.add_overlay(sizzling)

code/datums/components/spawner.dm

@@ -53,4 +53,4 @@
 	spawned_mobs += L
 	L.nest = src
 	L.faction = src.faction
-	P.visible_message("<span class='danger'>[L] [spawn_text] [P].</span>")
+	P.visible_message("<span class='danger'>[L] [spawn_text] [P].</span>")

code/datums/components/summoning.dm

@@ -68,4 +68,4 @@
 	spawn_location.visible_message("<span class='danger'>[L] [spawn_text].</span>")
 
 /datum/component/summoning/proc/on_spawned_death(mob/killed, gibbed)
-	spawned_mobs -= killed
+	spawned_mobs -= killed

code/datums/components/swarming.dm

@@ -52,4 +52,4 @@
 	var/atom/movable/owner = parent
 	if(is_swarming)
 		animate(owner, pixel_x = owner.pixel_x - offset_x, pixel_y = owner.pixel_y - offset_y, time = 2)
-		is_swarming = FALSE
+		is_swarming = FALSE

code/datums/components/thermite.dm

@@ -78,4 +78,4 @@
 
 /datum/component/thermite/proc/attackby_react(datum/source, obj/item/thing, mob/user, params)
 	if(thing.get_temperature())
-		thermite_melt(user)
+		thermite_melt(user)

code/datums/dash_weapon.dm

@@ -46,4 +46,4 @@
 	holder.update_action_buttons_icon()
 	if(recharge_sound)
 		playsound(dashing_item, recharge_sound, 50, 1)
-	to_chat(holder, "<span class='notice'>[src] now has [current_charges]/[max_charges] charges.</span>")
+	to_chat(holder, "<span class='notice'>[src] now has [current_charges]/[max_charges] charges.</span>")

code/datums/diseases/_MobProcs.dm

@@ -151,4 +151,4 @@
 	flags_1 |= SHOCKED_1
 
 /mob/living/proc/reset_shocked()
-	flags_1 &= ~ SHOCKED_1
+	flags_1 &= ~ SHOCKED_1

code/datums/diseases/advance/presets.dm

@@ -39,4 +39,4 @@
 			symptoms += S
 
 	name = "Sample #[rand(1,10000)]"
-	..()
+	..()

code/datums/diseases/advance/symptoms/disfiguration.dm

@@ -47,4 +47,4 @@ BONUS
 	if(!.)
 		return
 	if(A.affected_mob)
-		REMOVE_TRAIT(A.affected_mob, TRAIT_DISFIGURED, DISEASE_TRAIT)
+		REMOVE_TRAIT(A.affected_mob, TRAIT_DISFIGURED, DISEASE_TRAIT)

code/datums/diseases/advance/symptoms/dizzy.dm

@@ -52,4 +52,4 @@ Bonus
 			to_chat(M, "<span class='userdanger'>A wave of dizziness washes over you!</span>")
 			M.Dizzy(5)
 			if(power >= 2)
-				M.set_drugginess(5)
+				M.set_drugginess(5)

code/datums/diseases/advance/symptoms/flesh_eating.dm

@@ -134,4 +134,4 @@ Bonus
 		M.reagents.add_reagent_list(list(/datum/reagent/toxin/heparin = 2, /datum/reagent/toxin/lipolicide = 2))
 	if(zombie)
 		M.reagents.add_reagent(/datum/reagent/romerol, 1)
-	return 1
+	return 1

code/datums/diseases/advance/symptoms/headache.dm

@@ -59,4 +59,4 @@ BONUS
 		M.adjustStaminaLoss(25)
 	if(power >= 3 && A.stage >= 5)
 		to_chat(M, "<span class='userdanger'>[pick("Your head hurts!", "You feel a burning knife inside your brain!", "A wave of pain fills your head!")]</span>")
-		M.Stun(35)
+		M.Stun(35)

code/datums/diseases/advance/symptoms/itching.dm

@@ -53,4 +53,4 @@ BONUS
 		var/can_scratch = scratch && !M.incapacitated() && get_location_accessible(M, picked_bodypart)
 		M.visible_message("[can_scratch ? "<span class='warning'>[M] scratches [M.p_their()] [bodypart.name].</span>" : ""]", "<span class='warning'>Your [bodypart.name] itches. [can_scratch ? " You scratch it." : ""]</span>")
 		if(can_scratch)
-			bodypart.receive_damage(0.5)
+			bodypart.receive_damage(0.5)

code/datums/diseases/advance/symptoms/oxygen.dm

@@ -67,4 +67,4 @@ Bonus
 	if(!..())
 		return
 	if(A.stage >= 4)
-		REMOVE_TRAIT(A.affected_mob, TRAIT_NOBREATH, DISEASE_TRAIT)
+		REMOVE_TRAIT(A.affected_mob, TRAIT_NOBREATH, DISEASE_TRAIT)

code/datums/diseases/advance/symptoms/skin.dm

@@ -38,4 +38,4 @@ BONUS
 				M.reagents.add_reagent(color, 5)
 		else
 			if (prob(50)) // spam
-				M.visible_message("<span class='warning'>[M] looks rather vibrant...</span>", "<span class='notice'>The colors, man, the colors...</span>")
+				M.visible_message("<span class='warning'>[M] looks rather vibrant...</span>", "<span class='notice'>The colors, man, the colors...</span>")

code/datums/diseases/advance/symptoms/sneeze.dm

@@ -51,4 +51,4 @@ Bonus
 		else
 			M.emote("sneeze")
 			if(M.CanSpreadAirborneDisease()) //don't spread germs if they covered their mouth
-				A.spread(4 + power)
+				A.spread(4 + power)

code/datums/diseases/advance/symptoms/symptoms.dm

@@ -79,4 +79,4 @@
 	return
 
 /datum/symptom/proc/OnRemove(datum/disease/advance/A)	//But dont forget to remove them too.
-	return
+	return

code/datums/diseases/advance/symptoms/weight.dm

@@ -50,4 +50,4 @@ Bonus
 		else
 			to_chat(M, "<span class='warning'><i>[pick("So hungry...", "You'd kill someone for a bite of food...", "Hunger cramps seize you...")]</i></span>")
 			M.overeatduration = max(M.overeatduration - 100, 0)
-			M.adjust_nutrition(-100)
+			M.adjust_nutrition(-100)

code/datums/diseases/advance/symptoms/youth.dm

@@ -55,4 +55,4 @@ BONUS
 			if(5)
 				if(H.age > 21)
 					H.age = 21
-					to_chat(H, "<span class='notice'>You feel like you can take on the world!</span>")
+					to_chat(H, "<span class='notice'>You feel like you can take on the world!</span>")

code/datums/diseases/anxiety.dm

@@ -38,4 +38,4 @@
 													"<span class='userdanger'>You cough up butterflies!</span>")
 				new /mob/living/simple_animal/butterfly(affected_mob.loc)
 				new /mob/living/simple_animal/butterfly(affected_mob.loc)
-	return
+	return

code/datums/diseases/beesease.dm

@@ -36,4 +36,4 @@
 				affected_mob.visible_message("<span class='danger'>[affected_mob] coughs up a swarm of bees!</span>", \
 													"<span class='userdanger'>You cough up a swarm of bees!</span>")
 				new /mob/living/simple_animal/hostile/poison/bees(affected_mob.loc)
-	return
+	return

code/datums/diseases/cold.dm

@@ -50,4 +50,4 @@
 				if(!affected_mob.disease_resistances.Find(/datum/disease/flu))
 					var/datum/disease/Flu = new /datum/disease/flu()
 					affected_mob.ForceContractDisease(Flu, FALSE, TRUE)
-					cure()
+					cure()

code/datums/diseases/cold9.dm

@@ -36,4 +36,4 @@
 			if(prob(1))
 				to_chat(affected_mob, "<span class='danger'>Your throat feels sore.</span>")
 			if(prob(10))
-				to_chat(affected_mob, "<span class='danger'>You feel stiff.</span>")
+				to_chat(affected_mob, "<span class='danger'>You feel stiff.</span>")

code/datums/diseases/heart_failure.dm

@@ -62,4 +62,4 @@
 				cure()
 
 	else
-		cure()
+		cure()

code/datums/diseases/magnitis.dm

@@ -65,4 +65,4 @@
 					var/iter = rand(1,3)
 					for(i=0,i<iter,i++)
 						step_towards(S,affected_mob)
-	return
+	return

code/datums/diseases/pierrot_throat.dm

@@ -52,4 +52,4 @@
 
 /datum/disease/pierrot_throat/remove_disease()
 	UnregisterSignal(affected_mob, COMSIG_MOB_SAY)
-	return ..()
+	return ..()

code/datums/diseases/retrovirus.dm

@@ -81,4 +81,4 @@
 				if(prob(50))
 					scramble_dna(affected_mob, 1, 0, rand(50,75))
 				else
-					scramble_dna(affected_mob, 0, 1, rand(50,75))
+					scramble_dna(affected_mob, 0, 1, rand(50,75))

code/datums/elements/update_icon_blocker.dm

@@ -7,4 +7,4 @@
 	RegisterSignal(target, COMSIG_ATOM_UPDATE_ICON, .proc/block_update_icon)
 
 /datum/element/update_icon_blocker/proc/block_update_icon()
-	return COMSIG_ATOM_NO_UPDATE_ICON_STATE | COMSIG_ATOM_NO_UPDATE_OVERLAYS
+	return COMSIG_ATOM_NO_UPDATE_ICON_STATE | COMSIG_ATOM_NO_UPDATE_OVERLAYS