diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm
index 03b586f933a8..795472e44f63 100644
--- a/code/__DEFINES/misc.dm
+++ b/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"
diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm
index 97c216a4f268..8441488b42b0 100644
--- a/code/__HELPERS/mobs.dm
+++ b/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
diff --git a/code/datums/components/storage/storage.dm b/code/datums/components/storage/storage.dm
index 508819994666..035ebe694aaf 100644
--- a/code/datums/components/storage/storage.dm
+++ b/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)
diff --git a/code/datums/progressbar.dm b/code/datums/progressbar.dm
index cf79c5518759..afe8e2adafe5 100644
--- a/code/datums/progressbar.dm
+++ b/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))
diff --git a/code/modules/modular_computers/file_system/programs/ntpda_msg.dm b/code/modules/modular_computers/file_system/programs/ntpda_msg.dm
index 5dd70dea1827..42141c846bd0 100644
--- a/code/modules/modular_computers/file_system/programs/ntpda_msg.dm
+++ b/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 NTPDA Message ([username] --> [recipient.username]): [span_message(message)]", user, user, speaker_key = user.ckey)
+ deadchat_broadcast(" sent an NTPDA Message ([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 NTPDA Message ([username] --> Everyone): [span_message(message)]", user, user, speaker_key = user.ckey)
+ deadchat_broadcast(" sent an NTPDA Message ([username] --> Everyone): [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
diff --git a/html/changelog.html b/html/changelog.html
index 4d3805ffe607..0e5c8fedb41e 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -57,6 +57,28 @@
-->
+
08 December 2024
+
Oblisk234 updated:
+
+ - Fixed an exploit where you could use the cursed stomach to vomitcrawl to Centcomm
+
+
SapphicOverload updated:
+
+ - Fixed movement canceling certain timed actions when it shouldn't
+ - Fixed containers not picking up and emptying items properly
+
+
ToasterBiome updated:
+
+ - Ghost "Enable PDA notifications" setting will now function correctly
+
+
+
04 December 2024
+
SapphicOverload updated:
+
+ - Adds lactose intolerance quirk
+ - Lizards are now lactose intolerant instead of not liking vegetables and sugar
+
+
03 December 2024
13spacemen updated:
@@ -784,61 +806,6 @@ cowbot92 updated:
- Adds a new area to enter the backrooms on station
- This is experimental
-
-
08 September 2024
-
AgentCitrus, kit-katz, PowerfulBacon, ToasterBiome updated:
-
- - Adds a distortion effect to the supermatter engine
- - Fixes singularity spawned by delamination to not be a gravitational one
-
-
M4565, ToasterBiome updated:
-
- - makes burning surgical mats drop plastic instead of metal
-
-
SapphicOverload updated:
-
- - Fixed objectives sometimes not re-rolling properly
-
-
ToasterBiome updated:
-
- - Scrubs instances of the word retard/retarded
- - centcom ban DB check now works again
-
-
-
07 September 2024
-
AMyriad updated:
-
- - Fixed many mapping errors in the meteorite ruin on lavaland
-
-
ToasterBiome updated:
-
- - Break machinery objective take into account multi z stations and only assigns station machines
- - You can flip empty drinking glasses and shot glasses with alt click!
-
-
-
04 September 2024
-
JohnFulpWillard updated:
-
- - Holotools should now only work as multitools when they are set to the multitool setting.
- - Ghosts no longer get spammed when using telecomms machines.
-
-
SapphicOverload updated:
-
- - Icemoon now uses the day/night cycle
- - Icemoon's geothermal power stations are no longer named solar arrays
-
-
ToasterBiome updated:
-
- - ripping out the master r&d hard drive is faster now
-
-
ToasterBiome, Cowbot93 updated:
-
- - Heretic spells now get transferred on clone
-
-
ktlwjec updated:
-
- - Silver and gold centcom ID cards.
-