Merge pull request #133 from Glamyrio/code_review

Code review

Author: Glamyrio

.github/labeler.yml

@@ -1,4 +1,3 @@
-
 "GitHub":
   - changed-files:
       - any-glob-to-any-file: [".github/**"]
@@ -13,8 +12,8 @@
       - any-glob-to-any-file: [".vscode/**"]
 "Документация":
   - all:
-    - changed-files:
-        - any-glob-to-any-file: ["**/*.md"]
+      - changed-files:
+          - any-glob-to-any-file: ["**/*.md"]
 "Звуки":
   - changed-files:
       - any-glob-to-any-file: ["**/*.ogg"]
@@ -29,12 +28,12 @@
       - any-glob-to-any-file: ["modular_meta/**"]
 "Спрайты":
   - changed-files:
-       - any-glob-to-any-file: ["**/*.dmi"]
+      - any-glob-to-any-file: ["**/*.dmi"]
 
-"Слияние с апстримом":
+"Апстрим":
   - all:
       - base-branch: "master"
-      - head-branch: "merge[-_]upstream"
+      - head-branch: "upstream"
 "Фишка":
   - head-branch: ["^feat", "feat"]
 "Улучшение":

.github/workflows/ci_suite.yml

@@ -74,7 +74,7 @@ jobs:
     name: Completion Gate
     needs: [
         compare_screenshots,
-        #compile_all_maps, - we need ts fixed, so we doesn't include it, for now
+        compile_all_maps,
         run_all_tests,
         run_alternate_tests,
         #run_linters,

_maps/bearcat.json

@@ -3,6 +3,7 @@
 	"map_name": "Bearcat",
 	"map_path": "map_files/bearcat",
 	"map_file": "bearcat.dmm",
+	"exclude_from_ci": true,
 	"shuttles": {
 		"cargo": "cargo_box",
 		"ferry": "ferry_fancy",
@@ -18,19 +19,21 @@
 			"Baseturf": "/turf/open/openspace",
 			"Linkage": "Cross",
 			"Gravity": true
-
 		},
 		{
 			"Baseturf": "/turf/open/openspace",
 			"Linkage": "Cross",
 			"Gravity": true
-
 		}
-	]
-	,
+	],
 	"job_changes": {
 		"Cook": {
-			"additional_cqc_areas": ["/area/station/service/bar", "/area/station/service/hydroponics", "/area/station/maintenance/floor2/port/fore", "/area/station/commons/lounge"]
+			"additional_cqc_areas": [
+				"/area/station/service/bar",
+				"/area/station/service/hydroponics",
+				"/area/station/maintenance/floor2/port/fore",
+				"/area/station/commons/lounge"
+			]
 		},
 		"Coroner": {
 			"total_positions": 0,

_maps/gateway_test.json

@@ -4,6 +4,7 @@
 	"map_path": "map_files/debug",
 	"map_file": "gateway_test.dmm",
 	"space_ruin_levels": 0,
+	"exclude_from_ci": true,
 	"minetype": "none",
 	"load_all_away_missions": true,
 	"ignored_unit_tests": [

_maps/kilostation.json

@@ -14,6 +14,7 @@
 			"Linkage": "Cross"
 		}
 	],
+	"ignored_unit_tests": ["/datum/unit_test/create_and_destroy"],
 	"job_changes": {
 		"Cook": {
 			"additional_cqc_areas": ["/area/station/service/bar/atrium"]

_maps/map_files/KiloStation/KiloStation.dmm

@@ -1444,6 +1444,7 @@
 /obj/effect/turf_decal/tile/red/half/contrasted{
 	dir = 8
 	},
+/obj/effect/landmark/firealarm_sanity,
 /turf/open/floor/iron/showroomfloor,
 /area/station/security/checkpoint/science/research)
 "awW" = (
@@ -11738,6 +11739,12 @@
 	},
 /turf/open/floor/iron/showroomfloor,
 /area/station/medical/virology)
+"dUA" = (
+/obj/effect/landmark/firealarm_sanity,
+/turf/open/floor/engine{
+	name = "Holodeck Projector Floor"
+	},
+/area/station/holodeck/rec_center)
 "dUE" = (
 /obj/structure/chair{
 	dir = 1
@@ -18246,6 +18253,7 @@
 /obj/effect/turf_decal/tile/neutral/half/contrasted{
 	dir = 4
 	},
+/obj/effect/landmark/firealarm_sanity,
 /turf/open/floor/iron/dark,
 /area/station/security/checkpoint/medical)
 "fZk" = (
@@ -18568,6 +18576,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/duct,
+/obj/effect/landmark/firealarm_sanity,
 /turf/open/floor/iron/dark,
 /area/station/maintenance/port/greater)
 "geO" = (
@@ -24983,6 +24992,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/mapping_helpers/broken_floor,
 /obj/machinery/duct,
+/obj/effect/landmark/firealarm_sanity,
 /turf/open/floor/plating,
 /area/station/security/execution/transfer)
 "idh" = (
@@ -25341,6 +25351,7 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/obj/effect/landmark/firealarm_sanity,
 /turf/open/floor/iron/showroomfloor,
 /area/station/medical/virology)
 "ijy" = (
@@ -28345,6 +28356,7 @@
 /obj/effect/turf_decal/tile/purple,
 /obj/effect/turf_decal/tile/purple/half/contrasted,
 /obj/machinery/duct,
+/obj/machinery/firealarm/directional/south,
 /turf/open/floor/iron/showroomfloor,
 /area/station/science/xenobiology)
 "jds" = (
@@ -33732,6 +33744,7 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
 	dir = 1
 	},
+/obj/effect/landmark/firealarm_sanity,
 /turf/open/floor/iron/checker,
 /area/station/security/processing/cremation)
 "kUX" = (
@@ -36031,6 +36044,7 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
+/obj/effect/landmark/firealarm_sanity,
 /turf/open/floor/plating,
 /area/station/cargo/warehouse/upper)
 "lFt" = (
@@ -37699,6 +37713,7 @@
 /obj/effect/decal/cleanable/blood/old,
 /mob/living/basic/spider/giant/hunter/scrawny,
 /obj/effect/turf_decal/tile/neutral/opposingcorners,
+/obj/effect/landmark/firealarm_sanity,
 /turf/open/floor/iron/dark,
 /area/station/maintenance/port/greater)
 "mii" = (
@@ -41378,6 +41393,7 @@
 /obj/effect/turf_decal/tile/neutral{
 	dir = 1
 	},
+/obj/effect/landmark/firealarm_sanity,
 /turf/open/floor/iron,
 /area/station/security/processing)
 "nuf" = (
@@ -52616,6 +52632,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/effect/mapping_helpers/broken_floor,
+/obj/effect/landmark/firealarm_sanity,
 /turf/open/floor/plating,
 /area/station/security/execution/education)
 "rll" = (
@@ -52795,7 +52812,6 @@
 /obj/effect/turf_decal/tile/green/anticorner/contrasted{
 	dir = 1
 	},
-/obj/machinery/duct,
 /turf/open/floor/iron/showroomfloor,
 /area/station/medical/virology)
 "rou" = (
@@ -53559,6 +53575,10 @@
 	dir = 8
 	},
 /obj/structure/cable,
+/obj/machinery/firealarm/directional/west{
+	pixel_x = -26;
+	pixel_y = -26
+	},
 /turf/open/floor/iron,
 /area/station/hallway/primary/central/fore)
 "rxD" = (
@@ -53868,6 +53888,7 @@
 	},
 /obj/effect/turf_decal/stripes/line,
 /obj/effect/turf_decal/tile/neutral/opposingcorners,
