mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-07-18 03:21:13 +01:00
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
This commit is contained in:
@@ -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))
|
||||
|
||||
@@ -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, "<span class='warning'>\The [covering] is in the way.</span>")
|
||||
|
||||
@@ -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("<span class='notice'>\The [user] labels \the [name] as \"[input_clean_name]\".</span>")
|
||||
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("<span class='notice'>\The [user] adds a note to \the [name].</span>")
|
||||
desc = input_clean_desc
|
||||
|
||||
Reference in New Issue
Block a user