Code

Shavuha#49

Code

Closed

jailedfish wants to merge 37 commits intospace-syndicate:masterspace-syndicate/space-station-14-next:masterfrom jailedfish:shavuha_devjailedfish/space-station-14-next:shavuha_devCopy head branch name to clipboard

+85

Commits

Commits on Nov 10, 2024

• shaverma

  onlyfans12

  committed
  c20b804

  Copy full SHA for c20b804

• fix images

  onlyfans12

  committed
  839f9b9

  Copy full SHA for 839f9b9

• shaverma

  

  onlyfans12

  authored and

  jailedfish

  committed
  9062f93

  Copy full SHA for 9062f93

• Update shaverma-unbaked.yml

  jailedfish

  authored
  2591c13

  Copy full SHA for 2591c13

• Update shaverma-baked.yml

  jailedfish

  authored
  5ae25d9

  Copy full SHA for 5ae25d9

• Update Resources/Prototypes/Recipes/Cooking/meal_recipes.yml

  Show description for b9f9549
  

  jailedfish

  and

  FireNameFN

  authored
  b9f9549

  Copy full SHA for b9f9549

• Update Resources/Prototypes/Recipes/Cooking/meal_recipes.yml

  Show description for 8dca773
  

  jailedfish

  and

  FireNameFN

  authored
  8dca773

  Copy full SHA for 8dca773

• Update shaverma-baked.yml

  jailedfish

  authored
  0dfc180

  Copy full SHA for 0dfc180

Commits on Nov 11, 2024

• License updates

  jailedfish

  authored
  c673a94

  Copy full SHA for c673a94

• Localisation?

  jailedfish

  committed
  f668d07

  Copy full SHA for f668d07

• Localisation

  jailedfish

  committed
  819895b

  Copy full SHA for 819895b

• undo something

  jailedfish

  committed
  6d4f8a4

  Copy full SHA for 6d4f8a4

• some codestyle fixes

  jailedfish

  committed
  896cb6f

  Copy full SHA for 896cb6f

• some codestyle fixes

  jailedfish

  committed
  69d9b42

  Copy full SHA for 69d9b42

• Discard changes to Resources/Prototypes/Recipes/Cooking/meal_recipes.yml

  jailedfish

  authored
  cb1c8d2

  Copy full SHA for cb1c8d2

• some codestyle fixes

  jailedfish

  committed
  415e25b

  Copy full SHA for 415e25b

• Delete Resources/Locale/ru-RU/_corvaxnext/entities/objects/consumable/food/shaverma-unbaked.ftl

  jailedfish

  authored
  f670348

  Copy full SHA for f670348

• Fix meta.json

  jailedfish

  authored
  a276d77

  Copy full SHA for a276d77

• Update Resources/Locale/ru-RU/_corvaxnext/entities/objects/consumable/food/shaverma.ftl

  Show description for 7a1cf2e
  

  jailedfish

  and

  FireNameFN

  authored
  7a1cf2e

  Copy full SHA for 7a1cf2e

• Update Resources/Locale/ru-RU/_corvaxnext/entities/objects/consumable/food/shaverma.ftl

  Show description for 268452a
  

  jailedfish

  and

  FireNameFN

  authored
  268452a

  Copy full SHA for 268452a

• Update Resources/Textures/_CorvaxNext/Objects/Consumable/Food/shavuha.rsi/meta.json

  Show description for 744a9a9
  

  jailedfish

  and

  FireNameFN

  authored
  744a9a9

  Copy full SHA for 744a9a9

• fixed Recipes

  jailedfish

  committed
  e4851f7

  Copy full SHA for e4851f7

• fixed Recipes

  jailedfish

  committed
  5bd6d8e

  Copy full SHA for 5bd6d8e

• Update Resources/Textures/_CorvaxNext/Objects/Consumable/Food/shavuha.rsi/meta.json

  Show description for 48a0a5e
  

  jailedfish

  and

  FireNameFN

  authored
  48a0a5e

  Copy full SHA for 48a0a5e

• fixed Recipes... again

  jailedfish

  committed
  42ec14e

  Copy full SHA for 42ec14e

Commits on Nov 12, 2024

• pita texture

  jailedfish

  committed
  fcb233b

  Copy full SHA for fcb233b

• moved locales

  jailedfish

  committed
  22959b0

  Copy full SHA for 22959b0

• moved locales

  jailedfish

  committed
  3bee4c6

  Copy full SHA for 3bee4c6

• no nl on end message removed

  jailedfish

  committed
  3ea91f1

  Copy full SHA for 3ea91f1

Commits on Nov 13, 2024

• removed pita.rsi

  jailedfish

  committed
  f3a8b4c

  Copy full SHA for f3a8b4c

• fix

  jailedfish

  committed
  85a3e9a

  Copy full SHA for 85a3e9a

• Create meta.json

  jailedfish

  committed
  12b822c

  Copy full SHA for 12b822c

• Revert "Create meta.json"

  Show description for e30b604
  jailedfish

  committed
  e30b604

  Copy full SHA for e30b604

• пофиксил отступы

  jailedfish

  authored
  64faa23

  Copy full SHA for 64faa23

• texture fix

  jailedfish

  committed
  eeb4669

  Copy full SHA for eeb4669

• some fixes

  jailedfish

  committed
  d46dd4a

  Copy full SHA for d46dd4a

• eat message

  jailedfish

  committed
  6d2124c

  Copy full SHA for 6d2124c