Code

T#72

Code

Closed

SixplyDev wants to merge 92 commits intoGoob-Station:masterGoob-Station/Goob-Station-MRP:masterfrom SixplyDev:mainSixplyDev/teehee-uhh-fuckery:mainCopy head branch name to clipboard

+2,926-4,991

Commits

Commits on Oct 13, 2024

• Read Me

  Aidenkrz

  committed
  07ee6dd

  Copy full SHA for 07ee6dd

• Logos

  Aidenkrz

  committed
  aab70ce

  Copy full SHA for aab70ce

• Rules

  Aidenkrz

  committed
  9d072ed

  Copy full SHA for 9d072ed

• Merge pull request #1 from Aidenkrz/setup

  Show description for 0a17a0e
  Aidenkrz

  authored
  0a17a0e

  Copy full SHA for 0a17a0e

• Merge branch 'master' of https://github.com/Simple-Station/Einstein-Engines into upstreammerge

  Aidenkrz

  committed
  413d389

  Copy full SHA for 413d389

• Update Rules.txt

  Aidenkrz

  authored
  c106bdb

  Copy full SHA for c106bdb

Commits on Oct 16, 2024

• Merge branch 'master' of https://github.com/Simple-Station/Einstein-Engines into upstreammerge

  Aidenkrz

  committed
  5157497

  Copy full SHA for 5157497

• Publish

  Aidenkrz

  committed
  0d38ad8

  Copy full SHA for 0d38ad8

• rules fix

  Aidenkrz

  committed
  39db34e

  Copy full SHA for 39db34e

• Merge pull request #2 from Aidenkrz/upstreammerge

  Show description for bb6b08f
  Aidenkrz

  authored
  bb6b08f

  Copy full SHA for bb6b08f

• Update publish.yml

  Aidenkrz

  authored
  837d106

  Copy full SHA for 837d106

• chmod

  Aidenkrz

  committed
  a6c1cb8

  Copy full SHA for a6c1cb8

• Merge pull request #3 from Aidenkrz/upstreammerge

  Show description for 9b8f5ba
  Aidenkrz

  authored
  9b8f5ba

  Copy full SHA for 9b8f5ba

• Merge branch 'master' of https://github.com/Simple-Station/Einstein-Engines into upstreammerge

  Aidenkrz

  committed
  456473c

  Copy full SHA for 456473c

• Merge pull request #4 from Aidenkrz/upstreammerge

  Show description for db184dd
  Aidenkrz

  authored
  db184dd

  Copy full SHA for db184dd

Commits on Oct 17, 2024

• Rebrand

  Aidenkrz

  committed
  3be7147

  Copy full SHA for 3be7147

• i mean

  Aidenkrz

  committed
  17b10de

  Copy full SHA for 17b10de

• part 1

  

  Piras314

  authored and

  Aidenkrz

  committed
  fa92347

  Copy full SHA for fa92347

• pt 2

  

  Piras314

  authored and

  Aidenkrz

  committed
  865cc12

  Copy full SHA for 865cc12

• git is dumb

  

  Piras314

  authored and

  Aidenkrz

  committed
  f0397f5

  Copy full SHA for f0397f5

• nuke music

  Aidenkrz

  committed
  24fba97

  Copy full SHA for 24fba97

• final fixes

  Aidenkrz

  committed
  f1a9f5d

  Copy full SHA for f1a9f5d

• Merge branch 'master' of https://github.com/Simple-Station/Einstein-Engines into rebrand

  Aidenkrz

  committed
  6329d5f

  Copy full SHA for 6329d5f

• Merge pull request #5 from Aidenkrz/rebrand

  Show description for 65211c6
  Aidenkrz

  authored
  65211c6

  Copy full SHA for 65211c6

• Update README.md

  Aidenkrz

  authored
  ae0cd12

  Copy full SHA for ae0cd12

• Update README.md

  Aidenkrz

  authored
  d7c5968

  Copy full SHA for d7c5968

Commits on Oct 18, 2024

• fix changelogs based direct commit

  Piras314

  authored
  d22c3a0

  Copy full SHA for d22c3a0

• make discord changelogs use the variable so they work on the right branch

  Piras314

  authored
  38693e6

  Copy full SHA for 38693e6

