From fedefa4ce3ff42e0938b4dd31015c27cf84f235a Mon Sep 17 00:00:00 2001
From: KingOfThePing <43940569+KingOfThePing@users.noreply.github.com>
Date: Sat, 16 Apr 2022 13:55:38 +0200
Subject: [PATCH] Description fix, blood pack addition and fixed floating text
 (#13536)

---
 code/game/objects/items/devices/auto_cpr.dm   |  2 +-
 code/modules/mob/floating_messages.dm         |  2 +-
 .../reagents/reagent_containers/blood_pack.dm |  4 +-
 html/changelogs/KingOfThePing - 13536.yml     | 43 +++++++++++++++++++
 4 files changed, 47 insertions(+), 4 deletions(-)
 create mode 100644 html/changelogs/KingOfThePing - 13536.yml

diff --git a/code/game/objects/items/devices/auto_cpr.dm b/code/game/objects/items/devices/auto_cpr.dm
index 08721b48184..aedf6aa67a6 100644
--- a/code/game/objects/items/devices/auto_cpr.dm
+++ b/code/game/objects/items/devices/auto_cpr.dm
@@ -1,6 +1,6 @@
 /obj/item/auto_cpr
 	name = "auto-compressor"
-	desc = "A device that gives regular compression to the victim's ribcage, used in case of urgent heart issues."
+	desc = "A device that gives regular compression to the patient's ribcage, used in case of urgent heart issues."
 	icon = 'icons/obj/auto_cpr.dmi'
 	icon_state = "pumper"
 	w_class = ITEMSIZE_NORMAL
diff --git a/code/modules/mob/floating_messages.dm b/code/modules/mob/floating_messages.dm
index 910794763be..f17b2a5c42a 100644
--- a/code/modules/mob/floating_messages.dm
+++ b/code/modules/mob/floating_messages.dm
@@ -63,7 +63,7 @@ var/list/floating_chat_colors = list()
 
 	style = "font-family: 'Small Fonts'; -dm-text-outline: 1 black; font-size: [size]px; [style]"
 	I.maptext = "<center><span style=\"[style]\">[message]</span></center>"
-	animate(I, 1, alpha = 255, pixel_y = 16)
+	animate(I, 1, alpha = 255, pixel_y = 23)
 
 	for(var/image/old in holder.stored_chat_text)
 		animate(old, 2, pixel_y = old.pixel_y + 8)
diff --git a/code/modules/reagents/reagent_containers/blood_pack.dm b/code/modules/reagents/reagent_containers/blood_pack.dm
index 8b7e17b27bc..f66648d9da5 100644
--- a/code/modules/reagents/reagent_containers/blood_pack.dm
+++ b/code/modules/reagents/reagent_containers/blood_pack.dm
@@ -163,12 +163,12 @@
 		if (REAGENT_VOLUME(reagents, /decl/reagent/blood) && name != "empty blood pack") //Stops people mucking with bloodpacks that are filled
 			to_chat(usr, "<span class='notice'>You can't relabel [name] until it is empty!</span>")
 			return
-		var/blood_name = input(usr, "What blood type would you like to label it as?", "Blood Types") in list("A+", "A-", "B+", "B-", "O+", "O-", "AB+", "AB-", "Cancel")
+		var/blood_name = input(usr, "What blood type would you like to label it as?", "Blood Types") in list("A+", "A-", "B+", "B-", "O+", "O-", "AB+", "AB-", "Saline Plus", "Cancel")
 		if (blood_name == "Cancel") return
 		var/obj/item/i = usr.get_active_hand()
 		if (!i.ispen() || !in_range(user, src)) return //Checks to see if pen is still held or bloodback is in range
 		name = "blood pack [blood_name]"
-		desc = "Contains blood used for transfusion."
+		desc = "Contains fluids used for transfusions."
 		to_chat(usr, "<span class='notice'>You label the blood pack as [blood_name].</span>")
 		return
 
diff --git a/html/changelogs/KingOfThePing - 13536.yml b/html/changelogs/KingOfThePing - 13536.yml
new file mode 100644
index 00000000000..028f7880f71
--- /dev/null
+++ b/html/changelogs/KingOfThePing - 13536.yml	
@@ -0,0 +1,43 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.
+author: KingOfThePing
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - spellcheck: "Fixed the autocompressor's spelling."
+  - tweak: "Added a Saline Plus option to blood pack labeling."
+  - bugfix: "Floating text is now actually overhead again."
\ No newline at end of file