Some improvements for the LiquidFood stuff.

This commit is contained in:
SkyMarshal
2012-05-30 16:26:24 -07:00
parent 6f34ec4df4
commit 2bc692ec4d
5 changed files with 35 additions and 43 deletions
+1 -1
View File
@@ -165,7 +165,7 @@
containername = "Snack charge crate"
/datum/supply_packs/charge/liquidfood
name = "LiquidFood Charge"
name = "\"LiquidFood\" Charge"
contains = list("/obj/item/weapon/vending_charge/liquid")
containername = "LiquidFood charge crate"
+1 -1
View File
@@ -397,7 +397,7 @@
product_paths = "/obj/item/weapon/reagent_containers/food/snacks/liquidfood;/obj/item/weapon/flavor/red;/obj/item/weapon/flavor/blue"
// product_amounts = "6;6;6;6;6;6;6"
product_prices = "1;1;1"
product_slogans = "Enjoy your NanoTrasen LiquidFood Ration! Now with a choice of TWO delicious flavors!"
product_slogans = "Enjoy your NanoTrasen \"LiquidFood\" Ration! Now with a choice of TWO delicious flavors!"
product_hidden = ""
// product_hideamt = "10"
hidden_prices = ""
+15 -8
View File
@@ -2043,18 +2043,25 @@ eternal248: Found broken and buggy Z-levels 7-12, ended up leading to my discove
icon_state = "appendixinflamed"
/obj/item/weapon/flavor
name = "flavoring"
desc = "A sachet of flavoring, designed to be used with LiquidFood rations."
name = "bland flavoring packet"
desc = "A sachet of flavoring, designed to be used with \"LiquidFood\" rations. The flavor is indeterminable."
icon = 'food_ingredients.dmi'
var/descriptor = "disturbingly beige" //Description shown to onlookers.
var/color = "beige" //Color the icon should take on when this is applied. Also shown when it is mixed in.
var/newDesc = "It posesses a strange and unidentifiable taste. You try not to think to hard about it." //What gets pegged onto the description.
/obj/item/weapon/flavor/red
name = "cherry flavoring"
desc = "A sachet of cherry flavoring, designed to be used with LiquidFood rations."
icon = 'food_ingredients.dmi'
name = "cherry flavoring packet"
desc = "A sachet of cherry flavoring, designed to be used with \"LiquidFood\" rations."
icon_state = "flavor-red"
descriptor = "garrishly red"
color = "red"
newDesc = "It has a faintly cherry taste, but still is hard to stomach. Reminds you of cough syrup."
/obj/item/weapon/flavor/blue
name = "berry flavoring"
desc = "A sachet of berry flavoring, designed to be used with LiquidFood rations."
icon = 'food_ingredients.dmi'
name = "berry flavoring packet"
desc = "A sachet of berry flavoring, designed to be used with \"LiquidFood\" rations."
icon_state = "flavor-blue"
descriptor = "molted blue"
color = "blue"
newDesc = "It has a faint bitter berry taste, but still is hard to stomach. Strangely crunchy."
+1 -1
View File
@@ -47,7 +47,7 @@
icon = 'candle.dmi'
icon_state = "candle4"
liquidfood
name = "LiquidFood ration"
name = "\improper \"LiquidFood\" ration"
icon_state = "liquidfood"
/obj/item/trash/attack(mob/M as mob, mob/living/user as mob)
+17 -32
View File
@@ -1472,7 +1472,7 @@
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/liquidfood
name = "LiquidFood ration"
name = "\improper \"LiquidFood\" ration"
icon_state = "liquidfood"
desc = "A bland, tasteless pulp of what you need to survive. Packaged in a airtight bag, which you can drink through a straw. Strangely crunchy."
trash = "liquidfood"
@@ -1484,19 +1484,6 @@
reagents.add_reagent("tricordrazine", 2)
bitesize = 6
/obj/item/weapon/reagent_containers/food/snacks/liquidfood/red
name = "flavored LiquidFood ration"
icon_state = "liquidfood-red"
desc = "A flavored pulp of nutritional essentials. It has a faint sour apple taste, but still is hard to stomach. Strangely crunchy."
flavored = 1
/obj/item/weapon/reagent_containers/food/snacks/liquidfood/blue
name = "flavored LiquidFood ration"
icon_state = "liquidfood-blue"
desc = "A flavored pulp of nutritional essentials. It has a faint bitter berry taste, but still is hard to stomach. Strangely crunchy."
flavored = 1
/////////////////////////////////////////////////Sliceable////////////////////////////////////////
// All the food items that can be sliced into smaller bits like Meatbread and Cheesewheels
@@ -2049,27 +2036,25 @@
..()
// Liquidfood + Flavoring = Flavored Liquidfood! :P
/obj/item/weapon/reagent_containers/food/snacks/liquidfood/attackby(obj/item/weapon/W as obj, mob/user as mob)
/obj/item/weapon/reagent_containers/food/snacks/liquidfood/attackby(obj/item/weapon/flavor/W as obj, mob/user as mob)
// Check if already flavored
if (istype(W,/obj/item/weapon/flavor) && src.flavored)
user << "You cannot add flavoring to an already flavored ration."
if(istype(W))
if (flavored)
user << "You cannot add flavoring to an already flavored ration, however bland it may be."
return
user.visible_message("\The [user] adds [prob(30) ? "some of" : ""] \a [W] to \a [src], mixing it into [W.decriptor] gruel.",\
"You add \the [W] into your bland [src]. As you mix it into a grotesquely [W.color] paste, you reflect that this was not a wise decision.",\
"You hear a small tinfoil package being ripped open, then the sound of a thick paste being mixed.")
name = "[W.color] \"LiquidFood\" ration"
icon_state = "liquidfood-[W.color]"
desc = "A flavored pulp of nutritional essentials. [W.newDesc]"
flavored = 1
del(W)
return
// Red flavoring
else if(istype(W,/obj/item/weapon/flavor/red))
var/turf/spawnloc = foodloc(user, src)
new /obj/item/weapon/reagent_containers/food/snacks/liquidfood/red(spawnloc)
user << "You add the flavoring."
del(W)
del(src)
// Blue flavoring
else if(istype(W,/obj/item/weapon/flavor/blue))
var/turf/spawnloc = foodloc(user, src)
new /obj/item/weapon/reagent_containers/food/snacks/liquidfood/blue(spawnloc)
user << "You add the flavoring."
del(W)
del(src)
return ..()
/obj/item/weapon/reagent_containers/food/snacks/taco
name = "taco"