Code

Merge Upstream [09.07.2024]#1366

Code

Merged

Legendaxe merged 37 commits intoss220club:masterss220club/Paradise-SS220:masterfrom dj-34:merge_upstreamdj-34/Paradise-SS220:merge_upstreamCopy head branch name to clipboardJul 9, 2024

+2,385-1,516

Commits

Commits on Jul 6, 2024

• 10TC!!! (ParadiseSS13#26076)

  HMBGERDO

  authored
  8e57d9a

  Copy full SHA for 8e57d9a

• Correct areas for delta solars. (ParadiseSS13#26135)

  warriorstar-orion

  authored
  c70d75f

  Copy full SHA for c70d75f

• Nanocalcium pens now inject 10u of epinephrine (ParadiseSS13#26034)

  Show description for f5bb6d1
  DGamerL

  authored
  f5bb6d1

  Copy full SHA for f5bb6d1

• Adds a traitor rapid healing item: "Hyperregenerative Medipen" (ParadiseSS13#26033)

  Show description for 608b422
  

  3 peopleauthored
  608b422

  Copy full SHA for 608b422

• Makes TGUI strip menu size toggleable (ParadiseSS13#25763)

  Show description for 7764d13
  HMBGERDO

  authored
  7764d13

  Copy full SHA for 7764d13

• Newspaper bap fix (ParadiseSS13#26112)

  Show description for 04949b4
  

  5 peopleauthored
  04949b4

  Copy full SHA for 04949b4

Commits on Jul 7, 2024

• Fixes a very small oversight with blood DNA. (ParadiseSS13#26172)

  Spaghetti-bit

  authored
  fdcbfc4

  Copy full SHA for fdcbfc4

• Update medical_designs.dm (ParadiseSS13#26159)

  Show description for f1e98f7
  FaronCD

  authored
  f1e98f7

  Copy full SHA for f1e98f7

• Strange objects resprite (ParadiseSS13#26131)

  Show description for d075a68
  Us3rn4me228

  authored
  d075a68

  Copy full SHA for d075a68

• Fixing fulton pack not working (ParadiseSS13#26153)

  Show description for 67353fd
  

  HMBGERDO

  and

  1080pCat

  authored
  67353fd

  Copy full SHA for 67353fd

• Emotes now vary in frequency when they are not age based. (ParadiseSS13#26171)

  Spaghetti-bit

  authored
  421d7d8

  Copy full SHA for 421d7d8

• Dredd armor resprite - finally deconflicted (i hope) (ParadiseSS13#26167)

  Show description for 14a7b74
  McRamon

  authored
  14a7b74

  Copy full SHA for 14a7b74

• Begone, sinner (ParadiseSS13#26116)

  Onyxarias

  authored
  4a41007

  Copy full SHA for 4a41007

• Destroy the child (ParadiseSS13#26114)

  Onyxarias

  authored
  4747bb1

  Copy full SHA for 4747bb1

• Removes the 1s option from flashbangs (ParadiseSS13#26079)

  Show description for 4a74724
  

  1080pCat

  and

  Contrabang

  authored
  4a74724

  Copy full SHA for 4a74724

• Update bio_chip_supercharge.dm (ParadiseSS13#26173)

  Fordoxia

  authored
  7a3daae

  Copy full SHA for 7a3daae

• Fix: Active mousetrap inhand sprite (ParadiseSS13#26176)

  AyIong

  authored
  d118388

  Copy full SHA for d118388

• Checks for emagged on firealarms to properly disable them from activating unless pulled manually. (ParadiseSS13#26170)

  Spaghetti-bit

  authored
  edc6695

  Copy full SHA for edc6695

• Changes even more uses of stat comparisons to use the defines (ParadiseSS13#26154)

  Show description for 5e7b0c0
  

  DGamerL

  and

  hal9000PR

  authored
  5e7b0c0

  Copy full SHA for 5e7b0c0

Commits on Jul 8, 2024

• [s] Refactor Cream-Master UI handling. (ParadiseSS13#26187)

  Show description for 7b357f5
  FunnyMan3595

  authored
  7b357f5

  Copy full SHA for 7b357f5

• Reverts a tweak (ParadiseSS13#26188)

  DGamerL

  authored
  1ae53f2

  Copy full SHA for 1ae53f2

• Update glass.dm (ParadiseSS13#26184)

  Fordoxia

  authored
  46ca5d3

  Copy full SHA for 46ca5d3

• Various rollie fixes (ParadiseSS13#26163)

  Show description for 09a4ed7
  DGamerL

  authored
  09a4ed7

  Copy full SHA for 09a4ed7

• Fixes Some Minor Grammar Errors That Most People Will Never See (ParadiseSS13#26138)

  Show description for 13af419
  

  Fordoxia

  and

  Burzah

  authored
  13af419

  Copy full SHA for 13af419

• Changes energy sword sharpening to use signals (ParadiseSS13#26157)

  Show description for e591584
  

  DGamerL

  and

  Sirryan2002

  authored
  e591584

  Copy full SHA for e591584

• Knuckledusters now change hitsound again (ParadiseSS13#26177)

  DGamerL

  authored
  9a37b71

  Copy full SHA for 9a37b71

• cleanup: Remove all unused accesses. (ParadiseSS13#26146)

  Show description for 62dc3d5
  warriorstar-orion

  authored
  62dc3d5

  Copy full SHA for 62dc3d5

• Retrofit TG pathfinder with upstream improvements (ParadiseSS13#25583)

  Show description for ca93f6b
  warriorstar-orion

  authored
  ca93f6b

  Copy full SHA for ca93f6b

• Fixed telekinesis putting beaker in hand when swapped (ParadiseSS13#26130)

  Show description for b287cdb
  EmeraldCandy

  authored
  b287cdb

  Copy full SHA for b287cdb

• Minor throwing fixes (ParadiseSS13#26179)

  Show description for c1e97f7
  chuga-git

  authored
  c1e97f7

  Copy full SHA for c1e97f7

• Merge branch 'master-offs' into merge_upstream

  dj-34

  committed
  a9d51e2

  Copy full SHA for a9d51e2

• Rebuild TGUI

  dj-34

  committed
  ca6d508

  Copy full SHA for ca6d508

• Delete depreceated access

  dj-34

  committed
  39b7f57

  Copy full SHA for 39b7f57

• Fix re-defines

  dj-34

  committed
  c879657

  Copy full SHA for c879657

• Makes all playsounds use bools for vary (ParadiseSS13#26183)

  Show description for 4cf6595
  DGamerL

  authored
  4cf6595

  Copy full SHA for 4cf6595

Commits on Jul 9, 2024

• Consolidation (ParadiseSS13#26139)

  DGamerL

  authored
  8a6643f

  Copy full SHA for 8a6643f

• Merge branch 'master-offs' into merge_upstream

  dj-34

  committed
  e41e4a8

  Copy full SHA for e41e4a8