Merge branch 'cmss13-devs:master' into Adds-New-Synthetic-Cosmetics

code/game/machinery/ARES/ARES.dm

@@ -137,7 +137,7 @@
 	/// The current deleted chat log of 1:1 conversations being read.
 	var/list/deleted_1to1 = list()
 
-	/// Holds all (/datum/ares_record/announcement)s and (/datum/ares_record/security/security_alert)s
+	/// Holds all (/datum/ares_record/announcement)s
 	var/list/records_announcement = list()
 	/// Holds all (/datum/ares_record/bioscan)s
 	var/list/records_bioscan = list()

code/game/machinery/ARES/ARES_procs.dm

@@ -223,7 +223,7 @@ GLOBAL_LIST_INIT(maintenance_categories, list(
 	data["records_announcement"] = logged_announcements
 
 	var/list/logged_alerts = list()
-	for(var/datum/ares_record/security/security_alert as anything in records_announcement)
+	for(var/datum/ares_record/security/security_alert as anything in records_security)
 		if(!istype(security_alert))
 			continue
 		var/list/current_alert = list()
@@ -457,6 +457,10 @@ GLOBAL_LIST_INIT(maintenance_categories, list(
 					new_title = "[record.title] at [record.time]"
 					new_details = record.details
 					records_announcement -= record
+				if(ARES_RECORD_SECURITY)
+					new_title = "[record.title] at [record.time]"
+					new_details = record.details
+					records_security -= record
 				if(ARES_RECORD_BIOSCAN)
 					new_title = "[record.title] at [record.time]"
 					new_details = record.details

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

@@ -28,6 +28,11 @@
 	var/message = tgui_input_text(user, "Shout a message?", "Megaphone", multiline = TRUE)
 	if(!message)
 		return
+	// we know user is a human now, so adjust user for this check
+	var/mob/living/carbon/human/humanoid = user
+	if(humanoid.speech_problem_flag)
+		var/list/new_message = humanoid.handle_speech_problems(message)
+		message = new_message[1]
 	message = capitalize(message)
 	log_admin("[key_name(user)] used a megaphone to say: >[message]<")
 

code/modules/cm_aliens/structures/tunnel.dm

@@ -2,6 +2,8 @@
  * Tunnels
  */
 
+#define TUNNEL_COLLAPSING_TIME (60 SECONDS)
+
 /obj/structure/tunnel
 	name = "tunnel"
 	desc = "A tunnel entrance. Looks like it was dug by some kind of clawed beast."
@@ -83,6 +85,25 @@
 
 /obj/structure/tunnel/attackby(obj/item/W as obj, mob/user as mob)
 	if(!isxeno(user))
+		if(istype(W, /obj/item/tool/shovel))
+			var/obj/item/tool/shovel/destroying_shovel = W
+
+			if(destroying_shovel.folded)
+				return
+
+			playsound(user.loc, 'sound/effects/thud.ogg', 40, 1, 6)
+
+			user.visible_message(SPAN_NOTICE("[user] starts to collapse [src]!"), SPAN_NOTICE("You start collapsing [src]!"))
+
+			if(user.action_busy || !do_after(user, TUNNEL_COLLAPSING_TIME * ((100 - destroying_shovel.shovelspeed) * 0.01), INTERRUPT_ALL, BUSY_ICON_BUILD))
+				return
+
+			playsound(loc, 'sound/effects/tunnel_collapse.ogg', 50)
+
+			visible_message(SPAN_NOTICE("[src] collapses in on itself."))
+
+			qdel(src)
+
 		return ..()
 	return attack_alien(user)
 

code/modules/cm_marines/dropship_equipment.dm

@@ -289,7 +289,7 @@
 	density = FALSE
 	equip_categories = list(DROPSHIP_WEAPON, DROPSHIP_CREW_WEAPON)
 	icon_state = "mg_system"
-	point_cost = 300
+	point_cost = 50
 	var/deployment_cooldown
 	var/obj/structure/machinery/m56d_hmg/mg_turret/dropship/deployed_mg
 	combat_equipment = FALSE
@@ -449,7 +449,7 @@
 	icon_state = "spotlights"
 	desc = "A set of high-powered spotlights to illuminate large areas. Fits on electronics attach points of dropships. Moving this will require a powerloader."
 	is_interactable = TRUE
-	point_cost = 300
+	point_cost = 50
 	var/spotlights_cooldown
 	var/brightness = 11
 
@@ -513,7 +513,7 @@
 	name = "\improper LZ detector"
 	desc = "An electronic device linked to the dropship's camera system that lets you observe your landing zone mid-flight."
 	icon_state = "lz_detector"
-	point_cost = 400
+	point_cost = 50
 	var/obj/structure/machinery/computer/cameras/dropship/linked_cam_console
 
 /obj/structure/dropship_equipment/electronics/landing_zone_detector/update_equipment()
@@ -1137,7 +1137,7 @@
 	name = "rappel deployment system"
 	equip_categories = list(DROPSHIP_CREW_WEAPON)
 	icon_state = "rappel_module_packaged"
-	point_cost = 500
+	point_cost = 50
 	combat_equipment = FALSE
 
 	var/harness = /obj/item/rappel_harness

code/modules/defenses/sentry.dm

@@ -1,6 +1,5 @@
 #define SENTRY_FIREANGLE 135
 #define SENTRY_RANGE 5
-#define SENTRY_MUZZLELUM 3
 #define SENTRY_ENGAGED_TIMEOUT 60 SECONDS
 #define SENTRY_LOW_AMMO_TIMEOUT 20 SECONDS
 #define SENTRY_LOW_AMMO_ALERT_PERCENTAGE 0.25
@@ -336,9 +335,6 @@
 	if(isnull(angle))
 		return
 
-	SetLuminosity(SENTRY_MUZZLELUM)
-	addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, SetLuminosity), -SENTRY_MUZZLELUM), 10)
-
 	var/image_layer = layer + 0.1
 	var/offset = 13
 
@@ -726,4 +722,3 @@
 
 #undef SENTRY_FIREANGLE
 #undef SENTRY_RANGE
-#undef SENTRY_MUZZLELUM

code/modules/mob/living/carbon/xenomorph/Embryo.dm

@@ -100,6 +100,14 @@
 
 	switch(stage)
 		if(2)
+			if(prob(4))
+				if(affected_mob.knocked_out < 1)
+					affected_mob.pain.apply_pain(PAIN_CHESTBURST_WEAK)
+					affected_mob.visible_message(SPAN_DANGER("[affected_mob] starts shaking uncontrollably!"), \
+												SPAN_DANGER("You feel something moving inside you! You start shaking uncontrollably!"))
+					affected_mob.apply_effect(1, PARALYZE)
+					affected_mob.make_jittery(105)
+					affected_mob.take_limb_damage(1)
 			if(prob(2))
 				var/message = SPAN_WARNING("[pick("Your chest hurts a little bit", "Your stomach hurts")].")
 				to_chat(affected_mob, message)
@@ -113,22 +121,30 @@
 					affected_mob.take_limb_damage(1)
 			else if(prob(2))
 				affected_mob.emote("[pick("sneeze", "cough")]")
-		if(4)
-			if(prob(1))
+			if(prob(5))
 				if(affected_mob.knocked_out < 1)
 					affected_mob.pain.apply_pain(PAIN_CHESTBURST_WEAK)
 					affected_mob.visible_message(SPAN_DANGER("\The [affected_mob] starts shaking uncontrollably!"), \
-												SPAN_DANGER("You start shaking uncontrollably!"))
-					affected_mob.apply_effect(10, PARALYZE)
+												SPAN_DANGER("You feel something moving inside you! You start shaking uncontrollably!"))
+					affected_mob.apply_effect(2, PARALYZE)
 					affected_mob.make_jittery(105)
 					affected_mob.take_limb_damage(1)
