Code

Overmap Expansion #5#3868

Code

Draft

rye-rice wants to merge 184 commits intoshiptest-ss13:mastershiptest-ss13/Shiptest:masterfrom rye-rice:true_overmap5rye-rice/Shiptest:true_overmap5Copy head branch name to clipboard

+90,070-3,157

Commits

Commits on Mar 28, 2023

• prototype

  rye-rice

  committed
  d880240

Commits on Apr 9, 2024

• previous changes readded

  rye-rice

  committed
  57256e8

Commits on Apr 14, 2024

• FYCK

  rye-rice

  committed
  f5d9ba7

Commits on Apr 22, 2024

• yuh

  rye-rice

  committed
  f154989

Commits on Apr 29, 2024

• Merge remote-tracking branch 'upstream/master' into true_overmap5

  rye-rice

  committed
  0dd4ca3

Commits on May 4, 2024

• cargopack progress2

  rye-rice

  committed
  f5f3b11

Commits on Jun 2, 2024

• Merge remote-tracking branch 'upstream/master' into true_overmap5

  rye-rice

  committed
  7cb5fec

Commits on Jun 8, 2024

• Merge remote-tracking branch 'upstream/master' into true_overmap5

  rye-rice

  committed
  a94c79f

• fixes ship spawning

  rye-rice

  committed
  43534d2

• Merge remote-tracking branch 'upstream/master' into true_overmap5

  rye-rice

  committed
  542bf37

Commits on Jun 10, 2024

• wawa

  rye-rice

  committed
  89de063

Commits on Jun 13, 2024

• fixes empty space bug, shifts some vars, transit areas larger

  rye-rice

  committed
  a2504b2

Commits on Jun 17, 2024

• shiptest. sfx from nsv, remind me to credit

  rye-rice

  committed
  dac994d

• Merge remote-tracking branch 'upstream/master' into true_overmap5

  rye-rice

  committed
  0365fdc

• Merge remote-tracking branch 'upstream/master' into true_overmap5

  rye-rice

  committed
  d1e2a7a

Commits on Jun 19, 2024

• Fixes the code and makes ship2ship docking easier to do

  rye-rice

  committed
  6b7214f

• Merge remote-tracking branch 'upstream/master' into true_overmap5

  rye-rice

  committed
  0dda026

Commits on Jun 23, 2024

• some edits

  rye-rice

  committed
  b16486a

Commits on Jun 24, 2024

• Merge remote-tracking branch 'upstream/master' into true_overmap5

  rye-rice

  committed
  206c1c2

• whhops

  rye-rice

  committed
  8899ee5

Commits on Jun 30, 2024

• PLACEHOLDERS, remind to revert commmit

  rye-rice

  committed
  0a46cf6

• yep

  rye-rice

  committed
  5dcc079

• event content

  rye-rice

  committed
  341ba0d

• Merge remote-tracking branch 'upstream/master' into true_overmap5

  rye-rice

  committed
  0e8aac9

Commits on Jul 1, 2024

• last

  rye-rice

  committed
  f8ad878

• Revert "event content"

  Show description for 0cf077c
  rye-rice

  committed
  0cf077c

Commits on Jul 2, 2024

• Revert "last"

  Show description for 4b96474
  rye-rice

  committed
  4b96474

Commits on Jul 9, 2024

• Merge remote-tracking branch 'origin/ruintest' into true_overmap5

  rye-rice

  committed
  28a7502

Commits on Jul 10, 2024

• punchcard works

  rye-rice

  committed
  d40c274

• Squashed commit of the following:

  Show description for a79bf23
  rye-rice

  committed
  a79bf23

• gets the ws special mobs working again

  rye-rice

  committed
  3420c7a

Commits on Jul 26, 2024

• Merge remote-tracking branch 'upstream/master' into true_overmap5

  rye-rice

  committed
  51f1c64

Commits on Aug 6, 2024

• Merge remote-tracking branch 'upstream/master' into true_overmap5

  rye-rice

  committed
  b3662c5

Commits on Aug 19, 2024

• ?

  rye-rice

  committed
  5229105

Commits on Aug 22, 2024

• Merge remote-tracking branch 'upstream/master' into true_overmap5

  rye-rice

  committed
  5b8cfbe

Commits on Aug 31, 2024

• Merge remote-tracking branch 'upstream/master' into true_overmap5

  rye-rice

  committed
  55623ee

Commits on Sep 10, 2024

