Code

Upstream merge 63#1979

Code

Merged

TheArturZh merged 150 commits intoSerbiaStrong-220:masterSerbiaStrong-220/space-station-14:masterfrom DexlerXD:upstream-merge-63DexlerXD/space-station-14:upstream-merge-63Copy head branch name to clipboardOct 1, 2024

+44,900-29,098

Commits

Commits on Sep 19, 2024

• Fland change - Add glasslocks to the Contiguous Fland Hallway Volume (space-wizards#32264)

  Show description for 3e1c067
  SaphireLattice

  authored
  3e1c067

• Automatic changelog update

  PJBot

  committed
  937940b

• Removes cockroach/mothroach melee damage (space-wizards#32221)

  Show description for 24c412f
  Plykiya

  authored
  24c412f

• Automatic changelog update

  PJBot

  committed
  d74d44a

• Makes the rat king's cheeseEm order more convenient to use (space-wizards#32181)

  Show description for 1a601c4
  PopGamer45

  authored
  1a601c4

• Automatic changelog update

  PJBot

  committed
  7aae8c0

Commits on Sep 20, 2024

• Cog update (Mail) (space-wizards#32315)

  Show description for 2d42a6b
  Spessmann

  authored
  2d42a6b

• Modifications to bring Omega up to date. (space-wizards#32317)

  spanky-spanky

  authored
  fba6797

• Make small clamp use 2% battery instead of recharging 2% battery. (space-wizards#32320)

  Show description for b81c7a4
  

  JIPDawg

  and

  JIPDawg

  authored
  b81c7a4

• Automatic changelog update

  PJBot

  committed
  99101f2

• fix issues with proximity beeper (space-wizards#32322)

  Show description for 00002fa
  Ilya246

  authored
  00002fa

• Disable resizing of lobby character editor (space-wizards#32313)

  Show description for a9b5e39
  eoineoineoin

  authored
  a9b5e39

• Rolebanlist command UI (space-wizards#30827)

  Show description for 1567af6
  sativaleanne

  authored
  1567af6

• Fix disposal units flushing too soon after power-on (space-wizards#32314)

  Show description for 6d5ac1e
  

  eoineoineoin

  and

  metalgearsloth

  authored
  6d5ac1e

• Psychologist's Stamp (space-wizards#31881)

  Show description for e964e9c
  cohanna

  authored
  e964e9c

• Automatic changelog update

  PJBot

  committed
  c4d12df

• Security Clown Mask is now security restricted. (space-wizards#32335)

  Show description for 2955dd5
  GoldenCan

  authored
  2955dd5

• Soda water and Vodka recipes (space-wizards#32252)

  Show description for 3e92eb1
  saga3152

  authored
  3e92eb1

• Automatic changelog update

  PJBot

  committed
  c5d62ce

Commits on Sep 21, 2024

• Fix medical PDA/health analyzer long range intel bug (space-wizards#31879)

  Show description for 24ed1f7
  goet

  authored
  24ed1f7

• Automatic changelog update

  PJBot

  committed
  29e56be

• Added a directory to station maps (space-wizards#31156)

  Show description for d32c42f
  TGRCdev

  authored
  d32c42f

• Automatic changelog update

  PJBot

  committed
  3501d49

• Add skirt of life in contraband medidrobe (space-wizards#32214)

  lzk228

  authored
  5f5bed8

• Fix a spelling mistake in the DonutVend's advertisments (space-wizards#32348)

  Show description for 3cc7fd4
  voidnull000

  authored
  3cc7fd4

• Flora anomaly seeds (space-wizards#31987)

  Show description for 2ea54b1
  

  TheShuEd

  and

  slarticodefast

  authored
  2ea54b1

• Automatic changelog update

  PJBot

  committed
  6a11dd0

• fix cargo order scams, fix internals crate desc (space-wizards#32350)

  Show description for cd761ea
  Ilya246

  authored
  cd761ea

• Rat kings can butcher things (space-wizards#32232)

  Show description for 1b81ce4
  Plykiya

  authored
  1b81ce4

• Automatic changelog update

  PJBot

  committed
  49f1772

Commits on Sep 22, 2024

• Update Credits (space-wizards#32362)

  Show description for 4f5255b
  

  github-actions[bot]

  and

  PJBot

  authored
  4f5255b

• AI now "can" use media console (space-wizards#32334)

  AsnDen

  authored
  72acce5

• Make buckle mint (space-wizards#32370)

  Show description for 8f06155
  metalgearsloth

  authored
  8f06155

• Automatic changelog update

  PJBot

  committed
  8ed779b

• Adding a holy watermelon helmet (space-wizards#32272)

  Show description for 1aea1ae
  ravage123321

  authored
  1aea1ae

• Automatic changelog update

  PJBot

  committed
  b78156a

• added the ability for pigs to feed themselves (space-wizards#32358)

  Show description for 932af69
  Soydium

  authored
  932af69

• Lemons, limes, and oranges can now be mutated into each other (space-wizards#32306)

  saga3152

  authored
  1e46657

• Automatic changelog update

  PJBot

  committed
  f8514e7

• Makes it possible to disable the vent pressure lockout temporarily with a screwdriver (space-wizards#31050)

  Show description for d3ff4d5
  PotentiallyTom

  authored
  d3ff4d5

• Automatic changelog update

  PJBot

  committed
  ee393a1

• reach update :3 (space-wizards#32387)

  Killerqu00

  authored
  8a2c69d

Commits on Sep 23, 2024

• Add the Syndicate Instigator Shuttle (space-wizards#32083)

  Show description for 5e162e7
  IProduceWidgets

  authored
  5e162e7

• Predict vending machine BUI (space-wizards#32376)

  metalgearsloth

  authored
  dd7884e

• Include container ents in examine (space-wizards#32267)

  Show description for b2cb813
  metalgearsloth

  authored
  b2cb813

• Automatic changelog update

  PJBot

  committed
  ad6c5a1

• L6 Fits in the Suit Storage Slot (space-wizards#30525)

  Show description for 3d2aadd
  Cojoke-dot

  authored
  3d2aadd

• Automatic changelog update

  PJBot

  committed
  c4b8260

• Entity menu lookup changes (space-wizards#32395)

  ElectroJr

  authored
  caf34be

• Automatic changelog update

  PJBot

  committed
  b6845de

• Computer wirepanel (space-wizards#32273)

  Show description for a7e29f2
  Errant-4

  authored
  a7e29f2

• Automatic changelog update

  PJBot

  committed
  0a3273a

• Fix guidebook books don't have damage (space-wizards#32403)

  lzk228

  authored
  aab4236

• Automatic changelog update

  PJBot

  committed
  16c46af

• VIM have Passenger Access. (space-wizards#32302)

  Show description for 24140d8
  Jophire

  authored
  24140d8

• Automatic changelog update

  PJBot

  committed
  31db37e

• Omega Minor Sec Update (space-wizards#32410)

  Show description for 5e9a0c9
  spanky-spanky

  authored
  5e9a0c9

• fix(contraband): Make contraband work with chameleon items (space-wizards#30986)

  Show description for 20bb9ed
  

  Brandon-Huu

  and

  slarticodefast

  authored
  20bb9ed

• Fix cadet pda (space-wizards#32399)

  lzk228

  authored
  95104de

• Automatic changelog update

  PJBot

  committed
  d0bb408

• Paper QOL improvements (space-wizards#32418)

  Show description for 594aad0
  eoineoineoin

  authored
  594aad0

• Fix OOC not re-enabling if restartroundnow is used (space-wizards#32401)

  Show description for 1450d76
  PJB3005

  authored
  1450d76

Commits on Sep 24, 2024

• Remove all command age requirements (space-wizards#32340)

  Show description for f1bd0be
  VasilisThePikachu

  authored
  f1bd0be

• Automatic changelog update

  PJBot

  committed
  dc4d638

• Add missing LV cables in Omega atmos (space-wizards#32417)

  Show description for 9d75a22
  spanky-spanky

  authored
  9d75a22

• Allow AreaInsert pickups for one item (space-wizards#32153)

  Show description for 50395e2
  dvir001

  authored
  50395e2

• Automatic changelog update

  PJBot

  committed
  49d4e4c

• Antimov in both Traitor & Nukie Uplinks (space-wizards#31916)

  Show description for efd9894
  

  LordEclipse

  and

  PJBot

  authored
  efd9894

• Automatic changelog update

  PJBot

  committed
  b883f79

• craftable freezers (space-wizards#32277)

  Show description for 87932bc
  lzk228

  authored
  87932bc

• Automatic changelog update

  PJBot

  committed
  057de0c

• fix paper staying on fire forever (space-wizards#32412)

  Show description for 042f0d3
  MilonPL

  authored
  042f0d3

• Automatic changelog update

  PJBot

  committed
  f3e185c

• AstroNav GPS Cartridge (space-wizards#32194)

  Show description for 241be37
  

  ArchRBX

  and

  archrbx

  authored
  241be37

• Automatic changelog update

  PJBot

  committed
  4bca634

• Fix cartesian explosion in pref loading (space-wizards#32434)

  Show description for e36d735
  PJB3005

  authored
  e36d735

• Automatic changelog update

  PJBot

  committed
  89dbef7

• fix(BatterySelfRecharger): Fully charge BatterySelfRechargers (space-wizards#30627)

  Brandon-Huu

  authored
  95a159f

• Most papers are no longer trash (space-wizards#32343)

  Show description for 55366dc
  Moomoobeef

  authored
  55366dc

• Automatic changelog update

  PJBot

  committed
  52e85fe

Commits on Sep 25, 2024

• Fix contraband never getting added to vend inventory (space-wizards#32431)

  Show description for d1812c1
  goet

  authored
  d1812c1

• Automatic changelog update

  PJBot

  committed
  31c45d6

• Skull Helm Hand Sprite now turns (space-wizards#32442)

  Show description for 0dedc9d
  Zylofan

  authored
  0dedc9d

• Adds real-time charge & disabled action information to Actions (space-wizards#31821)

  keronshb

  authored
  7168959

• Fix agent ID card unlimited range (space-wizards#32445)

  Show description for e0a3d3d
  themias

  authored
  e0a3d3d

• Automatic changelog update

  PJBot

  committed
  d2ed93e

• Remove binary channel access to silicons without laws. (space-wizards#32385)

  Show description for 6459f71
  VasilisThePikachu

  authored
  6459f71

• Automatic changelog update

  PJBot

  committed
  92c5c87

• Makes the rolling pin craftable (space-wizards#32285)

  Show description for b2dad9f
  

  3 peopleauthored
  b2dad9f

• Automatic changelog update

  PJBot

  committed
  5a585f7

• Fix Doctors Delight metabolism Rate (space-wizards#32297)

  Show description for 548973b
  

  BramvanZijp

  and

  slarticodefast

  authored
  548973b

• Automatic changelog update

  PJBot

  committed
  9c2fe85

Commits on Sep 26, 2024

• Makes BaseAdvancedPen abstract (space-wizards#32454)

  Show description for 0f729bc
  

  IamVelcroboy

  and

  BurningRash

  authored
  0f729bc

• lower frezon/n2o sale prices, make frezon take more trit (space-wizards#32407)

  Show description for fd1f4a3
  Ilya246

  authored
  fd1f4a3

• Automatic changelog update

  PJBot

  committed
  4491550

• Add Votekick functionality (space-wizards#32005)

  SlamBamActionman

  authored
  eeadc75

• Automatic changelog update

  PJBot

  committed
  c2bc821

• Voice Mask refactor (space-wizards#30798)

  Show description for fe2145d
  beck-thompson

  authored
  fe2145d

• Automatic changelog update

  PJBot

  committed
  bf80f3a

Commits on Sep 27, 2024

• Cog update (power fix/grav) (space-wizards#32475)

  Show description for af3ea52
  Spessmann

  authored
  af3ea52

• Fixed collision for gas and volumetric pumps (space-wizards#32471)

  Show description for b9b0c10
  

  august-sun

  and

  august-sun

  authored
  b9b0c10

• Automatic changelog update

  PJBot

  committed
  b8d7733

• Fix airlock autoclose mispredict (space-wizards#32477)

  Show description for b1e69ee
  metalgearsloth

  authored
  b1e69ee

• Automatic changelog update

  PJBot

  committed
  bee66ed

• Fix storage area pickup sound playing multiple times (space-wizards#32397)

  metalgearsloth

  authored
  f46f5e2

• Automatic changelog update

  PJBot

  committed
  2e03787

• Predict stripping (space-wizards#32478)

  Show description for bc461b9
  metalgearsloth

  authored
  bc461b9

• Automatic changelog update

  PJBot

  committed
  0d26bb0

• Station AI ability to electricute doors (space-wizards#32012)

  Show description for 4bcf3c3
  

  4 peopleauthored
  4bcf3c3

• Automatic changelog update

  PJBot

  committed
  88ccc19

• Feature/grey trenchcoat for detective loadout (space-wizards#32380)

  Show description for bbf84d0
  

  LittleNorthStar

  and

  slarticodefast

  authored
  bbf84d0

• Automatic changelog update

  PJBot

  committed
  4e86095

• remove thief figurine objective (space-wizards#32413)

  Show description for 7d4ea96
  deltanedas

  authored
  7d4ea96

• Automatic changelog update

  PJBot

  committed
  b5a7326

Commits on Sep 28, 2024

• Predict appraisal tool verb! (space-wizards#32496)

  Show description for 7485411
  beck-thompson

  authored
  7485411

• Automatic changelog update

  PJBot

  committed
  caac678

• Optimise drains (space-wizards#32230)

  Show description for dd376e4
  metalgearsloth

  authored
  dd376e4

• Some new hairstyles! (space-wizards#31010)

  Show description for a371de1
  

  Futuristic-OK

  and

  UbaserB

  authored
  a371de1

• Automatic changelog update

  PJBot

  committed
  9f5b6af

• Fix multiple door issues (space-wizards#32483)

  Show description for bed9684
  metalgearsloth

  authored
  bed9684

• Automatic changelog update

  PJBot

  committed
  8b692d1

• Update submodule to 236.0.0 (space-wizards#32500)

  metalgearsloth

  authored
  0a7b23c

• Replace obsolete Tile Access methods (space-wizards#32508)

  Show description for 1b9d77a
  MilenVolf

  authored
  1b9d77a

Commits on Sep 29, 2024

• Fix RA0032 (space-wizards#32514)

  nikthechampiongr

  authored
  a5840b9

• Fix currency duplication bug (space-wizards#32524)

  ElectroJr

  authored
  d806db2

• Automatic changelog update

  PJBot

  committed
  6b49a51

• Add interaction rate limits (space-wizards#32527)

  Show description for f1f1fc1
  ElectroJr

  authored
  f1f1fc1

• Automatic changelog update

  PJBot

  committed
  6bc383c

• Fixes HoS's energy shotgun not being marked as restricted contraband (space-wizards#32521)

  Show description for 1dc9541
  ArtisticRoomba

  authored
  1dc9541

• Automatic changelog update

  PJBot

  committed
  cc9202b

• Add webhook for votekicks (space-wizards#32513)

  Show description for d0c4d5a
  SlamBamActionman

  authored
  d0c4d5a

• make conveyor belt assemblies cheaper (space-wizards#32444)

  Show description for 4aed728
  Ilya246

  authored
  4aed728

• Automatic changelog update

  PJBot

  committed
  f6ceaa7

• Fix mutation system debug assert (space-wizards#32530)

  slarticodefast

  authored
  1632500

• Execution System uses the identity of an entity; added "the" to execution message (space-wizards#32536)

  Show description for 5c0b127
  

  CuteMoonGod

  and

  Celene

  authored
  5c0b127

• Automatic changelog update

  PJBot

  committed
  dd15a68

Commits on Sep 30, 2024

• Use archived gas mixture in gas exchange comparison (space-wizards#32088)

  Show description for 7cf04dc
  

  3 peopleauthored
  7cf04dc

• Automatic changelog update

  PJBot

  committed
  c419e58

• AI can use fire alarm (space-wizards#32467)

  Show description for bc059f0
  qwerltaz

  authored
  bc059f0

• Automatic changelog update

  PJBot

  committed
  717f82f

• Merge commit 'cd761eae691e47b7502b94808926173e28160649' into upstream-merge-63

  DexlerXD

  committed
  af508f0

• Merge commit '89dbef7461abe1de886075cc011bc2e0af2bd40a' into upstream-merge-63

  DexlerXD

  committed
  503c73e

• Merge commit '0a7b23cd4db598e2f0215e582bd840773093d528' into upstream-merge-63

  DexlerXD

  committed
  3e6a1e8

• Merge commit '717f82f9da59b9498b505bb059652d7f8b36f574' into upstream-merge-63

  DexlerXD

  committed
  a82a91b

• post-merge fixes

  DexlerXD

  committed
  bec9350

• delete duplicate stamp

  DexlerXD

  committed
  d6ff27a

• return figurines steal group

  DexlerXD

  committed
  c2d9a55

Commits on Oct 1, 2024

• Merge branch 'master' of https://github.com/SerbiaStrong-220/space-station-14 into upstream-merge-63

  DexlerXD

  committed
  a5bf408

• delete contraband inheritance

  DexlerXD

  committed
  e49684f

• return deleted hat

  DexlerXD

  committed
  1b0e418