Code

Shipwrecked update#525

Code

Closed

Roudenn wants to merge 108 commits intoRxup:masterRxup/space-station-14:masterfrom Roudenn:shipwrecked-updateRoudenn/space-station-14:shipwrecked-updateCopy head branch name to clipboard

+23,616-8,088

Commits

Commits on Jan 2, 2024

• shipwrecked-upd

  Roudenn

  committed
  3d59520

• revert shuttle engi + upd map

  Show description for 79cbb66
  Roudenn

  committed
  79cbb66

Commits on Jan 3, 2024

• Merge remote-tracking branch 'upstream/master' into makeplanet-and-fixes

  Roudenn

  committed
  5520a3a

• гитхаб ты шизанулся что-ли?

  Show description for 06f76e0
  Roudenn

  committed
  06f76e0

• чистка от мусора

  Show description for 3b99158
  Roudenn

  committed
  3b99158

• нёрф исследователей

  Show description for 7a68f21
  Roudenn

  committed
  7a68f21

• structures + factions rebalance

  Show description for f343cd2
  Roudenn

  committed
  f343cd2

• Merge remote-tracking branch 'upstream/master' into shipwrecked-update

  Roudenn

  committed
  6c09839

Commits on Jan 4, 2024

• Dungeon balance

  Show description for 2d54fc7
  Roudenn

  committed
  2d54fc7

• Merge remote-tracking branch 'upstream/master' into shipwrecked-update

  Roudenn

  committed
  1c51ee7

• Update maps

  Show description for 51f5327
  Roudenn

  committed
  51f5327

• чистка №2 + музон

  Show description for c12dc3a
  Roudenn

  committed
  c12dc3a

• Merge remote-tracking branch 'upstream/master' into shipwrecked-update

  Roudenn

  committed
  fdcb3b4

Commits on Jan 5, 2024

• Merge remote-tracking branch 'upstream/master' into shipwrecked-update

  Roudenn

  committed
  2736073

• rebalance

  Show description for 2f809ac
  Roudenn

  committed
  2f809ac

• Merge branch 'shipwrecked-fixed' into shipwrecked-update

  Roudenn

  committed
  f6e1b61

• upd maps

  Show description for 6569e5b
  Roudenn

  committed
  6569e5b

• Merge branch 'shipwrecked-fixed' into shipwrecked-update

  Roudenn

  committed
  cc384e4

• oopsie fix

  Show description for 4807efe
  Roudenn

  committed
  4807efe

• Merge branch 'shipwrecked-fixed' into shipwrecked-update

  Roudenn

  committed
  8403049

Commits on Jan 6, 2024

• balance

  Roudenn

  committed
  3ec833c

• Merge branch 'shipwrecked-fixed' into shipwrecked-update

  Roudenn

  committed
  bc954e9

Commits on Jan 7, 2024

• balance!

  Roudenn

  committed
  365eb73

• Merge remote-tracking branch 'upstream/master' into shipwrecked-update

  Roudenn

  committed
  a7f61fb

Commits on Jan 9, 2024

• Merge remote-tracking branch 'upstream/master' into shipwrecked-update

  Roudenn

  committed
  d8d12b4

Commits on Jan 11, 2024

• Merge branch 'shipwrecked-fixed' into shipwrecked-update

  Roudenn

  committed
  51ddf18

Commits on Jan 13, 2024

• Merge remote-tracking branch 'upstream/master' into shipwrecked-update

  Roudenn

  committed
  130aa0f

• upd maps

  Show description for 4a68d03
  Roudenn

  committed
  4a68d03

• upd

  Rxup

  committed
  2c9a694

Commits on Jan 14, 2024

• upd

  Show description for 448e901
  Roudenn

  committed
  448e901

• fix!

  Roudenn

  committed
  921b566

• fix adventurer?

  Roudenn

  committed
  9a5868a

• New map: Traveller

  Roudenn

  committed
  6fe01ce

• Update shipwreck_factions.yml

  Roudenn

  committed
  07bda94