• Merge remote-tracking branch 'upstream/master' into true_overmap5

  rye-rice

  committed
  0db837d

• small updates to sounds

  rye-rice

  committed
  54ab58a

• many improvements, unhardcodes things

  rye-rice

  committed
  a7605f0

• fixes bug and desperate attempt to fix auxmos crash

  rye-rice

  committed
  1b76b89

Commits on Sep 11, 2024

• fixes some bugs, lavagrubs shows up in missions

  rye-rice

  committed
  8e4415f

Commits on Sep 13, 2024

• static overmap objects, WIP

  rye-rice

  committed
  b2931e7

• Merge remote-tracking branch 'upstream/master' into true_overmap5

  rye-rice

  committed
  81f31dd

Commits on Sep 15, 2024

• punchard

  rye-rice

  committed
  694bd86

Commits on Sep 16, 2024

• punchcards

  rye-rice

  committed
  33f962a

• friends in mineral town

  rye-rice

  committed
  f039389

• Merge remote-tracking branch 'upstream/master' into true_overmap5

  rye-rice

  committed
  df8a8ea

• accidentlaly deleted this file

  rye-rice

  committed
  ffd0889

• fixes

  rye-rice

  committed
  a1fb551

• better alloy

  rye-rice

  committed
  6c23ccb

Commits on Sep 18, 2024

• fixes this verb

  rye-rice

  committed
  7059da2

Commits on Sep 21, 2024

• spoopyu

  rye-rice

  committed
  96b59f3

• Merge remote-tracking branch 'upstream/master' into true_overmap5

  rye-rice

  committed
  b30b4df

Commits on Sep 23, 2024

• fixes

  rye-rice

  committed
  5dd1592

• Merge remote-tracking branch 'upstream/master' into true_overmap5

  rye-rice

  committed
  09930c4

Commits on Sep 24, 2024

• off to a bad start

  rye-rice

  committed
  f1492eb

• woop

  rye-rice

  committed
  181a74a

• more fixes

  rye-rice

  committed
  15883f0

• more fixes

  rye-rice

  committed
  a29d886

Commits on Sep 25, 2024

• fixes and misc/ nerfs

  rye-rice

  committed
  c877f44

Commits on Oct 1, 2024

• bugfixes

  rye-rice

  committed
  c6485ba

• Merge remote-tracking branch 'upstream/master' into true_overmap5

  rye-rice

  committed
  db759aa

• spooky ice

  rye-rice

  committed
  17dfdc7

Commits on Oct 5, 2024

• Merge remote-tracking branch 'upstream/master' into true_overmap5

  rye-rice

  committed
  4a1251d

Commits on Oct 8, 2024

• start point

  rye-rice

  committed
  0436a4a

Commits on Oct 9, 2024

• progress

  rye-rice

  committed
  42e4d31

Commits on Oct 13, 2024

• finally fixes the fucking planet spawner

  rye-rice

  committed
  bff96e0

• spookysnow ™️

  rye-rice

  committed
  b113a59

• wsgreeble and improvements

  rye-rice

  committed
  299fe2b

• Merge remote-tracking branch 'upstream/master' into true_overmap5

  rye-rice

  committed
  20aa092

• shit

  rye-rice

  committed
  77ca65b

• ez chloriene

  rye-rice

  committed
  a45516c

• Merge remote-tracking branch 'upstream/master' into true_overmap5

  rye-rice

  committed
  7573b04

• changes hyrdo wanted

  rye-rice

  committed
  5be19e2

• waow

  rye-rice

  committed
  df79256

Commits on Oct 14, 2024

• OOPS

  rye-rice

  committed
  d48ee7b

• better sprites and they mostly wor

  rye-rice

  committed
  63d6bae

• dug

  rye-rice

  committed
  1c31878

Commits on Oct 15, 2024

• better sprites by imaginos

  rye-rice

  committed
  d85a634

• buffs phoronite ore

  rye-rice

  committed
  314afa3

• bug

  rye-rice

  committed
  1443286

Commits on Oct 17, 2024

• fixes moon biome

  rye-rice

  committed
  0a63177

Commits on Oct 19, 2024

• latency suggestion

  rye-rice

  committed
  cd8e7ad

Commits on Oct 22, 2024

• Merge remote-tracking branch 'upstream/master' into true_overmap5

  rye-rice

  committed
  2ec5df7

• removes unused

  rye-rice

  committed
  ac7c4bb

• improvments

  rye-rice

  committed
  b91c562

