Commit Graph

611 Commits

Author SHA1 Message Date
Cadyn b90f7ec922 The 515 MegaPR early downport (#7783)
Co-authored-by: Selis <selis@xynolabs.com>
Co-authored-by: Selis <sirlionfur@hotmail.de>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: SatinIsle <thesatinisle@gmail.com>
Co-authored-by: Heroman <alesha3000@list.ru>
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
2024-02-27 20:17:32 +01:00
Drathek 3995338290 Moar whitespace normalization [MDB IGNORE] (#7750)
Co-authored-by: Raeschen <rycoop29@gmail.com>
2024-02-16 10:54:47 +01:00
Guti a2902e1064 Glacial Lettuce (#7502) 2024-01-04 17:19:01 -05:00
Guti f32a21f36b Phase fixes (#7484) 2023-12-31 20:13:13 -05:00
CHOMPStation2 d2e66e6410 [MIRROR] Refactors tool typechecks, refactors transforming tools, makes Altevian wrench into one (#7062)
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Nadyr <41974248+Darlantanis@users.noreply.github.com>
2023-10-04 18:37:41 -04:00
CHOMPStation2 7e7b7200ff [MIRROR] Fruit spawners (#6972)
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
2023-09-12 23:21:30 +02:00
Nadyr c036c32091 Merge branch 'master' into upstream-merge-14957 2023-06-09 22:27:00 -04:00
Heroman3003 1ccc27a6d3 Fixes #14956 2023-06-03 19:14:06 +00:00
Heroman3003 d41519dcb8 Items for the Plant People (not the literal plant people) 2023-06-02 01:22:32 +00:00
Heroman3003 c1ac01b62c Merge pull request #14759 from KillianKirilenko/kk-canteven
Botany/Hydroponics minifix
2023-04-06 07:32:10 +00:00
Heroman3003 8ab9a847d0 cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else 2023-03-10 06:51:22 +00:00
Heroman3003 e9c2487299 Merge pull request #14290 from VOREStation/upstream-merge-8851
[MIRROR] Maintenance on Hydro code, specifically vines and bees.
2023-01-04 02:56:23 +00:00
Casey f70dc36da1 Merge pull request #14051 from Heroman3003/hedgetrim
Makes hedge trimmers instakill vines
2022-11-13 20:44:27 +00:00
Heroman3003 a921153eca Merge pull request #13995 from Heroman3003/peppercorns
Adds peppercorn berry plant
2022-10-29 06:20:26 +00:00
Nadyr 39dcc037ba powder that makes you say yes 2022-10-11 20:31:01 -04:00
Casey 14d698a2e1 [MIRROR] Spkrtn/fix/8703 8733 [ABLE TO BE MERGED] 2022-10-10 03:06:13 +00:00
Verkister 0822ccfc55 Earlyport harvest color fix
Fixes harvested produce getting the produce color (meant for the produce part of the icon overlay and not the leaf part, which uses its own color) applied on top of both already colored overlays for a second time, most visible on mushrooms, which have ended up with hypersaturated caps and incorrect underside colors.
2022-10-05 14:05:53 +03:00
xnqm8h 6748b9fbcf Starts vine processing from tray on creation 2022-08-18 22:00:19 -04:00
xnqm8h 06f95c94d3 Commenting out fallingapples.
Commenting out fallingapples.
2022-08-06 21:45:32 -04:00
xnqm8h 00666fcad0 Adding chompedit comments to non chomp files.
Adding chompedit comments to non chomp files.
2022-08-06 20:03:59 -04:00
xnqm8h 3dbb49378f Fixes mutation chains for chomp seeds and some reaction formulas 🪴💊
Fixes missing mutation chains for most of the plant types in seed_datums_ch along with fixing some typos in some chemical reactions. Lastly added a simple description for Bullvalene since it had a placeholder one.
2022-08-05 16:53:02 -04:00
Poojawa 575a719688 get_random_colour() now prepends a # 2022-07-31 18:10:04 +00:00
Casey 48f835f41f Fixes in-chat icons being broken in oldchat 2022-07-20 17:24:27 +00:00
Novacat 4b4ba32e03 Merge pull request #12968 from Heroman3003/RUNTIME-FIX-END-ME
Fixes runtimes being broken. Removes back-worn watertanks. NO I DO NO…
2022-05-14 13:05:43 +00:00
Nadyr d45c7b7eed Merge branch 'master' into upstream-merge-12767 2022-04-17 23:33:35 -04:00
Casey c9eb919583 Big Pharma's Blessing: Snorting Mechanics 2022-04-17 21:17:05 +00:00
Casey abea22deec Merge pull request #12765 from GhostActual/Lettuce-Eat
Lettuce Eat
2022-04-17 17:55:59 +00:00
Casey de0be34c99 The Grand /TG Port - Part 6 2022-04-03 03:32:03 +00:00
Casey d07469a44c Carpet Craftin' 2022-02-25 23:37:02 +00:00
Casey 592777ba9b Merge Fixes for 8222 2022-02-19 22:04:54 +00:00
Casey 1ffb955516 Misc Tweaks 2022-02-17 13:02:10 +00:00
Casey 4763264965 Merge pull request #12128 from TheObserver-sys/XenoBotanyPass1
Xenobotany Pass 1 (Of who knows how many)
2022-02-03 06:29:57 +00:00
Nadyr 9122ceff75 Merge pull request #3484 from CHOMPStation2/upstream-merge-11997
[MIRROR] Fixes some issues with icons in hydroponics
2021-12-12 06:43:30 -05:00
Nadyr b6e1741f11 Merge pull request #3447 from CHOMPStation2/upstream-merge-11842
[MIRROR] SpaceVines - Now with 100% More Landmark Moments
2021-12-12 05:39:43 -05:00
Nadyr 59602e40bd powder that makes you say yes 2021-12-12 05:29:58 -05:00
Casey ab7e21e51c Merge pull request #11997 from Heroman3003/hydro-icon-fixes
Fixes some issues with icons in hydroponics
2021-12-11 03:45:13 +00:00
Casey 3b90133c20 SpaceVines - Now with 100% More Landmark Moments 2021-12-10 04:36:44 +00:00
Casey 9c7d030128 Somatoray Modularity 2021-12-10 04:33:32 +00:00
Rykka e622a208c4 Finishes the last of the error fixes
Fixes Integer precision loss in autotransfer.dm and types_ch.dm
Fixes operator overload in solargrub.dm
Fixes field access requires static type errors in vorepanel_vr.dm, kasscbuttons_ch.dm, and seed.dm
Fixes ambigious && in metroid_infestation.dm
2021-09-17 00:07:10 -07:00
Nadyr 6813c8f185 powder that makes you say yes 2021-08-27 20:11:38 -04:00
Chompstation Bot af0d7a0f6b Make stack amount var private 2021-08-26 15:39:04 +00:00
Aronai Sieyes 72f5e790db Upstream-11421 2021-08-24 21:10:20 -07:00
Novacat 96a6740ba2 Merge pull request #11480 from VOREStation/upstream-merge-8225
[MIRROR] Seed Contraband Changes
2021-08-24 23:57:31 +00:00
Chompstation Bot 15cafbe65b Optimize a couple things 2021-07-20 21:30:20 +00:00
Nadyr 5c7226fa54 Merge branch 'master' into upstream-merge-11110 2021-07-16 19:09:43 -04:00
Chompstation Bot d0d23ed393 Fixes a bunch of bools missed in #11100 2021-07-16 21:12:20 +00:00
Chompstation Bot 481c0e314e Convert some bools to TRUE/FALSE instead of 1/0. 2021-07-16 17:44:40 +00:00
Aronai Sieyes 12030d27d4 Merge pull request #11030 from MarinaGryphon/bugfix/plantsprite
Fixes #10722
2021-07-12 05:59:12 +00:00
Chompstation Bot 14129d60cf Converts visible_message notice spans to look more like emotes 2021-07-05 20:30:12 +00:00
Chompstation Bot b6e1989a01 The One Where I Port Modals 2021-06-30 19:29:34 +00:00