Update to tgmc

code/__DEFINES/actions.dm

@@ -26,3 +26,7 @@
 #define ABILITY_CRASH (1<<0)
 #define ABILITY_NUCLEARWAR (1<<1)
 #define ABILITY_ALL_GAMEMODE (ABILITY_CRASH|ABILITY_NUCLEARWAR)
+
+#define PSIONIC_INTERACTION_STRENGTH_WEAK 1
+#define PSIONIC_INTERACTION_STRENGTH_STANDARD 2
+#define PSIONIC_INTERACTION_STRENGTH_STRONG 3

code/__DEFINES/chat.dm

@@ -3,6 +3,11 @@
  * SPDX-License-Identifier: MIT
  */
 
+/// How many chat payloads to keep in history
+#define CHAT_RELIABILITY_HISTORY_SIZE 5
+/// How many resends to allow before giving up
+#define CHAT_RELIABILITY_MAX_RESENDS 3
+
 #define MESSAGE_TYPE_SYSTEM "system"
 #define MESSAGE_TYPE_LOCALCHAT "localchat"
 #define MESSAGE_TYPE_RADIO "radio"

code/__DEFINES/conflict.dm

@@ -219,3 +219,10 @@
 #define X_FIRE_LAYER 1
 #define X_TOTAL_LAYERS 9
 /////////////////////////////////
+
+//Cave comms defines
+#define CAVE_NO_INTERFERENCE 0 //! No impact on comms.
+#define CAVE_MINOR_INTERFERENCE 1 //! Scrambles outgoing messages, no impact on incoming.
+#define CAVE_FULL_INTERFERENCE 2 //! Prevents incoming and outgoing messages.
+
+#define ANTENNA_SYNCING_TIME 30 SECONDS //! Time needed to initially configure an antenna module after equipping.

code/__DEFINES/dcs/signals.dm

@@ -933,6 +933,15 @@
 #define COMSIG_XENOABILITY_SEISMIC_FRACTURE "xenoability_seismic_fracture"
 #define COMSIG_XENOABILITY_PRIMAL_WRATH "xenoability_primal_wrath"
 
+//sectoid abilities
+#define COMSIG_ABILITY_MINDMELD "ability_mindmeld"
+#define COMSIG_ABILITY_MINDFRAY "ability_mindfray"
+#define COMSIG_ABILITY_REKNIT_FORM "ability_reknit_form"
+#define COMSIG_ABILITY_FUSE "ability_fuse"
+#define COMSIG_ABILITY_STASIS "ability_stasis"
+#define COMSIG_ABILITY_TELEKINESIS "ability_telekinesis"
+#define COMSIG_ABILITY_REANIMATE "ability_reanimate"
+
 // throw parry signals
 #define COMSIG_THROW_PARRY_CHECK "throw_parry_check"
 #define COMSIG_PARRY_TRIGGER "parry_trigger"
@@ -1056,3 +1065,4 @@
 #define COMSIG_PUPPET_CHANGE_ORDER "puppetchangeorder"
 #define COMSIG_PUPPET_CHANGE_ALL_ORDER "puppetglobalorder"
 
+#define COMSIG_CAVE_INTERFERENCE_CHECK "cave_interference_check" //! Cave comms interference check signal.

code/__DEFINES/keybind.dm

@@ -7,6 +7,7 @@
 #define CATEGORY_LIVING "LIVING"
 #define CATEGORY_CARBON "CARBON"
 #define CATEGORY_HUMAN "HUMAN"
+#define CATEGORY_PSIONIC "PSIONIC"
 #define CATEGORY_MISC "MISC"
 #define CATEGORY_EMOTE "EMOTE"
 #define CATEGORY_CUSTOM_EMOTE "CUSTOM_EMOTE"

code/__DEFINES/modular_armor.dm

@@ -36,7 +36,7 @@
 
 //Pink
 #define ARMOR_PALETTE_PEARL_PINK "#673c3d#9b6b6b#b08a8b#d5ccc3#efe6dc"
-#define ARMOR_PALETTE_MOUNTBATTEN "#3b2f53#5a456e#877499#D0ABD6#F2D2E"
+#define ARMOR_PALETTE_MOUNTBATTEN "#3b2f53#5a456e#877499#D0ABD6#f0d5e8"
 #define ARMOR_PALETTE_CORAL_PINK "#150e10#402139#59184c#972b78#e46c92"
 #define ARMOR_PALETTE_AZALEA_PINK "#230911#661A31#A23354#CC5073#E67395"
 

code/__DEFINES/movespeed_modification.dm

@@ -52,5 +52,7 @@
 #define MOVESPEED_ID_CHEM_CONNECT "CHEM_CONNECT"
 #define MOVESPEED_ID_VALI_BOOST "VALI_BOOST"
 
