cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 03:57:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

tweaks

Browse Source
This commit is contained in:
Fox-McCloud
2016-04-11 22:24:35 -04:00
parent 399813b36c
commit 49f59234e6
3 changed files with 35 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/hydroponics/grown.dm
+24
View File
@@ -9,6 +9,7 @@
var/plantname
var/datum/seed/seed
var/potency = -1
var/awakening = 0
/obj/item/weapon/reagent_containers/food/snacks/grown/New(newloc,planttype)
@@ -291,6 +292,9 @@
..()
/obj/item/weapon/reagent_containers/food/snacks/grown/attack(var/mob/living/carbon/M, var/mob/user, var/def_zone)
if(awakening)
user << "<span class='warning'>The [src] is twitching and shaking, preventing you from eating it.</span>"
return
if(user == M)
return ..()
@@ -445,6 +449,26 @@
user.put_in_hands(DN)
qdel(src)
return
if("killertomato")
if(awakening || istype(user.loc,/turf/space))
return
user << "<span class='notice'>You begin to awaken the Killer Tomato...</span>"
awakening = 1
spawn(30)
if(!qdeleted(src))
var/mob/living/simple_animal/hostile/killertomato/K = new /mob/living/simple_animal/hostile/killertomato(get_turf(src.loc))
var/endurance_value = seed.get_trait(TRAIT_ENDURANCE)
K.maxHealth += round(endurance_value / 3)
K.melee_damage_lower += round(potency / 10)
K.melee_damage_upper += round(potency / 10)
var/production_value = seed.get_trait(TRAIT_PRODUCTION)
K.move_to_delay -= round(production_value / 50)
K.health = K.maxHealth
K.visible_message("<span class='notice'>The Killer Tomato growls as it suddenly awakens.</span>")
if(user)
user.unEquip(src)
qdel(src)
if("cashpod")
to_chat(user, "You crack open the cash pod...")
var/value = round(seed.get_trait(TRAIT_POTENCY))
code/modules/hydroponics/grown_predefined.dm
+3
View File
@@ -12,6 +12,9 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/tomato
plantname = "tomato"
/obj/item/weapon/reagent_containers/food/snacks/grown/tomato/killer
plantname = "killertomato"
/obj/item/weapon/reagent_containers/food/snacks/grown/carrot
plantname = "carrot"
code/modules/hydroponics/seed_datums.dm
+8 -6
View File
@@ -168,7 +168,7 @@
name = "tomato"
seed_name = "tomato"
display_name = "tomato plant"
mutants = list("bluetomato","bloodtomato")
mutants = list("bluetomato","bloodtomato","killertomato")
chems = list("plantmatter" = list(1,10))
kitchen_tag = "tomato"
preset_icon = "tomato"
@@ -179,7 +179,7 @@
set_trait(TRAIT_JUICY,1)
set_trait(TRAIT_MATURATION,8)
set_trait(TRAIT_PRODUCTION,6)
set_trait(TRAIT_YIELD,2)
set_trait(TRAIT_YIELD,3)
set_trait(TRAIT_POTENCY,10)
set_trait(TRAIT_PRODUCT_ICON,"tomato")
set_trait(TRAIT_PRODUCT_COLOUR,"#D10000")
@@ -189,7 +189,7 @@
name = "bloodtomato"
seed_name = "blood tomato"
display_name = "blood tomato plant"
mutants = list("killertomato")
mutants = null
chems = list("protein" = list(1,10), "blood" = list(1,5))
splat_type = /obj/effect/decal/cleanable/blood/splatter
kitchen_tag = "bloodtomato"
@@ -197,7 +197,6 @@
/datum/seed/tomato/blood/New()
..()
set_trait(TRAIT_YIELD,3)
set_trait(TRAIT_PRODUCT_COLOUR,"#FF0000")
set_trait(TRAIT_RARITY,20)
@@ -206,12 +205,14 @@
seed_name = "killer tomato"
display_name = "killer tomato plant"
mutants = null
can_self_harvest = 1
preset_product = /mob/living/simple_animal/hostile/killertomato
kitchen_tag = "killertomato"
preset_icon = "killertomato"
final_form = 0
/datum/seed/tomato/killer/New()
..()
set_trait(TRAIT_ENDURANCE,15)
set_trait(TRAIT_HARVEST_REPEAT,0)
set_trait(TRAIT_YIELD,2)
set_trait(TRAIT_PRODUCT_COLOUR,"#A86747")
set_trait(TRAIT_RARITY,30)
@@ -226,6 +227,7 @@
/datum/seed/tomato/blue/New()
..()
set_trait(TRAIT_YIELD,2)
set_trait(TRAIT_PRODUCT_COLOUR,"#4D86E8")
set_trait(TRAIT_PLANT_COLOUR,"#070AAD")
set_trait(TRAIT_RARITY,20)