Two new microwave recipes:

- Tele Bacon: Requires one piece of meat and a remote signaler. It is delicious and may allow 

people to teleport to your location.
- Banana Phone: Requires a banana, a radio, and 5 units of psilocybin. Basically an edible radio. Eat at your own risk (MAY CAUSE HOMICIDAL URGES, NOT LIKE THAT IS ANYTHING UNUSUAL).

On a totally unrelated note:
- Banana Phone (full version of the song, not the short loop version) can now be played via the "Banana Phone" fun admin command. It only runs once.
- Fixed a potential runtime error in the juicer code.

DRINKS!
- Potato juice added, produced from putting a potato in a juicer.
- 10 Potato Juice + 2 Enzyme = Vodka
- 5 coffee + 5 sugar + 2 enzyme = Kahlua

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1484 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
morikou@gmail.com
2011-04-21 17:52:16 +00:00
parent 28b3e2c6bf
commit b06cc3ee34
13 changed files with 302 additions and 195 deletions

View File

@@ -1536,11 +1536,11 @@ datum
id = "hot_ramen"
description = "The noodles are boiled, the flavors are artificial, just like being back in school."
reagent_state = LIQUID
nutriment_factor = 5 * REAGENTS_METABOLISM
on_mob_life(var/mob/living/M as mob)
..()
if (M.bodytemperature < 310)//310 is the normal bodytemp. 310.055
M.bodytemperature = min(310, M.bodytemperature+10)
M:nutrition += 5
return
hell_ramen
@@ -1548,12 +1548,19 @@ datum
id = "hell_ramen"
description = "The noodles are boiled, the flavors are artificial, just like being back in school."
reagent_state = LIQUID
nutriment_factor = 5 * REAGENTS_METABOLISM
on_mob_life(var/mob/living/M as mob)
..()
M:bodytemperature += 10
M:nutrition += 5
return
potato_juice
name = "Potato Juice"
id = "potato"
description = "Juice of the potato. Bleh."
reagent_state = LIQUID
nutriment_factor = 2 * REAGENTS_METABOLISM
/////////////////////////////////////////////////////////////////////////////////////////////////////////
/////////////////////// DRINKS BELOW, Beer is up there though, along with cola. Cap'n Pete's Cuban Spiced Rum////////////////////////////////

View File

@@ -568,6 +568,21 @@ datum
required_reagents = list("berryjuice" = 10, "enzyme" = 2)
result_amount = 5
vodka
name = "Vodka"
id = "vodka"
result = "vodka"
required_reagents = list("potato" = 10, "enzyme" = 2)
result_amount = 5
kahlua
name = "Kahlua"
id = "kahlua"
result = "kahlua"
required_reagents = list("coffee" = 5, "sugar" = 5, "enzyme" = 2)
gin_tonic
name = "Gin and Tonic"
id = "gintonic"

View File