+#define MOVESPEED_ID_MINDMELD "MINDMELD"
+
 //Specific slowdown bitfield
 #define SLOWDOWN_IMPEDE_JETPACK (1<<0) //Reduce the range of jetpack

code/__DEFINES/status_effects.dm

@@ -39,6 +39,9 @@
 
 #define STATUS_EFFECT_DRAIN_SURGE /datum/status_effect/drain_surge
 
+#define STATUS_EFFECT_MINDMEND /datum/status_effect/mindmeld
+
+#define STATUS_EFFECT_REKNIT_FORM /datum/status_effect/reknit_form
 /////////////
 // DEBUFFS //
 /////////////

code/__DEFINES/traits.dm

@@ -159,6 +159,8 @@
 ///indicates this mob was spawned by a corpse spawner
 #define TRAIT_MAPSPAWNED "mapspawned"
 
+#define TRAIT_MINDMELDED "mindmelded"
+
 /// Prevents usage of manipulation appendages (picking, holding or using items, manipulating storage).
 #define TRAIT_HANDS_BLOCKED "handsblocked"
 #define TRAIT_STUNIMMUNE "stun_immunity"

code/__HELPERS/unsorted.dm

@@ -1095,11 +1095,11 @@ will handle it, but:
 	for(var/client/C in show_to)
 		C.images += I
 	animate(I, transform = 0, alpha = 255, time = 0.5 SECONDS, easing = ELASTIC_EASING)
-	addtimer(CALLBACK(GLOBAL_PROC, TYPE_PROC_REF(/, fade_out), I), duration - 0.5 SECONDS)
+	addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(fade_out), I), duration - 0.5 SECONDS)
 
 /proc/fade_out(image/I, list/show_to)
 	animate(I, alpha = 0, time = 0.5 SECONDS, easing = EASE_IN)
-	addtimer(CALLBACK(GLOBAL_PROC, TYPE_PROC_REF(/, remove_images_from_clients), I, show_to), 0.5 SECONDS)
+	addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(remove_images_from_clients), I, show_to), 0.5 SECONDS)
 
 //takes an input_key, as text, and the list of keys already used, outputting a replacement key in the format of "[input_key] ([number_of_duplicates])" if it finds a duplicate
 //use this for lists of things that might have the same name, like mobs or objects, that you plan on giving to a player as input

code/_onclick/hud/_defines.dm

@@ -13,7 +13,6 @@
 	Therefore, the top right corner (except during admin shenanigans) is at "15,15"
 */
 
-
 //Lower left, persistant menu
 #define ui_inventory "WEST:6,1:5"
 
@@ -30,34 +29,15 @@
 #define ui_storage2 "WEST+9:20,1:5"
 
 //Lower right, persistant menu
-#define ui_dropbutton "EAST-4:22,1:5"
 #define ui_drop_throw "EAST-1:28,SOUTH+1:7"
 #define ui_acti "EAST-3:24,SOUTH:5"
 #define ui_above_movement "EAST-2:26,SOUTH+1:7"
 #define ui_above_intent "EAST-3:24, SOUTH+1:7"
 #define ui_movi "EAST-2:26,SOUTH:5"
 #define ui_zonesel "EAST-1:28,SOUTH:5"
 #define ui_acti_alt "EAST-1:28,1:5" //alternative intent switcher for when the interface is hidden (F12)
-#define ui_crafting "EAST-4:22,SOUTH:5"
-#define ui_building "EAST-4:22,SOUTH:21"
 #define ui_language_menu "EAST-4:6,SOUTH:21"
 
-#define ui_borg_pull "EAST-3:24,2:7"
-#define ui_borg_module "EAST-2:26,2:7"
-#define ui_borg_panel "EAST-1:28,2:7"
-
-//Gun buttons
-#define ui_gun1 "EAST-2:26,3:7"
-#define ui_gun2 "EAST-1:28, 4:7"
-#define ui_gun3 "EAST-2:26,4:7"
-#define ui_gun_select "EAST-1:28,3:7"
-
-#define ui_gun_burst "EAST-3:-8,1:+5"
-#define ui_gun_railtoggle "EAST-3:-21,1:+13"
-#define ui_gun_eject "EAST-3:-12,1:+5"
-#define ui_gun_attachment "EAST-3:-10,1:+5"
-#define ui_gun_unique "EAST-3:-4,1:+2"
-
 //Upper-middle right (alerts)
 #define ui_alert1 "EAST-1:28,CENTER+5:27"
 #define ui_alert2 "EAST-1:28,CENTER+4:25"
@@ -71,26 +51,16 @@
 #define ui_oxygen "EAST-1:28,11:23"
 #define ui_pressure "EAST-1:28,10:21"
 
