Special SnowFood [Food Feature + Food-Related fixes] (#21935)

* Fixes Food Renaming and sorts

* wew

* Pkp + Remie Review
This commit is contained in:
ExcessiveUseOfCobblestone
2016-12-06 10:35:44 +13:00
committed by oranges
parent b2d1cb332e
commit b07589a933
3 changed files with 6 additions and 15 deletions
+4 -3
View File
@@ -19,11 +19,12 @@
..()
/obj/item/weapon/proc/rename_weapon(mob/M)
var/input = stripped_input(M,"What do you want to name the weapon?", ,"", MAX_NAME_LEN)
var/oldname = name
var/input = stripped_input(M,"What do you want to name /the [name]?", ,"", MAX_NAME_LEN)
if(!qdeleted(src) && M.canUseTopic(src, BE_CLOSE) && input != "")
name = input
M << "You name the weapon [input]. Say hello to your new friend."
M << "/The [oldname] has successfully been renamed to /the [input]."
return
else
return
@@ -33,7 +34,7 @@
if(!qdeleted(src) && M.canUseTopic(src, BE_CLOSE) && input != "")
desc = input
M << "You have successfully changed the object's description."
M << "You have successfully changed /the [name]'s description."
return
else
return
@@ -15,6 +15,7 @@
bitesize = 4
w_class = WEIGHT_CLASS_SMALL
volume = 80
unique_rename = 1
var/ingMax = 12
var/list/ingredients = list()
@@ -56,18 +57,6 @@
update_overlays(S)
user << "<span class='notice'>You add the [I.name] to the [name].</span>"
update_name(S)
else if(istype(I, /obj/item/weapon/pen))
var/txt = stripped_input(user, "What would you like the food to be called?", "Food Naming", "", 30)
if(txt)
ingMax = ingredients.len
user << "<span class='notice'>You add a last touch to the dish by renaming it.</span>"
customname = txt
if(istype(src, /obj/item/weapon/reagent_containers/food/snacks/customizable/sandwich))
var/obj/item/weapon/reagent_containers/food/snacks/customizable/sandwich/S = src
if(S.finished)
name = "[customname] sandwich"
return
name = "[customname] [initial(name)]"
else . = ..()
@@ -3,6 +3,7 @@
desc = "Yummy."
icon = 'icons/obj/food/food.dmi'
icon_state = null
unique_rename = 1
var/bitesize = 2
var/bitecount = 0
var/trash = null