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

-Apples have potency now, and can be mutated into golden apples.

Browse Source 
-Added a couple salads and golden apple tarts for the chef.
-Renamed the 'sleep rejuvinate' chemical and gave it a new id. If there was a REASON for it having the same ID as sleep toxin(i can't imagine why), please comment.
-Capsaicin and Frost Oil reworked heavily. They now make you much hotter/colder depending on how much you consume. It's not really wise to consume either in excessive amounts. Drinking coffee removes some frost oil from your system.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3891 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
d_h2005@yahoo.com
2012-06-23 06:57:24 +00:00
parent ec52b9c032
commit b4db0b5081
9 changed files with 149 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/defines/obj/hydro.dm
+38 -2
View File
@@ -684,6 +684,24 @@
maturation = 6
production = 6
yield = 5
potency = 10
plant_type = 0
growthstages = 6
/obj/item/seeds/goldappleseed
name = "pack of golden apple seeds"
desc = "These seeds grow into golden apple trees. Good thing there are no firebirds in space."
icon_state = "seed-goldapple"
mypath = "/obj/item/seeds/goldappleseed"
species = "goldapple"
plantname = "Golden Apple Tree"
productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/goldapple"
lifespan = 55
endurance = 35
maturation = 10
production = 10
yield = 3
potency = 10
plant_type = 0
growthstages = 6
@@ -1249,6 +1267,24 @@
reagents.add_reagent("nutriment", 1+round((potency / 10), 1))
bitesize = 1+round(reagents.total_volume / 2, 1)
/obj/item/weapon/reagent_containers/food/snacks/grown/goldapple
seed = "/obj/item/seeds/goldappleseed"
name = "golden apple"
desc = "Emblazoned upon the apple is the word 'Kallisti'."
icon_state = "goldapple"
potency = 15
New()
..()
reagents.add_reagent("nutriment", 1+round((potency / 10), 1))
reagents.add_reagent("gold", 1+round((potency / 5), 1))
bitesize = 1+round(reagents.total_volume / 2, 1)
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/libertycap/attackby(var/obj/item/O as obj, var/mob/user as mob)
. = ..()
if (istype(O, /obj/item/device/analyzer/plant_analyzer))
user << "<span class='info'>- Mineral Content: <i>[reagents.get_reagent_amount("gold")]%</i></span>"
/obj/item/weapon/reagent_containers/food/snacks/grown/watermelon
seed = "/obj/item/seeds/watermelonseed"
name = "watermelon"
@@ -1573,7 +1609,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/walkingmushroom
seed = "/obj/item/seeds/walkingmushroom"
name = "walking mushroom"
desc = "The beginging of the great walk."
desc = "The beginning of the great walk."
icon_state = "walkingmushroom"
New()
..()
@@ -1611,7 +1647,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom
seed = "/obj/item/seeds/glowshroom"
name = "glowshroom cluster"
desc = "<I>Glowshroom</I>: This species of mushroom glows in the dark. Or does it?"
desc = "<I>Mycena Bregprox</I>: This species of mushroom glows in the dark. Or does it?"
icon_state = "glowshroom"
New()
..()
code/game/machinery/hydroponics.dm
+4
View File
@@ -326,6 +326,10 @@ obj/machinery/hydroponics/proc/mutatespecie() // Mutagent produced a new plant!
del(src.myseed)
src.myseed = new /obj/item/seeds/icepepperseed
else if ( istype(src.myseed, /obj/item/seeds/appleseed ))
del(src.myseed)
src.myseed = new /obj/item/seeds/goldappleseed
else if ( istype(src.myseed, /obj/item/seeds/berryseed ))
del(src.myseed)
switch(rand(1,100))
code/modules/chemical/Chemistry-Reagents.dm
+45 -20
View File
@@ -374,9 +374,9 @@ datum
..()
return
srejuvinate
name = "Sleep Rejuvinate"
id = "stoxin"
srejuvenate
name = "Soporific Rejuvenant"
id = "stoxin2"
description = "Put people to sleep, and heals them."
reagent_state = LIQUID
color = "#C8A5DC" // rgb: 200, 165, 220
@@ -803,9 +803,6 @@ datum
T.overlays = image('effects.dmi',icon_state = "thermite")
return
mutagen
name = "Unstable mutagen"
id = "mutagen"
@@ -1214,7 +1211,7 @@ datum
..()
return
adminordrazine //An OP chemical for adminis
adminordrazine //An OP chemical for admins
name = "Adminordrazine"
id = "adminordrazine"
description = "It's magic. We don't have to explain it."
@@ -1730,12 +1727,25 @@ datum
on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
M:bodytemperature += 5
if(prob(40) && !istype(M, /mob/living/carbon/metroid))
M.take_organ_damage(0, 1)
if(istype(M, /mob/living/carbon/metroid))
M:bodytemperature += rand(5,20)
if(!data) data = 1
switch(data)
if(1 to 15)
M:bodytemperature += 5
if(holder.has_reagent("frostoil"))
holder.remove_reagent("frostoil", 5)
if(prob(40) && !istype(M, /mob/living/carbon/metroid))
M.take_organ_damage(0, 1)
if(istype(M, /mob/living/carbon/metroid))
M:bodytemperature += rand(5,20)
if(15 to 25)
M:bodytemperature += 10
if(prob(60) && !istype(M, /mob/living/carbon/metroid))
M.take_organ_damage(0, 1)
if(istype(M, /mob/living/carbon/metroid))
M:bodytemperature += rand(5,20)
if(25 to INFINITY)
M:bodytemperature += 15
data++
..()
return
@@ -1805,12 +1815,25 @@ datum
on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
M:bodytemperature -= 5
//if(prob(40))
// M.take_organ_damage(0, 1)
if(prob(80) && istype(M, /mob/living/carbon/metroid))
M.adjustFireLoss(rand(5,20))
M << "\red You feel a terrible chill inside your body!"
if(!data) data = 1
switch(data)
if(1 to 15)
M:bodytemperature -= 5
if(holder.has_reagent("capsaicin"))
holder.remove_reagent("capsaicin", 5)
if(prob(80) && istype(M, /mob/living/carbon/metroid))
M.adjustFireLoss(rand(5,20))
M << "\red You feel a terrible chill inside your body!"
if(15 to 25)
M:bodytemperature -= 10
if(prob(60) && !istype(M, /mob/living/carbon/metroid))
M.take_organ_damage(0, 1)
if(istype(M, /mob/living/carbon/metroid))
M:bodytemperature -= rand(5,20)
if(25 to INFINITY)
M:bodytemperature -= 15
if(prob(1)) M:emote("shiver")
data++
..()
return
@@ -2220,7 +2243,7 @@ datum
if(!M) M = holder.my_atom
if(M:getBruteLoss() && prob(20)) M:heal_organ_damage(1,0)
if(holder.has_reagent("capsaicin"))
holder.remove_reagent(" capsaicin", 2)
holder.remove_reagent("capsaicin", 2)
M:nutrition++
..()
return
@@ -2268,6 +2291,8 @@ datum
if (M.bodytemperature < 310)//310 is the normal bodytemp. 310.055
M.bodytemperature = min(310, M.bodytemperature+5)
M.make_jittery(5)
if(holder.has_reagent("frostoil"))
holder.remove_reagent("frostoil", 5)
..()
return
code/modules/food/food.dm
+34 -2
View File
@@ -1143,7 +1143,7 @@
/obj/item/weapon/reagent_containers/food/snacks/sandwich
name = "Sandwich"
desc = "A grand creation of meat, cheese, bread and several leafs oflettuce! Arthur Dent would be proud."
desc = "A grand creation of meat, cheese, bread, and several leaves of lettuce! Arthur Dent would be proud."
icon_state = "sandwich"
trash = "plate"
New()
@@ -1411,7 +1411,7 @@
/obj/item/weapon/reagent_containers/food/snacks/beetsoup
name = "beet soup"
desc = "Wait, how do you spell it, again..?"
desc = "Wait, how do you spell it again..?"
icon_state = "beetsoup"
trash = "snack_bowl"
New()
@@ -1432,6 +1432,38 @@
reagents.add_reagent("nutriment", 8)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/herbsalad
name = "herb salad"
desc = "A tasty salad with apples on top."
icon_state = "herbsalad"
trash = "snack_bowl"
New()
..()
reagents.add_reagent("nutriment", 8)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/aesirsalad
name = "Aesir salad"
desc = "Probably too incredible for mortal men to fully enjoy."
icon_state = "aesirsalad"
trash = "snack_bowl"
New()
..()
reagents.add_reagent("nutriment", 8)
reagents.add_reagent("tricordrazine", 8)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/appletart
name = "golden apple streusel tart"
desc = "A tasty dessert that won't make it through a metal detector."
icon_state = "gappletart"
trash = "plate"
New()
..()
reagents.add_reagent("nutriment", 8)
reagents.add_reagent("gold", 5)
bitesize = 3
/////////////////////////////////////////////////Sliceable////////////////////////////////////////
// All the food items that can be sliced into smaller bits like Meatbread and Cheesewheels
code/modules/food/recipes_microwave.dm
+28 -1
View File
@@ -1127,4 +1127,31 @@
/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
result = /obj/item/weapon/reagent_containers/food/snacks/beetsoup
/datum/recipe/appletart
reagents = list("sugar" = 5, "milk" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/flour,
/obj/item/weapon/reagent_containers/food/snacks/egg,
/obj/item/weapon/reagent_containers/food/snacks/grown/goldapple,
)
result = /obj/item/weapon/reagent_containers/food/snacks/appletart
/datum/recipe/herbsalad
items = list(
/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiavulgaris,
/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiavulgaris,
/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiavulgaris,
/obj/item/weapon/reagent_containers/food/snacks/grown/apple,
)
result = /obj/item/weapon/reagent_containers/food/snacks/herbsalad
/datum/recipe/aesirsalad
items = list(
/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiadeus,
/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiadeus,
/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiadeus,
/obj/item/weapon/reagent_containers/food/snacks/grown/goldapple,
)
result = /obj/item/weapon/reagent_containers/food/snacks/aesirsalad