Code

Rebase Start#1

Code

Closed

dwasint wants to merge 39 commits intoMonkestation:masterMonkestation/Monkestation2.0:masterfrom dwasint:monke-rebasedwasint/Monkestation2.0:monke-rebaseCopy head branch name to clipboard

+9,077-1,117

Commits

Commits on Mar 15, 2023

• adds the entire monkestation folder to start

  dwasint

  committed
  5b21827

  Copy full SHA for 5b21827

• part 2

  dwasint

  committed
  b5823ec

  Copy full SHA for b5823ec

• Revert "part 2"

  Show description for 944425b
  dwasint

  committed
  944425b

  Copy full SHA for 944425b

• Revert "adds the entire monkestation folder to start"

  Show description for e66df36
  dwasint

  committed
  e66df36

  Copy full SHA for e66df36

• brings back old botany

  

  Salex08

  authored and

  dwasint

  committed
  ee2eb1a

  Copy full SHA for ee2eb1a

• old botany compiles

  dwasint

  committed
  3faf812

  Copy full SHA for 3faf812

• more fixes

  dwasint

  committed
  9e0225e

  Copy full SHA for 9e0225e

• start of turning fermi-chem into flags for certain reactions

  dwasint

  committed
  cf5f8c7

  Copy full SHA for cf5f8c7

• Update reagents.dm

  dwasint

  committed
  830a027

  Copy full SHA for 830a027

• start of oozelings

  dwasint

  committed
  474ce59

  Copy full SHA for 474ce59

• butts and custom sounds

  dwasint

  committed
  d1a052d

  Copy full SHA for d1a052d

• re-adds hardsuits to the game

  dwasint

  committed
  9ab8594

  Copy full SHA for 9ab8594

• adds strings

  dwasint

  committed
  dd4b8ee

  Copy full SHA for dd4b8ee

• removes species lore

  dwasint

  committed
  fadde96

  Copy full SHA for fadde96

• adds liquids

  dwasint

  committed
  8bbcd47

  Copy full SHA for 8bbcd47

Commits on Mar 16, 2023

• oozeling stuff

  dwasint

  committed
  a268c22

  Copy full SHA for a268c22

• ipcs well most of em

  dwasint

  committed
  873534d

  Copy full SHA for 873534d

• more ipcs stuff

  dwasint

  committed
  ab16ef0

  Copy full SHA for ab16ef0

• adds selectable chassis to ipc, fixes antenna selection, adds screen selection to ipc

  dwasint

  committed
  599ff73

  Copy full SHA for 599ff73

Commits on Mar 17, 2023

• part 1 of simians

  dwasint

  committed
  8e7aa9d

  Copy full SHA for 8e7aa9d

• simans part 2

  dwasint

  committed
  71f4f29

  Copy full SHA for 71f4f29

• whoops

  dwasint

  committed
  18015e1

  Copy full SHA for 18015e1

• changes some fallbacks

  dwasint

  committed
  1e7bdee

  Copy full SHA for 1e7bdee

• simians tail pref works

  dwasint

  committed
  d9b15d2

  Copy full SHA for d9b15d2

• Update tails.dmi

  dwasint

  committed
  b0d320d

  Copy full SHA for b0d320d

• felinds be like *poof

  dwasint

  committed
  26b2fad

  Copy full SHA for 26b2fad

• Update pet_carrier.dm

  dwasint

  committed
  b495a98

  Copy full SHA for b495a98

• more fixes

  dwasint

  committed
  35a8689

  Copy full SHA for 35a8689

• hat stacking

  dwasint

  committed
  05a26fb

  Copy full SHA for 05a26fb

Commits on Mar 18, 2023

• Merge pull request Monkestation#25 from AcapitalA/engines

  Show description for e4df4ae
  

  Djiq

  authored and

  dwasint

  committed
  e4df4ae

  Copy full SHA for e4df4ae

• Revert "Merge pull request Monkestation#25 from AcapitalA/engines"

  Show description for a93f728
  dwasint

  committed
  a93f728

  Copy full SHA for a93f728

• adds singularity and rad collectors back fixes hat stacking runtime

  dwasint

  committed
  6338457

  Copy full SHA for 6338457

Commits on Mar 19, 2023

• random rooms and engines part 1

  dwasint

  committed
  362b7d4

  Copy full SHA for 362b7d4

• why the fuck do you say every file is gone

  dwasint

  committed
  aa5ddc9

  Copy full SHA for aa5ddc9

• and now you say every file is here....

  dwasint

  committed
  28987d3

  Copy full SHA for 28987d3

• Merge branch 'master' into monke-rebase

  dwasint

  committed
  f755efa

  Copy full SHA for f755efa

• compiles again

  dwasint

  committed
  07d5ec0

  Copy full SHA for 07d5ec0

• compile again again

  dwasint

  committed
  efaafae

  Copy full SHA for efaafae

• test

  dwasint

  committed
  1ad1a2f

  Copy full SHA for 1ad1a2f