-#define ui_alien_toxin "EAST-1:28,13:25"
-#define ui_alien_fire "EAST-1:28,12:25"
-#define ui_alien_oxygen "EAST-1:28,11:25"
-#define ui_alien_resist "EAST-4:20,1:5"
-
 //Middle right (status indicators)
 #define ui_nutrition "EAST-1:28,5:11"
 #define ui_temp "EAST-1:28,6:13"
-#define ui_healthdoll "EAST-1:28,CENTER-3:11"
 #define UI_STAMINA "EAST-1:28,CENTER-2:13"
 #define ui_health "EAST-1:28,CENTER-1:15"
-#define ui_internal "EAST-1:28,CENTER:17"
 #define ui_ammo1 "EAST-1:28,CENTER+1:25"
 #define ui_ammo2 "EAST-1:28,CENTER+2:27"
 #define ui_ammo3 "EAST-1:28,CENTER+3:29"
 #define ui_ammo4 "EAST-1:28,CENTER+4:31"
 
-									//borgs
-#define ui_borg_health "EAST-1:28,6:13" //borgs have the health display where humans have the bodytemp indicator.
-#define ui_borg_temp "EAST-1:28,10:21"	//borgs have the bodytemp display where humans have the pressure indicator.
 //RUTGMC EDIT BEGIN
 /* //ORIGINAL
 #define ui_alien_nightvision "EAST-1:28,5:13"
@@ -120,11 +90,8 @@
 #define ui_sl_dir "CENTER,CENTER"
 
 // Ghosts
-#define ui_ghost_slot1 "SOUTH:6,CENTER-2:24"
 #define ui_ghost_slot2 "SOUTH:6,CENTER-1:24"
 #define ui_ghost_slot3 "SOUTH:6,CENTER:24"
-#define ui_ghost_slot4 "SOUTH:6,CENTER+1:24"
-#define ui_ghost_slot5 "SOUTH:6,CENTER+2:24"
 
 // AI
 #define ui_ai_core "SOUTH:6,WEST"

code/_onclick/hud/ghost.dm

@@ -50,14 +50,6 @@
 	using.screen_loc = ui_ghost_slot2
 	static_inventory += using
 
-	// using = new /atom/movable/screen/ghost/follow_xeno()
-	// using.screen_loc = ui_ghost_slot2
-	// static_inventory += using
-
-	// using = new /atom/movable/screen/ghost/follow_human()
-	// using.screen_loc = ui_ghost_slot3
-	// static_inventory += using
-
 	using = new /atom/movable/screen/ghost/reenter_corpse()
 	using.screen_loc = ui_ghost_slot3
 	static_inventory += using

code/_onclick/hud/screen_objects/screen_objects.dm

@@ -388,9 +388,6 @@
 	icon = 'icons/mob/screen/alien.dmi'
 	z_prefix = "ay_"
 
-/atom/movable/screen/zone_sel/robot
-	icon = 'icons/mob/screen/cyborg.dmi'
-
 /atom/movable/screen/healths
 	name = "health"
 	icon_state = "health0"
@@ -401,11 +398,6 @@
 	icon = 'icons/mob/screen/alien.dmi'
 	screen_loc = ui_alien_health
 
-/atom/movable/screen/healths/robot
-	icon = 'icons/mob/screen/cyborg.dmi'
-	screen_loc = ui_borg_health
-
-
 /atom/movable/screen/stamina_hud
 	icon = 'icons/mob/screen/health.dmi'
 	name = "stamina"

code/controllers/subsystem/chat.dm

@@ -5,39 +5,94 @@
 
 SUBSYSTEM_DEF(chat)
 	name = "Chat"
-	flags = SS_TICKER
+	flags = SS_TICKER|SS_NO_INIT
 	wait = 1
 	priority = FIRE_PRIORITY_CHAT
 	init_order = INIT_ORDER_CHAT
 
-	var/list/payload_by_client = list()
+	/// Assosciates a ckey with a list of messages to send to them.
+	var/list/list/datum/chat_payload/client_to_payloads = list()
 
-/datum/controller/subsystem/chat/Initialize()
-	// Just used by chat system to know that initialization is nearly finished.
-	// The to_chat checks could probably check the runlevel instead, but would require testing.
-	return SS_INIT_SUCCESS
+	/// Associates a ckey with an assosciative list of their last CHAT_RELIABILITY_HISTORY_SIZE messages.
+	var/list/list/datum/chat_payload/client_to_reliability_history = list()
+
+	/// Assosciates a ckey with their next sequence number.
+	var/list/client_to_sequence_number = list()
+
+/datum/controller/subsystem/chat/proc/generate_payload(client/target, message_data)
+	var/sequence = client_to_sequence_number[target.ckey]
+	client_to_sequence_number[target.ckey] += 1
+
+	var/datum/chat_payload/payload = new
+	payload.sequence = sequence
+	payload.content = message_data
+
+	if(!(target.ckey in client_to_reliability_history))
+		client_to_reliability_history[target.ckey] = list()
+	var/list/client_history = client_to_reliability_history[target.ckey]
+	client_history["[sequence]"] = payload
+
+	if(length(client_history) > CHAT_RELIABILITY_HISTORY_SIZE)
+		var/oldest = text2num(client_history[1])
+		for(var/index in 2 to length(client_history))
+			var/test = text2num(client_history[index])
+			if(test < oldest)
+				oldest = test
+		client_history -= "[oldest]"
+	return payload
+
+/datum/controller/subsystem/chat/proc/send_payload_to_client(client/target, datum/chat_payload/payload)
+	target.tgui_panel.window.send_message("chat/message", payload.into_message())
+	SEND_TEXT(target, payload.get_content_as_html())
 
 /datum/controller/subsystem/chat/fire()
-	for(var/key in payload_by_client)
-		var/client/client = key
-		var/payload = payload_by_client[key]
-		payload_by_client -= key
-		if(client)
-			// Send to tgchat
-			client.tgui_panel?.window.send_message("chat/message", payload)
-			// Send to old chat
-			for(var/message in payload)
-				SEND_TEXT(client, message_to_html(message))
+	for(var/ckey in client_to_payloads)
+		var/client/target = GLOB.directory[ckey]
+		if(isnull(target)) // verify client still exists
+			LAZYREMOVE(client_to_payloads, ckey)
+			continue
+
+		for(var/datum/chat_payload/payload as anything in client_to_payloads[ckey])
+			send_payload_to_client(target, payload)
+		LAZYREMOVE(client_to_payloads, ckey)
+
 		if(MC_TICK_CHECK)
 			return
 
-/datum/controller/subsystem/chat/proc/queue(target, message)
-	if(islist(target))
-		for(var/_target in target)
-			var/client/client = CLIENT_FROM_VAR(_target)
-			if(client)
-				LAZYADD(payload_by_client[client], list(message))
+/datum/controller/subsystem/chat/proc/queue(queue_target, list/message_data)
+	var/list/targets = islist(queue_target) ? queue_target : list(queue_target)
+	for(var/target in targets)
+		var/client/client = CLIENT_FROM_VAR(target)
+		if(isnull(client))
+			continue
+		LAZYADDASSOCLIST(client_to_payloads, client.ckey, generate_payload(client, message_data))
+
+/datum/controller/subsystem/chat/proc/send_immediate(send_target, list/message_data)
+	var/list/targets = islist(send_target) ? send_target : list(send_target)
+	for(var/target in targets)
+		var/client/client = CLIENT_FROM_VAR(target)
+		if(isnull(client))
+			continue
+		send_payload_to_client(client, generate_payload(client, message_data))
+
+/datum/controller/subsystem/chat/proc/handle_resend(client/client, sequence)
+	var/list/client_history = client_to_reliability_history[client.ckey]
+	sequence = "[sequence]"
+	if(isnull(client_history) || !(sequence in client_history))
 		return
-	var/client/client = CLIENT_FROM_VAR(target)
-	if(client)
-		LAZYADD(payload_by_client[client], list(message))
+
+	var/datum/chat_payload/payload = client_history[sequence]
+	if(payload.resends > CHAT_RELIABILITY_MAX_RESENDS)
+		return // we tried but byond said no
+
+	payload.resends += 1
+	send_payload_to_client(client, client_history[sequence])
+	SSblackbox.record_feedback(
+		"nested tally",
+		"chat_resend_byond_version",
+		1,
+		list(
+			"[client.byond_version]",
+			"[client.byond_build]",
+		),
+	)

code/controllers/subsystem/minimaps.dm

@@ -41,11 +41,9 @@ SUBSYSTEM_DEF(minimaps)
 	var/list/hashed_minimaps = list()
 
 /datum/controller/subsystem/minimaps/Initialize()
+	initialized = TRUE
 	for(var/datum/space_level/z_level AS in SSmapping.z_list)
 		load_new_z(null, z_level)
-	//RegisterSignal(SSdcs, COMSIG_GLOB_NEW_Z, PROC_REF(load_new_z))
-
-	initialized = TRUE
 
 	return SS_INIT_SUCCESS
 

code/datums/actions/ability_actions.dm

@@ -151,6 +151,7 @@
 	if(!button)
 		CRASH("no button object on finishing ability action cooldown")
 	button.cut_overlay(visual_references[VREF_IMAGE_XENO_CLOCK])
+	update_button_icon()
 
 ///Any changes when a xeno with this ability evolves
 /datum/action/ability/proc/on_xeno_upgrade()