Commit Graph

89 Commits

Author SHA1 Message Date
João Marcos
68da0084b5 Fix noreact trait not being passed to mutated seeds (#35126)
* makes plasma cabbages absorb plasma from the air

* reduces amount of cabbages per harvest

* fix plant absorb amount so the gas doesnt go negative

* oopsies -1 is not actually smaller than -2

* revert yield change

* turn it into a xenophysiology trait that works for other gases besides plasma

* add oxygen production to gas_carbon and balance the ratio of oxy and carbon

* Adds gas_absorb trait to plant analyzer and seed extractor

* remove the unnecessary capacity variables

* Increase potency of the plant when absorbing gas

* No longer modifies the New() proc for all grown food

* Add potency cap of 200 to gas_absorb trait

* fix noreact trait not being passed to mutated seeds

* will this work?
2023-10-13 16:40:15 -05:00
João Marcos
108e5d6953 Makes plasma cabbages absorb plasma from the air (#35104)
* makes plasma cabbages absorb plasma from the air

* reduces amount of cabbages per harvest

* fix plant absorb amount so the gas doesnt go negative

* oopsies -1 is not actually smaller than -2

* revert yield change

* turn it into a xenophysiology trait that works for other gases besides plasma

* add oxygen production to gas_carbon and balance the ratio of oxy and carbon

* Adds gas_absorb trait to plant analyzer and seed extractor

* remove the unnecessary capacity variables

* Increase potency of the plant when absorbing gas

* No longer modifies the New() proc for all grown food

* Add potency cap of 200 to gas_absorb trait
2023-10-06 18:30:47 -05:00
gurfan
5858b036de Revert Biogenerator Biomolecules (#34258)
* Revert "Space Drugs n Mescaline mutate biomolecules (#34089)"

This reverts commit 9bc9d522f6.

* revert
2023-05-10 17:13:26 -05:00
TJ
ff5363fd05 Rework materials system for biogenerator. (#33985)
* Rework materials system for biogenerator.

* Added molecule types for prehistoric plants.

* Shifted molecule type to be on the seed datum, made it a list, and added genetics capabilities

* Change molecule_type field on prehistoric plants to seed datum

* Change plant molecule to new gene group
2023-02-10 15:03:26 -06:00
SECBATON GRIFFON
51aeb85ad4 Wizard's Arcane Tamper (#33409)
* beginning work on it

* the spell

* invocations and capitalization fix

* defibs n vendors

* case...

* machine frames

* compooters too

* T

* removes on death of mob

* removes on death of mob

* removes on death of mob

* Canisters and hacking

* Canisters and hacking

* inverted key behavior

* potted plants

* potted plants

* couches

* improves glass, visuals and method of saying things

* actual sprites and spellbook downside

* making it work

* food tampering

* new spell method

* kicking

* kicking

* the hungry bag

* the hungry bag

* the hungry bag

* the hungry bag

* the hungry bag

* movables

* more fun with welding tanks

* comms consoles

* request ones too

* markov paper

* better like this

* better like this

* randomised artifact

* starts on by default

* rand not random

* slot machines too

* removing this because if recursive casting is on it's just unfair

* spell cost adjust, microwaves, hydroponics

* door now properly stuck

* envelopes

* attempt at fixing vehicle stuff

* attempt at fixing vehicle stuff

* mirrors

* cash

* ID access random spam sanity

* Better system

* Better system

* doors like this

* doors like this

* better pen stuff

* more stuff

* more stuff

* spoons and forks

* conveyors

* cables

* grenades

* grenades

* grenades now work

* sharts

* singulo

* fix

* mops and janicarts

* mops and janicarts

* dna

* switchtool

* lotto vend

* inherit you git

* i said INHERIT

* arcade

* removing this

* only once please

* ways to do this

* better

* more table fun

Co-authored-by: SECBATON GRIFFON <sage>
2022-10-21 12:38:57 -05:00
adacovsk
e8d2dc095c Hydroponics bugfixes (#32924)
* hydroponics

* Update Chemistry-Reagents.dm

* sugar and weeds

* Update Chemistry-Reagents.dm

* salts

* Update Chemistry-Reagents.dm

* Update hydroponics_mutations.dm

* Update hydroponics_mutations.dm

* Update hydroponics_mutations.dm

* Update Chemistry-Reagents.dm

* Update hydroponics_reagents.dm

* Update hydroponics_reagents.dm

* Update Chemistry-Reagents.dm

* Update Chemistry-Reagents.dm

* Update Chemistry-Reagents.dm

* Update hydroponics_reagents.dm

* fix seed splice

* Update Chemistry-Reagents.dm
2022-07-21 00:41:53 -05:00
adacovsk
a05d78af20 Hydroponics Mutations Rework (#32853)
* commits were messed up, should be good now

* fix hematophage and balance left4zed

* Update hydroponics_reagents.dm

* Update Chemistry-Reagents.dm

* Update Chemistry-Reagents.dm

* Update hydroponics_mutations.dm

* Eneocho changes

* Update hydroponics_mutations.dm

* Update hydroponics_mutations.dm

* Update hydroponics_mutations.dm

* Update hydroponics_mutations.dm

* no more no_react and auto_harvest

* Update hydroponics.dm

* somatoray changes

- all genes included
- replaced particle effects
- put it all in energy weapon special.dm

* somatoray compiles

* somatoray generally works

* Update special.dm
2022-07-10 11:37:28 -05:00
adacovsk
9e81e9af15 Hydroponics refactoring (#32609)
* toxins affinity replacement

* Update hydro_tray_process.dm

* HYDROPONICS

- Data encapsulation
- Putting changes where they should be
- Modifying so reagents don't directly remove plant health, rather a function of toxicity
- Modified toxin tolerance to toxin affinity where your plants can heal with higher levels of toxin affinity

* hardwork

* Update seeds.dm

* aggh

* Update hydro_tray_process.dm

* Update hydro_tools.dm

* Update diona.dm

* big changes

* Update hydro_tools.dm

* try compiling for first time

* compiles

* works

* Update hydro_tray_process.dm

* Update hydro_tray_process.dm

* fixed

* ugh

* Update hydroponics_reagents.dm

* finally

* Update hydro_tray_process.dm

* Update hydroponics_mutations.dm

* Update Chemistry-Reagents.dm

* Update hydroponics_mutations.dm

* Update hydro_tray_process.dm

* Update hydro_tray_process.dm

* Update hydro_tray_process.dm

* ok

* Update hydroponics_reagents.dm

* Update hydro_tray_process.dm

* eyup

* Update seeds.dm

* Update hydro_tray_process.dm

* diona update
2022-06-07 13:02:36 -05:00
Hinaichigo
bb59873110 Implements strange seed and no-fruit product blacklist and fixes related inconsistencies with clovers (#32711)
* Update grown.dm

* Update grown.dm

* Update seed_datums.dm

* Update grown.dm

* Update grown.dm

* Update grown.dm

* Update seed_datums.dm

* Update grown.dm

* Update seed_datums.dm

* Update grown.dm

* Update grown.dm

* Update grown.dm

* Update seed_datums.dm

* Update grown.dm

* Update grown.dm
2022-06-06 22:36:00 -05:00
Hinaichigo
555b742e38 Fixes issue with harvesting non-edible plants (#32721)
* Update seed_datums.dm

* Update seed_datums.dm
2022-06-06 21:42:04 -05:00
kane-f
ae602a8ec9 Allows amauri noreact property to interact with xenobotany genes (#32716)
Co-authored-by: kanef <kanef9x@protonmail.com>
2022-06-06 21:41:15 -05:00
adacovsk
022cacab12 A limit on autoharvesting (#32653)
* works

* Update seed_datums.dm

* Update seed_datums.dm

* Update code/modules/hydroponics/seed_datums.dm

Co-authored-by: DamianX <DamianX@users.noreply.github.com>

* Update seed_datums.dm

Co-authored-by: DamianX <DamianX@users.noreply.github.com>
2022-06-03 20:47:49 -05:00
Hinaichigo
1bfa7fe062 Update seed_datums.dm (#32662)
Fix harvesting runtime.
2022-05-23 13:10:26 -05:00
Hinaichigo
65918d5380 Luck (#32519)
* Luckiness.

* More changes.

* Luck scaling function.

* Remove debug residue.

* .

* Perhaps this will work.

* Mime vow-breaking curse.

* Rabbit foot.

* More work on clovers.

* .

* Clover mechanics.

* New clover sprites.

* Moved some things to their proper locations and neatened up.

* Add clover seeds to the seed vendor.

* Shuttle console kicking. Fixed overflow bug.

* Eating clovers.

* Want to check linters.

* Reintegrated nonmutated clover spawning.

* Luck and potency based clover harvesting.

* Rad storm considerations.

* Clover sprites and plant params.

* Neatening up.

* In case.

* Changed luck calculation.

* .

* Added precalculation of luck.

* .

* Change loop types. Reorganization and comments.

* Fix aliasing bug.

* Change description comment.

* .

* .

* Decreased clover nutriment.

* Comment tweak.

* Changed clover leaf probs.

* .

* One more thing.

* Moved update_leaves() to initialize(). Added more mirror shattering cases.

* Update hydroponics_mutations.dm

* Update grown.dm

Tweak clover probabilities.

* Update grown.dm

* Update grown.dm

* Update grown.dm
2022-05-23 00:49:40 -05:00
adacovsk
b30153715d Scoreboard organization/optimization (#32094)
* Scoreboard

* Update next_map.dm

* Update gameticker.dm

* Update role.dm

* ugh

* safe me

* added dat to every proc

* Update scoreboard.dm

* Update scoreboard.dm

* Update department_score.dm

* turfssingulod

* Update misc_score.dm

* Update scoreboard.dm

* Update scoreboard.dm

* Update mobs.dm

* Update items.dm

* Update stunbaton.dm

* Update human_attackhand.dm

* Update living_defense.dm

* Update misc_score.dm

* Update swords_axes_etc.dm

* Update human_attackhand.dm

* Update misc_score.dm

* Update misc_score.dm

* Update scoreboard.dm
2022-02-22 17:39:14 +01:00
joaomarcosh
435dc6e5e5 Adds Plasma cabbages to hydroponics (#31625)
* Add files via upload

Plasbage icon.

* Update grown.dm

Added plasbage.

* Update seeds.dm

added plasbage.

* Update seeds.dm

Plasbages should now consume plasma in the atmosphere.

* Revert "Update seeds.dm"

This reverts commit adf491dbe6.

* Removes plasma from the list of chemicals for random seeds

* Changes the name to Plasma Cabbage
2021-12-15 19:36:11 +00:00
ShiftyRail
5d253dd59f Better botany logs (#28880) 2021-02-21 16:07:42 -06:00
adrian
f686aca6b9 Fixes invisible fruits (#27547)
* Fixes invisible plant mutations products. Random mutations can have more sprites

* Removes /datum/seed/test

* This comment is not relevant anymore
2020-08-14 12:10:39 -03:00
Exxion
dedf8edced Fixes botany (#25938)
Consequences: Still unforeseen
2020-02-28 23:35:48 -06:00
ancientpower
b459ea3fde initial commit 2019-10-29 18:42:14 -05:00
Exxion
4d7a2df990 Renamed Clamp() to clamp() 2019-10-25 17:18:20 -04:00
Irradiation
efb721110c (Silver) Pears 2: microwave boogaloo
See [#21443] for the content, upboats and what-have-you.

Pickled Pears:
-2x Pears

Bugolgi:
-2x Meat
-1x Carrot
-1x Pears
-5u Sugar
-10u Soy Sauce

Credits goes to :
TheBimmer231 for the pear sprites
RealestEstate for growing plant sprites
Blithering for the seed pack sprites

[content][sprites][wiki]

🆑
 * rscadd: Added (Silver) pears to botany.
 * rscadd: Added pickled pears & bugolgi to the recipes.
2019-01-28 21:11:17 -05:00
Bathos Bathtime
7287904cd9 Botany Chems (#21124) 2018-12-30 01:07:12 -08:00
Exxion
c6a7e5098e Defines (#19835) 2018-09-27 14:50:54 -07:00
Kurfursten
bf76233e90 newbotany on suicide watch (#19551) 2018-09-02 09:05:16 -03:00
Allspice
6c9558b49f Implements new fossilized plant features and related chems. (#19303)
* Implements new fossilized plant features and related chems.

* Make spiders from the drink spawn under the imbiber.
2018-08-23 06:24:21 -03:00
DamianX
43ffcb899e Made plant_controller into a proper subsystem (#18733)
* Made plant_controller into a proper subsystem

* rm oldcode

* Actually remove PHENOL from the list
2018-07-06 08:34:00 -03:00
Shadowmech88
b9ea1e43f0 Replaces Chemistry Chemicals in Plants With Snowflake Plant Chemicals (#14778)
* Replaces some artificial chemicals found in plants with natural chemicals.

* Replaces some more chemicals.

* Some more replacements.

* It's the Replacements.

* Opium is now described with the same language as bicaridine.

* Gives the plant reagents unique colors.

* Nine more seasons of coderbus.

* Adds cocaine to movement speed code.

* Fixes duplicate nicotine define.
2017-05-27 19:20:44 -07:00
clusterfack
246b9261f5 Revert PHORON 2017-04-02 00:37:37 -05:00
clusterfack
8d9d66ce28 Makes Station Rotate (#14506)
* Changes plasma to phoron

Because plasma has been coopted to mean the 4th state of matter, we're rebasing to the new bay naming standard of phoron

* Fixes maps and filenames

* Whoops forgot to change test box!
2017-04-02 00:01:08 +02:00
DrCelt
f9b8c780ee Fixes #8231, Plasmamen being forevially jittery, drowsy, confused, etc etc etc fuck whoever did this (#12899)
* Fixes #8231, Plasmamen being forevially jittery, drowsy, confused, etc etc etc fuck whoever did this

* promotes ghetto var to proper var to prevent ghetto var meltdown

* h

* it compiles
2017-01-02 22:17:56 +01:00
9600bauds
bacedc1818 Sharpness flags (#12728)
* Sharpness flags

* Sharpness flag implementation

* We don't need this anymore!

* pretty

* Ow The Commit Message
2016-12-21 07:19:37 -05:00
unid15
6139b2657a Glass code fix (#12624) 2016-12-02 00:14:36 +00:00
ComicIronic
d490e1f970 Removed one line ifs and elses. (#11389) 2016-08-15 05:36:21 -05:00
ComicIronic
03861f64f5 Moved limb and zone internal names over to defines, (#10871) 2016-07-06 18:25:43 -05:00
Kurfursten
0534e8c04c whee (#10846) 2016-06-30 12:49:13 -03:00
ComicIronic
11119d4d0b Moved reagent IDs to defines. (#10636)
* Moved reagent IDs to defines.

TODO: Convert xenoarch chems.

* Added xenoarch chem defines

* Fixed some bad chem names.
2016-06-19 15:43:37 -05:00
unid15
75d79b3c23 Hand refactor (#10045)
* hand refactor (COMPILES)

* Works pretty much

* Test martians

* Martians

* Fix human UI

* Fix find_organ_by_grasp_index() returning arms

* CL + tweaks

* Last fixes

* a

* Better CL

* Fix weird issue!

* Fix virologist job

* Resolves a very important issue

* I thought I had already fixed this

oh well

* Fix grabs

* Shat
2016-06-05 02:33:12 -05:00
unid15
569a5a08af drop_stack() for hydroponics, crafting and biogenerator 2016-01-09 20:08:33 +01:00
clusterfack
b914b3f411 Merge pull request #7037 from 9600bauds/slimeforthecamera
Slays snowflake oldcode, tweaks to exotic seed reagents
2015-12-25 16:03:23 -06:00
9600bauds
a54057115f eg 2015-12-21 04:57:32 -03:00
9600bauds
be4a94ed10 Fixes xenobotany typo 2015-12-15 18:08:51 -03:00
9600bauds
8a2c1786a4 Slays snowflake oldcode, tweaks to exotic seed reagents 2015-12-14 22:10:19 -03:00
9600bauds
2e7d19ee5c If I rebase, noone can see my shit commit names
Oregon Trail 2: Return to Mississippi

look at me, clusterfack would be proud

Makes the Seed Extractor not awful

Squashes a couple of bugs with seed diverging and plant cuttings, removes unused variables.

Xenobotany & Shit

fak u

(B) HATE CONFLICT

Break Deity's fix again because clusterfack said so

like my old grandma used to say, "remember to commit often with descriptive commit names"

I SURE CANNOT WAIT TO FIX CONFLICTS ON PACID FOR THE FOURTH TIME

The Changelog Is Here

I have done as thy asked

remember to test your shit!

thank you for testing!

wait a sec this doesn't fire on process() anyways

Glowy plant no hate glow

SOIL IS NOT MACHINE

Fixed bio-lum fruits not glowing, added harvesting kudzu with plant bags, kudzu will only grow when mature

Push my Face into the Sun

I forgot about this

Thank you anonymous person
2015-12-13 16:44:47 -03:00
PJB3005
99bf59d80e Adds a to_chat() proc, to pave the way to a non shit chat. 2015-11-25 15:55:15 +01:00
PJB3005
3cca5692af Removes the panic writer messages. 2015-11-20 03:17:06 +01:00
Probe1
ed7c05d231 seed_datum.dm had an incorrect reagent id. slimetoxin and aslimetoxin have different IDs than their datum name. this caused warnings. 2015-11-07 09:28:41 -05:00
Rob Nelson
519b95ab6d Merge pull request #6328 from 9600bauds/risefromyourgrave
Fixes not being able to mutate killer tomatoes
2015-10-27 16:02:37 -07:00
9600bauds
2864c31fb4 Fixes not being able to mutate killer tomatoes 2015-10-26 13:54:18 -03:00
DeityLink
a564e315f6 small mutated plants 2015-10-21 21:38:30 +02:00