Merge branch 'master' into ui/almayer-control

cmss13-devs · Aug 1, 2023 · 6a3b4b4 · 6a3b4b4
2 parents ae2f0f5 + a8150de
commit 6a3b4b4
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 9 deletions.
diff --git 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,

diff --git 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

diff --git 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
@@ -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].")

diff --git a/html/changelogs/AutoChangeLog-pr-4049.yml 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"
diff --git a/html/changelogs/AutoChangeLog-pr-4051.yml b/html/changelogs/AutoChangeLog-pr-4051.yml
diff --git a/html/changelogs/AutoChangeLog-pr-4061.yml 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"
diff --git a/html/changelogs/AutoChangeLog-pr-4069.yml 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."
diff --git a/html/changelogs/archive/2023-08.yml b/html/changelogs/archive/2023-08.yml
@@ -0,0 +1,3 @@
+2023-08-01:
+  Drathek:
+  - bugfix: Fixed hung mobs merging with weeds