Code

Upstream1#1

Code

Merged

Schrodinger71 merged 124 commits intoRatyyy:upstreamRatyyy/space_station:upstreamfrom Schrodinger71:upstream1Schrodinger71/space_station_ADT:upstream1Copy head branch name to clipboardMay 23, 2024

+747,053-99,362

Commits

Commits on Mar 24, 2024

• Поправил баг с неусвоением пищи у пеплоходцев

  AnderFan

  committed
  e213135

  Copy full SHA for e213135

Commits on Mar 26, 2024

• починил ошибку yaml

  AnderFan

  committed
  3b69d3c

  Copy full SHA for 3b69d3c

Commits on Apr 15, 2024

• Ретекстур костяного копья

  Show description for bd93d2f
  Us3rn4me228

  authored
  bd93d2f

  Copy full SHA for bd93d2f

• Merge branch 'xtray85:master' into bonespear-resprite

  Us3rn4me228

  authored
  239dadf

  Copy full SHA for 239dadf

• Update ChangelogADT.yml

  Us3rn4me228

  authored
  762cd7f

  Copy full SHA for 762cd7f

• Update ChangelogADT.yml

  Us3rn4me228

  authored
  3db3bad

  Copy full SHA for 3db3bad

• Delete Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/spear1.png

  Us3rn4me228

  authored
  8e2e78f

  Copy full SHA for 8e2e78f

Commits on Apr 18, 2024

• Merge branch 'master' into bonespear-resprite

  Schrodinger71

  authored
  00f27ac

  Copy full SHA for 00f27ac

Commits on Apr 29, 2024

• fix

  modern-nm

  committed
  926e3cd

  Copy full SHA for 926e3cd

• radial item size tweak

  modern-nm

  committed
  ccd23bc

  Copy full SHA for ccd23bc

Commits on Apr 30, 2024

• it works

  modern-nm

  committed
  bec70b4

  Copy full SHA for bec70b4

Commits on May 3, 2024

• фикс локализации

  PyotrIgn

  committed
  5227bf9

  Copy full SHA for 5227bf9

Commits on May 4, 2024

• radial container modified

  modern-nm

  committed
  cf07e22

  Copy full SHA for cf07e22

Commits on May 12, 2024

• spriteeees

  

  Ratyyy

  committed
  d8b5366

  Copy full SHA for d8b5366

• Добавлены слизнекотики

  Us3rn4me228

  committed
  6896f93

  Copy full SHA for 6896f93

Commits on May 13, 2024

• Update ChangelogADT.yml

  Us3rn4me228

  authored
  6f05be6

  Copy full SHA for 6f05be6

• Delete Resources/Textures/ADT/Mobs/Animals/slug-cat.rsi/dead_creek.png

  Us3rn4me228

  authored
  f60893b

  Copy full SHA for f60893b

• Update ChangelogADT.yml

  Us3rn4me228

  authored
  b575c9b

  Copy full SHA for b575c9b

• Merge branch 'master' into slug-cats

  Us3rn4me228

  authored
  f12eb3a

  Copy full SHA for f12eb3a

• Update slugcat.yml

  Us3rn4me228

  authored
  d125779

  Copy full SHA for d125779

Commits on May 15, 2024

• Merge branch 'master' into slug-cats

  Us3rn4me228

  authored
  0314d98

  Copy full SHA for 0314d98

• Update ChangelogADT.yml

  Us3rn4me228

  authored
  9f26b62

  Copy full SHA for 9f26b62

• skin, hair, facial hair

  modern-nm

  committed
  f50b36a

  Copy full SHA for f50b36a

Commits on May 16, 2024

• TryAllReactionsTest fix

  modern-nm

  committed
  7df1077

  Copy full SHA for 7df1077

• Merge branch 'xtray85:master' into slug-cats

  Us3rn4me228

  authored
  3f8b3cd

  Copy full SHA for 3f8b3cd

Commits on May 17, 2024

• fixes + license

  

  Ratyyy

  committed
  18790b3

  Copy full SHA for 18790b3

• fix tiles

  

  Ratyyy

  committed
  781666f

  Copy full SHA for 781666f

Commits on May 18, 2024

• untrashing

  

  Ratyyy

  committed
  f081674

  Copy full SHA for f081674

• Merge branch 'xtray85:master' into resprites

  Ratyyy

  authored
  1641f8e

  Copy full SHA for 1641f8e

Commits on May 19, 2024

• Update yaml-linter.yml

  modern-nm

  authored
  17ddb20

  Copy full SHA for 17ddb20

