From 1e3cd89f03e3ccef4dcf52e675b1a683bd7cbbe7 Mon Sep 17 00:00:00 2001 From: Alberyk Date: Mon, 28 Oct 2019 10:44:35 -0300 Subject: [PATCH] Tweaks ear equipping restrictions and add food renaming limit (#7281) -makes so that any hat won't stop you from equipping stuff in your ear -fixes #7279 -fixes a custom item sprite -fixes mousedrop not unequipping clothing properly --- code/modules/clothing/clothing_accessories.dm | 2 ++ .../mob/living/carbon/human/inventory.dm | 2 +- .../reagent_containers/food/snacks.dm | 4 ++-- html/changelogs/alberyk-earstuff.yml | 7 +++++++ icons/obj/custom_items/djikstra_items.dmi | Bin 5763 -> 5340 bytes 5 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 html/changelogs/alberyk-earstuff.yml 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 44bf75c64b5536243731548a0b6d109359762b5c..fa57bc39888f3f128412d532a903e5cbe394aebe 100644 GIT binary patch delta 5181 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 q3U}0(ASMos7lK*`hNhiD+ulY delta 5607 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 o>)k7LUPT^iupj;b;Y;2lx?`g5eWt4U2>}lc