From 20fc136a3644271f2f80f23ed72c1b263c2f32fa Mon Sep 17 00:00:00 2001 From: Changelogs Date: Tue, 1 Aug 2023 01:27:26 +0000 Subject: [PATCH 1/7] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-4051.yml | 4 ---- html/changelogs/archive/2023-08.yml | 3 +++ 2 files changed, 3 insertions(+), 4 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-4051.yml create mode 100644 html/changelogs/archive/2023-08.yml diff --git a/html/changelogs/AutoChangeLog-pr-4051.yml b/html/changelogs/AutoChangeLog-pr-4051.yml deleted file mode 100644 index a29569312d65..000000000000 --- a/html/changelogs/AutoChangeLog-pr-4051.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Drathek" -delete-after: True -changes: - - bugfix: "Fixed hung mobs merging with weeds" \ No newline at end of file diff --git a/html/changelogs/archive/2023-08.yml b/html/changelogs/archive/2023-08.yml new file mode 100644 index 000000000000..7e7f1425264a --- /dev/null +++ b/html/changelogs/archive/2023-08.yml @@ -0,0 +1,3 @@ +2023-08-01: + Drathek: + - bugfix: Fixed hung mobs merging with weeds From 50e63bcc1fdc5ced8d3fe1cb7b39a8cf7e74fc30 Mon Sep 17 00:00:00 2001 From: Julian56 <117036822+Huffie56@users.noreply.github.com> Date: Tue, 1 Aug 2023 18:42:09 +0200 Subject: [PATCH 2/7] fixing care package for SG on WO spawning the old batteries. (#4069) # About the pull request fixes: https://github.com/cmss13-devs/cmss13/issues/4054 # Explain why it's good for the game # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: fix: Care package for SG on WO will now spawn with the proper batteries for them. /:cl: --------- Co-authored-by: Julien --- code/game/gamemodes/colonialmarines/whiskey_outpost.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/gamemodes/colonialmarines/whiskey_outpost.dm b/code/game/gamemodes/colonialmarines/whiskey_outpost.dm index 64d8795be3d2..e172939c847f 100644 --- a/code/game/gamemodes/colonialmarines/whiskey_outpost.dm +++ b/code/game/gamemodes/colonialmarines/whiskey_outpost.dm @@ -664,8 +664,8 @@ /obj/item/ammo_magazine/rocket/wp) if(2) //Smartgun supplies spawnitems = list( - /obj/item/cell/high, - /obj/item/cell/high, + /obj/item/smartgun_battery, + /obj/item/smartgun_battery, /obj/item/ammo_magazine/smartgun, /obj/item/ammo_magazine/smartgun, /obj/item/ammo_magazine/smartgun, From 239786c0a257014c73b31d9b1bf54b9cfb32ed33 Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Tue, 1 Aug 2023 17:51:21 +0100 Subject: [PATCH 3/7] Automatic changelog for PR #4069 [ci skip] --- html/changelogs/AutoChangeLog-pr-4069.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-4069.yml diff --git a/html/changelogs/AutoChangeLog-pr-4069.yml b/html/changelogs/AutoChangeLog-pr-4069.yml new file mode 100644 index 000000000000..dde219352a5e --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4069.yml @@ -0,0 +1,4 @@ +author: "Huffie56" +delete-after: True +changes: + - bugfix: "Care package for SG on WO will now spawn with the proper batteries for them." \ No newline at end of file From 77c6999f1acbc84c124416e3679d395477aab9c4 Mon Sep 17 00:00:00 2001 From: morrowwolf Date: Tue, 1 Aug 2023 13:28:09 -0400 Subject: [PATCH 4/7] Fixes brain surgery so it actually fixes your brain (#4061) # About the pull request Not using the proc to change damage? That's a paddlin'. # Explain why it's good for the game Bug bad # 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: Fixes brain damage qol: Jittering from brain damage is now capped /:cl: --- code/modules/organs/organ_internal.dm | 3 ++- code/modules/surgery/brainrepair.dm | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/code/modules/organs/organ_internal.dm b/code/modules/organs/organ_internal.dm index 5325e89910ba..2178e2d53f5c 100644 --- a/code/modules/organs/organ_internal.dm +++ b/code/modules/organs/organ_internal.dm @@ -258,7 +258,8 @@ if(organ_status >= ORGAN_BROKEN && prob(5 * delta_time)) owner.apply_effect(1, PARALYZE) - owner.make_jittery(50) + if(owner.jitteriness < 100) + owner.make_jittery(50) to_chat(owner, SPAN_DANGER("Your body seizes up!")) /datum/internal_organ/brain/prosthetic //used by synthetic species diff --git a/code/modules/surgery/brainrepair.dm b/code/modules/surgery/brainrepair.dm index 6d3060c2a4a6..2b4e51292203 100644 --- a/code/modules/surgery/brainrepair.dm +++ b/code/modules/surgery/brainrepair.dm @@ -55,10 +55,11 @@ var/datum/internal_organ/brain/B = target.internal_organs_by_name["brain"] if(B) - B.damage = 0 + B.heal_damage(B.damage) target.disabilities &= ~NERVOUS target.sdisabilities &= ~DISABILITY_DEAF target.sdisabilities &= ~DISABILITY_MUTE + target.jitteriness = 0 target.pain.recalculate_pain() log_interact(user, target, "[key_name(user)] finished taking bone chips out of [key_name(target)]'s brain with \the [tool], finishing [surgery].") From 947878f499b2a3041d426ddbd06aa4ca3a02350a Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Tue, 1 Aug 2023 18:36:28 +0100 Subject: [PATCH 5/7] Automatic changelog for PR #4061 [ci skip] --- html/changelogs/AutoChangeLog-pr-4061.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-4061.yml diff --git a/html/changelogs/AutoChangeLog-pr-4061.yml b/html/changelogs/AutoChangeLog-pr-4061.yml new file mode 100644 index 000000000000..377901480158 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4061.yml @@ -0,0 +1,5 @@ +author: "Morrow" +delete-after: True +changes: + - bugfix: "Fixes brain damage" + - qol: "Jittering from brain damage is now capped" \ No newline at end of file From e2e244f600181afa8fcf3808b8889cca6bd6c1f5 Mon Sep 17 00:00:00 2001 From: Dorodomki <128561204+Dorodomki@users.noreply.github.com> Date: Tue, 1 Aug 2023 16:53:01 -0300 Subject: [PATCH 6/7] HPR-addings (#4049) # About the pull request Adds the bipod and rail flashlight attatchment for the HPR Weapon Kit # Explain why it's good for the game Adds more quality of life for the marine players allowing them the use of the gun in the complete potential being the full auto mode and a comfortable range of vision with the flashlight # Changelog :cl: add: Adds A Bipod and Rail Flashlight to the HPR kit /:cl: --- code/modules/cm_marines/equipment/guncases.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/modules/cm_marines/equipment/guncases.dm b/code/modules/cm_marines/equipment/guncases.dm index ff4d8397be26..8538af7ca90e 100644 --- a/code/modules/cm_marines/equipment/guncases.dm +++ b/code/modules/cm_marines/equipment/guncases.dm @@ -58,13 +58,15 @@ /obj/item/storage/box/guncase/lmg name = "\improper M41AE2 heavy pulse rifle case" desc = "A gun case containing the M41AE2 heavy pulse rifle. You can get additional ammunition at requisitions." - storage_slots = 3 + storage_slots = 5 can_hold = list(/obj/item/weapon/gun/rifle/lmg, /obj/item/ammo_magazine/rifle/lmg) /obj/item/storage/box/guncase/lmg/fill_preset_inventory() new /obj/item/weapon/gun/rifle/lmg(src) new /obj/item/ammo_magazine/rifle/lmg(src) new /obj/item/ammo_magazine/rifle/lmg/holo_target(src) + new /obj/item/attachable/flashlight + new /obj/item/attachable/bipod //------------ /obj/item/storage/box/guncase/m41aMK1 From a8150de3991954adbcfec5d6f23bf60026f7b33c Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Tue, 1 Aug 2023 21:07:58 +0100 Subject: [PATCH 7/7] Automatic changelog for PR #4049 [ci skip] --- html/changelogs/AutoChangeLog-pr-4049.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-4049.yml diff --git a/html/changelogs/AutoChangeLog-pr-4049.yml b/html/changelogs/AutoChangeLog-pr-4049.yml new file mode 100644 index 000000000000..f84aa364ba2b --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4049.yml @@ -0,0 +1,4 @@ +author: "Dorodomki" +delete-after: True +changes: + - rscadd: "Adds A Bipod and Rail Flashlight to the HPR kit" \ No newline at end of file