+/obj/effect/landmark/firealarm_sanity,
 /turf/open/floor/iron/dark,
 /area/station/command/eva)
 "rDO" = (
@@ -54183,6 +54204,7 @@
 /obj/effect/turf_decal/tile/purple/half/contrasted{
 	dir = 8
 	},
+/obj/effect/landmark/firealarm_sanity,
 /turf/open/floor/iron/showroomfloor,
 /area/station/science/xenobiology)
 "rJS" = (
@@ -55978,6 +56000,7 @@
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
 	},
+/obj/machinery/firealarm/directional/west,
 /turf/open/floor/iron/dark,
 /area/station/command/bridge)
 "smC" = (
@@ -64119,6 +64142,7 @@
 /obj/effect/turf_decal/tile/neutral{
 	dir = 1
 	},
+/obj/effect/landmark/firealarm_sanity,
 /turf/open/floor/iron/dark,
 /area/station/maintenance/port/greater)
 "uQt" = (
@@ -68053,6 +68077,15 @@
 	},
 /turf/open/floor/iron,
 /area/station/engineering/atmos)
+"vYc" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/tile/purple/half/contrasted{
+	dir = 1
+	},
+/obj/effect/landmark/firealarm_sanity,
+/turf/open/floor/iron/showroomfloor,
+/area/station/science/ordnance)
 "vYm" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/effect/decal/cleanable/dirt,
