Code

NewRoles And Items#417

Code

Closed

Rinary1 wants to merge 35 commits intoRxup:masterRxup/space-station-14:masterfrom Rinary1:RolesCopy head branch name to clipboard

+44,234-8

Commits

Commits on Jan 5, 2024

• Merge branch 'upstream' of https://github.com/Rinary1/space-station-14 into upstream

  Rinary1

  committed
  2ca2967

  Copy full SHA for 2ca2967

• Merge branch 'master' of https://github.com/Rinary1/space-station-14 into upstream

  Rinary1

  committed
  c6ca0ae

  Copy full SHA for c6ca0ae

• Merge branch 'roboticist' of https://github.com/Rinary1/space-station-14 into upstream

  Rinary1

  committed
  a4db4ba

  Copy full SHA for a4db4ba

Commits on Jan 12, 2024

• Map Add

  Rinary1

  committed
  2e9d14e

  Copy full SHA for 2e9d14e

• Merge branch 'master' of https://github.com/Rinary1/space-station-14 into upstream

  Rinary1

  committed
  156ada0

  Copy full SHA for 156ada0

• BlueShield

  Rinary1

  committed
  ce95228

  Copy full SHA for ce95228

• Blueshield Locale + Starting Gear

  Rinary1

  committed
  c57c1fa

  Copy full SHA for c57c1fa

• Blueshield playTimeTracker + Department

  Rinary1

  committed
  b974ad0

  Copy full SHA for b974ad0

• Blueshield Job Icon + Add Time

  Show description for 91c9d74
  Rinary1

  committed
  91c9d74

  Copy full SHA for 91c9d74

• Blueshield Job Icon + Job Locale

  Rinary1

  committed
  b06be38

  Copy full SHA for b06be38

• Medical Sunglasses for Blueshield

  Rinary1

  committed
  7f2d8ce

  Copy full SHA for 7f2d8ce

• Blueshield has mindshield

  Rinary1

  committed
  1fbd571

  Copy full SHA for 1fbd571

• Pda id Fix, Blueshield Locker Filled add

  Rinary1

  committed
  3e64128

  Copy full SHA for 3e64128

• BlueShield HardSuit

  Rinary1

  committed
  a5e1d10

  Copy full SHA for a5e1d10

• BlueShield Spawner, New Suit Storage, Hardsuit locale

  Rinary1

  committed
  01c0db9

  Copy full SHA for 01c0db9

• Blueshield's Blue Gas Mask

  Rinary1

  committed
  6d4841c

  Copy full SHA for 6d4841c

Commits on Jan 13, 2024

• Blueshield Wardrob Icon Fix, Filled varient fix

  Rinary1

  committed
  b7490b7

  Copy full SHA for b7490b7

• Merge pull request #4 from Rxup/master

  Show description for 36790fc
  Rinary1

  authored
  36790fc

  Copy full SHA for 36790fc

• Merge branch 'upstream' of https://github.com/Rinary1/space-station-14 into Roles

  Rinary1

  committed
  022585b

  Copy full SHA for 022585b

• Merge branch 'upstream' of https://github.com/Rinary1/space-station-14 into ParadiseDelta

  Rinary1

  committed
  9be8643

  Copy full SHA for 9be8643

Commits on Jan 15, 2024

• Merge branch 'Roles' of https://github.com/Rinary1/space-station-14 into ParadiseDelta

  Rinary1

  committed
  d24e295

  Copy full SHA for d24e295

• sofa

  Rinary1

  committed
  0bd30a5

  Copy full SHA for 0bd30a5

• Merge branch 'Roles' of https://github.com/Rinary1/space-station-14 into ParadiseDelta

  Rinary1

  committed
  54275ca

  Copy full SHA for 54275ca

Commits on Feb 2, 2024

• Magistrat Job, Still in progress

  Show description for f25de44
  Rinary1

  committed
  f25de44

  Copy full SHA for f25de44

• Magistrat Update

  Show description for 95b8bce
  Rinary1

  committed
  95b8bce

  Copy full SHA for 95b8bce

• Magistrat Job Spawner >-<

  Rinary1

  committed
  4167f3f

  Copy full SHA for 4167f3f

• Merge branch 'master' into Roles

  Rinary1

  authored
  ef94337

  Copy full SHA for ef94337

• rsi fix

  Rinary1

  committed
  d390e7d

  Copy full SHA for d390e7d

• Merge branch 'Roles' of https://github.com/Rinary1/space-station-14 into Roles

  Rinary1

  committed
  b68d151

  Copy full SHA for b68d151

• add play time tracker for magistrate

  Rinary1

  committed
  cc3961f

  Copy full SHA for cc3961f

• wardrobe fix

  Rinary1

  committed
  2cae08b

  Copy full SHA for 2cae08b

Commits on Feb 3, 2024

• Merge branch 'master' into Roles

  Rinary1

  authored
  580e36b

  Copy full SHA for 580e36b

Commits on Feb 7, 2024

• Magistrat Job Spawnpoint Locale

  Rinary1

  committed
  2eb3bfd

  Copy full SHA for 2eb3bfd

• Merge branch 'Roles' of https://github.com/Rinary1/space-station-14 into Roles

  Rinary1

  committed
  c1bcf35

  Copy full SHA for c1bcf35

• Merge pull request #7 from Rxup/master

  Show description for 0f834f3
  Rinary1

  authored
  0f834f3

  Copy full SHA for 0f834f3