cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-27 23:27:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tgstation/tgstation into upstream-23-10-2025

Browse Source
This commit is contained in:
Roxy
2025-10-23 17:38:23 -04:00
parent e9ee4dea19 2a5fae5d2a
commit e28e9fbdba
453 changed files with 20635 additions and 15897 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/hydroponics/grown/apple.dm
+1 -1
View File
@@ -27,7 +27,7 @@
distill_reagent = /datum/reagent/consumable/ethanol/hcider
/obj/item/food/grown/apple/make_processable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/appleslice, 5, 20, screentip_verb = "Slice")
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/appleslice, 5, 20, screentip_verb = "Slice", sound_to_play = SFX_KNIFE_SLICE)
/obj/item/food/grown/apple/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
. = ..()
code/modules/hydroponics/grown/melon.dm
+2 -2
View File
@@ -35,7 +35,7 @@
wine_power = 40
/obj/item/food/grown/watermelon/make_processable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/watermelonslice, 5, 20, screentip_verb = "Slice")
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/watermelonslice, 5, 20, screentip_verb = "Slice", sound_to_play = SFX_KNIFE_SLICE)
/obj/item/food/grown/watermelon/make_dryable()
return //No drying
@@ -100,7 +100,7 @@
wine_flavor = "divinity"
/obj/item/food/grown/holymelon/make_processable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/holymelonslice, 5, 20, screentip_verb = "Slice")
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/holymelonslice, 5, 20, screentip_verb = "Slice", sound_to_play = SFX_KNIFE_SLICE)
/obj/item/food/grown/holymelon/make_dryable()
return //No drying
code/modules/hydroponics/hydroponics.dm
+1 -3
View File
@@ -508,10 +508,8 @@
/obj/machinery/hydroponics/update_name(updates)
. = ..()
if(myseed)
if(!GetComponent(/datum/component/rename) && myseed)
name = "[initial(name)] ([myseed.plantname])"
else
name = initial(name)
/obj/machinery/hydroponics/update_overlays()
. = ..()
code/modules/hydroponics/seeds.dm
+18 -33
View File
@@ -9,6 +9,7 @@
abstract_type = /obj/item/seeds
w_class = WEIGHT_CLASS_TINY
resistance_flags = FLAMMABLE
obj_flags = UNIQUE_RENAME
/// Name of plant when planted.
var/plantname = "Plants"
/// A type path. The thing that is created when the plant is harvested.
@@ -487,40 +488,24 @@
/obj/item/seeds/proc/on_chem_reaction(datum/reagents/reagents)
return
/obj/item/seeds/attackby(obj/item/O, mob/user, list/modifiers, list/attack_modifiers)
if(IS_WRITING_UTENSIL(O))
var/choice = tgui_input_list(usr, "What would you like to change?", "Seed Alteration", list("Plant Name", "Seed Description", "Product Description"))
if(isnull(choice))
return
if(!user.can_perform_action(src))
return
switch(choice)
if("Plant Name")
var/newplantname = reject_bad_text(tgui_input_text(user, "Write a new plant name", "Plant Name", plantname, max_length = MAX_NAME_LEN))
if(isnull(newplantname))
return
if(!user.can_perform_action(src))
return
name = "[LOWER_TEXT(newplantname)]"
plantname = newplantname
if("Seed Description")
var/newdesc = tgui_input_text(user, "Write a new seed description", "Seed Description", desc, max_length = MAX_DESC_LEN)
if(isnull(newdesc))
return
if(!user.can_perform_action(src))
return
desc = newdesc
if("Product Description")
if(product && !productdesc)
productdesc = initial(product.desc)
var/newproductdesc = tgui_input_text(user, "Write a new product description", "Product Description", productdesc, max_length = MAX_DESC_LEN)
if(isnull(newproductdesc))
return
if(!user.can_perform_action(src))
return
productdesc = newproductdesc
/obj/item/seeds/nameformat(input, user)
plantname = input
return "[LOWER_TEXT(input)]"
..() // Fallthrough to item/attackby() so that bags can pick seeds up
/obj/item/seeds/descformat(input, mob/living/user)
. = input
if(product && !productdesc)
productdesc = initial(product.desc)
var/newproductdesc = tgui_input_text(user, "Write a new product description", "Product Description", productdesc, max_length = MAX_DESC_LEN)
if(isnull(newproductdesc))
return
if(!user.can_perform_action(src))
return
productdesc = newproductdesc
/obj/item/seeds/rename_reset()
plantname = initial(plantname)
productdesc = initial(productdesc)
/obj/item/seeds/proc/randomize_stats()
set_lifespan(rand(25, 60))