Commits on Jan 15, 2024

• upd hecate

  Show description for 8176079
  Roudenn

  committed
  8176079

Commits on Jan 16, 2024

• Merge remote-tracking branch 'upstream/master' into shipwrecked-update

  Roudenn

  committed
  1bbecd8

Commits on Jan 18, 2024

• Merge remote-tracking branch 'upstream/master' into shipwrecked-update

  Roudenn

  committed
  90d6c68

Commits on Jan 19, 2024

• Merge remote-tracking branch 'upstream/master' into shipwrecked-update

  Roudenn

  committed
  8dbe61c

• upd

  Roudenn

  committed
  23ce95a

• Update traveller.yml

  Roudenn

  committed
  2161c40

Commits on Jan 20, 2024

• Merge remote-tracking branch 'upstream/master' into shipwrecked-update

  Roudenn

  committed
  5427b69

• Big upd

  Show description for e906859
  Roudenn

  committed
  e906859

• small upd

  Show description for e0c7716
  Roudenn

  committed
  e0c7716

• rebalance + some unworking code

  Roudenn

  committed
  242092c

Commits on Jan 21, 2024

• fix code

  Show description for 40e3918
  Roudenn

  committed
  40e3918

• Merge remote-tracking branch 'upstream/master' into shipwrecked-update

  Roudenn

  committed
  b755d0b

Commits on Jan 22, 2024

• Merge remote-tracking branch 'upstream/master' into shipwrecked-update

  Roudenn

  committed
  eed446e

Commits on Jan 23, 2024

• rebalance + upd locale + some unworking code

  Show description for 6d2642b
  Roudenn

  committed
  6d2642b

• Colossus + upd maps

  Show description for eeea51f
  Roudenn

  committed
  eeea51f

• oopsie fix

  Roudenn

  committed
  c8833a8

Commits on Jan 24, 2024

• Merge remote-tracking branch 'upstream/master' into shipwrecked-update

  Roudenn

  committed
  3206cde

• CT-Artur

  Show description for 5219f3f
  Roudenn

  committed
  5219f3f

• rebalance

  Roudenn

  committed
  a5d2afa

Commits on Jan 26, 2024

• Merge remote-tracking branch 'upstream/master' into shipwrecked-update

  Roudenn

  committed
  77a65ce

Commits on Jan 27, 2024

• Update ShipwreckedRuleSystem.cs

  Roudenn

  committed
  00d7fc1

• get fixed boi

  Show description for 0d3be6b
  Roudenn

  committed
  0d3be6b

Commits on Jan 28, 2024

• upd

  Roudenn

  committed
  2a729b6

• upd maps

  Roudenn

  committed
  3f7863c

• Merge remote-tracking branch 'upstream/master' into shipwrecked-update

  Roudenn

  committed
  240a9bb

• small fix

  Show description for 1ae7b45
  Roudenn

  committed
  1ae7b45

• Update ShipwreckedRuleComponent.cs

  Roudenn

  committed
  8b16bd0

• map fix

  Show description for d314376
  Roudenn

  committed
  d314376

Commits on Jan 29, 2024

• fix

  Roudenn

  committed
  259128c

• Merge remote-tracking branch 'upstream/master' into shipwrecked-update

  Roudenn

  committed
  92c41e9

Commits on Jan 30, 2024

• mobspawn balance

  Show description for 20fc3fe
  Roudenn

  committed
  20fc3fe

• code fix

  Show description for d68a68a
  Roudenn

  committed
  d68a68a

Commits on Jan 31, 2024

• Merge remote-tracking branch 'upstream/master' into shipwrecked-update

  Roudenn

  committed
  c64fb1f

• upd some maps

  Show description for ed2b328
  Roudenn

  committed
  ed2b328

• migrate shuttles path

  Show description for 696ea94
  Roudenn

  committed
  696ea94

Commits on Feb 1, 2024

• upd locale + maps

  Show description for 21b945a
  Roudenn

  committed
  21b945a