Commits on Oct 23, 2024

• makes these vars work as intended + fixes act when docked

  rye-rice

  committed
  17ecee7

Commits on Oct 24, 2024

• removes astreoids, makes them generate naturally by docking into an asteroid tile

  rye-rice

  committed
  cd793c2

• better feedback on which planets have which ore

  rye-rice

  committed
  6d8b5c7

• Merge remote-tracking branch 'upstream/master' into true_overmap5

  rye-rice

  committed
  59f07bf

Commits on Nov 5, 2024

• Merge remote-tracking branch 'upstream/master' into true_overmap5

  rye-rice

  committed
  52fa663

• repaths

  rye-rice

  committed
  c522fc2

• post merge conflict fixes

  rye-rice

  committed
  ff38cc9

• small fixes and such

  rye-rice

  committed
  00955d1

Commits on Nov 8, 2024

• failsafes docking ports more, removes debug message

  rye-rice

  committed
  592fae5

• ws rock no longer has footsteps

  rye-rice

  committed
  55d9f30

Commits on Nov 9, 2024

• Merge remote-tracking branch 'upstream/master' into true_overmap5

  rye-rice

  committed
  24a1d6e

• bugfixes

  rye-rice

  committed
  e585d38

• bugfix

  rye-rice

  committed
  a83c1aa

• sprite changes

  rye-rice

  committed
  5909b0a

• test

  rye-rice

  committed
  ba832dd

Commits on Nov 10, 2024

• unhardcodes cargo, many small fixes

  rye-rice

  committed
  3d689c0

Commits on Nov 11, 2024

• new sun sprites + materials and you

  rye-rice

  committed
  a886de4

• weah

  rye-rice

  committed
  4411bb7

• tiny bugfix

  rye-rice

  committed
  8c7b579

Commits on Nov 13, 2024

• accidentally code in factional cargo

  rye-rice

  committed
  afbd4e7

• matbundle automation

  rye-rice

  committed
  1ad241e

Commits on Nov 14, 2024

• Revert "accidentally code in factional cargo"

  Show description for c21dd25
  rye-rice

  committed
  c21dd25

Commits on Nov 17, 2024

• Revert "PLACEHOLDERS, remind to revert commmit"

  Show description for bab2368
  rye-rice

  committed
  bab2368

• more cleanup

  rye-rice

  committed
  6756a99

Commits on Nov 20, 2024

• wawa

  rye-rice

  committed
  3fd6884

• gravity fix

  rye-rice

  committed
  9f50d3f

• bugfixes

  rye-rice

  committed
  3ef9ceb

Commits on Nov 21, 2024

• dont forget with temp pr

  rye-rice

  committed
  b581699

• keeps the file changed rent low

  rye-rice

  committed
  ab0b08c

• weh

  rye-rice

  committed
  e5481c2

• Merge remote-tracking branch 'upstream/master' into true_overmap5

  rye-rice

  committed
  130c97e

• push

  rye-rice

  committed
  8000348

• fixes

  rye-rice

  committed
  8ab9728

Commits on Nov 23, 2024

• resprites a ton of shit

  rye-rice

  committed
  f04a117

Commits on Nov 27, 2024

• took long enough good god - temp events

  rye-rice

  committed
  9ea0a3e

• Merge remote-tracking branch 'upstream/master' into true_overmap5

  rye-rice

  committed
  6a23dd9

Commits on Nov 28, 2024

• Punchards and such work

  rye-rice

  committed
  be8cdb7

• progress

  rye-rice

  committed
  768e47f

• wawa

  rye-rice

  committed
  9d32efc

• varios fixes

  rye-rice

  committed
  ad6f2dd

• params

  rye-rice

  committed
  5101680

• yep

  rye-rice

  committed
  d1bce4c

• Merge remote-tracking branch 'upstream/master' into true_overmap5

  rye-rice

  committed
  c80e13d

Commits on Dec 1, 2024

• failsafes, sprites, and polish

  rye-rice

  committed
  05dcb37

• Merge remote-tracking branch 'upstream/master' into true_overmap5

  rye-rice

  committed
  f80b00a

• various fixes

  rye-rice

  committed
  6e9bfbc

• makse EMI 2 way

  rye-rice

  committed
  269ef93

• lastminute changes and such

  rye-rice

  committed
  5f1c094

Commits on Dec 2, 2024

• ore veins / fixes thunder storms /defangs meteors

  rye-rice

  committed
  2382a97

