Code

Pomegranate & Aphrodisiacs#23

Code

Merged

FoxxoTrystan merged 15 commits intoFansana:masterFansana/floofstation1:masterfrom SleepyScarecrow:pomeSleepyScarecrow/floofstation1:pomeCopy head branch name to clipboardJul 13, 2024

+361

Commits

Commits on Jul 13, 2024

• pomegranate & aphrodisiacs

  SleepyScarecrow

  committed
  2ce0bcb

  Copy full SHA for 2ce0bcb

• Merge branch 'master' of https://github.com/Fansana/floofstation1

  SleepyScarecrow

  committed
  8b3121c

  Copy full SHA for 8b3121c

• Update Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml

  Show description for 70a23e0
  

  SleepyScarecrow

  and

  FoxxoTrystan

  authored
  70a23e0

  Copy full SHA for 70a23e0

• Update Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml

  Show description for 03b7a45
  

  SleepyScarecrow

  and

  FoxxoTrystan

  authored
  03b7a45

  Copy full SHA for 03b7a45

• Update Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml

  Show description for fcf0daa
  

  SleepyScarecrow

  and

  FoxxoTrystan

  authored
  fcf0daa

  Copy full SHA for fcf0daa

• Update Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_produce.yml

  Show description for 78e317d
  

  SleepyScarecrow

  and

  FoxxoTrystan

  authored
  78e317d

  Copy full SHA for 78e317d

• Update Resources/Prototypes/Hydroponics/seeds.yml

  Show description for e384d5f
  

  SleepyScarecrow

  and

  FoxxoTrystan

  authored
  e384d5f

  Copy full SHA for e384d5f

• Update Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/seeds.yml

  Show description for 8b6d50b
  

  SleepyScarecrow

  and

  FoxxoTrystan

  authored
  8b6d50b

  Copy full SHA for 8b6d50b

• Update Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/mail_civilian.yml

  Show description for f581fc8
  

  SleepyScarecrow

  and

  FoxxoTrystan

  authored
  f581fc8

  Copy full SHA for f581fc8

• Remove Apple.rsi.zip

  FoxxoTrystan

  committed
  8445eff

  Copy full SHA for 8445eff

• moved Pomegranate Sprites.

  SleepyScarecrow

  committed
  d4e66f7

  Copy full SHA for d4e66f7

• Update Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml

  Show description for be620a4
  

  SleepyScarecrow

  and

  FoxxoTrystan

  authored
  be620a4

  Copy full SHA for be620a4

• Update Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml

  Show description for 2e09421
  

  SleepyScarecrow

  and

  FoxxoTrystan

  authored
  2e09421

  Copy full SHA for 2e09421

• Update Resources/Prototypes/Hydroponics/seeds.yml

  Show description for 966d9b5
  

  SleepyScarecrow

  and

  FoxxoTrystan

  authored
  966d9b5

  Copy full SHA for 966d9b5

• deleted duplicates

  SleepyScarecrow

  committed
  f57772e

  Copy full SHA for f57772e