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

[MIRROR] Have you bingled that (#10545)

Browse Source 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-03-29 14:12:53 -07:00
committed by GitHub
parent 057fffd669
commit 16a213f699
386 changed files with 5637 additions and 1162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/hydroponics/grown.dm
View File

@@ -355,7 +355,7 @@
if(!reagents || reagents.total_volume <= 0)
return
reagents.remove_any(rand(1,3)) //Todo, make it actually remove the reagents the seed uses.
var/affected = pick("r_hand","l_hand")
var/affected = pick(BP_R_HAND,BP_L_HAND)
seed.do_thorns(H,src,affected)
seed.do_sting(H,src,affected)

1
code/modules/hydroponics/seed.dm
View File

@@ -26,6 +26,7 @@
var/has_item_product // Item products. (Eggy)
var/force_layer
var/harvest_sound = null //Vorestation edit - sound the plant makes when harvested
var/wiki_flag = 0
// Making the assumption anything in HYDRO-ponics is capable of processing water, and nutrients commonly associated with it, leaving us with the below to be tweaked.
var/list/beneficial_reagents // Reagents considered uniquely 'beneficial' by a plant.

1
code/modules/hydroponics/seedtypes/apples.dm
View File

@@ -24,6 +24,7 @@
name = PLANT_POISONAPPLE
mutants = null
chems = list(REAGENT_ID_CYANIDE = list(1,5))
wiki_flag = WIKI_SPOILER
/datum/seed/apple/gold
name = PLANT_GOLDAPPLE

2
code/modules/hydroponics/spreading/spreading_response.dm
View File

@@ -51,7 +51,7 @@
if(istype(H) && H.shoes)
return
seed.do_thorns(victim,src)
seed.do_sting(victim,src,pick("r_foot","l_foot","r_leg","l_leg"))
seed.do_sting(victim,src,pick(BP_R_FOOT,BP_L_FOOT,BP_R_LEG,BP_L_LEG))
if(seed.get_trait(TRAIT_SPORING) && prob(round(seed.get_trait(TRAIT_POTENCY)/2)))
seed.create_spores(get_turf(victim))

2
code/modules/hydroponics/trays/tray_tools.dm
View File

@@ -179,7 +179,7 @@
data["name"] = seed_name
data["uid"] = uid
data["endurance"] = get_trait(TRAIT_ENDURANCE)
data["yield"] = get_trait(TRAIT_YIELD)
data["crop_yield"] = get_trait(TRAIT_YIELD)
data["maturation_time"] = get_trait(TRAIT_MATURATION)
data["production_time"] = get_trait(TRAIT_PRODUCTION)
data["potency"] = get_trait(TRAIT_POTENCY)