Merge branch 'master' into inteqmed

_maps/RandomRuins/IceRuins/icemoon_underground_drakelair.dmm

@@ -127,7 +127,8 @@
 "iT" = (
 /obj/structure/stone_tile/slab,
 /mob/living/simple_animal/hostile/megafauna/dragon/icemoon{
-	loot = list(/obj/structure/closet/crate/necropolis/dragon,/obj/item/keycard/gatedrop/drakelair)
+	loot = list(/obj/structure/closet/crate/necropolis/dragon,/obj/item/keycard/gatedrop/drakelair);
+	crusher_loot = list(/obj/structure/closet/crate/necropolis/dragon/crusher,/obj/item/keycard/gatedrop/drakelair)
 	},
 /turf/open/indestructible/boss,
 /area/ruin)

_maps/configs/syndicate_aegis.json

@@ -1,5 +1,5 @@
 {
-	"prefix": "SSV",
+	"prefix": "SUNS",
 	"map_name": "Aegis-class Long Term Care Ship",
 	"map_short_name": "Aegis-class",
 	"map_path": "_maps/shuttles/syndicate/syndicate_aegis.dmm",

_maps/configs/syndicate_cybersun_kansatsu.json

@@ -1,6 +1,6 @@
 {
 	"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
-	"prefix": "SSV",
+	"prefix": "CSSV",
 	"namelists": [
 		"CYBERSUN",
 		"SPACE",

_maps/configs/syndicate_gorlex_hyena.json

@@ -1,6 +1,6 @@
 {
 	"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
-	"prefix": "SSV",
+	"prefix": "NGRV",
 	"namelists": [
 		"GORLEX",
 		"NATURAL_AGGRESSIVE",

_maps/configs/syndicate_gorlex_komodo.json

@@ -1,5 +1,5 @@
 {
-	"prefix": "SSV",
+	"prefix": "ISV",
 	"namelists": [
 		"GORLEX",
 		"NATURAL_AGGRESSIVE",

_maps/configs/syndicate_litieguai.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
 	"map_name": "Li Tieguai-class Rescue Ship",
-	"prefix": "SSV",
+	"prefix": "CSSV",
 	"map_short_name": "Li Tieguai-class",
 	"description": "A small, nimble, and exceptionally well-built medical response vessel, the Li Tieguai is a recent addition to Cybersun’s fleet, forming a critical component of their Frontier stabilization program. Li Tieguais come equipped with high-end medical equipment, including a selection of Cybersun augments and prosthetics, as well as weaponry and armor sufficient to protect its personnel in the often-dangerous Frontier sectors, so that they can offer premium healthcare (at premium prices) in even the most dangerous of scenarios.",
 	"tags": [

_maps/configs/syndicate_lugol.json

@@ -1,6 +1,6 @@
 {
 	"map_name": "Lugol-class GEC Engineering Project",
-	"prefix": "SEV",
+	"prefix": "XSV",
 	"map_short_name": "Lugol-class",
 	"description": "The Lugol is effectively an enormous Galactic Engineers Concordat research barge, used as a test bed for refinements to power systems, new technologies, and so on. As it offers freedom from the usual constraints of working aboard vessels belonging to other Syndicate factions, Lugols are especially popular among the GEC’s more radical members. Accordingly, they have a reputation for either accomplishing the impossible or generating the equivalent of a new star when they inevitably melt down. Lugols are generally only found on the Frontier, where the collateral damage from potential accidents can be kept to a minimum and secrecy, when needed, can be better maintained.",
 	"tags": [
@@ -14,7 +14,7 @@
 	],
 	"map_path": "_maps/shuttles/syndicate/syndicate_gec_lugol.dmm",
 	"map_id": "gec_lugol",
-	"limit": 2,
+	"limit": 1,
 	"job_slots": {
 		"Project Overseer": {
 			"outfit": "/datum/outfit/job/syndicate/ce/gec",

code/__DEFINES/tgs.dm

@@ -1,6 +1,6 @@
 // tgstation-server DMAPI
 
-#define TGS_DMAPI_VERSION "7.0.1"
+#define TGS_DMAPI_VERSION "7.0.2"
 
 // All functions and datums outside this document are subject to change with any version and should not be relied on.
 
@@ -426,6 +426,7 @@
 
 /**
  * Send a message to connected chats. This function may sleep!
+ * If TGS is offline when called, the message may be placed in a queue to be sent and this function will return immediately. Your message will be sent when TGS reconnects to the game.
  *
  * message - The [/datum/tgs_message_content] to send.
  * admin_only: If [TRUE], message will be sent to admin connected chats. Vice-versa applies.
@@ -435,6 +436,7 @@
 
 /**
  * Send a private message to a specific user. This function may sleep!
+ * If TGS is offline when called, the message may be placed in a queue to be sent and this function will return immediately. Your message will be sent when TGS reconnects to the game.
  *
  * message - The [/datum/tgs_message_content] to send.
  * user: The [/datum/tgs_chat_user] to PM.
@@ -444,6 +446,7 @@
 
 /**
  * Send a message to connected chats that are flagged as game-related in TGS. This function may sleep!
+ * If TGS is offline when called, the message may be placed in a queue to be sent and this function will return immediately. Your message will be sent when TGS reconnects to the game.
  *
  * message - The [/datum/tgs_message_content] to send.
  * channels - Optional list of [/datum/tgs_chat_channel]s to restrict the message to.

code/datums/mapgen/planetary/BeachGenerator.dm

@@ -119,7 +119,7 @@
 
 		/mob/living/simple_animal/butterfly = 4,
 		/mob/living/simple_animal/hostile/retaliate/poison/snake = 5,
-		/mob/living/simple_animal/hostile/poison/bees/toxin = 3,
+		/mob/living/simple_animal/hostile/poison/bees = 3,
 	)
 	mob_spawn_chance = 2
 	feature_spawn_chance = 0.1

code/datums/mapgen/planetary/JungleGenerator.dm

@@ -228,7 +228,7 @@
 	)
 	mob_spawn_chance = 1
 	mob_spawn_list = list(
-		/mob/living/simple_animal/hostile/poison/bees/toxin = 1,
+		/mob/living/simple_animal/hostile/poison/bees = 1,
 		/mob/living/simple_animal/hostile/mushroom = 1,
 		/mob/living/simple_animal/pet/dog/corgi/capybara = 1
 	)

code/modules/mining/machine_processing.dm

@@ -253,7 +253,7 @@
 	var/datum/component/material_container/materials = GetComponent(/datum/component/material_container)
 	materials.use_materials(alloy.materials, amount)
 
-	generate_mineral(alloy.build_path)
+	generate_mineral(alloy.build_path, amount)
 
 /obj/machinery/mineral/processing_unit/proc/can_smelt(datum/design/D)
 	if(D.make_reagents.len)
@@ -271,8 +271,8 @@
 
 	return build_amount
 
-/obj/machinery/mineral/processing_unit/proc/generate_mineral(P)
-	var/O = new P(src)
+/obj/machinery/mineral/processing_unit/proc/generate_mineral(P, amount)
+	var/O = new P(src, amount)
 	unload_mineral(O)
 
 /obj/machinery/mineral/processing_unit/on_deconstruction()

code/modules/mob/living/carbon/human/species_types/vox.dm

@@ -118,6 +118,7 @@
 /datum/action/innate/tail_hold
 	name = "Tail Hold"
 	desc = "Store an item in your tail's grip."
+	button_icon_state = "tail_hold"
 	var/obj/item/held_item
 	var/mutable_appearance/held_item_overlay
 

code/modules/surgery/healing.dm

@@ -65,11 +65,11 @@
 	var/urhealedamt_burn = burnhealing
 	if(missinghpbonus)
 		if(target.stat != DEAD)
-			urhealedamt_brute += round((target.getBruteLoss()/ missinghpbonus),0.1)
-			urhealedamt_burn += round((target.getFireLoss()/ missinghpbonus),0.1)
+			urhealedamt_brute += brutehealing ? round((target.getBruteLoss()/ missinghpbonus),0.1) : 0
+			urhealedamt_burn += burnhealing ? round((target.getFireLoss()/ missinghpbonus),0.1) : 0
 		else //less healing bonus for the dead since they're expected to have lots of damage to begin with (to make TW into defib not TOO simple)
-			urhealedamt_brute += round((target.getBruteLoss()/ (missinghpbonus*5)),0.1)
-			urhealedamt_burn += round((target.getFireLoss()/ (missinghpbonus*5)),0.1)
+			urhealedamt_brute += brutehealing ? round((target.getBruteLoss()/ (missinghpbonus*5)),0.1) : 0
+			urhealedamt_burn += burnhealing ? round((target.getFireLoss()/ (missinghpbonus*5)),0.1) : 0
 	if(!get_location_accessible(target, target_zone))
 		urhealedamt_brute *= 0.55
 		urhealedamt_burn *= 0.55

code/modules/tgs/v5/api.dm

@@ -8,8 +8,12 @@
 
 	var/reboot_mode = TGS_REBOOT_MODE_NORMAL
 
+	/// List of chat messages list()s that attempted to be sent during a topic call. To be bundled in the result of the call
 	var/list/intercepted_message_queue
 
+	/// List of chat messages list()s that attempted to be sent during a topic call. To be bundled in the result of the call
+	var/list/offline_message_queue
+
 	var/list/custom_commands
 
 	var/list/test_merges
@@ -194,17 +198,7 @@
 		var/datum/tgs_chat_channel/channel = I
 		ids += channel.id
 
-	message2 = UpgradeDeprecatedChatMessage(message2)
-
-	if (!length(channels))
-		return
-
-	var/list/data = message2._interop_serialize()
-	data[DMAPI5_CHAT_MESSAGE_CHANNEL_IDS] = ids
-	if(intercepted_message_queue)
-		intercepted_message_queue += list(data)
-	else
-		Bridge(DMAPI5_BRIDGE_COMMAND_CHAT_SEND, list(DMAPI5_BRIDGE_PARAMETER_CHAT_MESSAGE = data))
+	SendChatMessageRaw(message2, ids)
 
 /datum/tgs_api/v5/ChatTargetedBroadcast(datum/tgs_message_content/message2, admin_only)
 	var/list/channels = list()
@@ -213,26 +207,42 @@
 		if (!channel.is_private_channel && ((channel.is_admin_channel && admin_only) || (!channel.is_admin_channel && !admin_only)))
 			channels += channel.id
 
+	SendChatMessageRaw(message2, channels)
+
+/datum/tgs_api/v5/ChatPrivateMessage(datum/tgs_message_content/message2, datum/tgs_chat_user/user)
+	SendChatMessageRaw(message2, list(user.channel.id))
+
+/datum/tgs_api/v5/proc/SendChatMessageRaw(datum/tgs_message_content/message2, list/channel_ids)
 	message2 = UpgradeDeprecatedChatMessage(message2)
 
-	if (!length(channels))
+	if (!length(channel_ids))
 		return
 
 	var/list/data = message2._interop_serialize()
-	data[DMAPI5_CHAT_MESSAGE_CHANNEL_IDS] = channels
+	data[DMAPI5_CHAT_MESSAGE_CHANNEL_IDS] = channel_ids
 	if(intercepted_message_queue)
 		intercepted_message_queue += list(data)
-	else
-		Bridge(DMAPI5_BRIDGE_COMMAND_CHAT_SEND, list(DMAPI5_BRIDGE_PARAMETER_CHAT_MESSAGE = data))
+		return
 
-/datum/tgs_api/v5/ChatPrivateMessage(datum/tgs_message_content/message2, datum/tgs_chat_user/user)
-	message2 = UpgradeDeprecatedChatMessage(message2)
-	var/list/data = message2._interop_serialize()
-	data[DMAPI5_CHAT_MESSAGE_CHANNEL_IDS] = list(user.channel.id)
-	if(intercepted_message_queue)
-		intercepted_message_queue += list(data)
+	if(offline_message_queue)
+		offline_message_queue += list(data)
+		return
+
+	if(detached)
+		offline_message_queue = list(data)
+
+		WaitForReattach(FALSE)
+
+		data = offline_message_queue
+		offline_message_queue = null
+
+		for(var/queued_message in data)
+			SendChatDataRaw(queued_message)
 	else
-		Bridge(DMAPI5_BRIDGE_COMMAND_CHAT_SEND, list(DMAPI5_BRIDGE_PARAMETER_CHAT_MESSAGE = data))
+		SendChatDataRaw(data)
+
+/datum/tgs_api/v5/proc/SendChatDataRaw(list/data)
+	Bridge(DMAPI5_BRIDGE_COMMAND_CHAT_SEND, list(DMAPI5_BRIDGE_PARAMETER_CHAT_MESSAGE = data))
 
 /datum/tgs_api/v5/ChatChannelInfo()
 	RequireInitialBridgeResponse()

html/changelogs/archive/2024-01.yml

@@ -55,3 +55,21 @@
   - tweak: Descriptions of multiple clothing items.
   - rscadd: SecHuds now identify factions. Somewhat.
   - rscadd: More desperate groups of Frontiersmen have been spotted roaming the frontier.
+2024-01-19:
+  SomeguyManperson:
+  - tweak: tend brute/burns can no longer attempt to (very ineffectively) heal the
+      other damage type
+2024-01-23:
+  SomeguyManperson:
+  - bugfix: ore smelter no longer obliterates materials when smelting alloys
+2024-01-26:
+  Apogee-dev:
+  - tweak: Changed prefixes on Syndicate ships to reflect subfaction
+  SomeguyManperson:
+  - bugfix: you can no longer lock yourself out of the icemoon dragon lair by killing
+      the dragon with a crusher
+2024-01-28:
+  Fest1v3:
+  - imageadd: Added vox sprites & a tailhold icon.
+  Skies-Of-Blue:
+  - balance: planetary chem bees have been replaced with the garden variety