Merge branch 'master' of https://github.com/Monkestation/Monkestation2.0

 into superbowl

code/modules/hydroponics/plant_genes.dm

@@ -974,13 +974,13 @@
 /datum/plant_gene/trait/never_mutate
 	name = "Prosophobic Inclination"
 	description = "The plant does not mutate normally, but may give a mutated produce."
-	mutability_flags = PLANT_GENE_REMOVABLE | PLANT_GENE_MUTATABLE | PLANT_GENE_GRAFTABLE
+	mutability_flags = PLANT_GENE_REMOVABLE | PLANT_GENE_GRAFTABLE
 
 /// Prevents stat mutation caused by instability.  Trait acts as a tag for hydroponics.dm to recognise.
 /datum/plant_gene/trait/stable_stats
 	name = "Symbiotic Resilience"
 	description = "High instability does not affect the plant stats."
-	mutability_flags = PLANT_GENE_REMOVABLE | PLANT_GENE_MUTATABLE | PLANT_GENE_GRAFTABLE
+	mutability_flags = PLANT_GENE_REMOVABLE | PLANT_GENE_GRAFTABLE
 
 /// Traits for flowers, makes plants not decompose.
 /datum/plant_gene/trait/preserved
@@ -1025,3 +1025,8 @@
 /datum/plant_gene/trait/plant_type/alien_properties
 	name ="?????"
 	icon = "reddit-alien"
+
+/datum/plant_gene/trait/seedless
+	name = "Seedless"
+	description = "The plant is unable to produce seeds"
+	mutability_flags = PLANT_GENE_REMOVABLE | PLANT_GENE_MUTATABLE | PLANT_GENE_GRAFTABLE

code/modules/hydroponics/seeds.dm

@@ -254,6 +254,7 @@
 	///Name of the grown products.
 	var/product_name
 	var/seed_harvest_ratio = 0.2
+	var/seedless = get_gene(/datum/plant_gene/trait/seedless)
 	///the value of yield that the harvest amount stops being linear and slows down
 	var/yield_linearity_breakpoint = 100
 	///linear region growth coeff
@@ -272,12 +273,15 @@
 
 	if(plant_yield >= yield_linearity_breakpoint)
 		harvest_amount = qp_sigmoid(yield_linearity_breakpoint, maximum_harvest_amount, plant_yield)
-		maximum_seed_production = floor(harvest_amount * seed_harvest_ratio)
+		if(!seedless)
+			maximum_seed_production = floor(harvest_amount * seed_harvest_ratio)
+
 	else
 		harvest_amount = floor(plant_yield * harvest_linear_coeff)
-		maximum_seed_production = floor(harvest_amount * seed_harvest_ratio)
-		if ((plant_yield > 0 && maximum_seed_production == 0) && prob(50))
-			maximum_seed_production = 1
+		if(!seedless)
+			maximum_seed_production = floor(harvest_amount * seed_harvest_ratio)
+			if ((plant_yield > 0 && maximum_seed_production == 0) && prob(50))
+				maximum_seed_production = 1
 
 	while(harvest_counter < harvest_amount)
 		while(seed_counter < maximum_seed_production)

html/changelogs/archive/2024-06.yml

@@ -538,3 +538,70 @@
       overall by all sats.
   - balance: Slightly boosted the range of meteor defense satellite from 14 to 16
       tiles.
+2024-06-27:
+  Absolucy:
+  - rscadd: Engineers now have an RCD round start.
+  - balance: RCD construction/deconstruction effects can now be attacked in order
+      to cancel them. You can get the anti-disruption upgrade disk to prevent this.
+  - balance: RCD construction/deconstruction is now slower if you already have another
+      effect up. This does not effect reconstruction.
+  - balance: Both of the above effects do not effect the CE's roundstart RCD, nor
+      any other RCDs such as combat RCDs.
+  - rscadd: RCDs can make girders now.
+  - bugfix: Some RCD constructs took more material than manual construction. The RCD
+      cost should be consistent in comparison to manual construction now.
+  - bugfix: RCDs can build wallmounts on reinforced walls.
+  - qol: RCDs can build directional windows without requiring/building a grill.
+  - bugfix: You should be able to click on lattices on icebox with the RCD and construct
+      a floor now
+  - balance: Maintenance drones now can use RPED, RCD, holosigns, and spray bottles.
+  - rscadd: Added liquid barriers, currently mapped into xenobio, which block all
+      liquid flow across them, hopefully preventing the dreaded station-wide ooze
+      floods.
+  - image: (intercepti0n) Resprites t-ray scanner, gas analyzer, geiger counter and
+      hand drill.
+  - image: (LT3) Medical and improvised gauze are visibly different from cloth.
+  - image: (Alecksohs) Updated the Advanced Surgical Tool's sprites.
+  - code_imp: (Alecksohs) Updated the Advanced Surgical Tool's light code.
+  - qol: Placing someone on an operating table now actually buckles them.
+  - qol: Prettied up the Chemical Analyzer's output in chat, making it easier to read,
+      especially when scanning multiple things.
+  DexeeXI:
+  - rscadd: New Title for Captains
+  DustanHache:
+  - rscadd: Egg bags are now craftable using cloth, like many other bags.
+  Kapu1178:
+  - bugfix: Fixed stuff relating to the MODsuit pathfinder module.
+  - code_imp: AI pathfinding should produce slightly better paths.
+  KnigTheThrasher:
+  - bugfix: fixed latejoin prisoner spawns
+  - bugfix: :)
+  RafRoq:
+  - rscadd: 'Added new botany plant trait, seedless, can be found in money tree seeds
+
+      :cl:'
+  Rex9001, DexeeXI:
+  - rscadd: Brig Physician as a job
+  - rscadd: 'Clothing items for Brig Physician: jumpsuit, skirt, scrubs, shoes, backpacks
+      of all kinds.'
+  - rscadd: Plasmaman support for Brig Physician. Sprites provided directly by DimWhat.
+  - rscadd: Alternative job title support for Brig Physician
+  - rscadd: SECHUD, Crew Monitor and ID card support for Brig Physician
+  - rscadd: Locker specifically for Brig Physician
+  - rscadd: Digi-legs support for new clothes for Lizards.
+  - rscadd: Most new items have inhand sprites
+  - rscadd: Brig Physician start markers in Prison Medbays.
+  - rscadd: Requested alternative title for Medical Doctor. (Admin Team Request)
+  - balance: All prison medbays overhauled to provide proper support. The old tram
+      medbay was completely bare while Box was mostly "feature complete". All medbays
+      should have very similar capability.
+  - bugfix: Head of Personnel's supervisor is now the Captain properly.
+  - rscdel: Virus extrapolator in the CMO's locker is now gone. (I don't know how
+      I missed this one)
+  TTNT789:
+  - rscadd: The Ashen Forge as a traitor faction
+  Uristthedorf:
+  - qol: You can craft plastitanium shards.
+  ven1883:
+  - rscadd: Adds Alveolic Deoxidation, a nanite program that heals suffocation.
+  - rscadd: Adds Alveolic Deoxidation to the tech tree.

monkestation/code/modules/botany/new_seeds/seeds.dm

@@ -52,7 +52,7 @@
 	icon_grow = "TreeCash-G"
 
 	possible_mutations = list()
-	genes = list(/datum/plant_gene/trait/repeated_harvest)
+	genes = list(/datum/plant_gene/trait/repeated_harvest, /datum/plant_gene/trait/seedless)
 	product = /obj/item/stack/spacecash/c10
 
 /obj/item/seeds/tree/steel