Code

Upstream merge 59.5#1524

Code

Merged

TheArturZh merged 46 commits intoSerbiaStrong-220:masterSerbiaStrong-220/space-station-14:masterfrom DexlerXD:upstream-merge-59-2DexlerXD/space-station-14:upstream-merge-59-2Copy head branch name to clipboardAug 5, 2024

+2,464-4,936

Commits

Commits on Aug 4, 2024

• Meta Robotics Console (space-wizards#30652)

  Show description for 21d0326
  JustCone14

  authored
  21d0326

  Copy full SHA for 21d0326

• Cluster Christmas Removal (space-wizards#30635)

  Show description for f1b8dcb
  JustCone14

  authored
  f1b8dcb

  Copy full SHA for f1b8dcb

• Update Core (space-wizards#30633)

  Show description for 17cecec
  UbaserB

  authored
  17cecec

  Copy full SHA for 17cecec

• Box Atmos Miners Grille Removal (space-wizards#30610)

  Show description for 548f9e3
  JustCone14

  authored
  548f9e3

  Copy full SHA for 548f9e3

• Fland Atmos Gas Miners Grille Removal (space-wizards#30615)

  Show description for c237ef2
  JustCone14

  authored
  c237ef2

  Copy full SHA for c237ef2

• fml to chatsan (space-wizards#30651)

  OrangeMoronage9622

  authored
  8e43bb1

  Copy full SHA for 8e43bb1

• tweak(grammar): Correct multiple instances of incorrect "it's" usage (space-wizards#30641)

  Brandon-Huu

  authored
  b306130

  Copy full SHA for b306130

• tweak(grammar): Correct multiple instances of incorrect "its" usage (space-wizards#30640)

  Brandon-Huu

  authored
  c04f717

  Copy full SHA for c04f717

Commits on Aug 5, 2024

• Fix GhostRoleRadio icons (space-wizards#30650)

  Show description for d87d9c4
  

  Plykiya

  and

  plykiya

  authored
  d87d9c4

  Copy full SHA for d87d9c4

• Fix falsely showing damage color effect to entities that aren't allowed to be attacked (space-wizards#30661)

  DrSmugleaf

  authored
  84a9253

  Copy full SHA for 84a9253

• Explosion resistance is now predicted! (space-wizards#30654)

  Show description for 490de1d
  beck-thompson

  authored
  490de1d

  Copy full SHA for 490de1d

• Automatic changelog update

  PJBot

  committed
  118ea97

  Copy full SHA for 118ea97

• Fix some descriptions (space-wizards#30644)

  lzk228

  authored
  82d7636

  Copy full SHA for 82d7636

• Improve communications console countdown formatting (space-wizards#30495)

  Show description for d0884a3
  slarticodefast

  authored
  d0884a3

  Copy full SHA for d0884a3

• Gets rid of all leftover usages of IEyeManager.CurrentMap (space-wizards#30022)

  Show description for c5b887f
  

  Plykiya

  and

  plykiya

  authored
  c5b887f

  Copy full SHA for c5b887f

• Sleeper agents event no longer occurs when evacuation is called (space-wizards#30646)

  Show description for 6503cb7
  Killerqu00

  authored
  6503cb7

  Copy full SHA for 6503cb7

• Automatic changelog update

  PJBot

  committed
  7e285ee

  Copy full SHA for 7e285ee

• Give Mice Combat Mode and a 0 Damage Attack (space-wizards#30487)

  Cojoke-dot

  authored
  a79cbf3

  Copy full SHA for a79cbf3

• Automatic changelog update

  PJBot

  committed
  68dbf64

  Copy full SHA for 68dbf64

• Fix warnings in ShuttleSystem.GridFill.cs (space-wizards#30253)

  Show description for 0ef5f66
  

  Simyon264

  and

  metalgearsloth

  authored
  0ef5f66

  Copy full SHA for 0ef5f66

• Move PaperSystem to Shared (space-wizards#30592)

  Show description for 01e1624
  

  3 peopleauthored
  01e1624

  Copy full SHA for 01e1624

• JobRequirement refactor (space-wizards#30347)

  Show description for a95d225
  TheShuEd

  authored
  a95d225

  Copy full SHA for a95d225

• Automatic changelog update

  PJBot

  committed
  71a8fd5

  Copy full SHA for 71a8fd5

• Restore the longer traitor briefing message (space-wizards#30404)

  Show description for 6264a55
  Errant-4

  authored
  6264a55

  Copy full SHA for 6264a55

• De-duplicate loadout gear (space-wizards#30341)

  Show description for 9a8620d
  metalgearsloth

  authored
  9a8620d

  Copy full SHA for 9a8620d

• Change the mimebot and killer tomato's descriptions (space-wizards#30639)

  Show description for a3cbbe7
  voidnull000

  authored
  a3cbbe7

  Copy full SHA for a3cbbe7

• Update submodule to 229.1.0 (space-wizards#30664)

  metalgearsloth

  authored
  c9b69ef

  Copy full SHA for c9b69ef

• add(Spawners): Add a honk bot spawner (space-wizards#30616)

  Brandon-Huu

  authored
  e2ca1a1

  Copy full SHA for e2ca1a1

• Missing mime mask sprites for Vox (space-wizards#30607)

  Show description for 1629e20
  foboscheshir

  authored
  1629e20

  Copy full SHA for 1629e20

• Automatic changelog update

  PJBot

  committed
  bc3d53e

  Copy full SHA for bc3d53e

• Debug command to set either your hunger or thirst to one of their respective threshold levels (space-wizards#30563)

  Show description for 8771cc0
  Mervill

  authored
  8771cc0

  Copy full SHA for 8771cc0

• Automatic changelog update

  PJBot

  committed
  52e03d2

  Copy full SHA for 52e03d2

• Fix random unused field warnings (space-wizards#29948)

  Show description for 8197382
  metalgearsloth

  authored
  8197382

  Copy full SHA for 8197382

• Change Thief Syndie & Chameleon kit contents, add Syndie codeword paper (space-wizards#30446)

  Show description for bf06d0e
  SlamBamActionman

  authored
  bf06d0e

  Copy full SHA for bf06d0e

• Automatic changelog update

  PJBot

  committed
  50408da

  Copy full SHA for 50408da

• Add slowdown to low temperatures (space-wizards#29692)

  Show description for b3a64d4
  EmoGarbage404

  authored
  b3a64d4

  Copy full SHA for b3a64d4

• Automatic changelog update

  PJBot

  committed
  d45810b

  Copy full SHA for d45810b

• Refactor the hungry debug command to be in line with thirsty (space-wizards#30591)

  Show description for c1eb319
  

  Mervill

  and

  metalgearsloth

  authored
  c1eb319

  Copy full SHA for c1eb319

• Fix verb sub (space-wizards#30667)

  Show description for f7d8b4e
  metalgearsloth

  authored
  f7d8b4e

  Copy full SHA for f7d8b4e

• Merge remote-tracking branch 'off/master' into upstream-merge-59-2

  DexlerXD

  committed
  87276d5

  Copy full SHA for 87276d5

• post-merge fixes

  DexlerXD

  committed
  fa6915f

  Copy full SHA for fa6915f

• ahhhhh, I need a loadout baaag

  DexlerXD

  committed
  1d55c5f

  Copy full SHA for 1d55c5f

• fix criminal records console ui

  DexlerXD

  committed
  8a00872

  Copy full SHA for 8a00872

• give hidden departments names

  DexlerXD

  committed
  59406a7

  Copy full SHA for 59406a7

• fix locale

  DexlerXD

  committed
  6ca638a

  Copy full SHA for 6ca638a

• we do a little amount of trolling

  DexlerXD

  committed
  882bae9

  Copy full SHA for 882bae9