Merge branch 'master' into awful

.github/CODEOWNERS

@@ -24,9 +24,9 @@
 /code/modules/food_and_drinks/drinks/drinks/breakawayflask.dm @FalloutFalcon
 /code/modules/food_and_drinks/food/ration.dm @FalloutFalcon
 /code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm @FalloutFalcon
-/code/modules/projectiles @FalloutFalcon
+/code/modules/projectiles/ @FalloutFalcon
 /code/modules/reagents/chemistry/reagents/trickwine_reagents.dm @FalloutFalcon
-/code/modules/unit_tests/icons @FalloutFalcon
+/code/modules/unit_tests/icons/ @FalloutFalcon
 
 # MarkSuckerberg
 

code/modules/surgery/bodyparts/bodyparts.dm

@@ -786,8 +786,8 @@
 	bone_status = BONE_FLAG_NORMAL
 
 /obj/item/bodypart/proc/on_mob_move()
-	// Dont trigger if it isn't broken or if it has no owner
-	if(bone_status != BONE_FLAG_BROKEN || !owner)
+	// Dont trigger if it isn't broken or if it has no owner or is buckled to a rollerbed
+	if(bone_status != BONE_FLAG_BROKEN || !owner || istype(owner?.buckled, /obj/structure/bed/roller))
 		return
 
 	if(prob(5))

html/changelogs/AutoChangeLog-pr-3024.yml

@@ -0,0 +1,4 @@
+author: SomeguyManperson
+changes:
+  - {balance: Rollerbeds stop broken bone damage ticks from occurring while buckled}
+delete-after: true

html/changelogs/AutoChangeLog-pr-3068.yml

@@ -0,0 +1,4 @@
+author: FalloutFalcon
+changes:
+  - {bugfix: 'fixed CODEOWNERS, i hope'}
+delete-after: true