Merge remote-tracking branch 'upstream/master220' into מילה-קטנה-ותפק…

…יד-חשוב-

.github/workflows/ci.yml

@@ -64,7 +64,7 @@ jobs:
     strategy:
       fail-fast: false # Let all map tests run to completion
       matrix:
-        maptype: ['/datum/map/cyberiad', '/datum/map/delta', '/datum/map/cerestation']
+        maptype: ['/datum/map/cyberiad', '/datum/map/delta', '/datum/map/cerestation', '/datum/map/celestation']
         byondtype: ['STABLE']
     services:
       mariadb:

_maps/map_files/Delta/delta.dmm

@@ -215,9 +215,7 @@
 /obj/structure/cable{
 	icon_state = "2-8"
 	},
-/mob/living/simple_animal/bot/secbot/armsky{
-	auto_patrol = 1
-	},
+/mob/living/simple_animal/bot/secbot/armsky,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -14703,7 +14701,7 @@
 "bLO" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/turretid/stun{
-	control_area = "\improper AI Satellite Antechamber";
+	control_area = "I Satellite Antechamber";
 	name = "AI Antechamber Turret Control";
 	pixel_y = 28;
 	req_access = list(75)
@@ -16097,7 +16095,7 @@
 	dir = 4
 	},
 /obj/machinery/turretid/stun{
-	control_area = "\improper AI Satellite";
+	control_area = "AI Satellite";
 	name = "AI Antechamber Turret Control";
 	pixel_x = -32;
 	req_access = list(75)
@@ -16262,7 +16260,7 @@
 	dir = 4
 	},
 /obj/machinery/turretid/stun{
-	control_area = "\improper AI Satellite";
+	control_area = "AI Satellite";
 	name = "AI Antechamber Turret Control";
 	pixel_x = 32;
 	req_access = list(75)
@@ -61274,7 +61272,9 @@
 	},
 /area/security/evidence)
 "ixc" = (
-/obj/machinery/door_timer/cell_2,
+/obj/machinery/door_timer/cell_2{
+	pixel_y = -32
+	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
@@ -70607,7 +70607,7 @@
 /obj/structure/closet/secure_closet/personal/cabinet,
 /obj/item/clothing/head/kitty,
 /obj/item/clothing/under/maid,
-/obj/item/clothing/suit/browntrenchcoat,
+/obj/item/clothing/suit/storage/browntrenchcoat,
 /turf/simulated/floor/wood,
 /area/crew_quarters/cabin3)
 "kMD" = (
@@ -86187,7 +86187,7 @@
 	dir = 1
 	},
 /obj/machinery/turretid/stun{
-	control_area = "\improper AI Upload Chamber";
+	control_area = "AI Upload Chamber";
 	name = "AI Upload Turret Control";
 	pixel_y = -24;
 	req_access = list(75)
@@ -92096,7 +92096,9 @@
 /turf/simulated/floor/plating,
 /area/crew_quarters/locker)
 "pIy" = (
-/obj/machinery/door_timer/cell_4,
+/obj/machinery/door_timer/cell_4{
+	pixel_y = -32
+	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
@@ -105757,7 +105759,7 @@
 "sNY" = (
 /obj/item/twohanded/required/kirbyplants,
 /obj/machinery/turretid/stun{
-	control_area = "\improper Telecoms Central Compartment";
+	control_area = "Telecoms Central Compartment";
 	name = "AI Antechamber Turret Control";
 	pixel_y = -26;
 	req_access = list(75)

_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm

@@ -321,7 +321,7 @@
 /obj/machinery/light{
 	dir = 4
 	},
-/turf/simulated/floor/pod/light,
+/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
 /area/ruin/powered/beach)
 "lM" = (
 /obj/structure/dresser,
@@ -600,7 +600,7 @@
 /obj/machinery/light{
 	dir = 8
 	},
-/turf/simulated/floor/pod/light,
+/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
 /area/ruin/powered/beach)
 "TS" = (
 /obj/structure/closet/secure_closet/freezer/meat,

_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_winter.dmm

@@ -151,13 +151,6 @@
 /obj/mecha/working/ripley/mining,
 /turf/simulated/floor/pod/light,
 /area/ruin/powered/snow_biodome)
-"aF" = (
-/obj/structure/bookcase/random,
-/turf/simulated/floor/wood/cold,
-/area/ruin/powered/snow_cabin)
-"aG" = (
-/turf/simulated/floor/wood/cold,
-/area/ruin/powered/snow_cabin)
 "aH" = (
 /mob/living/simple_animal/hostile/skeleton/eskimo,
 /turf/simulated/floor/wood,
@@ -183,7 +176,7 @@
 /area/ruin/powered/snow_cabin)
 "aM" = (
 /obj/effect/baseturf_helper/lava_land/surface,
-/turf/simulated/floor/wood/cold,
+/turf/simulated/floor/wood,
 /area/ruin/powered/snow_cabin)
 "aN" = (
 /obj/structure/bed/dogbed,
@@ -257,7 +250,7 @@
 /area/ruin/powered/snow_biodome)
 "bD" = (
 /obj/effect/spawner/window,
-/turf/simulated/floor/wood/cold,
+/turf/simulated/floor/wood,
 /area/ruin/powered/snow_cabin)
 "bM" = (
 /obj/machinery/light,
@@ -308,7 +301,7 @@
 	dir = 1
 	},
 /obj/effect/mapping_helpers/no_lava,
-/turf/simulated/floor/pod/dark,
+/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
 /area/ruin/powered/snow_biodome)
 "iB" = (
 /obj/structure/chair/sofa/left{
@@ -414,10 +407,6 @@
 /obj/item/clothing/gloves/fingerless,
 /turf/simulated/floor/pod/dark,
 /area/ruin/powered/snow_biodome)
-"Dz" = (
-/mob/living/simple_animal/hostile/skeleton/eskimo,
-/turf/simulated/floor/wood/cold,
-/area/ruin/powered/snow_cabin)
 "Ef" = (
 /obj/structure/reagent_dispensers/fueltank,
 /turf/simulated/floor/pod/dark,
@@ -530,7 +519,7 @@
 /obj/structure/table/wood,
 /obj/item/folder/blue,
 /obj/item/pen,
-/turf/simulated/floor/wood/cold,
+/turf/simulated/floor/wood,
 /area/ruin/powered/snow_cabin)
 "Nh" = (
 /obj/structure/table/wood,
@@ -617,10 +606,6 @@
 "Wg" = (
 /turf/simulated/wall/r_wall,
 /area/ruin/powered/snow_biodome)
-"Ww" = (
-/obj/machinery/light,
-/turf/simulated/floor/wood/cold,
-/area/ruin/powered/snow_cabin)
 "WM" = (
 /obj/structure/dresser,
 /turf/simulated/floor/carpet,
@@ -1255,9 +1240,9 @@ af
 aq
 ax
 aH
-aF
-aF
-aF
+av
+av
+av
 MR
 To
 at
@@ -1288,10 +1273,10 @@ af
 tg
 as
 at
-aG
+at
 aM
 Jl
-aG
+at
 Ir
 at
 Bz
@@ -1321,10 +1306,10 @@ am
 Uv
 Kn
 bx
-aG
 at
 at
-Dz
+at
+aH
 Gf
 at
 bz
@@ -1356,7 +1341,7 @@ ai
 ar
 OV
 HZ
-aG
+at
 aq
 bD
 bD
@@ -1389,7 +1374,7 @@ ay
 zi
 Ye
 VW
-Ww
+bz
 aq
 ak
 ak
@@ -1422,7 +1407,7 @@ Ko
 Ep
 QJ
 VW
-aG
+at
 bD
 ak
 ak