Code

Add a variety of marine plants#71844

Code

Closed

worm-girl wants to merge 23 commits intoCleverRaven:masterCleverRaven/Cataclysm-DDA:masterfrom worm-girl:seaplantsworm-girl/Cataclysm-DDA:seaplantsCopy head branch name to clipboard

+497-24

Commits

Commits on Feb 19, 2024

• seaplants

  worm-girl

  committed
  9936cb2

• kelp forests

  worm-girl

  committed
  2296e68

• kelp

  worm-girl

  committed
  5f49eac

• stuff

  worm-girl

  committed
  4ff22d4

• harvesting

  worm-girl

  committed
  bdd3014

• cook it

  worm-girl

  committed
  f07c849

• Merge branch 'master' into seaplants

  worm-girl

  authored
  7e4abeb

• Update effects.json

  worm-girl

  committed
  a319c0b

• Merge branch 'seaplants' of https://github.com/fairyarmadillo/Cataclysm-DDA into seaplants

  worm-girl

  committed
  dc42c2c

Commits on Feb 20, 2024

• Update harvest.json

  worm-girl

  authored
  0dbed10

• Update raw_veggy.json

  worm-girl

  authored
  8bf1093

• Update veggy_dishes.json

  worm-girl

  authored
  fd6c674

• Update map_extras.json

  worm-girl

  authored
  a1d3590

• Delete undersea.json

  worm-girl

  committed
  dab97f8

• Merge branch 'seaplants' of https://github.com/fairyarmadillo/Cataclysm-DDA into seaplants

  worm-girl

  committed
  8ca2ece

• Update activity_actor.cpp

  worm-girl

  authored
  60e6372

• stuff

  worm-girl

  committed
  fd4db24

• no fucoidan

  worm-girl

  committed
  6baa5b6

• uncrafts

  worm-girl

  committed
  c91dee8

• recipes

  worm-girl

  committed
  fe4bfc7

• material, descs, cleanup

  worm-girl

  committed
  dd1c292

• Update dictionary.txt

  worm-girl

  committed
  6d8e979

Commits on Mar 29, 2024

• Update furniture-flora_marine.json

  Maleclypse

  authored
  752c7e2