• Update yaml-linter.yml

  modern-nm

  authored
  0f54ce1

  Copy full SHA for 0f54ce1

• Update yaml-linter.yml

  modern-nm

  authored
  bd2ada4

  Copy full SHA for bd2ada4

• Update global.json

  modern-nm

  authored
  dcc4fb9

  Copy full SHA for dcc4fb9

• Update test-packaging.yml

  modern-nm

  authored
  c71473b

  Copy full SHA for c71473b

• Update build-test-debug.yml

  modern-nm

  authored
  32845ad

  Copy full SHA for 32845ad

• Update yaml-linter.yml

  modern-nm

  authored
  97d10bc

  Copy full SHA for 97d10bc

• Merge pull request AdventureTimeSS14#707 from xtray85/modern-nm-patch-1

  Show description for 61b7aeb
  xEnlil

  authored
  61b7aeb

  Copy full SHA for 61b7aeb

• Merge branch 'xtray85:master' into slug-cats

  Us3rn4me228

  authored
  a4c5d48

  Copy full SHA for a4c5d48

• Merge pull request AdventureTimeSS14#708 from modern-nm/tests-chemistry-fix

  Show description for 8ea1d6f
  modern-nm

  authored
  8ea1d6f

  Copy full SHA for 8ea1d6f

• Deleting ForceSleep effect from abomination enemies

  Lonkuk

  committed
  69c8855

  Copy full SHA for 69c8855

• уборка

  modern-nm

  committed
  c24038b

  Copy full SHA for c24038b

Commits on May 20, 2024

• Merge pull request AdventureTimeSS14#688 from Us3rn4me228/slug-cats

  Show description for 7d446f7
  modern-nm

  authored
  7d446f7

  Copy full SHA for 7d446f7

• Merge branch 'master' into bonespear-resprite

  Us3rn4me228

  authored
  ee5e796

  Copy full SHA for ee5e796

• Add files via upload

  Us3rn4me228

  authored
  3f01b38

  Copy full SHA for 3f01b38

• Update meta.json

  Us3rn4me228

  authored
  22e9011

  Copy full SHA for 22e9011

• Merge pull request AdventureTimeSS14#522 from AnderFan/ashtray

  Show description for 0c4c2af
  Schrodinger71

  authored
  0c4c2af

  Copy full SHA for 0c4c2af

• Merge pull request AdventureTimeSS14#666 from xtray85/easter

  Show description for b96ab85
  Schrodinger71

  authored
  b96ab85

  Copy full SHA for b96ab85

• Revert "Revert "ratyy week update 2""

  Show description for 7727fd8
  Schrodinger71

  committed
  7727fd8

  Copy full SHA for 7727fd8

• Revert "Revert "Trysort""

  Show description for a9b69ab
  Schrodinger71

  committed
  a9b69ab

  Copy full SHA for a9b69ab

• Revert "Revert "обновление субмодуля""

  Show description for 83944f0
  Schrodinger71

  committed
  83944f0

  Copy full SHA for 83944f0

• Merge pull request AdventureTimeSS14#712 from Schrodinger71/new_revert_revert

  Show description for d398b17
  Schrodinger71

  authored
  d398b17

  Copy full SHA for d398b17

• Сортировка папки Entities

  1Stepka1

  committed
  088c9bc

  Copy full SHA for 088c9bc

• resolve

  1Stepka1

  committed
  17d7d56

  Copy full SHA for 17d7d56

• Merge branch 'master' into EntitiesSort

  1Stepka1

  authored
  a16f5d3

  Copy full SHA for a16f5d3

• resolve

  1Stepka1

  committed
  2841d2e

  Copy full SHA for 2841d2e

• Merge branch 'EntitiesSort' of https://github.com/1Stepka1/space_station_14 into EntitiesSort

  1Stepka1

  committed
  b62699b

  Copy full SHA for b62699b

• fix missing tags

  1Stepka1

  authored
  9b0378d

  Copy full SHA for 9b0378d

• Update backpack.yml

  1Stepka1

  authored
  b16007b

  Copy full SHA for b16007b

• trader miss

  1Stepka1

  committed
  325e62e

  Copy full SHA for 325e62e

• Merge branch 'EntitiesSort' of https://github.com/1Stepka1/space_station_14 into EntitiesSort

  1Stepka1

  committed
  c4ca667

  Copy full SHA for c4ca667