+		if(4)
 			if(prob(2))
 				affected_mob.pain.apply_pain(PAIN_CHESTBURST_WEAK)
 				var/message = pick("Your chest hurts badly", "It becomes difficult to breathe", "Your heart starts beating rapidly, and each beat is painful")
 				message = SPAN_WARNING("[message].")
 				to_chat(affected_mob, message)
 				if(prob(50))
 					affected_mob.emote("scream")
+			if(prob(6))
+				if(affected_mob.knocked_out < 1)
+					affected_mob.pain.apply_pain(PAIN_CHESTBURST_WEAK)
+					affected_mob.visible_message(SPAN_DANGER("[affected_mob] starts shaking uncontrollably!"), \
+												SPAN_DANGER("You feel something moving inside you! You start shaking uncontrollably!"))
+					affected_mob.apply_effect(3, PARALYZE)
+					affected_mob.make_jittery(105)
+					affected_mob.take_limb_damage(1)
 		if(5)
 			become_larva()
 		if(6)

code/modules/mob/living/carbon/xenomorph/Xenomorph.dm

@@ -1125,3 +1125,8 @@
 	SPAN_WARNING("You squeeze and scuttle underneath [current_structure]."), max_distance = 5)
 	forceMove(current_structure.loc)
 	return TRUE
