Merge upstream 22.09.2024 (#1540)

<!-- Пишите **НИЖЕ** заголовков и **ВЫШЕ** комментариев, иначе что то
может пойти не так. -->
<!-- Вы можете прочитать Contributing.MD, если хотите узнать больше. -->

## Что этот PR делает

<!-- Вкратце опишите изменения, которые вносите. -->
<!-- Опишите **все** изменения, так как противное может сказаться на
рассмотрении этого PR'а! -->
<!-- Если вы исправляете Issue, добавьте "Fixes #xxxx" (где xxxx - номер
Issue) где-нибудь в описании PR'а. Это автоматически закроет Issue после
принятия PR'а. -->

## Почему это хорошо для игры

<!-- Опишите, почему, по вашему, следует добавить эти изменения в игру.
-->

## Изображения изменений

<!-- Если вы не меняли карту или спрайты, можете опустить эту секцию.
Если хотите, можете вставить видео. -->

## Тестирование

<!-- Как вы тестировали свой PR, если делали это вовсе? -->

## Changelog

NPFC

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

_maps/map_files/RandomRuins/SpaceRuins/wizardcrash.dmm

@@ -14,10 +14,10 @@
 	icon_state = "small"
 	},
 /obj/effect/landmark/damageturf,
-/turf/simulated/floor/wood,
+/turf/simulated/floor/plating,
 /area/ruin/space/powered)
 "ae" = (
-/turf/simulated/wall/mineral/titanium/nodecon/wizard,
+/turf/simulated/wall/indestructible/titanium/nodiagonal,
 /area/ruin/space/powered)
 "af" = (
 /obj/structure/computerframe,
@@ -32,7 +32,7 @@
 /obj/structure/grille/broken,
 /obj/item/shard,
 /obj/effect/landmark/damageturf,
-/turf/simulated/floor/wood,
+/turf/simulated/floor/plating,
 /area/ruin/space/powered)
 "aj" = (
 /obj/structure/chair/comfy/shuttle{
@@ -447,8 +447,8 @@
 /turf/simulated/floor/plating/airless,
 /area/ruin/space/powered)
 "bH" = (
-/turf/simulated/wall/mineral/titanium/nodecon/wizard,
-/area/space/nearstation)
+/turf/simulated/wall/indestructible/titanium,
+/area/ruin/space/powered)
 "bI" = (
 /obj/structure/window/plasmareinforced,
 /turf/simulated/floor/mineral/plasma,
@@ -588,7 +588,7 @@ aa
 aa
 aa
 aa
-ae
+bH
 ae
 ae
 ae
@@ -624,7 +624,7 @@ aa
 aa
 aa
 aa
-ae
+bH
 ae
 aY
 aS
@@ -654,13 +654,13 @@ ac
 ac
 ac
 ac
-ae
+bH
 ae
 al
 ae
 ae
 al
-ae
+bH
 ae
 ae
 bc
@@ -1024,13 +1024,13 @@ ac
 ac
 ac
 ac
-ae
+bH
 ae
 al
 ae
 ae
 aM
-ae
+bH
 ae
 ae
 bd
@@ -1068,7 +1068,7 @@ aa
 aa
 aa
 aa
-ae
+bH
 ae
 bC
 bk
@@ -1106,7 +1106,7 @@ aa
 aa
 aa
 aa
-ae
+bH
 ae
 ae
 ae

code/game/mecha/mech_fabricator.dm

@@ -454,6 +454,7 @@
 				var/user_pass = tgui_input_text(usr, "Please enter network password", "Password Entry")
 				// Check the password
 				if(user_pass == C.network_password)
+					C.mechfabs += UID()
 					network_manager_uid = C.UID()
 					to_chat(usr, "<span class='notice'>Successfully linked to <b>[C.network_name]</b>.</span>")
 				else
@@ -536,6 +537,8 @@
 	add_fingerprint(usr)
 
 /obj/machinery/mecha_part_fabricator/proc/unlink()
+	var/obj/machinery/computer/rnd_network_controller/RNC = locateUID(network_manager_uid)
+	RNC.mechfabs -= UID()
 	network_manager_uid = null
 	SStgui.update_uis(src)
 

code/game/objects/items/weapons/twohanded.dm

@@ -621,10 +621,8 @@
 			step_towards(X, pull)
 		else if(ishuman(X))
 			var/mob/living/carbon/human/H = X
-			if(istype(H.shoes, /obj/item/clothing/shoes/magboots))
-				var/obj/item/clothing/shoes/magboots/M = H.shoes
-				if(M.magpulse)
-					continue
+			if(HAS_TRAIT(H, TRAIT_MAGPULSE))
+				continue
 			H.Weaken(4 SECONDS)
 			step_towards(H, pull)
 			step_towards(H, pull)

code/game/turfs/simulated/walls_indestructible.dm

@@ -261,6 +261,38 @@ GLOBAL_DATUM(title_splash, /turf/simulated/wall/indestructible/splashscreen)
 	smoothing_groups = list(SMOOTH_GROUP_SIMULATED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_REINFORCED_WALLS)
 	canSmoothWith = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_REGULAR_WALLS, SMOOTH_GROUP_REINFORCED_WALLS)
 
