Code

Upstream Merge 08/05/2024#77

Code

Merged

FoxxoTrystan merged 85 commits intoFansana:masterFansana/floofstation1:masterfrom FoxxoTrystan:upstream-mergeFoxxoTrystan/floofstation1:upstream-mergeCopy head branch name to clipboardAug 6, 2024

+7,165-2,436

Commits

Commits on Jul 28, 2024

• Update Credits (#602)

  Show description for c92ea10
  

  github-actions[bot]

  and

  SimpleStation14

  authored
  c92ea10

Commits on Jul 29, 2024

• Box Retexture (#597)

  Show description for a0d7f7d
  CilliePaint

  authored
  a0d7f7d

• Automatic Changelog Update (#597)

  SimpleStation14

  committed
  4b9c598

• Fix 125 Toolshed Commands Being Unusable for Anyone without +HOST (#572)

  Show description for faa239a
  Mnemotechnician

  authored
  faa239a

• Automatic Changelog Update (#572)

  SimpleStation14

  committed
  41a5e8e

• Radiation Doesn't Prevent DoAfters (#606)

  Show description for a9e28ee
  VMSolidus

  authored
  a9e28ee

• Automatic Changelog Update (#606)

  SimpleStation14

  committed
  7c5625b

• Make Jobs & Antags Use CharacterRequirements (#596)

  Show description for 54c119e
  

  DEATHB4DEFEAT

  and

  VMSolidus

  authored
  54c119e

Commits on Jul 30, 2024

• Add Cybernetic Limb Markings (#613)

  Show description for 56d039c
  

  angelofallars

  and

  WarMechanic

  authored
  56d039c

• Automatic Changelog Update (#613)

  SimpleStation14

  committed
  055ad75

• Add Makeup (#614)

  Show description for 08dde02
  angelofallars

  authored
  08dde02

• Automatic Changelog Update (#614)

  SimpleStation14

  committed
  b744818

Commits on Jul 31, 2024

• Hotfix Late Joins (#612)

  Show description for 29cb1b0
  VMSolidus

  authored
  29cb1b0

• Hotfix Playtime Requirements (#621)

  Show description for d38c7d4
  Mnemotechnician

  authored
  d38c7d4

• Remove Cargo Pallet From Request Console (#626)

  Show description for 9527936
  Tmanzxd

  authored
  9527936

• Use Correct Changelog Name (#627)

  Show description for 3a9c337
  angelofallars

  authored
  3a9c337

• Fix Sound Params (#624)

  Show description for d39c990
  VMSolidus

  authored
  d39c990

• Automatic Changelog Update (#624)

  SimpleStation14

  committed
  5f73a5a

• Lasers Have No Recoil (#603)

  Show description for c0114c0
  VMSolidus

  authored
  c0114c0

• Automatic Changelog Update (#603)

  SimpleStation14

  committed
  8a3abcb

• Fix the Uncategorized Category Not Being Hidden (#628)

  Show description for fa2abfa
  DEATHB4DEFEAT

  authored
  fa2abfa

• Automatic Changelog Update (#628)

  SimpleStation14

  committed
  5335dce

• Minor Language Fixes (#618)

  Show description for b15d096
  Mnemotechnician

  authored
  b15d096

• Comms Console Announcer Fixes (#610)

  Show description for 80eb456
  

  VMSolidus

  and

  Fansana

  authored
  80eb456

• Automatic Changelog Update (#618)

  SimpleStation14

  committed
  3da588f

Commits on Aug 1, 2024

• More Loadout Items: Wave 2 (#616)

  Show description for 6d1ae15
  angelofallars

  authored
  6d1ae15

• Automatic Changelog Update (#616)

  SimpleStation14

  committed
  b3c3647

• Replace and Fix MedHud Icons (#631)

  Show description for 7fb089d
  Tmanzxd

  authored
  7fb089d

• Manual Removal of easy_pry.yml (#632)

  Show description for 5f2cae0
  Tmanzxd

  authored
  5f2cae0

• Revert "Mirror: Restrict Door Remotes to only Being Able to Manipulate Doors Relevant to Their Type" (#491)

  Show description for 00a74a2
  

  stellar-novas

  and

  DEATHB4DEFEAT

  authored
  00a74a2

• Invert the Running/Walking States (#485)

  Show description for ac2fc06
  

  DEATHB4DEFEAT

  and

  Pspritechologist

  authored
  ac2fc06

• Automatic Changelog Update (#485)

  SimpleStation14

  committed
  a6237f3

• Move Survival Boxes To Loadouts (#634)

  Show description for 94098c6
  VMSolidus

  authored
  94098c6

• Automatic Changelog Update (#634)

  SimpleStation14

  committed
  11524d8

• Make Boxes Not Useless (#635)

  Show description for dfdae62
  VMSolidus

  authored
  dfdae62

• Automatic Changelog Update (#635)

  SimpleStation14

  committed
  437ac5a

• "Buff" Vision Traits (#636)

  Show description for 6bc8b60
  

  VMSolidus

  and

  DEATHB4DEFEAT

  authored
  6bc8b60

• Automatic Changelog Update (#636)

  SimpleStation14

  committed
  0d1c931

• More Loadout Items: Wave 3 (#633)

  Show description for c96cfcc
  angelofallars

  authored
  c96cfcc

• Automatic Changelog Update (#633)

  SimpleStation14

  committed
  adafe4a

• Vulpkanin Tail Wagging (#588)

  Show description for 1481146
  

  FoxxoTrystan

  and

  DEATHB4DEFEAT

  authored
  1481146

• Automatic Changelog Update (#588)

  SimpleStation14

  committed
  8ccbf7e

Commits on Aug 2, 2024

• Increase Combat Knife Availability (#640)

  Show description for 172e036
  

  angelofallars

  and

  Ghagliiarghii

  authored
  172e036

• Automatic Changelog Update (#640)

  SimpleStation14

  committed
  3a27ee8

• Add Breaching Charges (#638)

  Show description for 9b3f1f5
  

  angelofallars

  and

  rosieposieeee

  authored
  9b3f1f5

• Automatic Changelog Update (#638)

  SimpleStation14

  committed
  aa9664d

• AHelp Sound Improvements (#585)

  Show description for 6b86a6d
  DEATHB4DEFEAT

  authored
  6b86a6d

• Automatic Changelog Update (#585)

  SimpleStation14

  committed
  49c944d

• Fix Stinky Anomaly Announcement (#646)

  Show description for d25a25c
  Mnemotechnician

  authored
  d25a25c

• Revert "Refactor Ramping Event Scheduler (#592)" (#644)

  Show description for 58a1f88
  Mnemotechnician

  authored
  58a1f88

• Automatic Changelog Update (#644)

  SimpleStation14

  committed
  b9b3868

Commits on Aug 3, 2024

• Supermatter Engine (Port From White Dream) (Fansana#341)

  Show description for 80e48a5
  

  5 peopleauthored
  80e48a5

• Automatic Changelog Update (Fansana#341)

  SimpleStation14

  committed
  d5d3942

• Fix NoMaterialArbitrage Test Fail (#653)

  Show description for d2e976e
  VMSolidus

  authored
  d2e976e

• Fix for Failed to Cherry-Pick PR #26217: Fix Pressure Damage Calculat… (#655)

  Show description for 9d25d0f
  Tmanzxd

  authored
  9d25d0f

• Changed Rouny Sprite (#649)

  Show description for 7e822be
  SleepyScarecrow

  authored
  7e822be

• Automatic Changelog Update (#649)

  SimpleStation14

  committed
  b5bc583

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

  FoxxoTrystan

  committed
  d2fd3c3

• Fix Event Manager Allowing to Start Multiple Events of the Same Type in a Short Time Window (#645)

  Show description for 75b36bf
  Mnemotechnician

  authored
  75b36bf

Commits on Aug 4, 2024

• Remove Clothesmate Bloat (#637)

  Show description for dd2a0cf
  VMSolidus

  authored
  dd2a0cf

• Automatic Changelog Update (#637)

  SimpleStation14

  committed
  62045ff

• Fixes Failed to Cherry-Pick PR #25986: Return Detective to Security Fansana#145 (#656)

  Show description for fb7c4d9
  Tmanzxd

  authored
  fb7c4d9

• Update Credits (#667)

  Show description for 1509caa
  

  github-actions[bot]

  and

  SimpleStation14

  authored
  1509caa

• Add 4 Missing Vendors To Vendor Spawners (#639)

  Show description for f6a5a2f
  VMSolidus

  authored
  f6a5a2f

• Automatic Changelog Update (#639)

  SimpleStation14

  committed
  1c26a10

• New Trait: Voracious (#668)

  Show description for 23fc467
  angelofallars

  authored
  23fc467

• Automatic Changelog Update (#668)

  SimpleStation14

  committed
  09e11de

• Zombie Improvements Take 2 (#652)

  Show description for 0b0e5f3
  VMSolidus

  authored
  0b0e5f3

• Automatic Changelog Update (#652)

  SimpleStation14

  committed
  4a6ad8c

Commits on Aug 5, 2024

• Rename Trait "Heavyweight Drunk" To "Alcohol Tolerance" (#669)

  Show description for 7f784b0
  

  angelofallars

  and

  DangerRevolution

  authored
  7f784b0

• Automatic Changelog Update (#669)

  SimpleStation14

  committed
  812a303

• New Trait: Light Step (#658)

  Show description for 0acb879
  angelofallars

  authored
  0acb879

• Automatic Changelog Update (#658)

  SimpleStation14

  committed
  27c2c35

• New Trait: Sign Language (#677)

  Show description for 17aca3c
  angelofallars

  authored
  17aca3c

• Automatic Changelog Update (#677)

  SimpleStation14

  committed
  1bd9cd8

• Oracle Refactor (#549)

  Show description for c976bfa
  Mnemotechnician

  authored
  c976bfa

• Automatic Changelog Update (#549)

  SimpleStation14

  committed
  22c979c

• Carrying System Refactor (#580)

  Show description for 664f482
  VMSolidus

  authored
  664f482

• Automatic Changelog Update (#580)

  SimpleStation14

  committed
  636f7f5

• Automatic Changelog Update (#673)

  SimpleStation14

  committed
  f177d7d

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

  FoxxoTrystan

  committed
  b7384e8

• fixes

  FoxxoTrystan

  committed
  fa4c669

• Revert role timers

  FoxxoTrystan

  committed
  3920adc

• Merge branch 'master' into upstream-merge

  FoxxoTrystan

  authored
  6009872

Commits on Aug 6, 2024

• update playtime requirements to 4 hours

  Fansana

  committed
  99c8c22