Merge branch 'master' into assistant-outfit-fix

shiptest-ss13 · Dec 19, 2023 · 9f9ffc0 · 9f9ffc0
2 parents 1ebb26c + fa00e59
commit 9f9ffc0
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 1 deletion.
diff --git a/code/datums/blood_type.dm b/code/datums/blood_type.dm
@@ -28,7 +28,7 @@
 
 /datum/blood_type/ab_plus
 	name = "AB+"
-	compatible_types = list(/datum/blood_type/b_minus, /datum/blood_type/a_minus, /datum/blood_type/ab_minus, /datum/blood_type/o_minus)
+	compatible_types = list(/datum/blood_type/b_minus, /datum/blood_type/b_plus, /datum/blood_type/a_minus, /datum/blood_type/a_plus, /datum/blood_type/ab_minus, /datum/blood_type/ab_plus, /datum/blood_type/o_minus, /datum/blood_type/o_plus)
 
 /datum/blood_type/o_minus
 	name = "O-"

diff --git a/html/changelogs/AutoChangeLog-pr-2588.yml b/html/changelogs/AutoChangeLog-pr-2588.yml
@@ -0,0 +1,4 @@
+author: SomeguyManperson
+changes:
+  - {bugfix: AB+ blood is no longer incompatible with + bloodtypes}
+delete-after: true
diff --git a/html/changelogs/AutoChangeLog-pr-2593.yml b/html/changelogs/AutoChangeLog-pr-2593.yml
@@ -0,0 +1,5 @@
+author: SomeguyManperson
+changes:
+  - {bugfix: obliterated a floating white pixel on the cleaning skillcape}
+  - {bugfix: skillcapes are no longer missing a pixel on their left side of the front}
+delete-after: true
diff --git a/icons/mob/clothing/neck.dmi b/icons/mob/clothing/neck.dmi