Code

Merge upstream 19.03.2024#1115

Code

Merged

Legendaxe merged 31 commits intoss220club:masterss220club/Paradise-SS220:masterfrom m-dzianishchyts:merge-upstreamm-dzianishchyts/Paradise-SS220:merge-upstreamCopy head branch name to clipboardMar 19, 2024

+10,340-10,117

Commits

Commits on Mar 17, 2024

• oops (ParadiseSS13#24658)

  chuga-git

  authored
  cb7cf57

  Copy full SHA for cb7cf57

Commits on Mar 18, 2024

• Cyborgs drop their upgrades on the floor when reset or deconstructed (ParadiseSS13#24467)

  Show description for 926dff2
  

  Fordoxia

  and

  Henri215

  authored
  926dff2

  Copy full SHA for 926dff2

• Modsuit activation/deactivation is no longer cancelled by user incapacitation (ParadiseSS13#24564)

  Show description for f31961a
  chuga-git

  authored
  f31961a

  Copy full SHA for f31961a

• Fix: Body Scanner layout (ParadiseSS13#24140)

  Show description for 45f7f41
  

  AyIong

  and

  S34NW

  authored
  45f7f41

  Copy full SHA for 45f7f41

• niche case (ParadiseSS13#24595)

  Contrabang

  authored
  df29a55

  Copy full SHA for df29a55

• Adjusts Species Lung Temperature Tolerances (ParadiseSS13#24509)

  Show description for 6f63204
  

  LtDiggs

  and

  Henri215

  authored
  6f63204

  Copy full SHA for 6f63204

• Adds Meson Sunglasses (ParadiseSS13#24619)

  Show description for fdef20c
  

  4 peopleauthored
  fdef20c

  Copy full SHA for fdef20c

• Makes headslug mob_size MOB_SIZE_SMALL (ParadiseSS13#24623)

  Show description for dabcd51
  

  Adrer

  and

  [email protected]

  authored
  dabcd51

  Copy full SHA for dabcd51

• Capitalized Comfrey. (ParadiseSS13#24642)

  FunnyMan3595

  authored
  fa9246e

  Copy full SHA for fa9246e

• Update inflatable.dm (ParadiseSS13#24646)

  Fordoxia

  authored
  e4b0ca0

  Copy full SHA for e4b0ca0

• Fix dynamic lighting in secret clown HQ (ParadiseSS13#24181)

  Show description for 864520f
  

  3 peopleauthored
  864520f

  Copy full SHA for 864520f

• re-maps cables on box station (ParadiseSS13#24260)

  Show description for 1b3370d
  Fluffyzack21

  authored
  1b3370d

  Copy full SHA for 1b3370d

• Fixes all the cables on meta station (ParadiseSS13#24589)

  Show description for 7054f86
  

  Fluffyzack21

  and

  warriorstar-orion

  authored
  7054f86

  Copy full SHA for 7054f86

• oversight perma pipe missing (ParadiseSS13#24607)

  Fluffyzack21

  authored
  238525d

  Copy full SHA for 238525d

• goodbye exclaims (ParadiseSS13#24593)

  Contrabang

  authored
  664b04a

  Copy full SHA for 664b04a

• fixes admin shuttles breaking the escape shuttle / not working (ParadiseSS13#24677)

  Qwertytoforty

  authored
  c8dde43

  Copy full SHA for c8dde43

• Fix RD-Robotics Surgery window tint button on Cyberiad. (ParadiseSS13#24647)

  Show description for 79c2af1
  

  FunnyMan3595

  and

  S34NW

  authored
  79c2af1

  Copy full SHA for 79c2af1

• Update gun icon on knife removing (ParadiseSS13#24674)

  m-dzianishchyts

  authored
  e92e3a8

  Copy full SHA for e92e3a8

• Fix mime/clown picked names not being on their bank account. (ParadiseSS13#24669)

  FunnyMan3595

  authored
  153284e

  Copy full SHA for 153284e

• Make pAIs show correctly in diagnostic HUDs (ParadiseSS13#24666)

  FunnyMan3595

  authored
  13f0d60

  Copy full SHA for 13f0d60

• Retaliate mobs no longer break stuff after revived with a laz injector. (ParadiseSS13#24665)

  FunnyMan3595

  authored
  a5aa7d9

  Copy full SHA for a5aa7d9

• Remove IPC heel pixel on standard chassis type (ParadiseSS13#24657)

  VetleNeumann

  authored
  5bd3b32

  Copy full SHA for 5bd3b32

• Handle 'Adjacent' for items inside structures (ParadiseSS13#24655)

  Show description for 850888e
  VetleNeumann

  authored
  850888e

  Copy full SHA for 850888e

• adds extra check (ParadiseSS13#24648)

  BiancaWilkson

  authored
  c6c8811

  Copy full SHA for c6c8811

• Make gravity generator power-dependent again (ParadiseSS13#24601)

  m-dzianishchyts

  authored
  435fbb6

  Copy full SHA for 435fbb6

• Cargo "View Contents" Fix (ParadiseSS13#24562)

  Show description for 576cbdc
  Oyu07

  authored
  576cbdc

  Copy full SHA for 576cbdc

• Made eating Keeki a bit smarter. (ParadiseSS13#24373)

  Show description for 4dcc43f
  

  FunnyMan3595

  and

  Henri215

  authored
  4dcc43f

  Copy full SHA for 4dcc43f

• Fixed clown and mime brain/head naming. (ParadiseSS13#24668)

  FunnyMan3595

  authored
  ba2720a

  Copy full SHA for ba2720a

• It just work's. Probably. (ParadiseSS13#24515)

  Show description for ffd3927
  

  AyIong

  and

  S34NW

  authored
  ffd3927

  Copy full SHA for ffd3927

• Multi-tile doors fix (ParadiseSS13#24113)

  Show description for 7779516
  MrRomainzZ

  authored
  7779516

  Copy full SHA for 7779516

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

  m-dzianishchyts

  committed
  5e9be1b

  Copy full SHA for 5e9be1b