Merge remote-tracking branch 'upstream/master' into skill-issue

Author: SapphicOverload

code/__DEFINES/misc.dm

@@ -226,6 +226,7 @@ GLOBAL_LIST_INIT(donor_pdas, list(PDA_COLOR_NORMAL, PDA_COLOR_TRANSPARENT, PDA_C
 #define DEADCHAT_DEATHRATTLE "deathrattle"
 #define DEADCHAT_REGULAR "regular-deadchat"
 #define DEADCHAT_ANNOUNCEMENT "announcement"
+#define DEADCHAT_PDA "pdamessage"
 
 // Bluespace shelter deploy checks
 #define SHELTER_DEPLOY_ALLOWED "allowed"

code/__HELPERS/mobs.dm

@@ -455,6 +455,9 @@ GLOBAL_LIST_EMPTY(species_list)
 			if(DEADCHAT_ARRIVALRATTLE)
 				if(prefs.toggles & DISABLE_ARRIVALRATTLE)
 					continue
+			if(DEADCHAT_PDA)
+				if(prefs.chat_toggles & CHAT_GHOSTPDA)
+					continue
 
 		if(isobserver(M))
 			var/rendered_message = message

code/datums/components/storage/storage.dm

@@ -239,7 +239,7 @@ GLOBAL_LIST_EMPTY(cached_storage_typecaches)
 		to_chat(M, span_notice("You failed to pick up anything with [parent]."))
 		return
 	var/list/rejections = list()
-	while(do_after(M, 1 SECONDS, parent, TRUE, FALSE, CALLBACK(src, PROC_REF(handle_mass_pickup), things, I.loc, rejections)))
+	while(do_after(M, 1 SECONDS, parent, NONE, TRUE, CALLBACK(src, PROC_REF(handle_mass_pickup), things, I.loc, rejections)))
 		continue
 	to_chat(M, span_notice("You put everything you could [insert_preposition] [parent]."))
 
@@ -291,7 +291,7 @@ GLOBAL_LIST_EMPTY(cached_storage_typecaches)
 	to_chat(M, span_notice("You start dumping out [parent]."))
 	var/turf/T = get_turf(A)
 	var/list/things = contents()
-	while (do_after(M, 1 SECONDS, T, TRUE, FALSE, CALLBACK(src, PROC_REF(mass_remove_from_storage), T, things)))
+	while (do_after(M, 1 SECONDS, T, NONE, TRUE, CALLBACK(src, PROC_REF(mass_remove_from_storage), T, things)))
 		continue
 
 /datum/component/storage/proc/mass_remove_from_storage(atom/target, list/things, trigger_on_found = TRUE)

code/datums/progressbar.dm

@@ -68,7 +68,7 @@
 		var/obj/mecha/mech = user.loc
 		if(ismecha(user.loc) && user == mech.occupant)
 			RegisterSignal(mech, COMSIG_MOVABLE_MOVED, PROC_REF(on_moved))
-	if(!(timed_action_flags & IGNORE_TARGET_LOC_CHANGE))
+	if(!(timed_action_flags & IGNORE_TARGET_LOC_CHANGE) && target != user)
 		RegisterSignal(target, COMSIG_MOVABLE_MOVED, PROC_REF(on_moved))
 	if(!(timed_action_flags & IGNORE_HELD_ITEM))
 		var/obj/item/held = user.get_active_held_item()
@@ -79,6 +79,9 @@
 			RegisterSignal(user, COMSIG_MOB_PICKUP_ITEM, PROC_REF(end_progress))
 		RegisterSignal(user, COMSIG_MOB_SWAPPING_HANDS, PROC_REF(end_progress))
 	if(!(timed_action_flags & IGNORE_INCAPACITATED))
+		if(HAS_TRAIT(user, TRAIT_INCAPACITATED))
+			end_progress()
+			return
 		RegisterSignal(user, SIGNAL_ADDTRAIT(TRAIT_INCAPACITATED), PROC_REF(end_progress))
 
 

code/modules/modular_computers/file_system/programs/ntpda_msg.dm

@@ -124,7 +124,7 @@ GLOBAL_LIST_EMPTY(NTPDAMessages)
 		return FALSE
 
 	// Show ghosts (and admins)
-	deadchat_broadcast(" sent an <b>NTPDA Message</b> ([username] --> [recipient.username]): [span_message(message)]", user, user, speaker_key = user.ckey)
+	deadchat_broadcast(" sent an <b>NTPDA Message</b> ([username] --> [recipient.username]): [span_message(message)]", user, user, speaker_key = user.ckey, message_type = DEADCHAT_PDA)
 	computer.visible_message(span_notice("Message sent!"), null, null, 1)
 	message_history += list(list(username, message, REF(src), signal))
 	return TRUE
@@ -182,7 +182,7 @@ GLOBAL_LIST_EMPTY(NTPDAMessages)
 		return FALSE
 
 	// Show ghosts (and admins)
-	deadchat_broadcast(" sent an <b>NTPDA Message</b> ([username] --> <b>Everyone</b>): [span_message(message)]", user, user, speaker_key = user.ckey)
+	deadchat_broadcast(" sent an <b>NTPDA Message</b> ([username] --> <b>Everyone</b>): [span_message(message)]", user, user, speaker_key = user.ckey, message_type = DEADCHAT_PDA)
 	computer.visible_message(span_notice("Message sent!"), null, null, 1)
 	message_history += list(list(username, message, REF(src), signal))
 	return TRUE

html/changelog.html

@@ -57,6 +57,28 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">08 December 2024</h2>
+			<h3 class="author">Oblisk234 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixed an exploit where you could use the cursed stomach to vomitcrawl to Centcomm</li>
+			</ul>
+			<h3 class="author">SapphicOverload updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixed movement canceling certain timed actions when it shouldn't</li>
+				<li class="bugfix">Fixed containers not picking up and emptying items properly</li>
+			</ul>
+			<h3 class="author">ToasterBiome updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Ghost "Enable PDA notifications" setting will now function correctly</li>
+			</ul>
+
+			<h2 class="date">04 December 2024</h2>
+			<h3 class="author">SapphicOverload updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Adds lactose intolerance quirk</li>
+				<li class="tweak">Lizards are now lactose intolerant instead of not liking vegetables and sugar</li>
+			</ul>
+
 			<h2 class="date">03 December 2024</h2>
 			<h3 class="author">13spacemen updated:</h3>
 			<ul class="changes bgimages16">
@@ -784,61 +806,6 @@ <h3 class="author">cowbot92 updated:</h3>
 				<li class="mapping">Adds a new area to enter the backrooms on station</li>
 				<li class="experiment">This is experimental</li>
 			</ul>
-
-			<h2 class="date">08 September 2024</h2>
-			<h3 class="author">AgentCitrus, kit-katz, PowerfulBacon, ToasterBiome updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Adds a distortion effect to the supermatter engine</li>
-				<li class="bugfix">Fixes singularity spawned by delamination to not be a gravitational one</li>
-			</ul>
-			<h3 class="author">M4565, ToasterBiome updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">makes burning surgical mats drop plastic instead of metal</li>
-			</ul>
-			<h3 class="author">SapphicOverload updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">Fixed objectives sometimes not re-rolling properly</li>
-			</ul>
-			<h3 class="author">ToasterBiome updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="tweak">Scrubs instances of the word retard/retarded</li>
-				<li class="bugfix">centcom ban DB check now works again</li>
-			</ul>
-
-			<h2 class="date">07 September 2024</h2>
-			<h3 class="author">AMyriad updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="mapping">Fixed many mapping errors in the meteorite ruin on lavaland</li>
-			</ul>
-			<h3 class="author">ToasterBiome updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="tweak">Break machinery objective take into account multi z stations and only assigns station machines</li>
-				<li class="rscadd">You can flip empty drinking glasses and shot glasses with alt click!</li>
-			</ul>
-
-			<h2 class="date">04 September 2024</h2>
-			<h3 class="author">JohnFulpWillard updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">Holotools should now only work as multitools when they are set to the multitool setting.</li>
-				<li class="bugfix">Ghosts no longer get spammed when using telecomms machines.</li>
-			</ul>
-			<h3 class="author">SapphicOverload updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="tweak">Icemoon now uses the day/night cycle</li>
-				<li class="mapping">Icemoon's geothermal power stations are no longer named solar arrays</li>
-			</ul>
-			<h3 class="author">ToasterBiome updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="tweak">ripping out the master r&d hard drive is faster now</li>
-			</ul>
-			<h3 class="author">ToasterBiome, Cowbot93 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">Heretic spells now get transferred on clone</li>
-			</ul>
-			<h3 class="author">ktlwjec updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="imageadd">Silver and gold centcom ID cards.</li>
-			</ul>
 		</div>
 
 <b>GoonStation 13 Development Team</b>

html/changelogs/.all_changelog.yml

@@ -45761,3 +45761,17 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
 2024-12-03:
   13spacemen:
   - bugfix: Vox spawn with the correct tank and mask at roundstart
+2024-12-04:
+  SapphicOverload:
+  - rscadd: Adds lactose intolerance quirk
+  - tweak: Lizards are now lactose intolerant instead of not liking vegetables and
+      sugar
+2024-12-08:
+  Oblisk234:
+  - bugfix: Fixed an exploit where you could use the cursed stomach to vomitcrawl
+      to Centcomm
+  SapphicOverload:
+  - bugfix: Fixed movement canceling certain timed actions when it shouldn't
+  - bugfix: Fixed containers not picking up and emptying items properly
+  ToasterBiome:
+  - bugfix: Ghost "Enable PDA notifications" setting will now function correctly

html/changelogs/AutoChangelog-pr-22829.yml

@@ -447,5 +447,5 @@ GLOBAL_LIST_EMPTY(vomit_spots)
 
 /obj/effect/dummy/crawling/vomit/proc/follow_vomit()
 	var/turf/T = get_turf(currentvomit)
-	if(T)
+	if(T && !(is_centcom_level(T.z)||is_reserved_level(T.z)))
 		forceMove(T)