Code

Merge Upstream 02.04.2024#1154

Code

Closed

AyIong wants to merge 49 commits intoss220club:masterss220club/Paradise-SS220:masterfrom AyIong:merge-upstreamCopy head branch name to clipboard

+4,967-2,330

Commits

Commits on Mar 26, 2024

• yes (ParadiseSS13#24826)

  Contrabang

  authored
  d740ede

  Copy full SHA for d740ede

• cere: bridge has correct supply computer (ParadiseSS13#24825)

  warriorstar-orion

  authored
  048dfec

  Copy full SHA for 048dfec

• Cyborgs can now choose what type of brain they spawn with. (ParadiseSS13#23954)

  Show description for f9e30f8
  

  3 peopleauthored
  f9e30f8

  Copy full SHA for f9e30f8

• Use a github app token, not the default token, to run !merge_upstream workflow actions (ParadiseSS13#24822)

  Show description for 3954100
  

  S34NW

  and

  Arthri

  authored
  3954100

  Copy full SHA for 3954100

• one more time (ParadiseSS13#24831)

  S34NW

  authored
  164ce33

  Copy full SHA for 164ce33

• it was under my DAMN NOSE THE WHOLE TIME (ParadiseSS13#24832)

  S34NW

  authored
  bb3800c

  Copy full SHA for bb3800c

Commits on Mar 27, 2024

• fixes bugs with observer crew monitor (ParadiseSS13#24828)

  lewcc

  authored
  83f2e85

  Copy full SHA for 83f2e85

• Sord missing icon fix (ParadiseSS13#24829)

  AyIong

  authored
  c7887bf

  Copy full SHA for c7887bf

• Adds the Proto-Adrenaline Bio-chip (ParadiseSS13#24716)

  Show description for 0a16d6e
  

  Qwertytoforty

  and

  Contrabang

  authored
  0a16d6e

  Copy full SHA for 0a16d6e

• Rags can clean kitchen machines just like real life (ParadiseSS13#24748)

  Fordoxia

  authored
  8dc0120

  Copy full SHA for 8dc0120

• Soap is no longer comdom scented. Collectable captain hat doesn't look like a comdom hat. (ParadiseSS13#24661)

  Show description for d49d9d5
  

  Fordoxia

  and

  DGamerL

  authored
  d49d9d5

  Copy full SHA for d49d9d5

• fixes a ling gc issue (ParadiseSS13#24833)

  GDNgit

  authored
  6f1c476

  Copy full SHA for 6f1c476

• Slightly modifies the logging of runtimes (ParadiseSS13#24800)

  Show description for ebc98f5
  Contrabang

  authored
  ebc98f5

  Copy full SHA for ebc98f5

• Fixes disposals pipes in medbay on boxstation (ParadiseSS13#24771)

  Show description for 2f72336
  

  3 peopleauthored
  2f72336

  Copy full SHA for 2f72336

• missing cables (ParadiseSS13#24769)

  Show description for 3b2ab24
  

  3 peopleauthored
  3b2ab24

  Copy full SHA for 3b2ab24

• NanoMap Auto-Update (Wed Mar 27 01:08:10 UTC 2024) (ParadiseSS13#24741)

  Show description for 777458a
  

  github-actions[bot]

  and

  actions-user

  authored
  777458a

  Copy full SHA for 777458a

• Fixes Cyberiad External Airlocks Appear To Have Incorrect Access Settings (ParadiseSS13#24688)

  Show description for 608889f
  

  3 peopleauthored
  608889f

  Copy full SHA for 608889f

• Add job_globals sanitization, fix duplicate value (ParadiseSS13#24795)

  Show description for 06969b4
  VetleNeumann

  authored
  06969b4

  Copy full SHA for 06969b4

Commits on Mar 28, 2024

• Booze cures anxiety (and other ethanol diseases) (ParadiseSS13#24481)

  Show description for 934d6fa
  

  FunnyMan3595

  and

  lewcc

  authored
  934d6fa

  Copy full SHA for 934d6fa

• Service headset sprite update (ParadiseSS13#24840)

  Henri215

  authored
  2708767

  Copy full SHA for 2708767

• Ezpz fix (ParadiseSS13#24845)

  DGamerL

  authored
  8e4c868

  Copy full SHA for 8e4c868

• fixes tgui alerts taking WAY longer than they should to delete (ParadiseSS13#24859)

  GDNgit

  authored
  b1988e7

  Copy full SHA for b1988e7

• Fixes elite action buttons breaking entirely (ParadiseSS13#24860)

  Show description for 618eb8a
  lewcc

  authored
  618eb8a

  Copy full SHA for 618eb8a

• [s] Tis just a flesh wound (ParadiseSS13#24861)

  Qwertytoforty

  authored
  56b49fa

  Copy full SHA for 56b49fa

• Adds workflow for automatic handling of stale PRs and issues, tidies other workflows and adds better logging (ParadiseSS13#24839)

  Show description for 89d6873
  

  S34NW

  and

  lewcc

  authored
  89d6873

  Copy full SHA for 89d6873

• Gives ears a proper slot (ParadiseSS13#24848)

  Show description for 0e401c2
  

  lewcc

  and

  S34NW

  authored
  0e401c2

  Copy full SHA for 0e401c2

Commits on Mar 29, 2024

• updates last words (ParadiseSS13#24843)

  Show description for d793fcb
  

  lewcc

  and

  S34NW

  authored
  d793fcb

  Copy full SHA for d793fcb

• Don't runtime when creating nukies. (ParadiseSS13#24865)

  FunnyMan3595

  authored
  543b8d4

  Copy full SHA for 543b8d4

• refactor: Remove cave generation from mineral ore generation odds (ParadiseSS13#24783)

  Show description for 2a99f77
  warriorstar-orion

  authored
  2a99f77

  Copy full SHA for 2a99f77

• Fixes unbolted grey chairs to be bolted again in medbay on NSS Kerberos (ParadiseSS13#24838)

  Show description for 9a16c04
  Fluffyzack21

  authored
  9a16c04

  Copy full SHA for 9a16c04

• Follow-up patch for "tidies other workflows and adds better logging" (ParadiseSS13#24864)

  Show description for f779546
  S34NW

  authored
  f779546

  Copy full SHA for f779546

• fixes a cloner runtime (ParadiseSS13#24868)

  GDNgit

  authored
  5a0900d

  Copy full SHA for 5a0900d

• Fixed the grey autocloner bug again, this time for greys. (ParadiseSS13#24872)

  FunnyMan3595

  authored
  21b4333

  Copy full SHA for 21b4333

• refactor: remove unused var /area/no_air (ParadiseSS13#24866)

  warriorstar-orion

  authored
  f228031

  Copy full SHA for f228031

• Disguised clown shoes. (ParadiseSS13#24639)

  Show description for 321c887
  FunnyMan3595

  authored
  321c887

  Copy full SHA for 321c887

• ... (ParadiseSS13#24762)

  FunnyMan3595

  authored
  5c24d2b

  Copy full SHA for 5c24d2b

• Haha funny decimal I forgor (ParadiseSS13#24871)

  DGamerL

  authored
  d7ae085

  Copy full SHA for d7ae085

• get locked idiot (ParadiseSS13#24852)

  Show description for e6a5685
  

  3 peopleauthored
  e6a5685

  Copy full SHA for e6a5685

• Allowed cyborgs to set transfer amounts on their modules. (ParadiseSS13#24573)

  Show description for 26338e9
  FunnyMan3595

  authored
  26338e9

  Copy full SHA for 26338e9

• 🙃 (ParadiseSS13#24875)

  S34NW

  authored
  ff6af9b

  Copy full SHA for ff6af9b

• Pen resprite (ParadiseSS13#24756)

  Show description for c87c5e4
  

  3 peopleauthored
  c87c5e4

  Copy full SHA for c87c5e4

Commits on Mar 30, 2024

• rename all station files and datums, consolidate types into one file (ParadiseSS13#24823)

  warriorstar-orion

  authored
  d52535a

  Copy full SHA for d52535a

Commits on Apr 1, 2024

• Datumizes spells (ParadiseSS13#24242)

  Show description for eee8878
  

  GDNgit

  and

  Burzah

  authored
  eee8878

  Copy full SHA for eee8878

• Added an autoresponse system for mentorhelp, using the existing button. (ParadiseSS13#24384)

  Show description for 663e007
  

  3 peopleauthored
  663e007

  Copy full SHA for 663e007

• Secondary goals (ParadiseSS13#24599)

  Show description for 5c5f784
  

  4 peopleauthored
  5c5f784

  Copy full SHA for 5c5f784

• Fixes multitile doors and multitile engines on shuttles. Gives raven it's big engines back (ParadiseSS13#24781)

  Show description for 464d53e
  

  3 peopleauthored
  464d53e

  Copy full SHA for 464d53e

• [S]HAHAHAHAHAHAHAHAHA (ParadiseSS13#24969)

  Show description for 298f228
  Qwertytoforty

  authored
  298f228

  Copy full SHA for 298f228

Commits on Apr 2, 2024

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

  AyIong

  committed
  17ecf76

  Copy full SHA for 17ecf76

• Rebuild TGUI & Move maps

  AyIong

  committed
  f394688

  Copy full SHA for f394688