Merge branch 'master' into SynthUpdateVendor

code/datums/supply_packs/black_market.dm

@@ -448,7 +448,7 @@ Additionally, weapons that are way too good to put in the basically-flavor black
 	containertype = /obj/structure/largecrate/black_market
 
 /datum/supply_packs/contraband/seized/small
-	name = "S&W revolver (x6 magazines included)"
+	name = "Smith and Wesson revolver (x6 magazines included)"
 	contains = list(
 		/obj/item/weapon/gun/revolver/small,
 		/obj/item/ammo_magazine/revolver/small,

code/game/gamemodes/cm_initialize.dm

@@ -446,6 +446,10 @@ Additional game mode variables.
 			to_chat(xeno_candidate, SPAN_WARNING("You cannot join if the xenomorph is dead."))
 			return FALSE
 
+		if(new_xeno.stat == UNCONSCIOUS)
+			to_chat(xeno_candidate, SPAN_WARNING("You cannot join if the xenomorph is in critical condition or unconscious."))
+			return FALSE
+
 		if(!xeno_bypass_timer)
 			var/deathtime = world.time - xeno_candidate.timeofdeath
 			if(istype(xeno_candidate, /mob/new_player))

code/game/objects/items/devices/flashlight.dm

@@ -65,6 +65,7 @@
 	if(on)
 		on = FALSE
 		set_light_on(on)
+		update_icon()
 		for(var/X in actions)
 			var/datum/action/A = X
 			A.update_button_icon()

code/modules/cm_aliens/structures/special/pylon_core.dm

@@ -164,15 +164,15 @@
 
 /// Checks if all comms towers are connected and then starts end game content on all pylons if they are
 /obj/effect/alien/resin/special/pylon/endgame/proc/comms_relay_connection()
-	marine_announcement("ALERT.\n\nIrregular build up of energy around communication relays at [get_area(src)].", "[MAIN_AI_SYSTEM] Biological Scanner")
+	marine_announcement("ALERT.\n\nIrregular build up of energy around communication relays at [get_area(src)], biological hazard detected.\n\nDANGER: Hazard is generating new xenomorph entities, advise urgent termination of hazard by ground forces.", "[MAIN_AI_SYSTEM] Biological Scanner")
 
 	for(var/hivenumber in GLOB.hive_datum)
 		var/datum/hive_status/checked_hive = GLOB.hive_datum[hivenumber]
 		if(!length(checked_hive.totalXenos))
 			continue
 
 		if(checked_hive == linked_hive)
-			xeno_announcement(SPAN_XENOANNOUNCE("We have harnessed the tall's communication relay at [get_area(src)]. Hold it!"), hivenumber, XENO_GENERAL_ANNOUNCE)
+			xeno_announcement(SPAN_XENOANNOUNCE("We have harnessed the tall's communication relay at [get_area(src)].\n\nWe will now grow more of our number from this pylon. Hold it!"), hivenumber, XENO_GENERAL_ANNOUNCE)
 		else
 			xeno_announcement(SPAN_XENOANNOUNCE("Another hive has harnessed the tall's communication relay at [get_area(src)].[linked_hive.faction_is_ally(checked_hive.name) ? "" : " Stop them!"]"), hivenumber, XENO_GENERAL_ANNOUNCE)
 

html/changelogs/AutoChangeLog-pr-4510.yml

@@ -0,0 +1,7 @@
+author: "SpartanBobby"
+delete-after: True
+changes:
+  - maptweak: "CL now spawns in a hypersleep bay \"Passenger Bay\" it's right next to his office, the CC spawns with him too since his landmark was in the latejoin bay on the lowerdeck"
+  - maptweak: "re-arranged PO bunks should allow for better traffic in and out"
+  - maptweak: "fixed symmetry issue in north-south CIC hallway"
+  - maptweak: "minor warning stripe decal additions around Almayer"

html/changelogs/archive/2023-09.yml

@@ -395,3 +395,12 @@
       as DCC
   realforest2001:
   - balance: Adds an extra 75% damage and hive interference to plasma rifle vs xenos.
+2023-09-28:
+  Casper:
+  - bugfix: fixed S&W black market crate not working
+  - bugfix: fixed flashlights showing incorrect sprite state
+  Steelpoint:
+  - rscadd: Alert message regarding Pylon construction around a communications array
+      now properly emphasizes why it is a threat to Marines, and a benefit to Xenos.
+  TheGamerdk:
+  - qol: You can no longer doom yourself by joining as a crit xeno