cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

-Added chawanmushi recipe and beet soup recipes. Added a trash plate to metroid sammiches.

Browse Source 
-Ambrosia vulgaris now has a mutation. 
-Added 1% chance for a species mutation whenever a plant's stats mutate.
-You now get more descriptive messages when applying mutagen to plant trays.
-Removed sugarcane seeds from the vending machine. They were redundant and had poor sprites and no recipes. Added the seeds to the seeds crate so you can still get them, if you really want to...

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3460 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
d_h2005@yahoo.com
2012-04-15 19:21:11 +00:00
parent 954b597e98
commit 19d6e40bae
10 changed files with 110 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
code/defines/obj/hydro.dm
View File

@@ -687,6 +687,23 @@
plant_type = 0
growthstages = 6
/obj/item/seeds/ambrosiadeusseed
name = "pack of ambrosia deus seeds"
desc = "These seeds grow into ambrosia deus. Could it be the food of the gods..?"
icon_state = "seed-ambrosiadeus"
mypath = "/obj/item/seeds/ambrosiadeusseed"
species = "ambrosiadeus"
plantname = "Ambrosia Deus"
productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiadeus"
lifespan = 60
endurance = 25
maturation = 6
production = 6
yield = 6
potency = 5
plant_type = 0
growthstages = 6
/obj/item/seeds/whitebeetseed
name = "pack of white-beet seeds"
desc = "These seeds grow into sugary beet producing plants."
@@ -1172,6 +1189,22 @@
reagents.add_reagent("toxin", 3+round(potency / 5, 1))
bitesize = 1+round(reagents.total_volume / 2, 1)
/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiadeus
seed = "/obj/item/seeds/ambrosiadeus"
name = "ambrosia deus branch"
desc = "Eating this makes you feel immortal!"
icon_state = "ambrosiadeus"
potency = 10
New()
..()
reagents.add_reagent("nutriment", 1)
reagents.add_reagent("bicaridine", 3+round(potency / 5, 1))
reagents.add_reagent("synaptizine", 3+round(potency / 5, 1))
reagents.add_reagent("hyperzine", 3+round(potency / 8, 1))
reagents.add_reagent("kelotane", 3+round(potency / 8, 1))
reagents.add_reagent("toxin", 1+round(potency / 8, 1))
bitesize = 1+round(reagents.total_volume / 2, 1)
/obj/item/weapon/reagent_containers/food/snacks/grown/apple
seed = "/obj/item/seeds/appleseed"
name = "apple"

3
code/defines/obj/supplypacks.dm
View File

@@ -220,7 +220,8 @@
"/obj/item/seeds/carrotseed",
"/obj/item/seeds/sunflowerseed",
"/obj/item/seeds/chantermycelium",
"/obj/item/seeds/potatoseed")
"/obj/item/seeds/potatoseed",
"/obj/item/seeds/sugarcaneseed")
cost = 10
containertype = /obj/structure/closet/crate/hydroponics
containername = "Seeds crate"

6
code/defines/obj/vending.dm
View File

