Code

Upstream Merge 6/7/2024#20

Code

Merged

VMSolidus merged 52 commits intoSS14-Classic:masterSS14-Classic/deep-station-14:masterfrom VMSolidus:Sekrit-stuffVMSolidus/deep-station-14:Sekrit-stuffCopy head branch name to clipboardJun 8, 2024

+9,285-1,442

Commits

Commits on May 5, 2024

• Sleep deprived coding

  VMSolidus

  committed
  5b8d8bd

  Copy full SHA for 5b8d8bd

• guhh

  VMSolidus

  committed
  c964f91

  Copy full SHA for c964f91

Commits on May 8, 2024

• updating mimic rule

  VMSolidus

  committed
  84afa69

  Copy full SHA for 84afa69

• update mimic spawns

  VMSolidus

  committed
  7126614

  Copy full SHA for 7126614

Commits on May 11, 2024

• Guh

  VMSolidus

  committed
  dcbb94d

  Copy full SHA for dcbb94d

• Update submarine

  VMSolidus

  committed
  3a1bf4a

  Copy full SHA for 3a1bf4a

• rsi validator

  VMSolidus

  committed
  f293866

  Copy full SHA for f293866

• Revert "rsi validator"

  Show description for 2291292
  VMSolidus

  committed
  2291292

  Copy full SHA for 2291292

• guhhhhh

  VMSolidus

  committed
  e5b5765

  Copy full SHA for e5b5765

• Update vending_machines.yml

  VMSolidus

  committed
  bbc73ed

  Copy full SHA for bbc73ed

• Update vending_machines.yml

  VMSolidus

  committed
  9e6c56c

  Copy full SHA for 9e6c56c

• Update vending_machines.yml

  VMSolidus

  committed
  35204d3

  Copy full SHA for 35204d3

• Update vending_machines.yml

  VMSolidus

  committed
  e1e7d1f

  Copy full SHA for e1e7d1f

• Update vending_machines.yml

  VMSolidus

  committed
  bcbe1ad

  Copy full SHA for bcbe1ad

• Update vending_machines.yml

  VMSolidus

  committed
  7f1f618

  Copy full SHA for 7f1f618

Commits on May 12, 2024

• found it

  VMSolidus

  committed
  7fdfea5

  Copy full SHA for 7fdfea5

• Fuck the test

  VMSolidus

  committed
  01186cf

  Copy full SHA for 01186cf

• Update bay12barbershop.yml

  VMSolidus

  committed
  8455835

  Copy full SHA for 8455835

• Update vending_machines.yml

  VMSolidus

  committed
  f9c509a

  Copy full SHA for f9c509a

• more point lights

  VMSolidus

  committed
  6458ed0

  Copy full SHA for 6458ed0

• More work on shader

  VMSolidus

  committed
  1d2bd21

  Copy full SHA for 1d2bd21

Commits on May 14, 2024

• update cola and coffee

  VMSolidus

  committed
  1925472

  Copy full SHA for 1925472

• engivend done

  VMSolidus

  committed
  f27b719

  Copy full SHA for f27b719

Commits on May 15, 2024

• Chunk of sprites adjusted. Some may be slightly misaligned :)

  Pspritechologist

  committed
  e8fc219

  Copy full SHA for e8fc219

Commits on May 30, 2024

• Merge branch 'master' into Vendors

  VMSolidus

  authored
  d5afb68

  Copy full SHA for d5afb68

• wallmed done

  VMSolidus

  committed
  0f4cecf

  Copy full SHA for 0f4cecf

• guh

  VMSolidus

  committed
  9122ae1

  Copy full SHA for 9122ae1

• FINALLY DONE

  VMSolidus

  committed
  65a58f4

  Copy full SHA for 65a58f4

Commits on May 31, 2024

• Merge branch 'master' into FIX-MIMICS

  VMSolidus

  authored
  386057a

  Copy full SHA for 386057a

• Merge branch 'master' into Additional-Loadout-Items

  DangerRevolution

  authored
  8033d02

  Copy full SHA for 8033d02

• YE

  VMSolidus

  committed
  770a2b0

  Copy full SHA for 770a2b0

Commits on Jun 3, 2024

• Merge branch 'master' into Additional-Loadout-Items

  Show description for 0edd396
  VMSolidus

  authored
  0edd396

  Copy full SHA for 0edd396

• Update ciggy discreption

  VMSolidus

  committed
  8375afc

  Copy full SHA for 8375afc

• Update packs.yml

  VMSolidus

  committed
  6ca58bf

  Copy full SHA for 6ca58bf

• Update outerClothing.yml

  VMSolidus

  committed
  f24dcfe

  Copy full SHA for f24dcfe

• update categories

  VMSolidus

  committed
  c588ac5

  Copy full SHA for c588ac5

• Add bluesec and reorganize security

  VMSolidus

  committed
  c68218b

  Copy full SHA for c68218b

• Adding prescription glasses

  VMSolidus

  committed
  11c49a0

  Copy full SHA for 11c49a0

• Update medical.yml

  VMSolidus

  committed
  0c0cc24

  Copy full SHA for 0c0cc24

Commits on Jun 8, 2024

• Apply suggestions from code review

  Show description for d573549
  

  VMSolidus

  and

  DEATHB4DEFEAT

  authored
  d573549

  Copy full SHA for d573549

• Update MobReplacementRuleSystem.cs

  VMSolidus

  committed
  68461a6

  Copy full SHA for 68461a6

• Update MobReplacementRuleSystem.cs

  VMSolidus

  committed
  b2f4da6

  Copy full SHA for b2f4da6

• Merge remote-tracking branch 'EE-Personal/FIX-MIMICS' into Sekrit-stuff

  VMSolidus

  committed
  f5bfb93

  Copy full SHA for f5bfb93

• Merge remote-tracking branch 'EE-Personal/Additional-Loadout-Items' into Sekrit-stuff

  VMSolidus

  committed
  8763409

  Copy full SHA for 8763409

• Merge remote-tracking branch 'EE-Personal/Harpy-Markings-Wave-2' into Sekrit-stuff

  VMSolidus

  committed
  36d7208

  Copy full SHA for 36d7208

• Merge remote-tracking branch 'EE-Personal/Vendors' into Sekrit-stuff

  VMSolidus

  committed
  862b26c

  Copy full SHA for 862b26c

• Update fitness.yml

  VMSolidus

  committed
  ce16969

  Copy full SHA for ce16969

• Update barbershop.yml

  VMSolidus

  committed
  6ed6530

  Copy full SHA for 6ed6530

• Update drinks-cartons.yml

  VMSolidus

  committed
  6972cd1

  Copy full SHA for 6972cd1

• aaaaaaaaaaaaaaaaaa

  VMSolidus

  committed
  b39282c

  Copy full SHA for b39282c

• MORE OF THESE? They're being upstreamed by the way

  VMSolidus

  committed
  62f6090

  Copy full SHA for 62f6090

• Update drinks.yml

  VMSolidus

  committed
  1b8d149

  Copy full SHA for 1b8d149