Code

Almayer Renovation#8291

Code

Draft

Syndro101 wants to merge 67 commits intocmss13-devs:mastercmss13-devs/cmss13:masterfrom Syndro101:Almayer_RenovationSyndro101/CMSS13:Almayer_RenovationCopy head branch name to clipboard

+11,476-9,248

Commits

Commits on Jan 28, 2025

• almayer

  Syndro101

  committed
  ad60d84

  Copy full SHA for ad60d84

• ditto

  Syndro101

  committed
  5b9fd90

  Copy full SHA for 5b9fd90

• lower deck cryo bay stuff

  Syndro101

  committed
  98d7920

  Copy full SHA for 98d7920

• Merge branch 'cmss13-devs:master' into Almayer_Renovation

  Syndro101

  authored
  5c3f36b

  Copy full SHA for 5c3f36b

Commits on Jan 29, 2025

• fixes

  Syndro101

  committed
  0ad726f

  Copy full SHA for 0ad726f

• Merge branch 'Almayer_Renovation' of https://github.com/Syndro101/CMSS13 into Almayer_Renovation

  Syndro101

  committed
  da7a4b8

  Copy full SHA for da7a4b8

• Merge branch 'cmss13-devs:master' into Almayer_Renovation

  Syndro101

  authored
  0c384c3

  Copy full SHA for 0c384c3

Commits on Jan 30, 2025

• fixes some disposal pipes

  Syndro101

  committed
  6d2d261

  Copy full SHA for 6d2d261

• new reporter office

  Syndro101

  committed
  4bf6acc

  Copy full SHA for 4bf6acc

• small fixes

  Syndro101

  committed
  ea1ad83

  Copy full SHA for ea1ad83

• removal of some redundant walls

  Syndro101

  committed
  9e1b4b0

  Copy full SHA for 9e1b4b0

• CBRN closet for the new room in engineering

  Syndro101

  committed
  6da3ab4

  Copy full SHA for 6da3ab4

• small fixes

  Syndro101

  committed
  2343f07

  Copy full SHA for 2343f07

• small whoopsie

  Syndro101

  committed
  1ef49af

  Copy full SHA for 1ef49af

• removed 1 mopp suit for balance

  Syndro101

  committed
  4469203

  Copy full SHA for 4469203

• air pipe

  Syndro101

  committed
  f46fd7e

  Copy full SHA for f46fd7e

• Locks 2 CBRN suits behind CO only access

  Syndro101

  committed
  c935477

  Copy full SHA for c935477

• added decon showers to cbrn room as fluff

  Syndro101

  committed
  c95804b

  Copy full SHA for c95804b

• Merge branch 'cmss13-devs:master' into Almayer_Renovation

  Syndro101

  authored
  641288b

  Copy full SHA for 641288b

• minor changes to the CBRN closet

  Syndro101

  committed
  26058dc

  Copy full SHA for 26058dc

• Merge branch 'Almayer_Renovation' of https://github.com/Syndro101/CMSS13 into Almayer_Renovation

  Syndro101

  committed
  4a088c4

  Copy full SHA for 4a088c4

• We have a basic med helmet visor, why not glasses? Adds one to the CBRN locker as well.

  Syndro101

  committed
  08c63cb

  Copy full SHA for 08c63cb

• changes

  Syndro101

  committed
  1e530b9

  Copy full SHA for 1e530b9

• Merge branch 'cmss13-devs:master' into Almayer_Renovation

  Syndro101

  authored
  e6f8090

  Copy full SHA for e6f8090

• fixes shifted apc hopefully

  Syndro101

  committed
  dd118d4

  Copy full SHA for dd118d4

• Merge branch 'Almayer_Renovation' of https://github.com/Syndro101/CMSS13 into Almayer_Renovation

  Syndro101

  committed
  74a350c

  Copy full SHA for 74a350c

• fixes angry varediting

  Syndro101

  committed
  b076a31

  Copy full SHA for b076a31

• for real this time

  Syndro101

  committed
  b245a75

  Copy full SHA for b245a75

• Fixup maps in TGM format

  Show description for 34b0fec
  Syndro101

  committed
  34b0fec

  Copy full SHA for 34b0fec

Commits on Jan 31, 2025

• Merge branch 'master' into Almayer_Renovation

  Syndro101

  authored
  f20e6d4

  Copy full SHA for f20e6d4

• Merge branch 'master' into Almayer_Renovation

  Syndro101

  authored
  2cf1243

  Copy full SHA for 2cf1243

• CBRN closets are funky, removed for now and replaced with rad suits instead, sorry bros.

  Syndro101

  committed
  5d01067

  Copy full SHA for 5d01067

• Merge branch 'Almayer_Renovation' of https://github.com/Syndro101/CMSS13 into Almayer_Renovation

  Syndro101

  committed
  85382ce

  Copy full SHA for 85382ce

• Merge branch 'master' into Almayer_Renovation

  Syndro101

  authored
  88ca54b

  Copy full SHA for 88ca54b