@@ -198,8 +198,8 @@
name = "MegaSeed Servitor"
desc = "When you need seeds fast!"
icon_state = "seeds"
product_paths = "/obj/item/seeds/bananaseed;/obj/item/seeds/berryseed;/obj/item/seeds/carrotseed;/obj/item/seeds/chantermycelium;/obj/item/seeds/chiliseed;/obj/item/seeds/cornseed;/obj/item/seeds/eggplantseed;/obj/item/seeds/potatoseed;/obj/item/seeds/replicapod;/obj/item/seeds/soyaseed;/obj/item/seeds/sunflowerseed;/obj/item/seeds/tomatoseed;/obj/item/seeds/towermycelium;/obj/item/seeds/wheatseed;/obj/item/seeds/appleseed;/obj/item/seeds/poppyseed;/obj/item/seeds/ambrosiavulgarisseed;/obj/item/seeds/whitebeetseed;/obj/item/seeds/watermelonseed;/obj/item/seeds/limeseed;/obj/item/seeds/lemonseed;/obj/item/seeds/orangeseed;/obj/item/seeds/grassseed;/obj/item/seeds/sugarcaneseed;/obj/item/seeds/cocoapodseed;/obj/item/seeds/cabbageseed;/obj/item/seeds/grapeseed;/obj/item/seeds/pumpkinseed"
product_amounts = "3;2;2;2;2;2;2;2;3;2;2;2;2;2;3;5;4;3;3;3;3;3;3;3;3;3;3;3"
product_paths = "/obj/item/seeds/bananaseed;/obj/item/seeds/berryseed;/obj/item/seeds/carrotseed;/obj/item/seeds/chantermycelium;/obj/item/seeds/chiliseed;/obj/item/seeds/cornseed;/obj/item/seeds/eggplantseed;/obj/item/seeds/potatoseed;/obj/item/seeds/replicapod;/obj/item/seeds/soyaseed;/obj/item/seeds/sunflowerseed;/obj/item/seeds/tomatoseed;/obj/item/seeds/towermycelium;/obj/item/seeds/wheatseed;/obj/item/seeds/appleseed;/obj/item/seeds/poppyseed;/obj/item/seeds/ambrosiavulgarisseed;/obj/item/seeds/whitebeetseed;/obj/item/seeds/watermelonseed;/obj/item/seeds/limeseed;/obj/item/seeds/lemonseed;/obj/item/seeds/orangeseed;/obj/item/seeds/grassseed;/obj/item/seeds/cocoapodseed;/obj/item/seeds/cabbageseed;/obj/item/seeds/grapeseed;/obj/item/seeds/pumpkinseed"
product_amounts = "3;2;2;2;2;2;2;2;3;2;2;2;2;2;3;5;4;3;3;3;3;3;3;3;3;3;3"
product_slogans = "THIS'S WHERE TH' SEEDS LIVE! GIT YOU SOME!;Hands down the best seed selection on the station!;Also certain mushroom varieties available, more for experts! Get certified today!"
product_hidden = "/obj/item/seeds/amanitamycelium;/obj/item/seeds/glowshroom;/obj/item/seeds/libertymycelium;/obj/item/seeds/nettleseed;/obj/item/seeds/plumpmycelium"
product_hideamt = "2;2;2;2;2"
@@ -241,4 +241,4 @@
//product_amounts = "8;5;4" Old totals
product_hidden = "/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/cola"
product_hideamt = "20"
product_ads = "What the fuck is this shit?;Why would you buy this;holy shit help;i'm stuck;in;a;universe;factory;AAAAAARGH!;HEIL... Stalin?;CAPITALIST PIGS;FUCK THE WEST"
product_ads = "For Tsar and Country.;Have you fulfilled your nutrition quota today?;Very nice!;We are simple people, for this is all we eat.;If there is a person, there is a problem. If there is no person, then there is no problem."

22
code/game/machinery/hydroponics.dm
View File

@@ -96,10 +96,12 @@ obj/machinery/hydroponics/process()
if(src.age > src.myseed.production && (src.age - src.lastproduce) > src.myseed.production && (!src.harvest && !src.dead))
var/m_count = 0
while(m_count < src.mutmod)
if(prob(90))
if(prob(89))
src.mutate()
else if(prob(30))
src.hardmutate()
else if(prob(1))
src.mutatespecie()
m_count++;
if(src.yieldmod > 0 && src.myseed.yield != -1) // Unharvestable shouldn't be harvested
src.harvest = 1
@@ -301,6 +303,10 @@ obj/machinery/hydroponics/proc/mutatespecie() // Mutagent produced a new plant!
del(src.myseed)
src.myseed = new /obj/item/seeds/angelmycelium
else if ( istype(src.myseed, /obj/item/seeds/ambrosiavulgarisseed ))
del(src.myseed)
src.myseed = new /obj/item/seeds/ambrosiadeusseed
else if ( istype(src.myseed, /obj/item/seeds/plumpmycelium ))
del(src.myseed)
src.myseed = new /obj/item/seeds/walkingmushroommycelium
@@ -382,6 +388,8 @@ obj/machinery/hydroponics/proc/mutateweed() // If the weeds gets the mutagent in
spawn(5) // Wait a while
src.updateicon()
src.visible_message("\red The mutated weeds in [src] spawned a \blue [src.myseed.plantname]!")
else
usr << "The few weeds in the tray seem to react, but only for a moment..."
return
@@ -397,12 +405,12 @@ obj/machinery/hydroponics/proc/plantdies() // OH NOES!!!!! I put this all in one
obj/machinery/hydroponics/proc/mutatepest() // Until someone makes a spaceworm, this is commented out
// if ( src.pestlevel > 5 )
// user << "The worms seem to behave oddly..."
if ( src.pestlevel > 5 )
src.visible_message("The pests seem to behave oddly...")
// spawn(10)
// new /obj/effect/alien/spaceworm(src.loc)
// else
//user << "Nothing happens..."
else
usr << "The pests seem to behave oddly, but quickly settle down..." //Modified to give a better idea of what's happening when you inject mutagen. There's still nothing proper to spawn here though. -Cheridan
return
@@ -458,7 +466,7 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob)
if (81 to 90) src.mutatespecie()
if (66 to 80) src.hardmutate()
if (41 to 65) src.mutate()
if (21 to 41) user << "Nothing happens..."
if (21 to 41) user << "The plants don't seem to react..."
if (11 to 20) src.mutateweed()
if (1 to 10) src.mutatepest()
else user << "Nothing happens..."
@@ -583,7 +591,7 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob)
if (81 to 90) src.mutatespecie()
if (66 to 80) src.hardmutate()
if (41 to 65) src.mutate()
if (21 to 41) user << "Nothing happens..."
if (21 to 41) user << "The plants don't seem to react..."
if (11 to 20) src.mutateweed()
if (1 to 10) src.mutatepest()
else user << "Nothing happens..."

