Merge upstream 27.11.24 (#817)

## About The Pull Request Мерге --------- Co-authored-by: Ghom <[email protected]> Co-authored-by: tgstation-ci[bot] <179393467+tgstation-ci[bot]@users.noreply.github.com> Co-authored-by: Time-Green <[email protected]> Co-authored-by: Boviro <[email protected]> Co-authored-by: MrMelbert <[email protected]> Co-authored-by: Lucy <[email protected]> Co-authored-by: ValuedEmployee <[email protected]>
ss220club · Nov 27, 2024 · b444f2c · b444f2c
2 parents 9a72652 + 8e4d295
commit b444f2c
Show file tree

Hide file tree

Showing 16 changed files with 79 additions and 26 deletions.
diff --git a/code/datums/brain_damage/split_personality.dm b/code/datums/brain_damage/split_personality.dm
@@ -265,6 +265,10 @@
 
 /datum/brain_trauma/severe/split_personality/blackout/on_gain()
 	. = ..()
+
+	if(QDELETED(src))
+		return
+
 	RegisterSignal(owner, COMSIG_ATOM_SPLASHED, PROC_REF(on_splashed))
 	notify_ghosts(
 		"[owner] is blacking out!",

diff --git a/code/datums/wires/mulebot.dm b/code/datums/wires/mulebot.dm
@@ -29,24 +29,24 @@
 		if(WIRE_MOTOR1, WIRE_MOTOR2)
 			if(is_cut(WIRE_MOTOR1) && is_cut(WIRE_MOTOR2))
 				ADD_TRAIT(mule, TRAIT_IMMOBILIZED, MOTOR_LACK_TRAIT)
-				holder.audible_message(span_hear("The motors of [src] go silent."), null,  1)
+				holder.audible_message(span_hear("The motors of [mule] go silent."), null,  1)
 			else
 				REMOVE_TRAIT(mule, TRAIT_IMMOBILIZED, MOTOR_LACK_TRAIT)
-				holder.audible_message(span_hear("The motors of [src] whir to life!"), null,  1)
+				holder.audible_message(span_hear("The motors of [mule] whir to life!"), null,  1)
 
 			if(is_cut(WIRE_MOTOR1))
 				mule.set_varspeed(FAST_MOTOR_SPEED)
-				holder.audible_message(span_hear("The motors of [src] speed up!"), null,  1)
+				holder.audible_message(span_hear("The motors of [mule] speed up!"), null,  1)
 			else if(is_cut(WIRE_MOTOR2))
 				mule.set_varspeed(AVERAGE_MOTOR_SPEED)
-				holder.audible_message(span_hear("The motors of [src] whir."), null,  1)
+				holder.audible_message(span_hear("The motors of [mule] whir."), null,  1)
 			else
 				mule.set_varspeed(SLOW_MOTOR_SPEED)
-				holder.audible_message(span_hear("The motors of [src] move gently."), null,  1)
+				holder.audible_message(span_hear("The motors of [mule] move gently."), null,  1)
 		if(WIRE_AVOIDANCE)
 			if (!isnull(source))
 				log_combat(source, mule, "[is_cut(WIRE_AVOIDANCE) ? "cut" : "mended"] the MULE safety wire of")
-				holder.audible_message(span_hear("Something inside [src] clicks ominously!"), null,  1)
+				holder.audible_message(span_hear("Something inside [mule] clicks ominously!"), null,  1)
 
 /datum/wires/mulebot/on_pulse(wire)
 	var/mob/living/simple_animal/bot/mulebot/mule = holder

diff --git a/code/modules/fishing/fish/_fish.dm b/code/modules/fishing/fish/_fish.dm
@@ -862,7 +862,7 @@
 
 	// Do additional stuff
 	// Start flopping if outside of fish container
-	var/should_be_flopping = status == FISH_ALIVE && !HAS_TRAIT(src, TRAIT_FISH_STASIS) && loc && HAS_TRAIT(loc, TRAIT_IS_AQUARIUM)
+	var/should_be_flopping = status == FISH_ALIVE && !HAS_TRAIT(src, TRAIT_FISH_STASIS) && loc && !HAS_TRAIT(loc, TRAIT_IS_AQUARIUM)
 
 	if(should_be_flopping)
 		start_flopping()

diff --git a/code/modules/mob/living/brain/brain_item.dm b/code/modules/mob/living/brain/brain_item.dm
@@ -52,8 +52,6 @@
 
 /obj/item/organ/brain/on_mob_insert(mob/living/carbon/brain_owner, special = FALSE, movement_flags)
 	. = ..()
-	if(!.)
-		return
 
 	name = initial(name)
 
@@ -116,7 +114,7 @@
 				// Run the try_ proc with force = TRUE.
 				skillchip.try_deactivate_skillchip(silent = special, force = TRUE)
 
-	. = ..()
+	..()
 
 	for(var/X in traumas)
 		var/datum/brain_trauma/BT = X

diff --git a/code/modules/mob/living/carbon/emote.dm b/code/modules/mob/living/carbon/emote.dm
@@ -83,6 +83,36 @@
 	if(user.put_in_hands(N))
 		to_chat(user, span_notice("You make a circle with your hand."))
 
+/datum/emote/living/carbon/meow
+	key = "meow"
+	key_third_person = "meows"
+	vary = TRUE
+
+/datum/emote/living/carbon/meow/run_emote(mob/user, params, type_override, intentional)
+	. = ..()
+	if(istype(user.get_organ_slot(ORGAN_SLOT_TONGUE), /obj/item/organ/tongue/cat))
+		sound = SFX_CAT_MEOW
+		message = "meows!"
+		emote_type = EMOTE_VISIBLE | EMOTE_AUDIBLE
+	else
+		to_chat(user, span_warning("You can't quite make the sound."))
+		return
+
+/datum/emote/living/carbon/purr
+	key = "purr"
+	key_third_person = "purrs"
+	vary = TRUE
+
+/datum/emote/living/carbon/purr/run_emote(mob/user, params, type_override, intentional)
+	. = ..()
+	if(istype(user.get_organ_slot(ORGAN_SLOT_TONGUE), /obj/item/organ/tongue/cat))
+		sound = SFX_CAT_PURR
+		message = "purrs."
+		emote_type = EMOTE_VISIBLE | EMOTE_AUDIBLE
+	else
+		to_chat(user, span_warning("You can't quite make the sound."))
+		return
+
 /datum/emote/living/carbon/moan
 	key = "moan"
 	key_third_person = "moans"

diff --git a/code/modules/mod/mod_theme.dm b/code/modules/mod/mod_theme.dm
@@ -316,6 +316,7 @@
 	slowdown_active = 1
 	allowed_suit_storage = list(
 		/obj/item/analyzer,
+		/obj/item/extinguisher,
 		/obj/item/fireaxe/metal_h2_axe,
 		/obj/item/pipe_dispenser,
 		/obj/item/t_scanner,

diff --git a/code/modules/surgery/organ_manipulation.dm b/code/modules/surgery/organ_manipulation.dm
@@ -36,7 +36,7 @@
 
 /datum/surgery/organ_manipulation/Destroy()
 	if(QDELETED(target) || !HAS_TRAIT(target, TRAIT_FISHING_SPOT))
-		return
+		return ..()
 	// The surgery is not finished yet and we're currently on manipulate organs step
 	if(status <= length(steps) && ispath(steps[status], /datum/surgery_step/manipulate_organs))
 		remove_fishing_spot()

diff --git a/html/changelogs/AutoChangeLog-pr-88182.yml b/html/changelogs/AutoChangeLog-pr-88182.yml
diff --git a/html/changelogs/AutoChangeLog-pr-88188.yml b/html/changelogs/AutoChangeLog-pr-88188.yml
diff --git a/html/changelogs/AutoChangeLog-pr-88192.yml b/html/changelogs/AutoChangeLog-pr-88192.yml
diff --git a/html/changelogs/AutoChangeLog-pr-88207.yml b/html/changelogs/AutoChangeLog-pr-88207.yml
@@ -0,0 +1,4 @@
+author: "Absolucy"
+delete-after: True
+changes:
+  - bugfix: "ACTUALLY allow dot radio prefixes to also work with the tgui-say radio prefix display."
diff --git a/html/changelogs/AutoChangeLog-pr-88212.yml b/html/changelogs/AutoChangeLog-pr-88212.yml
@@ -0,0 +1,4 @@
+author: "ValuedEmployee"
+delete-after: True
+changes:
+  - rscadd: "New purr and meow emotes for players with felinid tongues"
diff --git a/html/changelogs/AutoChangeLog-pr-88218.yml b/html/changelogs/AutoChangeLog-pr-88218.yml
@@ -0,0 +1,4 @@
+author: "Melbert"
+delete-after: True
+changes:
+  - bugfix: "Maybe fixes some organ manipulation bugs"
diff --git a/html/changelogs/AutoChangeLog-pr-88220.yml b/html/changelogs/AutoChangeLog-pr-88220.yml
@@ -0,0 +1,4 @@
+author: "Melbert"
+delete-after: True
+changes:
+  - bugfix: "Mulebot wire hacking is less fourth wall breaking"
diff --git a/html/changelogs/archive/2024-11.yml b/html/changelogs/archive/2024-11.yml
@@ -962,3 +962,21 @@
   - bugfix: Fixed a (non-player facing) runtime in organ manipulation surgery
   grungussuss:
   - rscdel: The northstar arcship has been removed. :(
+2024-11-27:
+  Boviro:
+  - qol: Atmos MODsuits can now hold extinguishers on their suit slot
+  Ghommie:
+  - bugfix: FIsh flops again.
+  Melbert:
+  - balance: Morphine's sedative power has been halved. It now takes ~10 units to
+      guarantee sleep, up from ~5.
+  - balance: Morphine now causes mild disgust.
+  - balance: Morphine is now twice as addictive, causing addiction if you down over
+      ~30 units without pause.
+  SmArtKar:
+  - sound: Reduced volume of fire sounds
+  Time-Green:
+  - bugfix: No more "is blacking out!"
+  - bugfix: Brain transplants work again
+  carlarctg:
+  - spellcheck: Fixes a typo in legionnaire abilities
diff --git a/tgui/packages/tgui-say/TguiSay.tsx b/tgui/packages/tgui-say/TguiSay.tsx
@@ -23,7 +23,7 @@ type State = {
   size: WINDOW_SIZES;
 };
 
-const CHANNEL_REGEX = /^[.:][\wА-Яа-яёЁ]\s/; // BANDATSTATION EDIT - Original: const CHANNEL_REGEX = /^:\w\s/;
+const CHANNEL_REGEX = /^[:.][\wА-Яа-яёЁ]\s/;
 
 export class TguiSay extends Component<{}, State> {
   private channelIterator: ChannelIterator;