• merge conflict 1

  Syndro101

  committed
  a0f2af0

  Copy full SHA for a0f2af0

• merge conflict 2

  Syndro101

  committed
  8697911

  Copy full SHA for 8697911

Commits on Feb 5, 2025

• sprite fix

  Syndro101

  committed
  33de5fa

  Copy full SHA for 33de5fa

• merge conflict 1

  Syndro101

  committed
  ecf8aeb

  Copy full SHA for ecf8aeb

• merge conflict 2

  Syndro101

  committed
  c692a30

  Copy full SHA for c692a30

• Fixup maps in TGM format

  Show description for c9cdb53
  Syndro101

  committed
  c9cdb53

  Copy full SHA for c9cdb53

• fixes apc, fixes missing area from merge

  Syndro101

  committed
  18188ee

  Copy full SHA for 18188ee

• fixing merge conflict glitches

  Syndro101

  committed
  d6f8186

  Copy full SHA for d6f8186

• Merge branch 'master' into Almayer_Renovation

  Syndro101

  authored
  323ec9a

  Copy full SHA for 323ec9a

• Fixup maps in TGM format

  Show description for 03665fc
  Syndro101

  committed
  03665fc

  Copy full SHA for 03665fc

• Merge branch 'Almayer_Renovation' of https://github.com/Syndro101/CMSS13 into Almayer_Renovation

  Syndro101

  committed
  17312ec

  Copy full SHA for 17312ec

Commits on Feb 6, 2025

• Fixes 1: Fixes floating semotics mentioned on github, floating button, adjusts positions of several small items, fixed id to saferoom exterior shutters, standardized floor tiling for cryobays, fixe…

  Show description for 8b33b6f
  Syndro101

  committed
  8b33b6f

  Copy full SHA for 8b33b6f

• Fixup maps in TGM format

  Show description for 765234e
  Syndro101

  committed
  765234e

  Copy full SHA for 765234e

• Remade intel office to be more spacious, removed some rails that dont layer properly.

  Syndro101

  committed
  3284e66

  Copy full SHA for 3284e66

• Fixup maps in TGM format

  Show description for 910b0e7
  Syndro101

  committed
  910b0e7

  Copy full SHA for 910b0e7

• fixed access to saferoom, minor fixes to misplaced lights and other things.

  Syndro101

  committed
  f50bff6

  Copy full SHA for f50bff6

• Fixup maps in TGM format

  Show description for c26256a
  Syndro101

  committed
  c26256a

  Copy full SHA for c26256a

• Hydrogen tanks readded for OT, intercom outside CIC, moved stairwell APC into better spots, minor changes elsewhere.

  Syndro101

  committed
  ff95b1d

  Copy full SHA for ff95b1d

• Fixup maps in TGM format

  Show description for 9e7ad36
  Syndro101

  committed
  9e7ad36

  Copy full SHA for 9e7ad36

• minor tile changes

  Syndro101

  committed
  13dc73d

  Copy full SHA for 13dc73d

• Fixup maps in TGM format

  Show description for 1e1c112
  Syndro101

  committed
  1e1c112

  Copy full SHA for 1e1c112

• it'd be nice if the icon check didnt take a half hour to even run.

  Syndro101

  committed
  71b95b5

  Copy full SHA for 71b95b5

• Fixup maps in TGM format

  Show description for f0ab385
  Syndro101

  committed
  f0ab385

  Copy full SHA for f0ab385

• maybe final?

  Syndro101

  committed
  b2dc526

  Copy full SHA for b2dc526

• Fixup maps in TGM format

  Show description for a5a631e
  Syndro101

  committed
  a5a631e

  Copy full SHA for a5a631e

Commits on Feb 8, 2025

• small changes to pilot doors access. added some tarbacks to the SEA office.

  Syndro101

  committed
  cd85a28

  Copy full SHA for cd85a28

Commits on Feb 13, 2025

• Merge remote-tracking branch 'cmss13-devs/master' into Almayer_Renovation

  

  forest2001

  committed
  0489c9e

  Copy full SHA for 0489c9e

• Maint Access fix

  

  forest2001

  committed
  74f7aab

  Copy full SHA for 74f7aab

• Curse of the Forest

  

  forest2001

  committed
  25bb620

  Copy full SHA for 25bb620

Commits on Feb 17, 2025

• Merge branch 'cmss13-devs:master' into Almayer_Renovation

  Syndro101

  authored
  761677a

  Copy full SHA for 761677a

Commits on Feb 18, 2025

• goes over some of the reviews concerns

  Syndro101

  committed
  24a7be3

  Copy full SHA for 24a7be3

• Fixup maps in TGM format

  Show description for 32cd41e
  Syndro101

  committed
  32cd41e

  Copy full SHA for 32cd41e

• Merge branch 'master' of https://github.com/Syndro101/CMSS13 into Almayer_Renovation

  Syndro101

  committed
  468158d

  Copy full SHA for 468158d