+/turf/simulated/wall/indestructible/titanium
+	icon = 'icons/turf/walls/plastinum_wall.dmi'
+	icon_state = "plastinum_wall-0"
+	base_icon_state = "plastinum_wall"
+	flags_ricochet = RICOCHET_SHINY | RICOCHET_HARD
+	smoothing_flags = SMOOTH_BITMASK | SMOOTH_DIAGONAL_CORNERS
+	smoothing_groups = list(SMOOTH_GROUP_TITANIUM_WALLS, SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE)
+	canSmoothWith = list(SMOOTH_GROUP_TITANIUM_WALLS, SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_SHUTTLE_PARTS, SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE)
+
+/turf/simulated/wall/indestructible/titanium/nodiagonal
+	icon_state = "map-shuttle_nd"
+	smoothing_flags = SMOOTH_BITMASK
+
+/turf/simulated/wall/indestructible/titanium/nosmooth
+	icon_state = "plastinum_wall"
+	smoothing_flags = NONE
+
+/turf/simulated/wall/indestructible/titanium/tileblend
+	fixed_underlay = list("icon" = 'icons/turf/floors.dmi', "icon_state" = "darkredfull")
+
+/turf/simulated/wall/indestructible/titanium/soviet
+	name = "\improper USSP wall"
+	desc = "Like regular titanium, but able to deflect capitalist aggressors!"
+
+/turf/simulated/wall/indestructible/titanium/soviet/nodiagonal
+	icon_state = "map-shuttle_nd"
+	smoothing_flags = SMOOTH_BITMASK
+
+/turf/simulated/wall/indestructible/titanium/soviet/nosmooth
+	icon_state = "plastinum_wall"
+	smoothing_flags = NONE
+
 /turf/simulated/wall/indestructible/syndicate
 	icon = 'icons/turf/walls/plastitanium_wall.dmi'
 	icon_state = "plastitanium_wall-0"

code/game/turfs/simulated/walls_mineral.dm

@@ -279,44 +279,6 @@
 
 /turf/simulated/wall/mineral/titanium/survival/pod
 
-//undeconstructable type for derelict
-//these walls are undeconstructable/unthermitable
-/turf/simulated/wall/mineral/titanium/nodecon
-	name = "russian wall"
-	desc = "Like regular titanium, but able to deflect capitalist aggressors."
-	can_dismantle_with_welder = FALSE
-
-/turf/simulated/wall/mineral/titanium/nodecon/wizard
-	name = "wizard wall"
-	desc = "Like regular titanium, but able to deflect wizards aggressors."
-
-/turf/simulated/wall/mineral/titanium/nodecon/tileblend
-	fixed_underlay = list("icon"='icons/turf/floors.dmi', "icon_state"="darkredfull")
-
-/turf/simulated/wall/mineral/titanium/nodecon/nodiagonal
-	icon_state = "map-shuttle_nd"
-	smoothing_flags = SMOOTH_BITMASK
-
-/turf/simulated/wall/mineral/titanium/nodecon/nosmooth
-	icon_state = "plastinum_wall"
-	smoothing_flags = NONE
-
-//properties for derelict sub-type to prevent said deconstruction/thermiting
-/turf/simulated/wall/mineral/titanium/nodecon/try_decon(obj/item/I, mob/user, params)
-	return
-
-/turf/simulated/wall/mineral/titanium/nodecon/thermitemelt(mob/user as mob, speed)
-	return
-
-/turf/simulated/wall/mineral/titanium/nodecon/burn_down()
-	return
-
-/turf/simulated/wall/mineral/titanium/nodecon/welder_act()
-	return
-
-/turf/simulated/wall/mineral/titanium/nodecon/try_destroy()
-	return
-
 /////////////////////Plastitanium walls/////////////////////
 
 /turf/simulated/wall/mineral/plastitanium

code/modules/mob/mob_misc_procs.dm

@@ -186,7 +186,7 @@
 		to_chat(M, "Your mob has been taken over by a ghost!")
 		message_admins("[key_name_admin(theghost)] has taken control of ([key_name_admin(M)])")
 		var/mob/dead/observer/ghost = M.ghostize(TRUE) // Keep them respawnable
-		ghost.can_reenter_corpse = FALSE // but keep them out of their old body
+		ghost?.can_reenter_corpse = FALSE // but keep them out of their old body
 		M.key = theghost.key
 		dust_if_respawnable(theghost)
 	else

code/modules/research/rdconsole.dm

@@ -478,6 +478,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 				var/user_pass = input(usr, "Please enter network password", "Password Entry")
 				// Check the password
 				if(user_pass == C.network_password)
+					C.consoles += UID()
 					network_manager_uid = C.UID()
 					to_chat(usr, "<span class='notice'>Successfully linked to <b>[C.network_name]</b>.</span>")
 				else
@@ -708,6 +709,8 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 	return TRUE // update uis
 
 /obj/machinery/computer/rdconsole/proc/unlink()
+	var/obj/machinery/computer/rnd_network_controller/RNC = locateUID(network_manager_uid)
+	RNC.consoles -= UID()
 	network_manager_uid = null
 	SStgui.update_uis(src)
 

tgui/packages/tgui-panel/chat/constants.js

@@ -61,7 +61,7 @@ export const MESSAGE_TYPES = [
     name: 'Radio',
     description: 'All departments of radio messages',
     selector:
-      '.alert, .syndradio, .centradio, .airadio, .entradio, .comradio, .secradio, .engradio, .medradio, .sciradio, .supradio, .srvradio, .expradio, .radio, .deptradio, .newscaster',
+      '.alert, .syndradio, .centradio, .airadio, .entradio, .comradio, .secradio, .engradio, .medradio, .sciradio, .supradio, .srvradio, .expradio, .radio, .deptradio, .newscaster, .proradio',
   },
   {
     type: MESSAGE_TYPE_INFO,