Code

Test PR 2#2

Code

Closed

SlamBamActionman wants to merge 40 commits intomasterSlamBamActionman/space-station-14:masterfrom xenoSlamBamActionman/space-station-14:xenoCopy head branch name to clipboard

+128,300-5

Commits

Commits on May 4, 2024

• Xeno walls

  SlamBamActionman

  committed
  a4fec9e

  Copy full SHA for a4fec9e

Commits on May 25, 2024

• Fix icon smoothing for the walls

  SlamBamActionman

  committed
  a5ee776

  Copy full SHA for a5ee776

Commits on Jun 7, 2024

• Added a bunch of items, and the map/shuttle

  SlamBamActionman

  committed
  0d3f848

  Copy full SHA for 0d3f848

• Fixed construction graphs

  SlamBamActionman

  committed
  ae0691a

  Copy full SHA for ae0691a

• Merge branch 'master' into xeno

  Show description for 56a8fbd
  SlamBamActionman

  committed
  56a8fbd

  Copy full SHA for 56a8fbd

• Put the map in the right place gosh

  SlamBamActionman

  committed
  c489d5d

  Copy full SHA for c489d5d

Commits on Jun 10, 2024

• Merge branch 'master' into xeno

  SlamBamActionman

  committed
  bcdd9f7

  Copy full SHA for bcdd9f7

• Fix shuttle walls rusting, invalid IDs, latejoin cryo, deprecated properties

  SlamBamActionman

  committed
  4cd54b4

  Copy full SHA for 4cd54b4

• Fix APC names and stuff

  SlamBamActionman

  committed
  6bf7baa

  Copy full SHA for 6bf7baa

Commits on Jun 13, 2024

• Updated to v1.1

  SlamBamActionman

  committed
  1e1b117

  Copy full SHA for 1e1b117

• Updated armory

  SlamBamActionman

  committed
  c38acc6

  Copy full SHA for c38acc6

• Actually commit armory

  SlamBamActionman

  committed
  f307e3f

  Copy full SHA for f307e3f

• Add map to integration test

  SlamBamActionman

  committed
  23e4c64

  Copy full SHA for 23e4c64

Commits on Jun 14, 2024

• Fix lawyer spawn

  SlamBamActionman

  committed
  7991e52

  Copy full SHA for 7991e52

Commits on Aug 7, 2024

• Merge branch 'master' into xeno

  Show description for acd9ec1
  SlamBamActionman

  committed
  acd9ec1

  Copy full SHA for acd9ec1

Commits on Aug 8, 2024

• Change xeno spawner to be less deadly

  SlamBamActionman

  committed
  811400a

  Copy full SHA for 811400a

• ContainmentFieldGenerator is now able to be on from the start

  SlamBamActionman

  committed
  01239e7

  Copy full SHA for 01239e7

• Beta v1.2

  SlamBamActionman

  committed
  0e997ff

  Copy full SHA for 0e997ff

Commits on Aug 9, 2024

• Beta v 1.2.1; Fixed beacons, cargo shuttle atmos fixes; added small stalagtites to doorways, nerfed xeno a bit more, other minor fixes

  SlamBamActionman

  committed
  ca394ba

  Copy full SHA for ca394ba

Commits on Sep 4, 2024

• Merge branch 'master' into xeno

  Show description for cd543c8
  SlamBamActionman

  committed
  cd543c8

  Copy full SHA for cd543c8

• Fix wall merge error, fix Solid Chitin RCD, add dark techmaint to cutter

  SlamBamActionman

  committed
  28f9cdd

  Copy full SHA for 28f9cdd

• Fix new wall price, and update map itself with voxbox, AI and better singulo setup

  SlamBamActionman

  committed
  2fad57f

  Copy full SHA for 2fad57f

• Fixgridatmos

  SlamBamActionman

  committed
  502a8a5

  Copy full SHA for 502a8a5

Commits on Sep 16, 2024

• Merge branch 'master' into xeno

  SlamBamActionman

  committed
  4615f11

  Copy full SHA for 4615f11

Commits on Sep 28, 2024

• Xeno update part 1 of 2

  SlamBamActionman

  committed
  c9c7c72

  Copy full SHA for c9c7c72

Commits on Oct 5, 2024

• Beta v1.3, Part 2 of the updates

  SlamBamActionman

  committed
  1ad9fbc

  Copy full SHA for 1ad9fbc

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

  Show description for cb2252e
  SlamBamActionman

  committed
  cb2252e

  Copy full SHA for cb2252e

Commits on Oct 7, 2024

• Fix faulty code missed during merges

  SlamBamActionman

  committed
  893b167

  Copy full SHA for 893b167

Commits on Oct 20, 2024

• Xeno Beta v1.3.2

  SlamBamActionman

  committed
  ca09bf3

  Copy full SHA for ca09bf3

• Fix invalid in map file, make chapel more chapel-y

  SlamBamActionman

  committed
  178cda1

  Copy full SHA for 178cda1

Commits on Oct 21, 2024

• Xeno Beta 1.3.3; added custom evac shuttle

  SlamBamActionman

  committed
  0a2e0e8

  Copy full SHA for 0a2e0e8

• Added a custom background

  SlamBamActionman

  committed
  5033b75

  Copy full SHA for 5033b75

• Attribution (and fix incorrectly edited texture)

  SlamBamActionman

  committed
  5187d4b

  Copy full SHA for 5187d4b

Commits on Nov 3, 2024

• Xeno 1.3.4; QOL changes with materials, cameras, lights and names

  SlamBamActionman

  committed
  4b6cfb0

  Copy full SHA for 4b6cfb0

• Fix attribution error

  SlamBamActionman

  committed
  265e683

  Copy full SHA for 265e683

• Xeno 1.3.5; updated based on GH feedback

  SlamBamActionman

  committed
  bc18334

  Copy full SHA for bc18334

• Oops, missed this SpawnMobXenoPraetorian

  SlamBamActionman

  committed
  4da720e

  Copy full SHA for 4da720e

Commits on Nov 4, 2024

• Turbo is rightfully clowning on me for forgetting to rename the spawner

  SlamBamActionman

  committed
  2d43330

  Copy full SHA for 2d43330

• Merge branch 'upstream/master' into xeno

  SlamBamActionman

  committed
  d57889c

  Copy full SHA for d57889c

• Add bombing targets

  SlamBamActionman

  committed
  85591ce

  Copy full SHA for 85591ce