+
+/mob/living/carbon/xenomorph/knocked_down_callback()
+	. = ..()
+	if(!resting) // !resting because we dont wanna prematurely update wounds if they're just trying to rest
+		update_wounds()

code/modules/tents/deployed_tents.dm

@@ -149,10 +149,10 @@
 	icon_state = "big_interior"
 	roof_state = "big_top"
 	x_dim = 3
-	y_dim = 3
+	y_dim = 4
 
 /obj/structure/tent/reqs
 	icon_state = "reqs_interior"
 	roof_state = "reqs_top"
 	x_dim = 4
-	y_dim = 3
+	y_dim = 4

html/changelogs/AutoChangeLog-pr-3843.yml

@@ -0,0 +1,5 @@
+author: "zzzmike"
+delete-after: True
+changes:
+  - balance: "when facehugged, more paralyze chance with a smaller paralyze duration"
+  - ui: "during hugged effects, changes messaging to encourage new players to seek help"

html/changelogs/AutoChangeLog-pr-4001.yml

@@ -0,0 +1,7 @@
+author: "GoldenDarkness55"
+delete-after: True
+changes:
+  - balance: "Dropship machine gun cost lowered from 300 to 50."
+  - balance: "Dropship rappel module cost lowered from 500 to 50."
+  - balance: "Dropship spotlight cost lowered from 300 to 50."
+  - balance: "Dropship LZ detector cost lowered from 400 to 50."

html/changelogs/AutoChangeLog-pr-4008.yml

@@ -0,0 +1,4 @@
+author: "Ben10083"
+delete-after: True
+changes:
+  - bugfix: "Speech problems such as lisping now applies when using megaphone"

html/changelogs/AutoChangeLog-pr-4010.yml

@@ -0,0 +1,4 @@
+author: "Morrow"
+delete-after: True
+changes:
+  - bugfix: "Fixed sentries firing turning off their lights"

html/changelogs/AutoChangeLog-pr-4011.yml

@@ -0,0 +1,4 @@
+author: "Khadd"
+delete-after: True
+changes:
+  - bugfix: "xenos now update their wound icon when getting up"

html/changelogs/AutoChangeLog-pr-4013.yml

@@ -0,0 +1,4 @@
+author: "Morrow"
+delete-after: True
+changes:
+  - rscadd: "Shovels can now be used to collapse tunnels"

html/changelogs/archive/2023-07.yml

@@ -548,3 +548,9 @@
       of SDing another Yautja.
   - rscadd: Added a message to all Yautja if an SD is cancelled.
   - ui: Adds a UI panel for Yautja emotes, all credit to Zonespace.
+2023-07-27:
+  Ben10083:
+  - bugfix: ARES security logs now are properly displayed
+  - ui: Xenos (and others) now see comms relays on minimap
+  Drathek:
+  - code_imp: Bump alternate 515 testing to byond 1610

tgui/packages/tgui/interfaces/AresInterface.js

@@ -1268,8 +1268,14 @@ const AntiAir = (props, context) => {
 
 const Security = (props, context) => {
   const { data, act } = useBackend(context);
-  const { logged_in, access_text, last_page, current_menu, records_security } =
-    data;
+  const {
+    logged_in,
+    access_text,
+    last_page,
+    current_menu,
+    records_security,
+    access_level,
+  } = data;
 
   return (
     <>