• fine tuning

  rye-rice

  committed
  04c3be0

• EDGE CASE: HOLOPADS

  rye-rice

  committed
  519a234

• fixes part million

  rye-rice

  committed
  aa52fe4

Commits on Dec 3, 2024

• cleanup p1

  rye-rice

  committed
  c056a06

• Merge remote-tracking branch 'upstream/master' into true_overmap5

  rye-rice

  committed
  6010873

Commits on Dec 4, 2024

• fixups

  rye-rice

  committed
  81bebb0

Commits on Dec 5, 2024

• go away

  rye-rice

  committed
  3ae3059

• cleanup part 2

  rye-rice

  committed
  a315859

• lints

  rye-rice

  committed
  b7146a8

Commits on Dec 6, 2024

• cleanup3

  rye-rice

  committed
  5e2b556

• yeah

  rye-rice

  committed
  d3e1fbd

• cleanup part 4

  rye-rice

  committed
  4bb9d58

• thgvr suggestion - removes plastic from a lot of recipies reeplaces with carbon

  rye-rice

  committed
  8b7e77f

• removes nebula ambience, never worked right anyways

  rye-rice

  committed
  c946995

• test fixes

  rye-rice

  committed
  04b5e7d

• fixes part 2: the squeakel

  rye-rice

  committed
  ace9ecd

• linters going to make me go insane

  rye-rice

  committed
  12c51bf

• Merge remote-tracking branch 'upstream/master' into true_overmap5

  rye-rice

  committed
  e91bee5

• one last linter my fucking god

  rye-rice

  committed
  1a7715d

• wawa

  rye-rice

  committed
  e6aaaea

• Merge remote-tracking branch 'upstream/master' into true_overmap5

  rye-rice

  committed
  ad62045

• woops

  rye-rice

  committed
  e0d5514

Commits on Dec 7, 2024

• few bugs i didn't qutie get / kneecaps lava embers / tcoms processsors reduce interference

  rye-rice

  committed
  52e4af3

• whyyyy

  rye-rice

  committed
  0625178

• small touchups, supports some newer ships now

  rye-rice

  committed
  1778825

• idk

  rye-rice

  committed
  589c336

• simpel and easy fixes from the round

  rye-rice

  committed
  73e224f

Commits on Dec 11, 2024

• various fixes and suggestions

  rye-rice

  committed
  7ffd65d

Commits on Dec 12, 2024

• Merge remote-tracking branch 'upstream/master' into true_overmap5

  rye-rice

  committed
  e0ace63

• fixes span

  rye-rice

  committed
  aecae81

Commits on Dec 13, 2024

• spoopy sprites + general fixes

  rye-rice

  committed
  09a799f

• Merge remote-tracking branch 'upstream/master' into true_overmap5

  rye-rice

  committed
  ecad782

• fixes annoying bug

  rye-rice

  committed
  cf73fb0

• adds a single break

  rye-rice

  committed
  b42394a

Commits on Dec 14, 2024

• various patches

  rye-rice

  committed
  f4886e7

• restores old plasma sprite

  rye-rice

  committed
  f3ece4a

• tones down greeble spawn rates, maybe will make moons spawn faster?

  rye-rice

  committed
  d19e066

Commits on Dec 15, 2024

• woopsie

  rye-rice

  committed
  0cc9a18

• good suggestions

  rye-rice

  committed
  226cada

Commits on Dec 20, 2024

• reduces slowdown by 30% from a suggestion someone gave a month ago i havent gotten to

  rye-rice

  committed
  de70362

• fixes plusars and disbales abttlefield and sandbox

  rye-rice

  committed
  d0325fb

• rockplanet sprites waow

  rye-rice

  committed
  9d18d77

Commits on Dec 21, 2024

• Merge remote-tracking branch 'upstream/master' into true_overmap5

  rye-rice

  committed
  099f007

• fixes, bumps down a mob's spawn chance, etc

  rye-rice

  committed
  480cde3

• various

  rye-rice

  committed
  2440523

• might as well bump up the chance

  rye-rice

  committed
  0eb9ad9

Commits on Dec 24, 2024

• small changes, spooky asked for rocky sand to spawn like this

  rye-rice

  committed
  aea7fed

• commits the sample map subshuttle while im waiting on a review fo rit

  rye-rice

  committed
  5161684

Commits on Jan 2, 2025

• Merge remote-tracking branch 'upstream/master' into true_overmap5

  rye-rice

  committed
  47da6cc