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

Merge pull request #14290 from VOREStation/upstream-merge-8851

Browse Source 
[MIRROR] Maintenance on Hydro code, specifically vines and bees.
This commit is contained in:
Heroman3003
2023-01-04 12:55:59 +10:00
committed by CHOMPStation2
parent 541cfe409b
commit e9c2487299
7 changed files with 110 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

118
code/modules/hydroponics/beekeeping/beehive.dm
View File

@@ -9,7 +9,7 @@
var/bee_count = 0 // Percent
var/smoked = 0 // Timer
var/honeycombs = 0 // Percent
var/frames = 0
var/list/frames = list() // List of frames inside.
var/maxFrames = 5
/obj/machinery/beehive/update_icon()
@@ -17,8 +17,8 @@
icon_state = "beehive"
if(closed)
add_overlay("lid")
if(frames)
add_overlay("empty[frames]")
if(length(frames))
add_overlay("empty[length(frames)]")
if(honeycombs >= 100)
add_overlay("full[round(honeycombs / 100)]")
if(!smoked)
@@ -38,59 +38,59 @@
/obj/machinery/beehive/attackby(var/obj/item/I, var/mob/user)
if(I.is_crowbar())
closed = !closed
user.visible_message("<span class='notice'>[user] [closed ? "closes" : "opens"] \the [src].</span>", "<span class='notice'>You [closed ? "close" : "open"] \the [src].</span>")
user.visible_message(SPAN_NOTICE("[user] [closed ? "closes" : "opens"] \the [src]."), SPAN_NOTICE("You [closed ? "close" : "open"] \the [src]."))
update_icon()
return
else if(I.is_wrench())
anchored = !anchored
playsound(src, I.usesound, 50, 1)
user.visible_message("<span class='notice'>[user] [anchored ? "wrenches" : "unwrenches"] \the [src].</span>", "<span class='notice'>You [anchored ? "wrench" : "unwrench"] \the [src].</span>")
user.visible_message(SPAN_NOTICE("[user] [anchored ? "wrenches" : "unwrenches"] \the [src]."), SPAN_NOTICE("You [anchored ? "wrench" : "unwrench"] \the [src]."))
return
else if(istype(I, /obj/item/bee_smoker))
if(closed)
to_chat(user, "<span class='notice'>You need to open \the [src] with a crowbar before smoking the bees.</span>")
to_chat(user, SPAN_NOTICE("You need to open \the [src] with a crowbar before smoking the bees."))
return
user.visible_message("<span class='notice'>[user] smokes the bees in \the [src].</span>", "<span class='notice'>You smoke the bees in \the [src].</span>")
user.visible_message(SPAN_NOTICE("[user] smokes the bees in \the [src]."), SPAN_NOTICE("You smoke the bees in \the [src]."))
smoked = 30
update_icon()
return
else if(istype(I, /obj/item/honey_frame))
if(closed)
to_chat(user, "<span class='notice'>You need to open \the [src] with a crowbar before inserting \the [I].</span>")
to_chat(user, SPAN_NOTICE("You need to open \the [src] with a crowbar before inserting \the [I]."))
return
if(frames >= maxFrames)
to_chat(user, "<span class='notice'>There is no place for an another frame.</span>")
if(length(frames) >= maxFrames)
to_chat(user, SPAN_NOTICE("There is no place for an another frame."))
return
var/obj/item/honey_frame/H = I
if(H.honey)
to_chat(user, "<span class='notice'>\The [I] is full with beeswax and honey, empty it in the extractor first.</span>")
to_chat(user, SPAN_NOTICE("\The [I] is full with beeswax and honey, empty it in the extractor first."))
return
++frames
user.visible_message("<span class='notice'>[user] loads \the [I] into \the [src].</span>", "<span class='notice'>You load \the [I] into \the [src].</span>")
user.visible_message(SPAN_NOTICE("[user] loads \the [I] into \the [src]."), SPAN_NOTICE("You load \the [I] into \the [src]."))
update_icon()
user.drop_from_inventory(I)
qdel(I)
user.drop_from_inventory(H)
H.forceMove(src)
frames.Add(H)
return
else if(istype(I, /obj/item/bee_pack))
var/obj/item/bee_pack/B = I
if(B.full && bee_count)
to_chat(user, "<span class='notice'>\The [src] already has bees inside.</span>")
to_chat(user, SPAN_NOTICE("\The [src] already has bees inside."))
return
if(!B.full && bee_count < 90)
to_chat(user, "<span class='notice'>\The [src] is not ready to split.</span>")
to_chat(user, SPAN_NOTICE("\The [src] is not ready to split."))
return
if(!B.full && !smoked)
to_chat(user, "<span class='notice'>Smoke \the [src] first!</span>")
to_chat(user, SPAN_NOTICE("Smoke \the [src] first!"))
return
if(closed)
to_chat(user, "<span class='notice'>You need to open \the [src] with a crowbar before moving the bees.</span>")
to_chat(user, SPAN_NOTICE("You need to open \the [src] with a crowbar before moving the bees."))
return
if(B.full)
user.visible_message("<span class='notice'>[user] puts the queen and the bees from \the [I] into \the [src].</span>", "<span class='notice'>You put the queen and the bees from \the [I] into \the [src].</span>")
user.visible_message(SPAN_NOTICE("[user] puts the queen and the bees from \the [I] into \the [src]."), SPAN_NOTICE("You put the queen and the bees from \the [I] into \the [src]."))
bee_count = 20
B.empty()
else
user.visible_message("<span class='notice'>[user] puts bees and larvae from \the [src] into \the [I].</span>", "<span class='notice'>You put bees and larvae from \the [src] into \the [I].</span>")
user.visible_message(SPAN_NOTICE("[user] puts bees and larvae from \the [src] into \the [I]."), SPAN_NOTICE("You put bees and larvae from \the [src] into \the [I]."))
bee_count /= 2
B.fill()
update_icon()
@@ -98,9 +98,9 @@
else if(istype(I, /obj/item/device/analyzer/plant_analyzer))
to_chat(user, "<span class='notice'>Scan result of \the [src]...</span>")
to_chat(user, "Beehive is [bee_count ? "[round(bee_count)]% full" : "empty"].[bee_count > 90 ? " Colony is ready to split." : ""]")
if(frames)
to_chat(user, "[frames] frames installed, [round(honeycombs / 100)] filled.")
if(honeycombs < frames * 100)
if(length(frames))
to_chat(user, "[length(frames)] frames installed, [round(honeycombs / 100)] filled.")
if(honeycombs < length(frames) * 100)
to_chat(user, "Next frame is [round(honeycombs % 100)]% full.")
else
to_chat(user, "No frames installed.")
@@ -109,12 +109,15 @@
return 1
else if(I.is_screwdriver())
if(bee_count)
to_chat(user, "<span class='notice'>You can't dismantle \the [src] with these bees inside.</span>")
to_chat(user, SPAN_NOTICE("You can't dismantle \the [src] with these bees inside."))
return
to_chat(user, "<span class='notice'>You start dismantling \the [src]...</span>")
if(length(frames))
to_chat(user, SPAN_NOTICE("You can't dismantle \the [src] with [length(frames)] frames still inside!"))
return
to_chat(user, SPAN_NOTICE("You start dismantling \the [src]..."))
playsound(src, I.usesound, 50, 1)
if(do_after(user, 30))
user.visible_message("<span class='notice'>[user] dismantles \the [src].</span>", "<span class='notice'>You dismantle \the [src].</span>")
user.visible_message(SPAN_NOTICE("[user] dismantles \the [src]."), SPAN_NOTICE("You dismantle \the [src]."))
new /obj/item/beehive_assembly(loc)
qdel(src)
return
@@ -122,19 +125,21 @@
/obj/machinery/beehive/attack_hand(var/mob/user)
if(!closed)
if(honeycombs < 100)
to_chat(user, "<span class='notice'>There are no filled honeycombs.</span>")
to_chat(user, SPAN_NOTICE("There are no filled honeycombs."))
return
if(!smoked && bee_count)
to_chat(user, "<span class='notice'>The bees won't let you take the honeycombs out like this, smoke them first.</span>")
to_chat(user, SPAN_NOTICE("The bees won't let you take the honeycombs out like this, smoke them first."))
return
user.visible_message("<span class='notice'>[user] starts taking the honeycombs out of \the [src].</span>", "<span class='notice'>You start taking the honeycombs out of \the [src]...</span>")
while(honeycombs >= 100 && do_after(user, 30))
new /obj/item/honey_frame/filled(loc)
user.visible_message(SPAN_NOTICE("[user] starts taking the honeycombs out of \the [src]."), SPAN_NOTICE("You start taking the honeycombs out of \the [src]..."))
while(honeycombs >= 100 && length(frames) && do_after(user, 30))
var/obj/item/honey_frame/H = pop(frames)
H.honey = 20
honeycombs -= 100
--frames
H.update_icon()
H.forceMove(get_turf(src))
update_icon()
if(honeycombs < 100)
to_chat(user, "<span class='notice'>You take all filled honeycombs out.</span>")
to_chat(user, SPAN_NOTICE("You take all filled honeycombs out."))
return
/obj/machinery/beehive/process()
@@ -153,45 +158,47 @@
if(H.seed && !H.dead)
H.health += 0.05 * coef
++trays
honeycombs = min(honeycombs + 0.1 * coef * min(trays, 5), frames * 100)
honeycombs = min(honeycombs + 0.1 * coef * min(trays, 5), length(frames) * 100)
/obj/machinery/honey_extractor
name = "honey extractor"
desc = "A machine used to turn honeycombs on the frame into honey and wax."
icon = 'icons/obj/virology_vr.dmi' //VOREStation Edit
icon = 'icons/obj/beekeeping.dmi'
icon_state = "centrifuge"
density = TRUE
var/processing = 0
var/honey = 0
/obj/machinery/honey_extractor/attackby(var/obj/item/I, var/mob/user)
if(processing)
to_chat(user, "<span class='notice'>\The [src] is currently spinning, wait until it's finished.</span>")
to_chat(user, SPAN_NOTICE("\The [src] is currently spinning, wait until it's finished."))
return
else if(istype(I, /obj/item/honey_frame))
var/obj/item/honey_frame/H = I
if(!H.honey)
to_chat(user, "<span class='notice'>\The [H] is empty, put it into a beehive.</span>")
to_chat(user, SPAN_NOTICE("\The [H] is empty, put it into a beehive."))
return
user.visible_message("<span class='notice'>[user] loads \the [H] into \the [src] and turns it on.</span>", "<span class='notice'>You load \the [H] into \the [src] and turn it on.</span>")
user.visible_message(SPAN_NOTICE("[user] loads \the [H]'s comb into \the [src] and turns it on."), SPAN_NOTICE("You load \the [H] into \the [src] and turn it on."))
processing = H.honey
icon_state = "centrifuge_moving"
qdel(H)
icon_state = "[initial(icon_state)]_moving"
H.honey = 0
H.update_icon()
spawn(50)
new /obj/item/honey_frame(loc)
new /obj/item/stack/material/wax(loc)
honey += processing
processing = 0
icon_state = "centrifuge"
icon_state = "[initial(icon_state)]"
else if(istype(I, /obj/item/weapon/reagent_containers/glass))
if(!honey)
to_chat(user, "<span class='notice'>There is no honey in \the [src].</span>")
to_chat(user, SPAN_NOTICE("There is no honey in \the [src]."))
return
var/obj/item/weapon/reagent_containers/glass/G = I
var/transferred = min(G.reagents.maximum_volume - G.reagents.total_volume, honey)
G.reagents.add_reagent("honey", transferred)
honey -= transferred
user.visible_message("<span class='notice'>[user] collects honey from \the [src] into \the [G].</span>", "<span class='notice'>You collect [transferred] units of honey from \the [src] into \the [G].</span>")
user.visible_message(SPAN_NOTICE("[user] collects honey from \the [src] into \the [G]."), SPAN_NOTICE("You collect [transferred] units of honey from \the [src] into \the [G]."))
return 1
/obj/item/bee_smoker
@@ -210,15 +217,22 @@
var/honey = 0
/obj/item/honey_frame/Initialize()
. = ..()
update_icon()
/obj/item/honey_frame/update_icon()
..()
overlays.Cut()
if(honey > 0)
add_overlay("honeycomb")
/obj/item/honey_frame/filled
name = "filled beehive frame"
desc = "A frame for the beehive that the bees have filled with honeycombs."
honey = 20
/obj/item/honey_frame/filled/New()
..()
add_overlay("honeycomb")
/obj/item/beehive_assembly
name = "beehive assembly"
desc = "Contains everything you need to build a beehive."
@@ -226,9 +240,9 @@
icon_state = "apiary"
/obj/item/beehive_assembly/attack_self(var/mob/user)
to_chat(user, "<span class='notice'>You start assembling \the [src]...</span>")
to_chat(user, SPAN_NOTICE("You start assembling \the [src]..."))
if(do_after(user, 30))
user.visible_message("<span class='notice'>[user] constructs a beehive.</span>", "<span class='notice'>You construct a beehive.</span>")
user.visible_message(SPAN_NOTICE("[user] constructs a beehive."), SPAN_NOTICE("You construct a beehive."))
new /obj/machinery/beehive(get_turf(user))
user.drop_from_inventory(src)
qdel(src)
@@ -283,4 +297,4 @@ var/global/list/datum/stack_recipe/wax_recipes = list( \
name = initial(name)
desc = initial(desc)
cut_overlays()
add_overlay("beepack-full")
add_overlay("beepack-full")

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

@@ -414,7 +414,7 @@
roundstart = 0
mysterious = 1
seed_noun = pick("spores","nodes","cuttings","seeds")
seed_noun = pick("spores","nodes","cuttings","seeds","pits")
set_trait(TRAIT_POTENCY,rand(5,30),200,0)
set_trait(TRAIT_PRODUCT_ICON,pick(SSplants.accessible_product_sprites))

14
code/modules/hydroponics/seed_gene_mut.dm
View File

@@ -94,15 +94,23 @@
if(prob(50))
S.set_trait(TRAIT_BIOLUM, !S.get_trait(TRAIT_BIOLUM))
if(S.get_trait(TRAIT_BIOLUM))
T.visible_message("<b>\The [S.display_name]</b> begins to glow!")
T.visible_message(SPAN_NOTICE("\The [S.display_name] begins to glow!"))
if(prob(50))
S.set_trait(TRAIT_BIOLUM_COLOUR,get_random_colour(0,75,190))
T.visible_message("<span class='notice'>\The [S.display_name]'s glow </span><font color='[S.get_trait(TRAIT_BIOLUM_COLOUR)]'>changes colour</font>!")
else
T.visible_message("<span class='notice'>\The [S.display_name]'s glow dims...</span>")
else
T.visible_message(SPAN_NOTICE("\The [S.display_name]'s glow dims..."))
if(prob(60))
S.set_trait(TRAIT_PRODUCES_POWER, !S.get_trait(TRAIT_PRODUCES_POWER))
if(prob(30))
S.set_trait(TRAIT_SPORING, !S.get_trait(TRAIT_SPORING))
if(S.get_trait(TRAIT_SPORING))
T.visible_message(SPAN_NOTICE("\The [S.display_name] releases a cloud of spores!"))
S.create_spores(T)
else
T.visible_message(SPAN_NOTICE("\The [S.display_name]'s spores no longer fall."))
/decl/plantgene/atmosphere/mutate(var/datum/seed/S)
if(prob(60))
S.set_trait(TRAIT_HEAT_TOLERANCE, S.get_trait(TRAIT_HEAT_TOLERANCE)+rand(-2,2),40,0)

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

@@ -120,7 +120,7 @@
if(seed.get_trait(TRAIT_CARNIVOROUS) >= 2)
growth_type = 1 // WOOOORMS.
else if(!(seed.seed_noun in list("seeds","pits")))
if(seed.seed_noun == "nodes")
if(seed.seed_noun in list("nodes", "cuttings"))
growth_type = 3 // Biomass
else
growth_type = 4 // Mold

37
code/modules/hydroponics/spreading/spreading_growth.dm
View File

@@ -91,22 +91,27 @@
if(prob(chance))
sampled = 0
if(is_mature() && !has_buckled_mobs())
for(var/turf/neighbor in neighbors)
for(var/mob/living/M in neighbor)
if(seed.get_trait(TRAIT_SPREAD) >= 2 && (M.lying || prob(round(seed.get_trait(TRAIT_POTENCY)))))
entangle(M)
if(is_mature())
if(!has_buckled_mobs())
for(var/turf/neighbor in neighbors)
for(var/mob/living/M in neighbor)
if(seed.get_trait(TRAIT_SPREAD) >= 2 && (M.lying || prob(round(seed.get_trait(TRAIT_POTENCY)))))
entangle(M)
if(is_mature() && neighbors.len && prob(spread_chance))
//spread to 1-3 adjacent turfs depending on yield trait.
var/max_spread = between(1, round(seed.get_trait(TRAIT_YIELD)*3/14), 3)
if(seed.get_trait(TRAIT_SPORING) && prob(1))
visible_message(SPAN_WARNING("\The [src] hisses, releasing a cloud of spores!"), SPAN_WARNING("Something nearby hisses loudly!"))
seed.create_spores(get_turf(src))
for(var/i in 1 to max_spread)
if(prob(spread_chance))
sleep(rand(3,5))
if(!neighbors.len)
break
spread_to(pick(neighbors))
if(length(neighbors) && prob(spread_chance))
//spread to 1-3 adjacent turfs depending on yield trait.
var/max_spread = between(1, round(seed.get_trait(TRAIT_YIELD)*3/14), 3)
for(var/i in 1 to max_spread)
if(prob(spread_chance))
sleep(rand(3,5))
if(!length(neighbors))
break
spread_to(pick(neighbors))
// We shouldn't have spawned if the controller doesn't exist.
check_health()
@@ -128,7 +133,7 @@
//move out to the destination
child.anchored = FALSE
step_to(child, target_turf)
child.Move(target_turf) // Do a normal move, so we can cross and uncross things we need to. Stairs, Open space "falling", etc.
child.anchored = TRUE
child.update_icon()
@@ -177,4 +182,4 @@
SSplants.add_plant(neighbor)
spawn(1) if(src) qdel(src)
#undef NEIGHBOR_REFRESH_TIME
#undef NEIGHBOR_REFRESH_TIME