• upd

  Roudenn

  committed
  0229ec7

• upd

  Roudenn

  committed
  4043ccf

Commits on Feb 2, 2024

• Merge remote-tracking branch 'upstream/master' into shipwrecked-update

  Roudenn

  committed
  26fd782

• upd

  Roudenn

  committed
  14cecf3

• Update shipwreck_destinations.yml

  Roudenn

  committed
  06e16e0

• balance

  Roudenn

  committed
  5b75836

• Update adventurer.yml

  Roudenn

  committed
  6f322f3

• reb

  Roudenn

  committed
  f98eb75

• rebalance

  Roudenn

  committed
  b143524

Commits on Feb 3, 2024

• rebalance + upd maps

  Roudenn

  committed
  da805b4

• final balance upd?

  Roudenn

  committed
  9d3eed8

• Merge remote-tracking branch 'upstream/master' into shipwrecked-update

  Roudenn

  committed
  77a00a2

• Merge remote-tracking branch 'upstream/master' into shipwrecked-update

  Roudenn

  committed
  e6a914f

Commits on Feb 13, 2024

• Merge remote-tracking branch 'upstream/master' into shipwrecked-update

  Roudenn

  committed
  bc2107c

Commits on Feb 17, 2024

• More prototypes and commentary in Shipwrecked

  Show description for 7bf3aed
  Roudenn

  committed
  7bf3aed

• Merge remote-tracking branch 'upstream/master' into shipwrecked-update

  Roudenn

  committed
  a3f9f3b

Commits on Feb 20, 2024

• Merge remote-tracking branch 'upstream/master' into shipwrecked-update

  Roudenn

  committed
  ba6383a

Commits on Feb 25, 2024

• Merge remote-tracking branch 'upstream/master' into shipwrecked-update

  Roudenn

  committed
  0392cc4

Commits on Mar 16, 2024

• Merge remote-tracking branch 'upstream/master' into shipwrecked-update

  Roudenn

  committed
  844b340

• fix

  Roudenn

  committed
  5194d09

• Add comentary + fix

  Roudenn

  committed
  bb00412

Commits on Mar 17, 2024

• Merge remote-tracking branch 'upstream/master' into shipwrecked-update

  Roudenn

  committed
  dc19c10

• scheduler

  Roudenn

  committed
  e45ac36

Commits on Mar 19, 2024

• Merge remote-tracking branch 'upstream/master' into shipwrecked-update

  Roudenn

  committed
  303d095

• remove megacity + shops, move markers to dest proto

  Roudenn

  committed
  9b5db5e

• move shipwrecked mappool

  Roudenn

  committed
  77975e6

• Add specified ores to shipwreck dest

  Roudenn

  committed
  4129768

• Update maps.yml

  Roudenn

  committed
  83c3ce8

Commits on Mar 20, 2024

• Merge remote-tracking branch 'upstream/master' into shipwrecked-update

  Roudenn

  committed
  96fb73c

• Reduce ore amount on Shipwrecked

  Show description for 113ecdc
  Roudenn

  committed
  113ecdc

• Delete biome_markers.yml

  Roudenn

  committed
  2500f24

• upd maps

  Roudenn

  committed
  b24ded4

Commits on Mar 21, 2024

• Update biome_markers_low.yml

  Roudenn

  committed
  d56e85f

• Merge remote-tracking branch 'upstream/master' into shipwrecked-update

  Roudenn

  committed
  806ff54

• Fix shwr dungeon code

  Show description for c7c00f4
  Roudenn

  committed
  c7c00f4

Commits on Mar 23, 2024

• Merge remote-tracking branch 'upstream/master' into shipwrecked-update

  Roudenn

  committed
  9f3147b

• fix markers + dungeon range

  Roudenn

  committed
  e1c3fb6

Commits on Mar 25, 2024

• Merge remote-tracking branch 'upstream/master' into shipwrecked-update

  Roudenn

  committed
  ef10fc8