cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-19 03:55:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tgstation/tgstation into upstream-sync

Browse Source
This commit is contained in:
xPokee
2025-10-04 05:28:09 -04:00
parent 5e629dff04 a378b2eb53
commit 8aa39b75f0
67 changed files with 1444 additions and 796 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/scanners/plant_analyzer.dm
+8 -8
View File
@@ -262,16 +262,16 @@
if(graft)
last_scan_data["graft_data"] = list(
"name" = graft.parent_name,
"name" = graft.plant_dna.name,
"icon" = graft.icon,
"icon_state" = graft.icon_state,
"yield" = graft.yield,
"production" = graft.production,
"lifespan" = graft.lifespan,
"endurance" = graft.endurance,
"weed_rate" = graft.weed_rate,
"weed_chance" = graft.weed_chance,
"graft_gene" = graft.stored_trait.type,
"yield" = graft.plant_dna.yield,
"production" = graft.plant_dna.production,
"lifespan" = graft.plant_dna.lifespan,
"endurance" = graft.plant_dna.endurance,
"weed_rate" = graft.plant_dna.weed_rate,
"weed_chance" = graft.plant_dna.weed_chance,
"graft_gene" = graft.plant_dna.graft_gene.type
)
if(user)