Merge remote-tracking branch 'cmss13-devs/master' into royalmarines

code/datums/supply_packs/food.dm

@@ -141,7 +141,7 @@
 	//all the finish snacks.
 
 /datum/supply_packs/donuts
-	name = "boxe of donut (x5)"
+	name = "box of donuts (x5)"
 	contains = list(
 		/obj/item/storage/donut_box,
 		/obj/item/storage/donut_box,
@@ -151,7 +151,7 @@
 	)
 	cost = 10
 	containertype = /obj/structure/closet/crate/supply
-	containername = "\improper boxe of donut (x5)"
+	containername = "box of donuts (x5)"
 	group = "Food"
 
 /datum/supply_packs/mre

code/modules/organs/organ_internal.dm

@@ -250,10 +250,14 @@
 /datum/internal_organ/brain/process(delta_time)
 	..()
 
+	if(owner.chem_effect_flags & CHEM_EFFECT_ORGAN_STASIS)
+		return
+
 	if(organ_status >= ORGAN_BRUISED && prob(5 * delta_time))
 		var/dir_choice = pick(list(NORTH, SOUTH, EAST, WEST))
 		owner.drop_held_items()
-		owner.Move(get_step(get_turf(owner), dir_choice))
+		if(!owner.buckled && owner.stat == CONSCIOUS)
+			owner.Move(get_step(get_turf(owner), dir_choice))
 		to_chat(owner, SPAN_DANGER("Your mind wanders and goes blank for a moment..."))
 
 	if(organ_status >= ORGAN_BROKEN && prob(5 * delta_time))

html/changelogs/AutoChangeLog-pr-4308.yml

@@ -0,0 +1,4 @@
+author: "Steelpoint"
+delete-after: True
+changes:
+  - spellcheck: "Box of donuts order from req is now spelt correctly"

html/changelogs/AutoChangeLog-pr-4316.yml

@@ -0,0 +1,5 @@
+author: "Morrow"
+delete-after: True
+changes:
+  - bugfix: "Peri now works for brain damage"
+  - bugfix: "Brain damage movement will no longer occur while buckled and unconscious"