• tiny readme update to test if changelogs work (#6)

  Piras314

  authored
  35b6d3a

  Copy full SHA for 35b6d3a

• Test changelog (#7)

  Show description for 01ab93a
  Piras314

  authored
  01ab93a

  Copy full SHA for 01ab93a

• Test changelog (#8)

  Show description for f598398
  Piras314

  authored
  f598398

  Copy full SHA for f598398

• Test changelog (#9)

  Show description for f739f23
  Piras314

  authored
  f739f23

  Copy full SHA for f739f23

• Automated changelog update (#9)

  

  GoobBot[bot]

  authored and

  GoobBot[bot]

  committed
  28f9792

  Copy full SHA for 28f9792

• make discord changelog use the discord webhook var instead of for some reason a different one

  Piras314

  authored
  2589ea2

  Copy full SHA for 2589ea2

• bad commit

  Piras314

  authored
  c5cf71a

  Copy full SHA for c5cf71a

• good commit

  Piras314

  authored
  f0de038

  Copy full SHA for f0de038

• useless commit (#10)

  Piras314

  authored
  ddf6ad2

  Copy full SHA for ddf6ad2

• Automated changelog update (#10)

  

  GoobBot[bot]

  authored and

  GoobBot[bot]

  committed
  c8d7935

  Copy full SHA for c8d7935

Commits on Oct 30, 2024

• Makes Role Timers Not Shit (#12)

  Show description for 19e6b57
  starch70

  authored
  19e6b57

  Copy full SHA for 19e6b57

• Gun Rebalancing - Rifles (#11)

  Show description for 2c07414
  TwoDucksOnnaPlane

  authored
  2c07414

  Copy full SHA for 2c07414

• Automated changelog update (#12)

  

  GoobBot[bot]

  authored and

  GoobBot[bot]

  committed
  81c3f12

  Copy full SHA for 81c3f12

• Automated changelog update (#11)

  

  GoobBot[bot]

  authored and

  GoobBot[bot]

  committed
  9801bf8

  Copy full SHA for 9801bf8

Commits on Oct 31, 2024

• Merge branch 'master' of https://github.com/Simple-Station/Einstein-Engines into upstreammerge

  Aidenkrz

  committed
  7cbdb35

  Copy full SHA for 7cbdb35

• Merge branch 'upstreammerge' of https://github.com/Aidenkrz/Doob-Station-MRP into upstreammerge

  Aidenkrz

  committed
  c6cae33

  Copy full SHA for c6cae33

• Merge pull request #13 from Aidenkrz/upstreammerge

  Show description for 8fe20f4
  Aidenkrz

  authored
  8fe20f4

  Copy full SHA for 8fe20f4

Commits on Nov 17, 2024

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

  Piras314

  committed
  9f0d129

  Copy full SHA for 9f0d129

• Merge pull request #14 from Piras314/merge-upstream

  Show description for 6c4e697
  Piras314

  authored
  6c4e697

  Copy full SHA for 6c4e697

• Automated changelog update (#14)

  

  GoobBot[bot]

  authored and

  GoobBot[bot]

  committed
  a1a2d01

  Copy full SHA for a1a2d01

Commits on Dec 29, 2024

• Merge branch 'master' of https://github.com/Simple-Station/Einstein-Engines into upstreammerge

  Aidenkrz

  committed
  6af79ea

  Copy full SHA for 6af79ea

• Merge pull request #15 from Aidenkrz/upstreammerge

  Aidenkrz

  authored
  7d85608

  Copy full SHA for 7d85608

• ignore (#16)

  Piras314

  authored
  bb3ab5a

  Copy full SHA for bb3ab5a

• Automated changelog update (#16)

  GoobBot

  committed
  1af4713

  Copy full SHA for 1af4713

Commits on Jan 1, 2025

• Add Server Rules and Standard Operating Procedure (#17)

  Show description for f2b9499
  CerberusWolfie

  authored
  f2b9499

  Copy full SHA for f2b9499

• Automated changelog update (#17)

  GoobBot

  committed
  c436dde

  Copy full SHA for c436dde

Commits on Jan 2, 2025

• Fixed Sacrifices

  CerberusWolfie

  committed
  3812fc7

  Copy full SHA for 3812fc7

Commits on Jan 4, 2025

• Merge Upstream

  sapphirescript

  committed
  32800f4

  Copy full SHA for 32800f4

• Enable Lamia Round Start

  sapphirescript

  committed
  a9bbb79

  Copy full SHA for a9bbb79

• Fix yaml fail

  sapphirescript

  committed
  dc09272

  Copy full SHA for dc09272

• Merge pull request #21 from sapphirescript/merge-upstream

  Show description for 320736b
  Aidenkrz

  authored
  320736b

  Copy full SHA for 320736b

• Automated changelog update (#21)

  GoobBot

  committed
  c4d47a2

  Copy full SHA for c4d47a2

• Revert "Merge Upstream and Enable Sneks"

  Aidenkrz

  authored
  52568cc

  Copy full SHA for 52568cc

• Merge pull request #22 from Goob-Station/revert-21-merge-upstream

  Show description for 9964010
  Aidenkrz

  authored
  9964010

  Copy full SHA for 9964010

• Update RT

  sapphirescript

  committed
  24ca6ff

  Copy full SHA for 24ca6ff

• Revert "Revert "Merge Upstream and Enable Sneks""

  Aidenkrz

  authored
  7eb85b8

  Copy full SHA for 7eb85b8

• Merge pull request #24 from Goob-Station/revert-22-revert-21-merge-upstream

  Show description for 4bf2d5b
  Aidenkrz

  authored
  4bf2d5b

  Copy full SHA for 4bf2d5b

• Merge pull request #23 from sapphirescript/updateRT

  Show description for 1c7db9c
  Aidenkrz

  authored
  1c7db9c

  Copy full SHA for 1c7db9c

Commits on Jan 5, 2025

• Do the Changes

  CerberusWolfie

  committed
  135c8bd

  Copy full SHA for 135c8bd

• Merge branch 'SOPHotFix' of https://github.com/CerberusWolfie/Goob-Station-MRP into SOPHotFix

  CerberusWolfie

  committed
  de48277

  Copy full SHA for de48277

• Merge branch 'Goob-Station:main' into SOPHotFix

  CerberusWolfie

  authored
  be41328

  Copy full SHA for be41328

• Actually merge upstream.

  CerberusWolfie

  committed
  40eeed1

  Copy full SHA for 40eeed1

• Add Different Launch Types to VSCode (#1430)

  Show description for c033ff0
  CerberusWolfie

  committed
  c033ff0

  Copy full SHA for c033ff0

• [Port] Port Guidebook Tables From Wizden PR #28484 (#1427)

  Show description for ac6677c
  

  CerberusWolfie

  and

  EmoGarbage404

  committed
  ac6677c

  Copy full SHA for ac6677c

• Automatic Changelog Update (#1427)

  

  SimpleStation14

  authored and

  CerberusWolfie

  committed
  959187d

  Copy full SHA for 959187d

• Update IPC rules as well.

  CerberusWolfie

  committed
  2ca9bb4

  Copy full SHA for 2ca9bb4

Commits on Jan 6, 2025

• Merge pull request #27 from CerberusWolfie/PortTables

  Show description for 464813a
  Aidenkrz

  authored
  464813a

  Copy full SHA for 464813a

• Merge pull request #26 from CerberusWolfie/PortVSC

  Show description for 6ab1ae4
  Aidenkrz

  authored
  6ab1ae4

  Copy full SHA for 6ab1ae4

• Merge pull request #19 from CerberusWolfie/SOPHotFix

  Show description for 704bf2b
  Aidenkrz

  authored
  704bf2b

  Copy full SHA for 704bf2b

• Gun Rebalancing Pt. 2 - Literally Everything Else (I Think) (#28)

  Show description for c711784
  TwoDucksOnnaPlane

  authored
  c711784

  Copy full SHA for c711784

• Automated changelog update (#19)

  GoobBot

  committed
  fcef2e0

  Copy full SHA for fcef2e0

• Automated changelog update (#28)

  GoobBot

  committed
  6f0ee5c

  Copy full SHA for 6f0ee5c

Commits on Jan 7, 2025

• Update README.md

  Aidenkrz

  authored
  49c4674

  Copy full SHA for 49c4674

• Merge branch 'master' of https://github.com/Simple-Station/Einstein-Engines into mergup

  sapphirescript

  committed
  122f586

  Copy full SHA for 122f586

• Revert "Integrate Modern HWID into content"

  Show description for 969f27a
  sapphirescript

  committed
  969f27a

  Copy full SHA for 969f27a

• Merge pull request #32 from sapphirescript/mergup

  Show description for cd53434
  Aidenkrz

  authored
  cd53434

  Copy full SHA for cd53434

• Revert "Mergup"

  Aidenkrz

  authored
  d94eaf8

  Copy full SHA for d94eaf8

• Merge pull request #33 from Goob-Station/revert-32-mergup

  Show description for 6234849
  Aidenkrz

  authored
  6234849

  Copy full SHA for 6234849

Commits on Jan 13, 2025

• Glass Cannon Shadowkin

  Show description for 2fe15fb
  SixplyDev

  authored
  2fe15fb

  Copy full SHA for 2fe15fb

• No more darkswap

  Show description for 2fe492c
  SixplyDev

  authored
  2fe492c

  Copy full SHA for 2fe492c

• Shadowkin damage modifiers update

  Show description for 1754518
  SixplyDev

  authored
  1754518

  Copy full SHA for 1754518

• Roundstart Shadowkin

  Show description for 6771ab1
  SixplyDev

  authored
  6771ab1

  Copy full SHA for 6771ab1

Commits on Jan 30, 2025

• Fixing shit I guess

  

  ShirouAjisai

  committed
  fbba6c2

  Copy full SHA for fbba6c2

• Merge branch 'main' of https://github.com/SixplyDev/teehee-uhh-fuckery

  

  ShirouAjisai

  committed
  2b21281

  Copy full SHA for 2b21281