@@ -68172,6 +68205,7 @@
 /obj/effect/turf_decal/stripes/corner,
 /obj/structure/cable,
 /obj/machinery/power/apc/auto_name/directional/west,
+/obj/effect/landmark/firealarm_sanity,
 /turf/open/floor/plating,
 /area/station/cargo/warehouse/upper)
 "war" = (
@@ -69437,6 +69471,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/effect/turf_decal/tile/blue,
 /obj/effect/turf_decal/tile/blue/half/contrasted,
+/obj/machinery/firealarm/directional/south,
 /turf/open/floor/iron/showroomfloor,
 /area/station/medical/psychology)
 "wua" = (
@@ -72601,6 +72636,7 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/obj/effect/landmark/firealarm_sanity,
 /turf/open/floor/plating,
 /area/station/cargo/warehouse/upper)
 "xvW" = (
@@ -75141,6 +75177,13 @@
 	},
 /turf/open/floor/iron,
 /area/station/security/brig)
+"yls" = (
+/obj/effect/turf_decal/box/corners{
+	dir = 1
+	},
+/obj/effect/landmark/firealarm_sanity,
+/turf/open/floor/engine,
+/area/station/science/xenobiology)
 "ylu" = (
 /obj/machinery/firealarm/directional/east,
 /obj/effect/turf_decal/tile/red/half/contrasted{
@@ -89229,7 +89272,7 @@ vjh
 bJv
 bJv
 bJv
-bJv
+dUA
 bJv
 bJv
 bJv
@@ -112045,7 +112088,7 @@ aeu
 aeu
 aeu
 vJc
-gpI
+yls
 qmW
 vuI
 wuc
@@ -115422,7 +115465,7 @@ rxo
 uLW
 kkg
 bwA
-tNC
+vYc
 rqn
 cqr
 fyq

_maps/multiz_debug.json

@@ -7,7 +7,8 @@
 		"/datum/unit_test/cargo_dep_order_locations",
 		"/datum/unit_test/maptest_job_roundstart_spawnpoints",
 		"/datum/unit_test/maptest_required_map_items",
-		"/datum/unit_test/spy_bounty"
+		"/datum/unit_test/spy_bounty",
+		"/datum/unit_test/create_and_destroy"
 	],
 	"traits": [
 		{

_maps/protoboxstation.json

@@ -9,9 +9,13 @@
 		"ferry": "ferry_fancy",
 		"cargo": "cargo_pubby"
 	},
+	"ignored_unit_tests": ["/datum/unit_test/create_and_destroy"],
 	"job_changes": {
 		"Cook": {
-			"additional_cqc_areas": ["/area/station/service/bar/atrium", "/area/station/security/prison/upper"]
+			"additional_cqc_areas": [
+				"/area/station/service/bar/atrium",
+				"/area/station/security/prison/upper"
+			]
 		},
 		"Prisoner": {
 			"spawn_positions": 2