38
code/modules/food/food.dm
View File

@@ -1336,6 +1336,7 @@
name = "Metroid Sandwich"
desc = "A sandwich is green stuff."
icon_state = "metroidsandwich"
trash = "plate"
New()
..()
reagents.add_reagent("nutriment", 2)
@@ -1376,7 +1377,7 @@
trash = "snack_bowl"
New()
..()
reagents.add_reagent("nutriment", 15)
reagents.add_reagent("nutriment", 10)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/plumphelmetbiscuit
@@ -1391,9 +1392,42 @@
reagents.add_reagent("nutriment", 15)
bitesize = 2
else
reagents.add_reagent("nutriment", 10)
reagents.add_reagent("nutriment", 5)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/chawanmushi
name = "chawanmushi"
desc = "A legendary egg custard that makes friends out of enemies. Probably too hot for a cat to eat."
icon_state = "chawanmushi"
trash = "snack_bowl"
New()
..()
reagents.add_reagent("nutriment", 5)
bitesize = 1
/obj/item/weapon/reagent_containers/food/snacks/beetsoup
name = "beet soup"
desc = "Wait, how do you spell it, again..?"
icon_state = "beetsoup"
trash = "snack_bowl"
New()
..()
switch(rand(1,6))
if(1)
name = "borsch"
if(2)
name = "bortsch"
if(3)
name = "borstch"
if(4)
name = "borsh"
if(5)
name = "borshch"
if(6)
name = "borscht"
reagents.add_reagent("nutriment", 8)
bitesize = 2
/////////////////////////////////////////////////Sliceable////////////////////////////////////////
// All the food items that can be sliced into smaller bits like Meatbread and Cheesewheels

25
code/modules/food/recipes_microwave.dm
View File

@@ -29,7 +29,7 @@
)
result = /obj/item/weapon/reagent_containers/food/snacks/boiledegg
/*p
/*
/datum/recipe/bananaphone
reagents = list("psilocybin" = 5) //Trippin' balls, man.
items = list(
@@ -1101,13 +1101,30 @@
/datum/recipe/plumphelmetbiscuit
items = list(
/obj/item/weapon/reagent_containers/food/snacks/flour,
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/plumphelmet
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/plumphelmet,
)
result = /obj/item/weapon/reagent_containers/food/snacks/plumphelmetbiscuit
/datum/recipe/mushroomsoup
reagents = list("water" = 5, "milk" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/chanterelle
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/chanterelle,
)
result = /obj/item/weapon/reagent_containers/food/snacks/mushroomsoup
result = /obj/item/weapon/reagent_containers/food/snacks/mushroomsoup
/datum/recipe/chawanmushi
reagents = list("water" = 5, "soysauce" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/egg,
/obj/item/weapon/reagent_containers/food/snacks/egg,
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/chanterelle,
)
result = /obj/item/weapon/reagent_containers/food/snacks/chawanmushi
/datum/recipe/beetsoup
reagents = list("water" = 10)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/grown/whitebeet,
/obj/item/weapon/reagent_containers/food/snacks/grown/cabbage,
)
result = /obj/item/weapon/reagent_containers/food/snacks/beetsoup