Merge branch 'master' into tac-refactor

code/defines/procs/announcement.dm

@@ -125,7 +125,7 @@
 
 //AI shipside announcement, that uses announcement mechanic instead of talking into comms
 //to ensure that all humans on ship hear it regardless of comms and power
-/proc/shipwide_ai_announcement(message, title = MAIN_AI_SYSTEM, sound_to_play = sound('sound/misc/interference.ogg'), signature)
+/proc/shipwide_ai_announcement(message, title = MAIN_AI_SYSTEM, sound_to_play = sound('sound/misc/interference.ogg'), signature, ares_logging = ARES_LOG_MAIN)
 	var/list/targets = GLOB.human_mob_list + GLOB.dead_mob_list
 	for(var/mob/T in targets)
 		if(isobserver(T))
@@ -136,8 +136,12 @@
 	if(!isnull(signature))
 		message += "<br><br><i> Signed by, <br> [signature]</i>"
 	var/datum/ares_link/link = GLOB.ares_link
-	if(link.interface && !(link.interface.inoperable()))
-		link.log_ares_announcement(title, message)
+	if(ares_can_log())
+		switch(ares_logging)
+			if(ARES_LOG_MAIN)
+				link.log_ares_announcement(title, message)
+			if(ARES_LOG_SECURITY)
+				link.log_ares_security(title, message)
 
 	announcement_helper(message, title, targets, sound_to_play)
 

code/modules/shuttle/computers/dropship_computer.dm

@@ -179,6 +179,9 @@
 				return
 			to_chat(xeno, SPAN_NOTICE("You command the metal bird to come down. Clever girl."))
 			xeno_announcement(SPAN_XENOANNOUNCE("Your Queen has commanded the metal bird to the hive at [linked_lz]."), xeno.hivenumber, XENO_GENERAL_ANNOUNCE)
+			var/datum/ares_link/link = GLOB.ares_link
+			link.log_ares_flight("Unknown", "Remote launch signal for [shuttle.name] received. Authentication garbled.")
+			link.log_ares_security("Security Alert", "Remote launch signal for [shuttle.name] received. Authentication garbled.")
 			return
 		if(shuttle.destination.id != linked_lz)
 			to_chat(xeno, "The shuttle not ready. The screen reads T-[shuttle.timeLeft(10)]. Have patience.")

code/modules/shuttle/shuttles/dropship.dm

@@ -100,7 +100,7 @@
 
 			var/name = "Unidentified Lifesigns"
 			var/input = "Unidentified lifesigns detected onboard. Recommendation: lockdown of exterior access ports, including ducting and ventilation."
-			shipwide_ai_announcement(input, name, 'sound/AI/unidentified_lifesigns.ogg')
+			shipwide_ai_announcement(input, name, 'sound/AI/unidentified_lifesigns.ogg', ares_logging = ARES_LOG_SECURITY)
 			set_security_level(SEC_LEVEL_RED)
 			return
 

code/modules/shuttles/marine_ferry.dm

@@ -230,7 +230,7 @@
 			if(X && X.stat != DEAD)
 				var/name = "Unidentified Lifesigns"
 				var/input = "Unidentified lifesigns detected onboard. Recommendation: lockdown of exterior access ports, including ducting and ventilation."
-				shipwide_ai_announcement(input, name, 'sound/AI/unidentified_lifesigns.ogg')
+				shipwide_ai_announcement(input, name, 'sound/AI/unidentified_lifesigns.ogg', ares_logging = ARES_LOG_SECURITY)
 				set_security_level(SEC_LEVEL_RED)
 				break
 

html/changelogs/archive/2023-10.yml

@@ -118,3 +118,12 @@
   - rscadd: tactical shotguns now come standard with their stock. Yes you can remove
       it if you dont want it
   - rscadd: new tactical shotgun stock sprite done by esselnek
+2023-10-10:
+  BeagleGaming1:
+  - code_imp: prop guns will copy attachments
+  CapCamIII:
+  - rscdel: XO can no longer take a sword as their personal weapon in their vendor.
+  realforest2001:
+  - rscadd: Added missing flight record for Queen dropship summon.
+  - code_imp: Added security record option for shipwide_ai_announcement.
+  - rscadd: Added security records for unidentified lifeforms announcement.