diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index 8b5aae14279..695869aa4cf 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -195,18 +195,13 @@
return
. = combat_mode
combat_mode = new_mode
- SEND_SIGNAL(src, COMSIG_LIVING_COMBAT_MODE_TOGGLE, new_mode) //SKYRAT EDIT ADDITION
+ // BUBBER EDIT START
+ if(client)
+ SEND_SIGNAL(src, COMSIG_LIVING_COMBAT_MODE_TOGGLE, new_mode)
+ // BUBBER EDIT END
if(hud_used?.action_intent)
hud_used.action_intent.update_appearance()
- //SKYRAT EDIT ADDITION BEGIN
- if(!ishuman(src) && !ckey)
- if(combat_mode)
- set_combat_indicator(TRUE)
- else
- set_combat_indicator(FALSE)
- face_mouse = (client?.prefs?.read_preference(/datum/preference/toggle/face_cursor_combat_mode) && combat_mode) ? TRUE : FALSE
- //SKYRAT EDIT ADDITION END
-
+ face_mouse = (client?.prefs?.read_preference(/datum/preference/toggle/face_cursor_combat_mode) && combat_mode) ? TRUE : FALSE // BUBBER EDIT
if(silent || !(client?.prefs.read_preference(/datum/preference/toggle/sound_combatmode)))
return
if(combat_mode)
diff --git a/html/changelogs/AutoChangeLog-pr-3167.yml b/html/changelogs/AutoChangeLog-pr-3167.yml
deleted file mode 100644
index 1f2308b8e80..00000000000
--- a/html/changelogs/AutoChangeLog-pr-3167.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "TealSeer"
-delete-after: True
-changes:
- - bugfix: "fixed the SAD deleting wounds"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-3185.yml b/html/changelogs/AutoChangeLog-pr-3185.yml
new file mode 100644
index 00000000000..79e41887085
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3185.yml
@@ -0,0 +1,4 @@
+author: "BurgerBB"
+delete-after: True
+changes:
+ - rscdel: "Reduces the weight of round-start malf ai from 10 to 2."
\ No newline at end of file
diff --git a/html/changelogs/archive/2025-02.yml b/html/changelogs/archive/2025-02.yml
index dd83b31d8ab..f661ac32f86 100644
--- a/html/changelogs/archive/2025-02.yml
+++ b/html/changelogs/archive/2025-02.yml
@@ -387,3 +387,6 @@
nikothedude:
- rscadd: Quirk; venemous bite. Allows you to bite people and inject them with a
venom, or medicine, of your choosing.
+2025-02-27:
+ TealSeer:
+ - bugfix: fixed the SAD deleting wounds
diff --git a/html/changelogs/archive/2025-03.yml b/html/changelogs/archive/2025-03.yml
new file mode 100644
index 00000000000..c4c098e74b0
--- /dev/null
+++ b/html/changelogs/archive/2025-03.yml
@@ -0,0 +1,10 @@
+2025-03-02:
+ Alecksohs:
+ - rscadd: Added a omni-species Kiryu-esque outfit to the Outfit Vendor.
+2025-03-03:
+ StrangeWeirdKitten:
+ - rscdel: Clientless mobs should no longer flash CI.
+ - admin: ghosted admins who LOOC now show by their ckey
+2025-03-04:
+ liz-lavenza:
+ - bugfix: fixed cryopods dropping prosthetic bodyparts of despawned mobs
diff --git a/modular_skyrat/master_files/icons/mob/clothing/species/teshari/uniform.dmi b/modular_skyrat/master_files/icons/mob/clothing/species/teshari/uniform.dmi
index 47ee715396d..fe62a0d10a2 100644
Binary files a/modular_skyrat/master_files/icons/mob/clothing/species/teshari/uniform.dmi and b/modular_skyrat/master_files/icons/mob/clothing/species/teshari/uniform.dmi differ
diff --git a/modular_skyrat/master_files/icons/mob/clothing/species/vox/uniform.dmi b/modular_skyrat/master_files/icons/mob/clothing/species/vox/uniform.dmi
index d221110bfb8..2a0a28676a5 100644
Binary files a/modular_skyrat/master_files/icons/mob/clothing/species/vox/uniform.dmi and b/modular_skyrat/master_files/icons/mob/clothing/species/vox/uniform.dmi differ
diff --git a/modular_skyrat/master_files/icons/mob/clothing/uniform.dmi b/modular_skyrat/master_files/icons/mob/clothing/uniform.dmi
index 637fa5a8350..bc03b15edfe 100644
Binary files a/modular_skyrat/master_files/icons/mob/clothing/uniform.dmi and b/modular_skyrat/master_files/icons/mob/clothing/uniform.dmi differ
diff --git a/modular_skyrat/master_files/icons/mob/clothing/uniform_digi.dmi b/modular_skyrat/master_files/icons/mob/clothing/uniform_digi.dmi
index b81819dce64..3293347bbbb 100644
Binary files a/modular_skyrat/master_files/icons/mob/clothing/uniform_digi.dmi and b/modular_skyrat/master_files/icons/mob/clothing/uniform_digi.dmi differ
diff --git a/modular_skyrat/master_files/icons/obj/clothing/suits.dmi b/modular_skyrat/master_files/icons/obj/clothing/suits.dmi
index 942684640f8..552f0edafd5 100644
Binary files a/modular_skyrat/master_files/icons/obj/clothing/suits.dmi and b/modular_skyrat/master_files/icons/obj/clothing/suits.dmi differ
diff --git a/modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi b/modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi
index bf740fe604c..c40b9d80235 100644
Binary files a/modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi and b/modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi differ
diff --git a/modular_skyrat/modules/better_vox/icons/clothing/uniform.dmi b/modular_skyrat/modules/better_vox/icons/clothing/uniform.dmi
index a126c64ad0e..dcaa93832c7 100644
Binary files a/modular_skyrat/modules/better_vox/icons/clothing/uniform.dmi and b/modular_skyrat/modules/better_vox/icons/clothing/uniform.dmi differ
diff --git a/modular_skyrat/modules/cryosleep/code/cryopod.dm b/modular_skyrat/modules/cryosleep/code/cryopod.dm
index 7778fbfaa5f..5805ae1ffa2 100644
--- a/modular_skyrat/modules/cryosleep/code/cryopod.dm
+++ b/modular_skyrat/modules/cryosleep/code/cryopod.dm
@@ -352,7 +352,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/computer/cryopod, 32)
for(var/obj/item/nested_item as anything in target_item)
try_store_item(holder, nested_item, control_computer)
return FALSE
- if(target_item.item_flags & DROPDEL)
+ if(target_item.item_flags & (ABSTRACT|DROPDEL))
return FALSE
if(control_computer)
@@ -428,7 +428,8 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/computer/cryopod, 32)
the_disk.throw_at(launch_target, 8, 14)
visible_message(span_warning("[src] violently ejects [the_disk]!"))
- for(var/obj/item/item_content as anything in mob_occupant)
+ // get_equipped_items() prevents moving bodyparts, since those are in mob contents now
+ for(var/obj/item/item_content in mob_occupant.get_equipped_items(INCLUDE_POCKETS | INCLUDE_HELD | INCLUDE_ACCESSORIES))
try_store_item(mob_occupant, item_content, control_computer)
GLOB.joined_player_list -= stored_ckey
diff --git a/modular_skyrat/modules/modular_vending/code/clothesmate.dm b/modular_skyrat/modules/modular_vending/code/clothesmate.dm
index 96a3cd4aa92..d4b1905e479 100644
--- a/modular_skyrat/modules/modular_vending/code/clothesmate.dm
+++ b/modular_skyrat/modules/modular_vending/code/clothesmate.dm
@@ -72,6 +72,10 @@
/obj/item/clothing/under/tachawaiian/purple = 5,
/obj/item/clothing/under/tachawaiian/green = 5,
/obj/item/clothing/under/tachawaiian/blue = 5,
+ // BUBBER EDIT START - Tojo's Outfits Clothesmate Definitions
+ /obj/item/clothing/under/red_and_white_collared_outfit = 5,
+ // BUBBER EDIT END
+
/obj/item/clothing/under/suit/skyrat/black_really_collared = 3,
/obj/item/clothing/under/suit/skyrat/black_really_collared/skirt = 3,
/obj/item/clothing/under/suit/skyrat/pencil = 3,
diff --git a/modular_skyrat/modules/verbs/code/looc.dm b/modular_skyrat/modules/verbs/code/looc.dm
index 4b2f3ed5d02..e0839cbc07a 100644
--- a/modular_skyrat/modules/verbs/code/looc.dm
+++ b/modular_skyrat/modules/verbs/code/looc.dm
@@ -92,7 +92,10 @@
if (is_holder)
continue //admins are handled afterwards
- to_chat(hearing_client, span_looc(span_prefix("LOOC[wall_pierce ? " (WALL PIERCE)" : ""]: [src.mob.name]: [msg]")))
+ if(holder && isdead(src.mob)) // Admins ghosted display ckey
+ to_chat(hearing_client, span_looc(span_prefix("LOOC[wall_pierce ? " (WALL PIERCE)" : ""]: [src.ckey]: [msg]")))
+ else
+ to_chat(hearing_client, span_looc(span_prefix("LOOC[wall_pierce ? " (WALL PIERCE)" : ""]: [src.mob.name]: [msg]")))
for(var/client/cli_client as anything in GLOB.admins)
if (admin_seen[cli_client])
diff --git a/modular_zubbers/code/modules/storyteller/event_defines/crewset/malf.dm b/modular_zubbers/code/modules/storyteller/event_defines/crewset/malf.dm
index d8007587c4c..cd3c91af2f5 100644
--- a/modular_zubbers/code/modules/storyteller/event_defines/crewset/malf.dm
+++ b/modular_zubbers/code/modules/storyteller/event_defines/crewset/malf.dm
@@ -23,7 +23,7 @@
roundstart = TRUE
typepath = /datum/round_event/antagonist/solo/malf_ai/roundstart
- weight = 10
+ weight = 2
// God has abandoned us
/datum/round_event_control/antagonist/solo/malf/roundstart/get_candidates()
diff --git a/modular_zubbers/code/modules/tojo_outfits/tojos_outfits.dm b/modular_zubbers/code/modules/tojo_outfits/tojos_outfits.dm
new file mode 100644
index 00000000000..a3860b27948
--- /dev/null
+++ b/modular_zubbers/code/modules/tojo_outfits/tojos_outfits.dm
@@ -0,0 +1,20 @@
+// You'll find the icons in the Skyrat master files. It was way too much of a headache to pretend to care about
+// the modularization when its been far abandoned due to lack of refactors to the species refit system.
+//
+// This is a cry for help, coders!
+
+// Kiryu outfits, for a joke, but also a good looking uniform that everyone can use.
+
+/obj/item/clothing/under/red_and_white_collared_outfit
+ desc = "An outfit that screams 'I've never killed anyone!', which is probably true."
+ name = "red and white collared outfit"
+ icon = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi'
+ worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/uniform.dmi'
+ icon_state = "whiteandred_kiryulmfao"
+ worn_icon_state = "whiteandred_kiryulmfao"
+ supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION
+
+/datum/loadout_item/uniform/miscellaneous/red_and_white_collared_outfit
+ name = "red and white collared outfit"
+ item_path = /obj/item/clothing/under/red_and_white_collared_outfit
+
diff --git a/tgstation.dme b/tgstation.dme
index 10b6b0f112e..bec96833a71 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -9477,6 +9477,7 @@
#include "modular_zubbers\code\modules\taur_mechanics\serpentine_taur.dm"
#include "modular_zubbers\code\modules\tgui_input\color.dm"
#include "modular_zubbers\code\modules\title_screen\code\title_screen_subsystem.dm"
+#include "modular_zubbers\code\modules\tojo_outfits\tojos_outfits.dm"
#include "modular_zubbers\code\modules\uplink\uplink_items\badass.dm"
#include "modular_zubbers\code\modules\vehicles\mech_fabricator.dm"
#include "modular_zubbers\code\modules\vending\armadyne.dm"