diff --git a/.merge_file_a11000 b/.merge_file_a11000
new file mode 100644
index 0000000000..a8209f25c5
Binary files /dev/null and b/.merge_file_a11000 differ
diff --git a/.merge_file_b11000 b/.merge_file_b11000
new file mode 100644
index 0000000000..5fbdedc171
Binary files /dev/null and b/.merge_file_b11000 differ
diff --git a/.merge_file_c11000 b/.merge_file_c11000
new file mode 100644
index 0000000000..4b10092dc3
Binary files /dev/null and b/.merge_file_c11000 differ
diff --git a/code/_onclick/hud/simple_animal.dm b/code/_onclick/hud/simple_animal.dm
new file mode 100644
index 0000000000..ef46c0d66e
--- /dev/null
+++ b/code/_onclick/hud/simple_animal.dm
@@ -0,0 +1,15 @@
+/datum/hud/living/simple_animal
+	ui_style = 'icons/mob/screen_gen.dmi'
+/datum/hud/living/simple_animal/New(mob/living/owner)
+	..()
+	pull_icon = new /obj/screen/pull()
+	pull_icon.icon = ui_style
+	pull_icon.update_icon()
+	pull_icon.screen_loc = ui_living_pull
+	pull_icon.hud = src
+	static_inventory += pull_icon
+
+	//mob health doll! assumes whatever sprite the mob is
+	healthdoll = new /obj/screen/healthdoll/living()
+	healthdoll.hud = src
+	infodisplay += healthdoll
diff --git a/html/changelogs/AutoChangeLog-pr-14716.yml b/html/changelogs/AutoChangeLog-pr-14716.yml
new file mode 100644
index 0000000000..adde6c3940
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-14716.yml
@@ -0,0 +1,4 @@
+author: "Putnam3145"
+delete-after: True
+changes: 
+  - bugfix: "Antag and species no longer remove all traits if one has a blacklisted trait"
diff --git a/html/changelogs/AutoChangeLog-pr-14739.yml b/html/changelogs/AutoChangeLog-pr-14739.yml
new file mode 100644
index 0000000000..6d4cab3d48
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-14739.yml
@@ -0,0 +1,5 @@
+author: "WanderingFox95"
+delete-after: True
+changes: 
+  - imageadd: "Replaced the antlers showing up when you select deer ears with actual deer ears. Literally why was that even a thing before?"
+  - imageadd: "Straight rabbit ears are now a thing."
diff --git a/html/changelogs/AutoChangeLog-pr-14742.yml b/html/changelogs/AutoChangeLog-pr-14742.yml
new file mode 100644
index 0000000000..92fa2489d3
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-14742.yml
@@ -0,0 +1,5 @@
+author: "keronshb"
+delete-after: True
+changes: 
+  - code_imp: "adds a special hud for simple mobs."
+  - imageadd: "a lot of >32x32 mobs now have icons for their health dolls"
diff --git a/html/changelogs/AutoChangeLog-pr-14743.yml b/html/changelogs/AutoChangeLog-pr-14743.yml
new file mode 100644
index 0000000000..50d7981282
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-14743.yml
@@ -0,0 +1,4 @@
+author: "keronshb"
+delete-after: True
+changes: 
+  - balance: "30 > 25 pop req for contractor kit"