cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-12 07:33:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

The great vending machine update.

Browse Source 
Banana Bread
Ice and iced drinks
A certain medical reagent update
Ramen Noodles!
And... stuff... I don't know new updates!

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1240 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
tronaldnwn@hotmail.com
2011-03-23 06:17:34 +00:00
parent 7c5eb35f13
commit 49d6e613bb
7 changed files with 240 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/WorkInProgress/Chemistry-Reagents.dm
+89 -2
View File
@@ -979,7 +979,7 @@ datum
reagent_state = LIQUID
on_mob_life(var/mob/M)
if(!M) M = holder.my_atom
if(M:bruteloss && prob(40)) M:heal_organ_damage(1,0)
M:heal_organ_damage(2,0)
..()
return
@@ -1391,6 +1391,39 @@ datum
description = "The raw essence of a banana. HONK"
nutriment_factor = 1 * REAGENTS_METABOLISM
dry_ramen
name = "Dry Ramen"
id = "dry_ramen"
description = "Space age food, since August 25, 1958. Contains dried noodles, vegetables, and chemicals that boil in contact with water."
reagent_state = SOLID
on_mob_life(var/mob/M)
..()
M:nutrition += 1
return
hot_ramen
name = "Hot Ramen"
id = "hot_ramen"
description = "The noodles are boiled, the flavors are artificial, just like being back in school."
reagent_state = LIQUID
on_mob_life(var/mob/M)
..()
if (M.bodytemperature < 310)//310 is the normal bodytemp. 310.055
M.bodytemperature = min(310, M.bodytemperature+10)
M:nutrition += 5
return
hell_ramen
name = "Hell Ramen"
id = "hell_ramen"
description = "The noodles are boiled, the flavors are artificial, just like being back in school."
reagent_state = LIQUID
on_mob_life(var/mob/M)
..()
M:bodytemperature += 10
M:nutrition += 5
return
/////////////////////////////////////////////////////////////////////////////////////////////////////////
/////////////////////// DRINKS BELOW, Beer is up there though, along with cola. Cap'n Pete's Cuban Spiced Rum////////////////////////////////
@@ -1452,6 +1485,49 @@ datum
..()
return
icecoffee
name = "Iced Coffee"
id = "icecoffee"
description = "Coffee and ice, refreshing and cool."
reagent_state = LIQUID
on_mob_life(var/mob/M)
..()
M.dizziness = max(0,M.dizziness-5)
M:drowsyness = max(0,M:drowsyness-3)
M:sleeping = 0
if (M.bodytemperature > 310)//310 is the normal bodytemp. 310.055
M.bodytemperature = min(310, M.bodytemperature-5)
M.make_jittery(5)
..()
return
icetea
name = "Iced Tea"
id = "icetea"
description = "No relation to a certain rap artist/ actor."
reagent_state = LIQUID
on_mob_life(var/mob/M)
..()
M.dizziness = max(0,M.dizziness-2)
M:drowsyness = max(0,M:drowsyness-1)
M:sleeping = 0
if(M:toxloss && prob(50)) M:toxloss--
if (M.bodytemperature > 310)//310 is the normal bodytemp. 310.055
M.bodytemperature = min(310, M.bodytemperature-5)
return
h_chocolate
name = "Hot Chocolate"
id = "h_chocolate"
description = "Made with love! And coco beans."
reagent_state = LIQUID
on_mob_life(var/mob/M)
..()
if (M.bodytemperature < 310)//310 is the normal bodytemp. 310.055
M.bodytemperature = min(310, M.bodytemperature+5)
M:nutrition += 5
return
space_cola
name = "Cola"
id = "cola"
@@ -1830,6 +1906,17 @@ datum
..()
return
ice
name = "Ice"
id = "ice"
description = "Frozen water, your dentist wouldn't like you chewing this."
reagent_state = SOLID
on_mob_life(var/mob/M)
if(!M) M = holder.my_atom
M:bodytemperature -= 5
..()
return
/////////////////////////////////////////////////////////////////cocktail entities//////////////////////////////////////////////
@@ -2278,4 +2365,4 @@ datum
else if(data >= 125 && prob(33))
M.confused = max(M:confused+2,0)
..()
return
return
code/WorkInProgress/Chemistry-Recipes.dm
+36
View File
@@ -469,6 +469,13 @@ datum
required_reagents = list("hydrogen" = 3, "nitrogen" = 1)
result_amount = 3
diethylamine
name = "Diethylamine"
id = "diethylamine"
result = "diethylamine"
required_reagents = list ("ammonia" = 1, "ethanol" = 1)
result_amount = 2
space_cleaner
name = "Space cleaner"
id = "cleaner"
@@ -516,6 +523,35 @@ datum
new /obj/item/weapon/reagent_containers/food/snacks/cheesewheel(location)
return
icetea
name = "Iced Tea"
id = "icetea"
result = "icetea"
required_reagents = list("ice" = 1, "tea" = 3)
result_amount = 4
icecoffee
name = "Iced Coffee"
id = "icecoffee"
result = "icecoffee"
required_reagents = list("ice" = 1, "coffee" = 3)
result_amount = 4
hot_ramen
name = "Hot Ramen"
id = "hot_ramen"
result = "hot_ramen"
required_reagents = list("water" = 1, "dry_ramen" = 3)
result_amount = 3
hell_ramen
name = "Hell Ramen"
id = "hell_ramen"
result = "hell_ramen"
required_reagents = list("capsaicin" = 1, "hot_ramen" = 6)
result_amount = 6
////////////////////////////////////////// COCKTAILS //////////////////////////////////////
moonshine
code/WorkInProgress/Chemistry-Tools.dm
+83 -7
View File
@@ -763,7 +763,7 @@
icon = 'syringe.dmi'
item_state = "hypo"
icon_state = "hypo"
amount_per_transfer_from_this = 10
amount_per_transfer_from_this = 5
volume = 30
possible_transfer_amounts = null
flags = FPRINT | ONBELT | TABLEPASS | OPENCONTAINER
@@ -1278,6 +1278,26 @@
..()
reagents.add_reagent("anti_toxin", 30)
/obj/item/weapon/reagent_containers/glass/bottle/ammonia
name = "ammonia bottle"
desc = "A small bottle."
icon = 'chemical.dmi'
icon_state = "bottle20"
New()
..()
reagents.add_reagent("ammonia", 30)
/obj/item/weapon/reagent_containers/glass/bottle/diethylamine
name = "diethylamine bottle"
desc = "A small bottle."
icon = 'chemical.dmi'
icon_state = "bottle17"
New()
..()
reagents.add_reagent("diethylamine", 30)
/obj/item/weapon/reagent_containers/glass/bottle/flu_virion
name = "Flu virion culture bottle"
@@ -1742,11 +1762,12 @@
/obj/item/weapon/reagent_containers/food/snacks/carrotcake
name = "Carrot Cake"
desc = "A favorite desert of a certain wascally wabbit. Also not a lie."
desc = "A favorite desert of a certain wascally wabbit. Not a lie."
icon_state = "carrotcake"
New()
..()
reagents.add_reagent("nutriment", 30)
reagents.add_reagent("imidazoline", 10)
bitesize = 2
attackby(obj/item/weapon/W as obj, mob/user as mob)
@@ -1759,11 +1780,12 @@
/obj/item/weapon/reagent_containers/food/snacks/carrotcakeslice
name = "Carrot Cake slice"
desc = "Carrotty slice of Carrot Cake"
desc = "Carrotty slice of Carrot Cake, carrots are good for your eyes! Also not a lie."
icon_state = "carrotcake_slice"
New()
..()
reagents.add_reagent("nutriment", 6)
reagents.add_reagent("imidazoline", 2)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/cheesecake
@@ -1824,7 +1846,7 @@
desc = "A delicious meatpie."
New()
..()
reagents.add_reagent("nutriment", 6)
reagents.add_reagent("nutriment", 10)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/momeatpie
@@ -1833,7 +1855,7 @@
desc = "A delicious meatpie."
New()
..()
reagents.add_reagent("nutriment", 6)
reagents.add_reagent("nutriment", 10)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/xemeatpie
@@ -2076,6 +2098,40 @@
reagents.add_reagent("xenomicrobes", 6)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/bananabread
name = "banana-nut bread"
desc = "A heavenly and filling treat."
icon_state = "tofubread" //filler sprite till there is a banana bread sprite
New()
..()
reagents.add_reagent("banana", 20)
reagents.add_reagent("nutriment", 20)
bitesize = 2
attackby(obj/item/weapon/W as obj, mob/user as mob)
if(istype(W, /obj/item/weapon/kitchenknife /*|| /obj/item/weapon/scalpel*/))
W.visible_message(" \red <B>You slice the banana bread! </B>", 1)
for(var/i=0,i<5,i++)
new /obj/item/weapon/reagent_containers/food/snacks/bananabreadslice (src.loc)
del(src)
return
if(istype(W, /obj/item/weapon/circular_saw))
W.visible_message(" \red <B>You inaccurately slice the banana bread with your [W]! </B>", 1)
for(var/i=0,i<3,i++)
new /obj/item/weapon/reagent_containers/food/snacks/bananabreadslice (src.loc)
del(src)
return
/obj/item/weapon/reagent_containers/food/snacks/bananabreadslice
name = "meatbread slice"
desc = "A slice of delicious Banana bread."
icon_state = "tofubreadslice" //Filler sprite
New()
..()
reagents.add_reagent("banana", 4)
reagents.add_reagent("nutriment", 4)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/tofubread
name = "Tofubread"
icon_state = "Like meatbread but for vegans. Not guaranteed to give superpowers."
@@ -2357,7 +2413,7 @@
/obj/item/weapon/reagent_containers/food/drinks/tea
name = "Duke Purple Tea"
desc = "For excellent taste, you can always bet on Duke Purple."
desc = "An insult to Duke Purple is an insult to the Space Queen! Any proper gentleman will fight you, if you sully this tea."
icon_state = "tea"
New()
..()
@@ -2365,6 +2421,26 @@
src.pixel_x = rand(-10.0, 10)
src.pixel_y = rand(-10.0, 10)
/obj/item/weapon/reagent_containers/food/drinks/ice
name = "Ice Cup"
desc = "Careful, cold ice, do not chew."
icon_state = "coffee"
New()
..()
reagents.add_reagent("ice", 30)
src.pixel_x = rand(-10.0, 10)
src.pixel_y = rand(-10.0, 10)
/obj/item/weapon/reagent_containers/food/drinks/h_chocolate
name = "Dutch Hot Coco"
desc = "Made in Space South America."
icon_state = "tea"
New()
..()
reagents.add_reagent("h_chocolate", 30)
src.pixel_x = rand(-10.0, 10)
src.pixel_y = rand(-10.0, 10)
/obj/item/weapon/reagent_containers/food/drinks/cola
name = "Space Cola"
desc = "Cola. in space."
@@ -2427,7 +2503,7 @@
/obj/item/weapon/reagent_containers/food/drinks/starkist
name = "Star-kist"
desc = "The taste of a star in liquid form."
desc = "The taste of a star in liquid form. And, a bit of tuna...?"
icon_state = "starkist"
New()
..()