• Merge pull request AdventureTimeSS14#620 from Us3rn4me228/bonespear-resprite

  Show description for f61e759
  modern-nm

  authored
  f61e759

  Copy full SHA for f61e759

Commits on May 21, 2024

• Добавление системы сразу изученных спелов (возможно работает и для других actions. Не тестил) (AdventureTimeSS14#313)

  Show description for 7407774
  

  themanyfaceddemon

  authored and

  Us3rn4me228

  committed
  7407774

  Copy full SHA for 7407774

• Merge pull request AdventureTimeSS14#709 from modern-nm/radial-item-size-tweak

  Show description for 9feeca4
  modern-nm

  authored
  9feeca4

  Copy full SHA for 9feeca4

• Merge branch 'master' into changeling-gamerule-fix

  modern-nm

  committed
  06b4105

  Copy full SHA for 06b4105

• Merge pull request AdventureTimeSS14#711 from modern-nm/changeling-gamerule-fix

  Show description for 4b9f008
  modern-nm

  authored
  4b9f008

  Copy full SHA for 4b9f008

• Merge branch 'xtray85:master' into resprites

  Ratyyy

  authored
  660baff

  Copy full SHA for 660baff

• remove_gamma_armory

  PyotrIgn

  committed
  b5fd9ad

  Copy full SHA for b5fd9ad

• Merge pull request AdventureTimeSS14#717 from xtray85/remove_gamma_armory

  Show description for c283887
  Schrodinger71

  authored
  c283887

  Copy full SHA for c283887

• Merge pull request AdventureTimeSS14#710 from Lonkuk/unsleepyEnemies

  Show description for 56027fc
  Schrodinger71

  authored
  56027fc

  Copy full SHA for 56027fc

Commits on May 22, 2024

• Merge pull request AdventureTimeSS14#714 from Us3rn4me228/learned_spells

  Show description for 8c8fd3b
  Schrodinger71

  authored
  8c8fd3b

  Copy full SHA for 8c8fd3b

• resolve stupid things

  1Stepka1

  committed
  b78d285

  Copy full SHA for b78d285

• resolve stupid things

  1Stepka1

  committed
  e5a6b36

  Copy full SHA for e5a6b36

• да вы заебали

  1Stepka1

  committed
  bbe52d8

  Copy full SHA for bbe52d8

• pon

  1Stepka1

  committed
  422ae8b

  Copy full SHA for 422ae8b

• Merge branch 'master' into EntitiesSort

  1Stepka1

  authored
  88cce66

  Copy full SHA for 88cce66

• fucking abomination

  1Stepka1

  committed
  f623524

  Copy full SHA for f623524

• Merge branch 'EntitiesSort' of https://github.com/1Stepka1/space_station_14 into EntitiesSort

  1Stepka1

  committed
  d881091

  Copy full SHA for d881091

• Merge pull request AdventureTimeSS14#704 from Ratyyy/resprites

  Show description for 694c165
  modern-nm

  authored
  694c165

  Copy full SHA for 694c165

• resolve stupid things

  1Stepka1

  committed
  442b674

  Copy full SHA for 442b674

• Merge branch 'master' into EntitiesSort

  1Stepka1

  authored
  cfaec44

  Copy full SHA for cfaec44

• resolve stupid thing

  1Stepka1

  committed
  384ca8d

  Copy full SHA for 384ca8d

• Merge branch 'EntitiesSort' of https://github.com/1Stepka1/space_station_14 into EntitiesSort

  1Stepka1

  committed
  e2cc24e

  Copy full SHA for e2cc24e

• Merge pull request AdventureTimeSS14#713 from 1Stepka1/EntitiesSort

  Show description for 390a720
  Schrodinger71

  authored
  390a720

  Copy full SHA for 390a720

• [add/tweak] Изменение и добавление новых кристаллов (AdventureTimeSS14#291)

  Show description for 6575da2
  

  Neko Dar

  authored and

  Us3rn4me228

  committed
  6575da2

  Copy full SHA for 6575da2

• Merge branch 'xtray85:master' into crystal

  Us3rn4me228

  authored
  c762f46

  Copy full SHA for c762f46

• Update meta.json

  Us3rn4me228

  authored
  5be7294

  Copy full SHA for 5be7294

• Update meta.json

  Us3rn4me228

  authored
  5201a7f

  Copy full SHA for 5201a7f

• Update meta.json

  Us3rn4me228

  authored
  3abcaa1

  Copy full SHA for 3abcaa1

• Update meta.json

  Us3rn4me228

  authored
  f35008f

  Copy full SHA for f35008f

• Update meta.json

  Us3rn4me228

  authored
  641d38e

  Copy full SHA for 641d38e

• Update meta.json

  Us3rn4me228

  authored
  cbd9e0e

  Copy full SHA for cbd9e0e

• Update meta.json

  Us3rn4me228

  authored
  1a42315

  Copy full SHA for 1a42315

• Update meta.json

  Us3rn4me228

  authored
  34d43e0

  Copy full SHA for 34d43e0

• Update meta.json

  Us3rn4me228

  authored
  f4bb584

  Copy full SHA for f4bb584

• Update meta.json

  Us3rn4me228

  authored
  f594301

  Copy full SHA for f594301

• Update meta.json

  Us3rn4me228

  authored
  dd39e7c

  Copy full SHA for dd39e7c

• новый костюм горничной

  Darkiich

  committed
  83b7b59

  Copy full SHA for 83b7b59

• маленькие правки

  Darkiich

  committed
  06a9a90

  Copy full SHA for 06a9a90

• еще правки

  Darkiich

  committed
  f933d0d

  Copy full SHA for f933d0d

• Update meta.json

  Darkiich

  authored
  6514e72

  Copy full SHA for 6514e72

• Merge branch 'gornichaya' of https://github.com/Darki255/wpfork into gornichaya

  Darkiich

  committed
  13b94c8

  Copy full SHA for 13b94c8

• решен конфликт RSI Validator'a

  Darkiich

  committed
  9f2bd04

  Copy full SHA for 9f2bd04

• Merge pull request AdventureTimeSS14#723 from Darki255/gornichaya

  Show description for 7f3bb7c
  Schrodinger71

  authored
  7f3bb7c

  Copy full SHA for 7f3bb7c

• old crystal shards 1984

  Show description for 2cb2801
  Us3rn4me228

  authored
  2cb2801

  Copy full SHA for 2cb2801

• Update ChangelogADT.yml

  Us3rn4me228

  authored
  2dfc910

  Copy full SHA for 2dfc910

• Merge branch 'master' into crystal

  Us3rn4me228

  authored
  16039f7

  Copy full SHA for 16039f7

• Update crystal_shard.yml

  Us3rn4me228

  authored
  0b786e1

  Copy full SHA for 0b786e1

• Update crystals.yml

  Us3rn4me228

  authored
  ed38138

  Copy full SHA for ed38138

• Update blue.yml

  Us3rn4me228

  authored
  2116600

  Copy full SHA for 2116600

• Update cyan.yml

  Us3rn4me228

  authored
  d33240b

  Copy full SHA for d33240b

• Update blue.yml

  Us3rn4me228

  authored
  22edb3c

  Copy full SHA for 22edb3c

• Update green.yml

  Us3rn4me228

  authored
  a65dce7

  Copy full SHA for a65dce7

• Update grey.yml

  Us3rn4me228

  authored
  939f892

  Copy full SHA for 939f892

• Update orange.yml

  Us3rn4me228

  authored
  cce86b9

  Copy full SHA for cce86b9

• Update pink.yml

  Us3rn4me228

  authored
  8a9fb99

  Copy full SHA for 8a9fb99

• Update red.yml

  Us3rn4me228

  authored
  6535675

  Copy full SHA for 6535675

• shards buff

  Us3rn4me228

  committed
  72191bc

  Copy full SHA for 72191bc

• locale and changelog fix

  Us3rn4me228

  committed
  f26e32b

  Copy full SHA for f26e32b

• FIX

  Us3rn4me228

  committed
  3a36708

  Copy full SHA for 3a36708

Commits on May 23, 2024

• Merge pull request AdventureTimeSS14#720 from Us3rn4me228/crystal

  Show description for 61707fe
  Schrodinger71

  authored
  61707fe

  Copy full SHA for 61707fe

• Фикс невозможнгости получить красные кристаллы без щитспавна

  Us3rn4me228

  committed
  0f8a2e0

  Copy full SHA for 0f8a2e0

• Merge branch 'xtray85:master' into crystal

  Us3rn4me228

  authored
  67bcfa1

  Copy full SHA for 67bcfa1

• Merge pull request AdventureTimeSS14#727 from Us3rn4me228/crystal

  Show description for ba4e266
  Schrodinger71

  authored
  ba4e266

  Copy full SHA for ba4e266

• Merge branch 'upstream' of https://github.com/Ratyyy/space_station into upstream1

  Schrodinger71

  committed
  0c0c856

  Copy full SHA for 0c0c856