From eaef948ec30cee9aa2ca0f7e5196ce4a67e1e124 Mon Sep 17 00:00:00 2001 From: morrowwolf Date: Sun, 3 Sep 2023 01:22:42 -0400 Subject: [PATCH 1/4] Brain damage tweaks (#4316) # About the pull request This PR: Makes peri work for brain damage Stops you from moving while buckled or not conscious # Explain why it's good for the game No more unconscious people crawling away from medics # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: Morrow fix: Peri now works for brain damage fix: Brain damage movement will no longer occur while buckled and unconscious /:cl: --- code/modules/organs/organ_internal.dm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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)) From db97f79e24715817b0035e7d65dc6b85c6adeb15 Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Sun, 3 Sep 2023 06:30:53 +0100 Subject: [PATCH 2/4] Automatic changelog for PR #4316 [ci skip] --- html/changelogs/AutoChangeLog-pr-4316.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-4316.yml 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 From 9ae3701d1ba97bf488c8bc1f01dfa8be72af4438 Mon Sep 17 00:00:00 2001 From: Steelpoint <6595389+Steelpoint@users.noreply.github.com> Date: Sun, 3 Sep 2023 13:23:20 +0800 Subject: [PATCH 3/4] Donut Spelling Error Fix (#4308) # About the pull request Fixes a spelling error with the box of donuts crate in req. # Explain why it's good for the game Spelling # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: spellcheck: Box of donuts order from req is now spelt correctly /:cl: --------- Co-authored-by: Steelpoint Co-authored-by: harryob --- code/datums/supply_packs/food.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 From aff3fd21671e4972d0a1558af188e1b1c59443ec Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Sun, 3 Sep 2023 06:45:15 +0100 Subject: [PATCH 4/4] Automatic changelog for PR #4308 [ci skip] --- html/changelogs/AutoChangeLog-pr-4308.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-4308.yml 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