Merge branch 'master' into Joey_Talks

code/game/gamemodes/colonialmarines/colonialmarines.dm

@@ -372,11 +372,11 @@
 				var/headcount = count_per_faction()
 				var/living = headcount["total_headcount"]
 				if ((headcount["WY_headcount"] / living) > MAJORITY)
-					musical_track = pick('sound/theme/LastManStanding_WY.ogg')
+					musical_track = pick('sound/theme/lastmanstanding_wy.ogg')
 				else if ((headcount["UPP_headcount"] / living) > MAJORITY)
-					musical_track = pick('sound/theme/LastManStanding_UPP.ogg')
+					musical_track = pick('sound/theme/lastmanstanding_upp.ogg')
 				else if ((headcount["CLF_headcount"] / living) > MAJORITY)
-					musical_track = pick('sound/theme/LastManStanding_CLF.ogg')
+					musical_track = pick('sound/theme/lastmanstanding_clf.ogg')
 				else if ((headcount["marine_headcount"] / living) > MAJORITY)
 					musical_track = pick('sound/theme/neutral_melancholy2.ogg') //This is the theme song for Colonial Marines the game, fitting
 			else

code/game/objects/items/weapons/twohanded.dm

@@ -323,13 +323,25 @@
 	item_state = "syn_breacher"
 	force_wielded = MELEE_FORCE_VERY_STRONG
 	really_heavy = TRUE
+	var/move_delay_addition = 1.5
 
 /obj/item/weapon/twohanded/breacher/synth/pickup(mob/user)
 	if(!(HAS_TRAIT(user, TRAIT_SUPER_STRONG)))
-		to_chat(user, SPAN_WARNING("You barely manage to lift \the [src] above your knees. This thing will probably be useless to you."))
+		to_chat(user, SPAN_HIGHDANGER("You barely manage to lift [src] above your knees. This thing will probably be useless to you."))
+		user.apply_effect(3, EYE_BLUR)
+		RegisterSignal(user, COMSIG_HUMAN_POST_MOVE_DELAY, PROC_REF(handle_movedelay))
+
 		return
 	..()
 
+/obj/item/weapon/twohanded/breacher/synth/proc/handle_movedelay(mob/living/M, list/movedata)
+	SIGNAL_HANDLER
+	movedata["move_delay"] += move_delay_addition
+
+/obj/item/weapon/twohanded/breacher/synth/dropped(mob/user, silent)
+	. = ..()
+	UnregisterSignal(user, COMSIG_HUMAN_POST_MOVE_DELAY)
+
 /obj/item/weapon/twohanded/breacher/synth/attack(target as mob, mob/living/user as mob)
 	if(!HAS_TRAIT(user, TRAIT_SUPER_STRONG))
 		to_chat(user, SPAN_WARNING("\The [src] is too heavy for you to use as a weapon!"))

html/changelogs/AutoChangeLog-pr-3860.yml

@@ -0,0 +1,4 @@
+author: "ghostsheet"
+delete-after: True
+changes:
+  - rscadd: "B5 Breaching Hammer will now slow down humans who picks it up."

html/changelogs/AutoChangeLog-pr-4082.yml

@@ -0,0 +1,4 @@
+author: "blackdragonTOW"
+delete-after: True
+changes:
+  - bugfix: "fixed a file reference that broke end of round music for some factions"

html/changelogs/archive/2023-08.yml

@@ -12,3 +12,13 @@
   Morrow:
   - bugfix: Fixes brain damage
   - qol: Jittering from brain damage is now capped
+2023-08-03:
+  Ben10083:
+  - rscadd: Lesser Drone Slots now have a minimum, currently set to 3.
+  Huffie56:
+  - balance: adding the possibility to buy "ES-4 stun magazine" for 10 point in the
+      portable vendor.
+  - bugfix: remove a bunch of ammo that where improper for ES-4 gun that are in the
+      lockbox.
+  Thwomper:
+  - maptweak: added Workin' Joey to maint bar.