diff --git a/code/datums/supply_packs/food.dm b/code/datums/supply_packs/food.dm index caef6e3f8664..9e0527aed6cf 100644 --- a/code/datums/supply_packs/food.dm +++ b/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 diff --git a/code/modules/organs/organ_internal.dm b/code/modules/organs/organ_internal.dm index 2178e2d53f5c..dd37ac5a8af1 100644 --- a/code/modules/organs/organ_internal.dm +++ b/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)) diff --git a/html/changelogs/AutoChangeLog-pr-4308.yml b/html/changelogs/AutoChangeLog-pr-4308.yml new file mode 100644 index 000000000000..10d65b66f0be --- /dev/null +++ b/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" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-4316.yml b/html/changelogs/AutoChangeLog-pr-4316.yml new file mode 100644 index 000000000000..61d078edfd78 --- /dev/null +++ b/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" \ No newline at end of file