Merge upstream 04.03.2024 (#1058)

## Changelog

:cl:
add: Мерж оффов
add: Добавлены координаты тележек уборщика в ПДА уборщика
tweak: Попадание перцового спрея в глаза теперь оглушает на 0,5 секунды,
ослепляет на 8 секунд и размывает экран на 20 секунд. Если цель без
маски, она получит 40 единиц урона по стамине, будет замедлена на 4
секунды и растеряна на 12 секунд. При двойном попадании в одну цель
второй урон по стамине будет не 40, а 20
tweak: Mousetrap Mortar Хонкомеха теперь стреляет взведенными
мышеловками
tweak: Призраки больше не видны при орбите Спектрального клинка, вместо
этого они проявляются в виде сфер
tweak: Кровь из бутылок с культурами вирусов больше не наносит урон от
токсинов
tweak: NT Recruiter: Скорректирован размер кнопки перехода в игру
tweak: NT Recruiter: Добавлено несколько трудовых книжек, одна удалена
tweak: NT Recruiter: Поле "Пол" было заменено на дату рождения, теперь
необходимо проверить, совпадает ли она с возрастом кандидата
fix: Nearspace снова радиоактивно во время радиоактивных бурь
fix: EFTPOS больше не будет запрашивать у вас ID и пароль учетной
записи. Они все равно не используются
fix: Исправлено неработающее орошение гидропонных лотков при соединении
их кусачками
fix: Last Resort генокрада снова работает
fix: Слипипены теперь правильно вызывают реакцию
del: Убирает рассеивание эктоплазмы у Ревенанта после смерти
/:cl:

<!-- Оба :cl:'а должны быть на месте, что-бы чейнджлог работал! Вы
можете написать свой ник справа от первого :cl:, если хотите. Иначе
будет использован ваш ник на ГитХабе. -->
<!-- Вы можете использовать несколько записей с одинаковым префиксом
(Они используются только для иконки в игре) и удалить ненужные. Помните,
что чейнджлог должен быть понятен обычным игроком. -->
<!-- Если чейнджлог не влияет на игроков(например, это рефактор), вы
можете исключить всю секцию. -->

.github/workflows/ci.yml

@@ -39,15 +39,9 @@ jobs:
           python -m tools.ci.check_icon_conflicts
           python -m tools.ci.check_icon_dupenames
           python -m tools.maplint.source --github
-          DREAMCHECKER_EXIT_CODE=0
-          ~/dreamchecker > ${GITHUB_WORKSPACE}/output-annotations.txt 2>&1 || DREAMCHECKER_EXIT_CODE=$?
-          echo 'DREAMCHECKER_ANNOTATED=1' >> "$GITHUB_ENV"
-          exit $DREAMCHECKER_EXIT_CODE
-      - name: Annotate Lints
-        uses: yogstation13/DreamAnnotate@v2
-        if: ${{ always() && env.DREAMCHECKER_ANNOTATED == '1' }}
-        with:
-          outputFile: output-annotations.txt
+      - name: Run DreamChecker
+        shell: bash
+        run: ~/dreamchecker 2>&1 | bash tools/ci/annotate_dm.sh
 
   odlint:
     name: Lint with OpenDream

_build_dependencies.sh

@@ -1,6 +1,6 @@
 # This file has all the information on what versions of libraries are thrown into the code
 # For dreamchecker
-export SPACEMANDMM_TAG=suite-1.7.1
+export SPACEMANDMM_TAG=suite-1.8
 # For TGUI
 export NODE_VERSION=20
 # Stable Byond Major

_maps/map_files/generic/centcomm.dmm

@@ -1372,7 +1372,7 @@
 /obj/structure/lattice,
 /obj/machinery/light/small,
 /turf/space,
-/area/space/nearstation)
+/area/space/nearstation/centcom)
 "fr" = (
 /obj/docking_port/stationary/transit{
 	dir = 4;
@@ -4568,7 +4568,7 @@
 /area/shuttle/administration)
 "ps" = (
 /turf/simulated/mineral/ancient/outer,
-/area/space/nearstation)
+/area/space/nearstation/centcom)
 "pt" = (
 /obj/machinery/door/airlock/hatch{
 	name = "Armory"
@@ -5803,7 +5803,7 @@
 "tL" = (
 /obj/structure/lattice,
 /turf/space,
-/area/space/nearstation)
+/area/space/nearstation/centcom)
 "tM" = (
 /obj/structure/chair/comfy/shuttle{
 	dir = 8
@@ -7018,7 +7018,7 @@
 "ya" = (
 /obj/effect/mob_spawn/human/corpse/clown/corpse,
 /turf/simulated/floor/plating/asteroid/ancient/airless,
-/area/space/nearstation)
+/area/space/nearstation/centcom)
 "yc" = (
 /obj/structure/table/reinforced,
 /obj/item/lighter/zippo/contractor,
@@ -7029,7 +7029,7 @@
 /turf/simulated/floor/plating/airless{
 	icon_state = "asteroidplating"
 	},
-/area/space/nearstation)
+/area/space/nearstation/centcom)
 "yg" = (
 /mob/living/silicon/decoy{
 	name = "A.L.I.C.E."
@@ -7110,7 +7110,7 @@
 /turf/simulated/floor/plating/airless{
 	icon_state = "asteroidplating"
 	},
-/area/space/nearstation)
+/area/space/nearstation/centcom)
 "yL" = (
 /obj/machinery/computer/card,
 /turf/simulated/floor/plasteel,
@@ -10851,7 +10851,7 @@
 "Mu" = (
 /obj/item/coin/antagtoken,
 /turf/simulated/floor/plating/asteroid/ancient/airless,
-/area/space/nearstation)
+/area/space/nearstation/centcom)
 "Mv" = (
 /obj/machinery/recharge_station/upgraded,
 /turf/simulated/floor/plasteel{
@@ -11598,7 +11598,7 @@
 /area/shuttle/escape)
 "OK" = (
 /turf/simulated/floor/plating/asteroid/ancient/airless,
-/area/space/nearstation)
+/area/space/nearstation/centcom)
 "OL" = (
 /obj/structure/curtain/open/shower,
 /obj/machinery/shower{
@@ -13971,7 +13971,7 @@
 /turf/simulated/floor/plating/airless{
 	icon_state = "asteroidplating"
 	},
-/area/space/nearstation)
+/area/space/nearstation/centcom)
 "Xt" = (
 /obj/machinery/door/airlock/centcom{
 	name = "CentCom Customs"
@@ -14329,7 +14329,7 @@
 "YI" = (
 /obj/effect/decal/remains/human,
 /turf/simulated/floor/plating/asteroid/ancient/airless,
-/area/space/nearstation)
+/area/space/nearstation/centcom)
 "YJ" = (
 /obj/machinery/door/window/classic/normal{
 	name = "Cell B";

_maps/map_files220/generic/centcomm.dmm

@@ -2296,7 +2296,7 @@
 /turf/simulated/floor/plating/airless{
 	icon_state = "asteroidplating"
 	},
-/area/space/nearstation)
+/area/space/nearstation/centcom)
 "bJO" = (
 /obj/structure/fans/tiny/invisible,
 /obj/structure/marker_beacon/dock_marker/collision,
@@ -8040,7 +8040,7 @@
 /turf/simulated/floor/plating/airless{
 	icon_state = "asteroidplating"
 	},
-/area/space/nearstation)
+/area/space/nearstation/centcom)
 "fqZ" = (
 /obj/structure/rack,
 /obj/item/tank/internals/emergency_oxygen/double/vox,
@@ -8816,7 +8816,7 @@
 "fVA" = (
 /obj/effect/mob_spawn/human/corpse/clown/corpse,
 /turf/simulated/floor/plating/asteroid/ancient/airless,
-/area/space/nearstation)
+/area/space/nearstation/centcom)
 "fVW" = (
 /turf/simulated/floor/beach/away/coastline{
 	water_overlay_image = null
@@ -8927,7 +8927,7 @@
 /area/shuttle/syndicate)
 "fYV" = (
 /turf/simulated/mineral/ancient/outer,
-/area/space/nearstation)
+/area/space/nearstation/centcom)
 "fZS" = (
 /obj/machinery/computer/account_database{
 	name = "Admin Accounts Database";
@@ -14423,7 +14423,7 @@
 /obj/structure/lattice,
 /obj/structure/light_fake/small,
 /turf/space,
-/area/space/nearstation)
+/area/space/nearstation/centcom)
 "jKB" = (
 /obj/effect/turf_decal/delivery,
 /turf/simulated/floor/plasteel{
@@ -16323,7 +16323,7 @@
 /turf/simulated/floor/plating/airless{
 	icon_state = "asteroidplating"
 	},
-/area/space/nearstation)
+/area/space/nearstation/centcom)
 "lkx" = (
 /obj/machinery/door/airlock/hatch/syndicate{
 	name = "Syndicate Base"
@@ -18506,7 +18506,7 @@
 /obj/structure/marker_beacon/dock_marker,
 /obj/structure/lattice/catwalk,
 /turf/space,
-/area/space/nearstation)
+/area/space/nearstation/centcom)
 "mBD" = (
 /obj/machinery/door/airlock/hatch/syndicate/command{
 	name = "Тюрьма";
@@ -20133,7 +20133,7 @@
 /area/syndicate_mothership/elite_squad)
 "nNr" = (
 /turf/simulated/floor/plating/asteroid/ancient/airless,
-/area/space/nearstation)
+/area/space/nearstation/centcom)
 "nNB" = (
 /obj/structure/bookcase/manuals/research_and_development,
 /turf/simulated/floor/wood/oak,
@@ -22343,7 +22343,7 @@
 "pxm" = (
 /obj/item/coin/antagtoken,
 /turf/simulated/floor/plating/asteroid/ancient/airless,
-/area/space/nearstation)
+/area/space/nearstation/centcom)
 "pxu" = (
 /obj/effect/turf_decal/siding/black{
 	dir = 8
@@ -22703,7 +22703,7 @@
 "pLx" = (
 /obj/effect/decal/remains/human,
 /turf/simulated/floor/plating/asteroid/ancient/airless,
-/area/space/nearstation)
+/area/space/nearstation/centcom)
 "pMa" = (
 /obj/machinery/computer/shuttle/syndicate/drop_pod,
 /turf/simulated/wall/mineral/plastitanium,
@@ -27166,7 +27166,7 @@
 "sQi" = (
 /obj/structure/lattice,
 /turf/space,
-/area/space/nearstation)
+/area/space/nearstation/centcom)
 "sQk" = (
 /obj/structure/chair/sofa/bench/left{
 	dir = 1

code/__DEFINES/is_helpers.dm

@@ -133,3 +133,5 @@ GLOBAL_LIST_INIT(turfs_pass_meteor, typecacheof(list(
 )))
 
 #define ispassmeteorturf(A) (is_type_in_typecache(A, GLOB.turfs_pass_meteor))
+
+#define is_screen_atom(A) istype(A, /atom/movable/screen)

code/__DEFINES/reagents_defines.dm

@@ -29,3 +29,6 @@
 #define SYRINGE_DRAW 0
 #define SYRINGE_INJECT 1
 #define SYRINGE_BROKEN 2
+
+/// Like O- blood but doesn't contribute to blood_volume or vampire nutrition
+#define BLOOD_TYPE_FAKE_BLOOD	"Vh Null"

code/__DEFINES/status_effects.dm

@@ -112,6 +112,7 @@
 
 #define STATUS_EFFECT_MAGIC_DISGUISE /datum/status_effect/magic_disguise
 
+#define STATUS_EFFECT_PEPPERSPRAYED /datum/status_effect/pepper_spray
 
 //#define STATUS_EFFECT_NECROPOLIS_CURSE /datum/status_effect/necropolis_curse
 //#define CURSE_BLINDING	1 //makes the edges of the target's screen obscured

code/__HELPERS/game.dm

@@ -345,14 +345,6 @@
 
 	return candidates
 
-/proc/ScreenText(obj/O, maptext="", screen_loc="CENTER-7,CENTER-7", maptext_height=480, maptext_width=480)
-	if(!isobj(O))	O = new /obj/screen/text()
-	O.maptext = maptext
-	O.maptext_height = maptext_height
-	O.maptext_width = maptext_width
-	O.screen_loc = screen_loc
-	return O
-
 /proc/remove_images_from_clients(image/I, list/show_to)
 	for(var/client/C in show_to)
 		C.images -= I

code/__HELPERS/unsorted.dm

@@ -744,7 +744,8 @@ Returns 1 if the chain up to the area contains the given typepath
 				atoms += A
 	return atoms
 
-/datum/coords //Simple datum for storing coordinates.
+/// Simple datum for storing coordinates.
+/datum/coords
 	var/x_pos
 	var/y_pos
 	var/z_pos

code/_onclick/click.dm

@@ -463,23 +463,23 @@
 		else		direction = WEST
 	dir = direction
 
-/obj/screen/click_catcher
+/atom/movable/screen/click_catcher
 	icon = 'icons/mob/screen_gen.dmi'
 	icon_state = "catcher"
 	plane = CLICKCATCHER_PLANE
 	mouse_opacity = MOUSE_OPACITY_OPAQUE
 	screen_loc = "CENTER"
 
-/obj/screen/click_catcher/MouseEntered(location, control, params)
+/atom/movable/screen/click_catcher/MouseEntered(location, control, params)
 	return
 
-/obj/screen/click_catcher/MouseExited(location, control, params)
+/atom/movable/screen/click_catcher/MouseExited(location, control, params)
 	return
 
 #define MAX_SAFE_BYOND_ICON_SCALE_TILES (MAX_SAFE_BYOND_ICON_SCALE_PX / world.icon_size)
 #define MAX_SAFE_BYOND_ICON_SCALE_PX (33 * 32)			//Not using world.icon_size on purpose.
 
-/obj/screen/click_catcher/proc/UpdateGreed(view_size_x = 15, view_size_y = 15)
+/atom/movable/screen/click_catcher/proc/UpdateGreed(view_size_x = 15, view_size_y = 15)
 	var/icon/newicon = icon('icons/mob/screen_gen.dmi', "catcher")
 	var/ox = min(MAX_SAFE_BYOND_ICON_SCALE_TILES, view_size_x)
 	var/oy = min(MAX_SAFE_BYOND_ICON_SCALE_TILES, view_size_y)
@@ -494,7 +494,7 @@
 	M.Scale(px/sx, py/sy)
 	transform = M
 
-/obj/screen/click_catcher/Click(location, control, params)
+/atom/movable/screen/click_catcher/Click(location, control, params)
 	var/list/modifiers = params2list(params)
 	if(modifiers["middle"] && iscarbon(usr))
 		var/mob/living/carbon/C = usr

code/_onclick/drag_drop.dm

@@ -28,7 +28,7 @@ FALSE if not
 		return
 	var/lagging = could_be_click_lag()
 	drag_start = 0
-	if(!(istype(over, /obj/screen) || (loc && loc == over.loc)))
+	if(!(is_screen_atom(over) || (loc && loc == over.loc)))
 		if(!Adjacent(usr) || !over.Adjacent(usr)) // should stop you from dragging through windows
 			if(lagging)
 				usr.ClickOn(src, params)