diff --git a/code/modules/clothing/clothing_accessories.dm b/code/modules/clothing/clothing_accessories.dm
index a40cc632d35..dcc8acc146b 100644
--- a/code/modules/clothing/clothing_accessories.dm
+++ b/code/modules/clothing/clothing_accessories.dm
@@ -56,6 +56,8 @@
var/obj/item/clothing/C = src
+ usr.unEquip(C)
+
switch(over_object.name)
if("r_hand")
if(istype(src, /obj/item/clothing/ears))
diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm
index edfb53ea3ce..48a7ad14ce8 100644
--- a/code/modules/mob/living/carbon/human/inventory.dm
+++ b/code/modules/mob/living/carbon/human/inventory.dm
@@ -334,7 +334,7 @@ This saves us from having to call add_fingerprint() any time something is put in
covering = src.wear_suit
if(slot_l_ear, slot_r_ear)
covering = src.head
- check_flags = HEAD
+ check_flags = FACE //this is to stop regular hats from stopping you from changing your ears stuff, but this should work for closed ones, like space helmets
if(covering && (covering.body_parts_covered & (I.body_parts_covered|check_flags)))
to_chat(user, "\The [covering] is in the way.")
diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm
index b3cd6b298d7..267c182ef3d 100644
--- a/code/modules/reagents/reagent_containers/food/snacks.dm
+++ b/code/modules/reagents/reagent_containers/food/snacks.dm
@@ -176,14 +176,14 @@
var/selection = alert(user,"Which attribute do you wish to edit?","Food Editor","Name","Description","Cancel")
if(selection == "Name")
- var/input_clean_name = sanitize(input(user,"What is the name of this food?", "Set Food Name") as text|null)
+ var/input_clean_name = sanitize(input(user,"What is the name of this food?", "Set Food Name") as text|null, MAX_LNAME_LEN)
if(input_clean_name)
user.visible_message("\The [user] labels \the [name] as \"[input_clean_name]\".")
name = input_clean_name
else
name = initial(name)
else if(selection == "Description")
- var/input_clean_desc = sanitize(input(user,"What is the description of this food?", "Set Food Description") as text|null)
+ var/input_clean_desc = sanitize(input(user,"What is the description of this food?", "Set Food Description") as text|null, MAX_MESSAGE_LEN)
if(input_clean_desc)
user.visible_message("\The [user] adds a note to \the [name].")
desc = input_clean_desc
diff --git a/html/changelogs/alberyk-earstuff.yml b/html/changelogs/alberyk-earstuff.yml
new file mode 100644
index 00000000000..21d75509493
--- /dev/null
+++ b/html/changelogs/alberyk-earstuff.yml
@@ -0,0 +1,7 @@
+author: Alberyk
+
+delete-after: True
+
+changes:
+ - tweak: "Headgear should be a bit less restricting when stopping things from being equipped on the ear slot."
+ - bugfix: "Fixed renaming food having no character limit."
diff --git a/icons/obj/custom_items/djikstra_items.dmi b/icons/obj/custom_items/djikstra_items.dmi
index 44bf75c64b5..fa57bc39888 100644
Binary files a/icons/obj/custom_items/djikstra_items.dmi and b/icons/obj/custom_items/djikstra_items.dmi differ