@@ -15,6 +15,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/carrot = "carrotjuice",
/obj/item/weapon/reagent_containers/food/snacks/grown/berries = "berryjuice",
/obj/item/weapon/reagent_containers/food/snacks/banana = "banana",
/obj/item/weapon/reagent_containers/food/snacks/grown/potato = "potato",
)
/obj/machinery/juicer/New()
@@ -61,7 +62,7 @@
var/is_beaker_ready = 0
var/processing_chamber = ""
var/beaker_contents = ""
for (var/i in allowed_items)
for (var/obj/item/O in src.contents)
if (!istype(O,i))
@@ -81,7 +82,7 @@
is_beaker_ready = 1
else
beaker_contents = "\The [src] has attached a beaker and beaker is full!"
var/dat = {"
<b>Processing chamber contains:</b><br>
[processing_chamber]<br>
@@ -103,7 +104,7 @@
switch(href_list["action"])
if ("juice")
juice()
if ("detach")
detach()
src.updateUsrDialog()
@@ -130,6 +131,8 @@
/obj/machinery/juicer/proc/get_juice_amount(var/obj/item/weapon/reagent_containers/food/snacks/grown/O)
if (!istype(O))
return 5
else if (O.potency == -1)
return 5
else
return round(5*sqrt(O.potency))

View File

@@ -15,3 +15,8 @@
src.code = "beacon"
src.add_fingerprint(usr)
return
/obj/item/device/radio/beacon/bacon //Probably a better way of doing this, I'm lazy.
proc/digest_delay()
spawn(600)
del(src)

View File

@@ -379,3 +379,8 @@ Speaker: <A href='byond://?src=\ref[src];ch_name=[chan_name];listen=[!list]'>[li
for (var/ch_name in channels)
channels[ch_name] = 0
..()
/obj/item/device/radio/banana //Why is this even needed? So that it shows up as a banana in the chat log.
name = "Banana Phone"
icon = 'items.dmi'
icon_state = "banana" //needs a new icon.

View File

@@ -156,4 +156,4 @@ Code:
else
usr << browse(null, "window=radio")
return
return
return

View File

@@ -152,6 +152,7 @@
src.verbs += /client/proc/object_talk // -- TLE
src.verbs += /client/proc/play_sound
src.verbs += /client/proc/cuban_pete // -- Urist
src.verbs += /client/proc/bananaphone // -- Darem
src.verbs += /client/proc/only_one // muskets
src.verbs += /client/proc/space_asshole // --Agouri :3
src.verbs += /client/proc/strike_team //N
@@ -283,6 +284,7 @@
//src.verbs += /client/proc/object_talk // -- TLE
src.verbs += /client/proc/play_sound
src.verbs += /client/proc/cuban_pete // -- Urist
src.verbs += /client/proc/bananaphone
src.verbs += /client/proc/only_one // muskets
src.verbs += /client/proc/space_asshole // --Agouri :3
//src.verbs += /client/proc/strike_team //N
@@ -411,6 +413,7 @@
//src.verbs += /client/proc/object_talk // -- TLE
src.verbs += /client/proc/play_sound
//src.verbs += /client/proc/cuban_pete // -- Urist
//src.verbs += /client/proc/bananaphone
//src.verbs += /client/proc/space_asshole // --Agouri :3
//src.verbs += /client/proc/strike_team //N
src.verbs += /client/proc/space_ninja //N
@@ -567,6 +570,7 @@
//src.verbs += /client/proc/object_talk // -- TLE
src.verbs += /client/proc/play_sound
//src.verbs += /client/proc/cuban_pete // -- Urist
//src.verbs += /client/proc/bananaphone
//src.verbs += /client/proc/space_asshole // --Agouri :3
//src.verbs += /client/proc/strike_team //N
//src.verbs += /client/proc/space_ninja //N
@@ -713,6 +717,7 @@
//src.verbs += /client/proc/object_talk // -- TLE
src.verbs += /client/proc/play_sound
//src.verbs += /client/proc/cuban_pete // -- Urist
//src.verbs += /client/proc/bananaphone
//src.verbs += /client/proc/space_asshole // --Agouri :3
//src.verbs += /client/proc/strike_team //N
//src.verbs += /client/proc/space_ninja //N
@@ -854,6 +859,7 @@
//src.verbs += /client/proc/object_talk // -- TLE
//src.verbs += /client/proc/play_sound
//src.verbs += /client/proc/cuban_pete // -- Urist
//src.verbs += /client/proc/bananaphone
//src.verbs += /client/proc/space_asshole // --Agouri :3
//src.verbs += /client/proc/strike_team //N
//src.verbs += /client/proc/space_ninja //N
@@ -979,6 +985,7 @@
//src.verbs += /client/proc/object_talk // -- TLE
//src.verbs += /client/proc/play_sound
//src.verbs += /client/proc/cuban_pete // -- Urist
//src.verbs += /client/proc/bananaphone
//src.verbs += /client/proc/space_asshole // --Agouri :3
//src.verbs += /client/proc/strike_team //N
//src.verbs += /client/proc/space_ninja //N
@@ -1147,6 +1154,7 @@
src.verbs -= /client/proc/object_talk // -- TLE
src.verbs -= /client/proc/play_sound
src.verbs -= /client/proc/cuban_pete // -- Urist
src.verbs -= /client/proc/bananaphone // -- Darem
src.verbs -= /client/proc/space_asshole // --Agouri :3
src.verbs -= /client/proc/strike_team //N
src.verbs -= /client/proc/space_ninja //N

View File

@@ -54,6 +54,17 @@
CP << "Your body can't contain the rhumba beat"
CP.gib(1)
/client/proc/bananaphone()
set category = "Fun"
set name = "Banana Phone"
message_admins("[key_name_admin(usr)] has activated Banana Phone!", 1)
for(var/mob/M in world)
if(M.client)
if(M.client.midis)
M << 'bananaphone.ogg'

View File

@@ -743,6 +743,44 @@
reagents.add_reagent("tomatojuice", 2)
bitesize = 5
/obj/item/weapon/reagent_containers/food/snacks/telebacon
name = "Tele Bacon"
desc = "It takes a little odd but it is still delicious."
icon_state = "bacon"
var/obj/item/device/radio/beacon/bacon/baconbeacon
bitesize = 3
New()
..()
reagents.add_reagent("nutriment", 6)
baconbeacon = new /obj/item/device/radio/beacon/bacon(src)
On_Consume()
if(!reagents.total_volume)
baconbeacon.loc = usr
baconbeacon.digest_delay()
/obj/item/weapon/reagent_containers/food/snacks/bananaphone
name = "Banana Phone"
desc = "Ring ring ring ring ring..."
icon = 'items.dmi'
icon_state = "banana" //needs a new icon.
bitesize = 5
var/obj/item/device/radio/banana/bananaphone
New()
..()
reagents.add_reagent("banana", 5)
bananaphone = new /obj/item/device/radio/banana(src)
bananaphone.listening = 1
bananaphone.broadcasting = 1
On_Consume()
if(!reagents.total_volume)
usr << sound('bananaphone.ogg',1)
hear_talk(mob/M as mob, msg)
if(bananaphone)
bananaphone.hear_talk(M, msg)
/////////////////////////////////////////////////Sliceable////////////////////////////////////////
// All the food items that can be sliced into smaller bits like Meatbread and Cheesewheels

View File

@@ -1,6 +1,21 @@
// see code/datums/recipe.dm
/datum/recipe/telebacon
items = list(
/obj/item/weapon/reagent_containers/food/snacks/meat,
/obj/item/device/radio/signaler
)
result = /obj/item/weapon/reagent_containers/food/snacks/telebacon
/datum/recipe/bananaphone
reagents = list("psilocybin" = 5) //Trippin' balls, man.
items = list(
/obj/item/weapon/reagent_containers/food/snacks/banana,
/obj/item/device/radio
)
result = /obj/item/weapon/reagent_containers/food/snacks/bananaphone
/datum/recipe/jellydonut
reagents = list("berryjuice" = 5)
items = list(