Code

micro-upstream #5#2857

Code

Closed

AwareFoxy wants to merge 124 commits intomasterspace-syndicate/space-station-14:masterfrom upstreamspace-syndicate/space-station-14-next:upstreamCopy head branch name to clipboard

+38,413-2,398

Commits

Commits on Sep 20, 2024

• AGPL v3

  Morb0

  committed
  1a21807

Commits on Sep 22, 2024

• Merge branch 'space-syndicate:master' into master

  Morb0

  authored
  7011e9f

Commits on Oct 24, 2024

• Lore branch (#8)

  Show description for 487f742
  Crazzy-pingvin

  authored
  487f742

Commits on Oct 27, 2024

• Revert "Lore branch (#8)" (#10)

  Show description for c90af7f
  Morb0

  authored
  c90af7f

Commits on Nov 2, 2024

• Merge branch 'space-syndicate:master' into master

  Morb0

  authored
  ec9096d

• Добавление лорных фракций v.2 (более корректная) (#12)

  Show description for 417f9dc
  Crazzy-pingvin

  authored
  417f9dc

Commits on Nov 6, 2024

• Merge branch 'space-syndicate:master' into master

  Vonsant

  authored
  0047169

Commits on Nov 9, 2024

• Merge branch 'space-syndicate:master' into master

  Vonsant

  authored
  270fbab

• Обновить темплейт описаний к ПРам (#22)

  Show description for 2d88815
  FireNameFN

  authored
  2d88815

• Move discipline lock from T3 to T4 (#19)

  Show description for 7a6e411
  

  TasiWeynad

  and

  AwareFoxy

  authored
  7a6e411

• Подсветка текста в фильтрах QOL (#14)

  Show description for 9933ab1
  

  4 peopleauthored
  9933ab1

• Footprints (#28)

  Show description for 9031a52
  

  AwareFoxy

  and

  FireNameFN

  authored
  9031a52

Commits on Nov 10, 2024

• Update PULL_REQUEST_TEMPLATE.md (#34)

  FireNameFN

  authored
  11c317a

• Добавить АПИИ (#30)

  Show description for aac693d
  FireNameFN

  authored
  aac693d

• Роль бригмедика (#31)

  Show description for 5ad3646
  Zekins3366

  authored
  5ad3646

• Merge branch 'space-syndicate:master' into master

  AwareFoxy

  authored
  3eeb970

• Merge branch 'space-syndicate:master' into master

  AwareFoxy

  authored
  2b2ee49

• brigmedic spawn roles (#36)

  AwareFoxy

  authored
  bd06ed9

• АПИИ 2 (#38)

  Show description for 199dc73
  FireNameFN

  authored
  199dc73

• [Feature] Система передачи из рук в руки (#29)

  Show description for c396a36
  

  3 peopleauthored
  c396a36

Commits on Nov 11, 2024

• Revert "Добавление лорных фракций v.2 (более корректная) (#12)"

  Show description for e6bbe08
  FireNameFN

  authored
  e6bbe08

• Merge pull request #40 from space-syndicate/revert-12-Lore_branch

  Show description for b883f4f
  Tornado-Technology

  authored
  b883f4f

Commits on Nov 13, 2024

• Update README.md (#45)

  Show description for 1caf015
  ksen0morph

  authored
  1caf015

• Possible TTS fix (#46)

  FireNameFN

  authored
  ae0fa71

• shaverma (#39)

  Show description for 9ed74fd
  

  3 peopleauthored
  9ed74fd

• Revert "shaverma (#39)" (#48)

  Show description for a3f519e
  ksen0morph

  authored
  a3f519e

Commits on Nov 15, 2024

• [Port] Operative UI Style (#55)

  PuroSlavKing

  authored
  828bc25

Commits on Nov 17, 2024

• [Tweak] Operative UI Adaptation (#61)

  Show description for 7c15f5d
  PuroSlavKing

  authored
  7c15f5d

Commits on Nov 18, 2024

• [Port] Advanced Body Bags (#57)

  PuroSlavKing

  authored
  83f1c80

• [Tweak] OfferItem Folder (#64)

  PuroSlavKing

  authored
  3af71ea

• Фикс следов (#59)

  Show description for cdba530
  

  3 peopleauthored
  cdba530

• Извлекаемые чертежи (#47)

  Show description for 74c8d77
  

  3 peopleauthored
  74c8d77

Commits on Nov 20, 2024

• АПИИ 3 (#52)

  Show description for a4b1611
  FireNameFN

  authored
  a4b1611

Commits on Nov 22, 2024

• Изменяемые законы боргов (#43)

  Show description for c0f94dd
  FireNameFN

  authored
  c0f94dd

• [Port] CaptainDrobe (#58)

  Show description for 88be7b7
  PuroSlavKing

  authored
  88be7b7

• Zombie buff (#44)

  Show description for 585ef2e
  RedTerrorDark

  authored
  585ef2e

• Хирургия (попытка 2) (#65)

  Show description for fdb6e27
  

  10 peopleauthored
  fdb6e27

• [Hotfix] Хирургия части тела теперь уничтожаемы (#73)

  Show description for 1d8ae69
  

  TokenStyle

  and

  AwareFoxy

  authored
  1d8ae69

Commits on Nov 23, 2024

• [Fix] Хирургия фикс выпадения органов у частей тела вместо хотфикса (#74)

  Show description for 724fb32
  TokenStyle

  authored
  724fb32

• footsteps 2 electric boogaloo (#67)

  Show description for d88b13e
  lzk228

  authored
  d88b13e

• Cucumber!!! + Немного СНГ еды (#53)

  Show description for 161c75f
  

  RedTerrorDark

  and

  Vonsant

  authored
  161c75f

Commits on Nov 24, 2024

• Merge remote-tracking branch 'upstream/master'

  AwareFoxy

  committed
  bfcc656

• fix reptilians

  AwareFoxy

  committed
  4f81f2d

• Remove brigmed from paper

  AwareFoxy

  committed
  9313f32

• Also remove brigmedic from avrite

  AwareFoxy

  committed
  2d1fdfd

• fix prices for tests

  AwareFoxy

  committed
  610d271

• Upstream #1 (#78)

  Show description for eeb5f18
  

  71 peopleauthored
  eeb5f18

• [Tweak] Remove Lizard Diete (#69)

  PuroSlavKing

  authored
  af11d16

• Merge pull request #80 from AwareFoxy/upstream

  Show description for 5a5650e
  Vonsant

  authored
  5a5650e

Commits on Nov 25, 2024

• Possible TTS fix 2 (#51)

  Show description for dd0017f
  FireNameFN

  authored
  dd0017f

• update codeowners (#54)

  AwareFoxy

  authored
  744d490

• [Port] Laying System (#83)

  Show description for 6bae52d
  

  4 peopleauthored
  6bae52d

• [Feature] Better Lizard Markings (#68)

  Show description for 1826f6f
  PuroSlavKing

  authored
  1826f6f

• Resomi (#27)

  Show description for 46bb84e
  

  pofitlo-Git

  and

  AwareFoxy

  authored
  46bb84e

Commits on Nov 26, 2024

• Игральные карты + механика к ним. (#79)

  Show description for 8178cd5
  

  3 peopleauthored
  8178cd5

• Revert "[Feature] Better Lizard Markings (#68)" (#85)

  Show description for aebcace
  CaptainSqrBeard

  authored
  aebcace

• zombie balance fix (no more грууаааа......) (#86)

  Show description for 242957c
  RedTerrorDark

  authored
  242957c

• [Port] Хирургия макак, рыб и кучу чего ещё (work in progress) (#77)

  Show description for 598bc1c
  

  6 peopleauthored
  598bc1c

Commits on Nov 27, 2024

• fix laying system infinite tryes of ssd players to stand up (#90)

  Show description for c6baee7
  TokenStyle

  authored
  c6baee7

• MRP update ohio.ftl (#91)

  ksen0morph

  authored
  c0b7ef8

• hotfix inventory slots dissapear in roundstart

  Show description for c791eb3
  TokenStyle

  committed
  c791eb3

• Bluspace Harvester [Fixed] (#92)

  Tornado-Technology

  authored
  da6e988

• Merge pull request #93 from TokenStyle/shitmed-hotfix-slots

  Show description for e2161be
  Tornado-Technology

  authored
  e2161be

• Update bluespace_harvester.yml (#94)

  Tornado-Technology

  authored
  000a7e1

• Update NextVars.cs (#89)

  Ratyyy

  authored
  82fdd47

Commits on Nov 30, 2024

• Fix locale directory (#101)

  Show description for fe766dc
  FireNameFN

  authored
  fe766dc

• Супер мелкий фикс локализации при передаче предметов (#96)

  Show description for d3b3bc2
  CaptainSqrBeard

  authored
  d3b3bc2

• Вязкость реагентов следов теперь не влияет на скорость движения (#99)

  Show description for e7ec454
  CaptainSqrBeard

  authored
  e7ec454

• [Port] ohio accent port fixes (#95)

  Show description for e2b45eb
  TokenStyle

  authored
  e2b45eb

Commits on Dec 1, 2024

• Анализатор семян и растений (#102)

  Show description for 5cda653
  Vonsant

  authored
  5cda653

• fix ohio

  TokenStyle

  committed
  8ed5887

• Merge pull request #106 from TokenStyle/surgery-ohio-fix

  Show description for 7a08a7f
  Vonsant

  authored
  7a08a7f

• Фиксы локали

  Vonsant

  authored
  837c29c

• Delete Resources/Locale/ru-RU/_CorvaxNext directory

  Vonsant

  authored
  bed5c4d

• Merge pull request #109 from space-syndicate/Vonsant-patch-1

  Show description for 3fcc9a5
  Vonsant

  authored
  3fcc9a5

• Пятиминутный тайм перед зомбификацией. (#107)

  Show description for 826bf14
  

  Vonsant

  and

  FireNameFN

  authored
  826bf14

Commits on Dec 2, 2024

• apstrem

  AwareFoxy

  committed
  031c946

• Merge pull request #110 from space-syndicate/upstream

  Show description for 8023853
  AwareFoxy

  authored
  8023853

• [fix] Исправление требуемых ресурсов для анализатора растений (#111)

  Show description for ffcfb00
  Vonsant

  authored
  ffcfb00

• Открытие шлюзов всегда сохраняет отпечатки. (#112)

  Show description for 516e286
  

  3 peopleauthored
  516e286

• Вкус демократии (#113)

  Show description for 1ea862f
  Vonsant

  authored
  1ea862f

Commits on Dec 4, 2024

• Сумки можно прятать под плитки пола. (#115)

  Show description for d022445
  

  Vonsant

  and

  FireNameFN

  authored
  d022445

• first (#116)

  pofitlo-Git

  authored
  893ba96

• bullshit (#118)

  CaptainSqrBeard

  authored
  3aeccb2

Commits on Dec 5, 2024

• Тик так часики (#120)

  Vonsant

  authored
  2747be7

• upstream

  AwareFoxy

  committed
  f8c547c

• Upstream #2 (#122)

  Show description for ee70af6
  

  75 peopleauthored
  ee70af6

• Revert "Upstream #2 (#122)" (#123)

  Show description for 9be32ec
  AwareFoxy

  authored
  9be32ec

• Upstream #2

  Show description for f040f05
  

  75 peopleauthored
  f040f05

• Impro (#126)

  Vonsant

  authored
  70337cf

Commits on Dec 6, 2024

• Merge remote-tracking branch 'upstream/master' into upstrean

  AwareFoxy

  committed
  1eb5e55

• Merge pull request #128 from space-syndicate/upstrean

  Show description for 5120fc5
  AwareFoxy

  authored
  5120fc5

• Port TapeRecorder (#129)

  Vonsant

  authored
  306bd79

Commits on Dec 7, 2024

• Audio Admin Panel (#125)

  Show description for 25fc23c
  AwareFoxy

  authored
  25fc23c

• NoScope 360 AWP kill

  AwareFoxy

  committed
  2e04efa

• Apply suggestions from code review

  Show description for 833f0ea
  

  AwareFoxy

  and

  FireNameFN

  authored
  833f0ea

• Revert "Audio Admin Panel (#125)" (#135)

  Show description for 7722ced
  AwareFoxy

  authored
  7722ced

• Их разыскивает Полиция. (#114)

  Show description for fef2399
  Vonsant

  authored
  fef2399

Commits on Dec 8, 2024

• icon

  Ko4ergaPunk

  committed
  47347e2

• Merge pull request #137 from Ko4ergaNext/offer-icon

  Show description for 38269e4
  Vonsant

  authored
  38269e4

Commits on Dec 9, 2024

• Night and thermal vision device (#104)

  Show description for e1a05f2
  

  3 peopleauthored
  e1a05f2

• Fix wristwatch uplink file (#138)

  Show description for 617f709
  Vonsant

  authored
  617f709

• Bluespace update (#139)

  Show description for 62b986c
  

  Tornado-Technology

  and

  FireNameFN

  authored
  62b986c

• Update BluespaceHarvesterSystem.cs (#140)

  Tornado-Technology

  authored
  023ab2c

• Less BSH cost

  Tornado-Technology

  committed
  cf6bbf1

• Merge pull request #141 from space-syndicate/less-bsh-cost

  Show description for 78616bc
  Tornado-Technology

  authored
  78616bc

• Merge pull request #133 from AwareFoxy/grinch

  Show description for 796e482
  Tornado-Technology

  authored
  796e482

• add stuff

  CaptainSqrBeard

  committed
  f5ad61e

• locker board

  CaptainSqrBeard

  committed
  eb23c78

• Дворфы больше не бесполезны. (#144)

  Show description for 5e06bc0
  

  Vonsant

  and

  lzk228

  authored
  5e06bc0

• medfab_cmo_locker

  Show description for eef8edf
  Vonsant

  authored
  eef8edf

• Merge pull request #142 from CaptainSqrBeard/researchable_biofab

  Show description for 48db55b
  Vonsant

  authored
  48db55b

Commits on Dec 10, 2024

• Жетоны Службы Безопасности (#145)

  Show description for 504cea1
  Vonsant

  authored
  504cea1

• [Port] Случайные выстрелы при падении оружия (#147)

  Show description for e3f7bce
  Vonsant

  authored
  e3f7bce

• Электрический стул. (#148)

  Show description for 7b4b3c3
  

  Vonsant

  and

  JerryImMouse

  authored
  7b4b3c3

Commits on Dec 11, 2024

• LessShitty

  Vonsant

  committed
  360115c

• Merge pull request #150 from Vonsant/ShittyLimbGrower

  FireNameFN

  authored
  13b94c9

Commits on Dec 12, 2024

• TooLoud (#151)

  Vonsant

  authored
  eef3b02

• Опять поднял гит (#152)

  Show description for 80526dc
  FireNameFN

  authored
  80526dc

• micro-upstream #4 (#149)

  Show description for 9db0a8e
  

  8 peopleauthored
  9db0a8e

• [PORT] Система обмена сообщениями в КПК (#153)

  Show description for a95d724
  Vonsant

  authored
  a95d724

• Revert "[PORT] Система обмена сообщениями в КПК (#153)" (#154)

  Show description for b72d322
  AwareFoxy

  authored
  b72d322

• [Port] Flags (#156)

  Show description for 4a803db
  PuroSlavKing

  authored
  4a803db

Commits on Dec 15, 2024

• Merge remote-tracking branch 'upstream/master' into upstream

  AwareFoxy

  committed
  c89fd75