From 35ff617e6eff37a9d031eee79b3bb66f429480ac Mon Sep 17 00:00:00 2001 From: Fleure Date: Sun, 22 Sep 2013 13:03:25 +0100 Subject: [PATCH] Vending machines now list Lemon-Lime as "Orange" --- code/game/machinery/vending.dm | 2 +- code/modules/reagents/reagent_containers/food/drinks.dm | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 50fcaa2f66c..8a44ffa1713 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -91,7 +91,7 @@ var/atom/temp = new typepath(null) var/datum/data/vending_product/R = new /datum/data/vending_product() - R.product_name = temp.name + R.product_name = initial(temp.name) R.product_path = typepath R.amount = amount R.display_color = pick("red","blue","green") diff --git a/code/modules/reagents/reagent_containers/food/drinks.dm b/code/modules/reagents/reagent_containers/food/drinks.dm index 7b89bb20449..8929907d7d9 100644 --- a/code/modules/reagents/reagent_containers/food/drinks.dm +++ b/code/modules/reagents/reagent_containers/food/drinks.dm @@ -322,11 +322,12 @@ reagents.add_reagent("sodawater", 50) /obj/item/weapon/reagent_containers/food/drinks/soda_cans/lemon_lime - name = "Lemon-Lime" + name = "Orange" desc = "You wanted ORANGE. It gave you Lemon Lime." icon_state = "lemon-lime" New() ..() + name = "Lemon-Lime" reagents.add_reagent("lemon_lime", 30) src.pixel_x = rand(-10.0, 10) src.pixel_y = rand(-10.0, 10)