Code

Cyborg Rebalance#34186

Code

Open

Nox38 wants to merge 65 commits intospace-wizards:masterspace-wizards/space-station-14:masterfrom Nox38:cyborg-rebalanceNox38/space-station-14:cyborg-rebalanceCopy head branch name to clipboard

+482-186

Commits

Commits on Nov 18, 2024

• added mail, moved some things around, and fixed a lot of APCs

  Nox38

  committed
  03f63cb

  Copy full SHA for 03f63cb

Commits on Nov 23, 2024

• Merge branch 'master' of https://github.com/space-wizards/space-station-14

  Nox38

  committed
  3be1bc4

  Copy full SHA for 3be1bc4

• fixed my mistakes

  Nox38

  committed
  a92532f

  Copy full SHA for a92532f

Commits on Jan 2, 2025

• Moved around and changed equipment of all borgs except service.

  Nox38

  committed
  d944324

  Copy full SHA for d944324

Commits on Jan 3, 2025

• Update Resources/Prototypes/Entities/Objects/Specific/Janitorial/trashbag.yml

  Show description for 8558133
  

  Nox38

  and

  ArtisticRoomba

  authored
  8558133

  Copy full SHA for 8558133

• Update Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml

  Show description for 48a8905
  

  Nox38

  and

  ArtisticRoomba

  authored
  48a8905

  Copy full SHA for 48a8905

• Update Resources/Prototypes/Entities/Objects/Specific/Janitorial/trashbag.yml

  Show description for 28253fc
  

  Nox38

  and

  ArtisticRoomba

  authored
  28253fc

  Copy full SHA for 28253fc

• Delete Resources/Maps/meta.yml

  Show description for b9ab148
  Nox38

  authored
  b9ab148

  Copy full SHA for b9ab148

• Update trashbag.yml

  Show description for c288522
  Nox38

  authored
  c288522

  Copy full SHA for c288522

• Delete Resources/Prototypes/Maps/meta.yml

  Show description for 2271fda
  Nox38

  authored
  2271fda

  Copy full SHA for 2271fda

• Update borg_modules.yml

  Nox38

  authored
  08fbe0a

  Copy full SHA for 08fbe0a

• meta is back

  Nox38

  committed
  790f919

  Copy full SHA for 790f919

• fixed up some issues with the modules and fucked around with the medical ones.

  Nox38

  committed
  252727b

  Copy full SHA for 252727b

• Revert "meta is back"

  Show description for 87fceb6
  ArtisticRoomba

  committed
  87fceb6

  Copy full SHA for 87fceb6

• Merge branch 'master' into cyborg-rebalance

  Show description for d2341a1
  ArtisticRoomba

  committed
  d2341a1

  Copy full SHA for d2341a1

Commits on Jan 4, 2025

• fixed one thing and reverted a fuckup

  Nox38

  committed
  b505d01

  Copy full SHA for b505d01

• Finished the mediborg changes.

  Nox38

  committed
  8ec61f3

  Copy full SHA for 8ec61f3

• RCD is once again starting equipment for engiborg

  Nox38

  committed
  23039a5

  Copy full SHA for 23039a5

• Added holoprojector to advanced tools module

  Nox38

  committed
  7d19c61

  Copy full SHA for 7d19c61

• A bunch of misc fixes + QOL improvements

  Show description for e5ddfb3
  ArtisticRoomba

  committed
  e5ddfb3

  Copy full SHA for e5ddfb3

• fix that amazing linter and build fail

  ArtisticRoomba

  committed
  a0c9c4a

  Copy full SHA for a0c9c4a

• Update Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml

  Show description for b5ade58
  

  Nox38

  and

  ArtisticRoomba

  authored
  b5ade58

  Copy full SHA for b5ade58

• Update Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml

  Show description for 288bad5
  

  Nox38

  and

  ArtisticRoomba

  authored
  288bad5

  Copy full SHA for 288bad5

• Update spray.yml

  Nox38

  authored
  9deef58

  Copy full SHA for 9deef58

• made the salvborg orebag bigger.

  Nox38

  committed
  6b7de79

  Copy full SHA for 6b7de79

• Merge branch 'cyborg-rebalance' of https://github.com/Nox38/space-station-14 into cyborg-rebalance

  Nox38

  committed
  fd52425

  Copy full SHA for fd52425

Commits on Jan 5, 2025

• Improved generic loadout and a few other small things.

  Nox38

  committed
  df08fd2

  Copy full SHA for df08fd2

Commits on Jan 6, 2025

• Removed extra 6 vials from chem modules

  Nox38

  committed
  f8ebbf5

  Copy full SHA for f8ebbf5

• oops left some recipes in

  Nox38

  committed
  8960456

  Copy full SHA for 8960456

• removed pesky radiation module from cog

  Nox38

  committed
  ec5eddc

  Copy full SHA for ec5eddc

• Merge branch 'space-wizards:master' into cyborg-rebalance

  Nox38

  authored
  2c87621

  Copy full SHA for 2c87621

• some goober added lingering cable x10 (which I removed) into gate, fixing that

  Nox38

  committed
  b3d5887

  Copy full SHA for b3d5887

• Revert "oops left some recipes in"

  Show description for 8bcd496
  Nox38

  committed
  8bcd496

  Copy full SHA for 8bcd496

• �Removing the stuff from the maps was a bad idea so just readded the useless rad module for Cog spesifically.

  Nox38

  committed
  eefeb7c

  Copy full SHA for eefeb7c

• completely readded the stupid dumb radiation module that no one uses because SOMEONE mapped it everything breaks if it doesnt exist

  Nox38

  committed
  14a936a

  Copy full SHA for 14a936a

• Revert "completely readded the stupid dumb radiation module that no one uses because SOMEONE mapped it everything breaks if it doesnt exist"

  Show description for 7f6fe4f
  ArtisticRoomba

  committed
  7f6fe4f

  Copy full SHA for 7f6fe4f

• Revert "�Removing the stuff from the maps was a bad idea so just readded the useless rad module for Cog spesifically."

  Show description for f4b0270
  ArtisticRoomba

  committed
  f4b0270

  Copy full SHA for f4b0270

• Reapply "oops left some recipes in"

  Show description for 2ba52c7
  ArtisticRoomba

  committed
  2ba52c7

  Copy full SHA for 2ba52c7

• Revert "some goober added lingering cable x10 (which I removed) into gate, fixing that"

  Show description for 63737f4
  ArtisticRoomba

  committed
  63737f4

  Copy full SHA for 63737f4

• Revert "removed pesky radiation module from cog"

  Show description for 6823f7d
  ArtisticRoomba

  committed
  6823f7d

  Copy full SHA for 6823f7d

• migrate deleted radiation module and changed lingering cable ID... no clue why this is mapped

  ArtisticRoomba

  committed
  3792acd

  Copy full SHA for 3792acd

Commits on Jan 9, 2025

• Added new sprites!

  Nox38

  committed
  53d14dc

  Copy full SHA for 53d14dc

Commits on Jan 10, 2025

• Rearranged a module, please pass the tests

  Nox38

  committed
  48f5e84

  Copy full SHA for 48f5e84

Commits on Jan 13, 2025

• Removed unneeded components from borgOreBag

  Nox38

  committed
  58df271

  Copy full SHA for 58df271

• added proper attributions

  Nox38

  committed
  d68223b

  Copy full SHA for d68223b

• properly added attributions

  Nox38

  committed
  292ba5a

  Copy full SHA for 292ba5a

Commits on Jan 20, 2025

• Update Resources/Prototypes/Entities/Objects/Specific/Salvage/ore_bag.yml

  Show description for a3b32e3
  

  Nox38

  and

  ArtisticRoomba

  authored
  a3b32e3

  Copy full SHA for a3b32e3

• Update Resources/Textures/Interface/Actions/actions_borg.rsi/meta.json

  Show description for 219e7fe
  

  Nox38

  and

  ArtisticRoomba

  authored
  219e7fe

  Copy full SHA for 219e7fe

Commits on Jan 22, 2025

• Added power drill to tools module

  Nox38

  committed
  d07bb0b

  Copy full SHA for d07bb0b

• Merge remote-tracking branch 'origin/cyborg-rebalance' into cyborg-rebalance

  Nox38

  committed
  5612610

  Copy full SHA for 5612610

Commits on Jan 24, 2025

• Merge remote-tracking branch 'origin/master' into cyborg-rebalance

  Nox38

  committed
  7616ae6

  Copy full SHA for 7616ae6

• Merge branch 'master' into cyborg-rebalance

  Nox38

  authored
  799a363

  Copy full SHA for 799a363

Commits on Feb 5, 2025

• Added ScarKy0's suggestions

  Nox38

  committed
  722bced

  Copy full SHA for 722bced

• forgot trashbag oopsies

  Nox38

  committed
  18098cf

  Copy full SHA for 18098cf

• Merge branch 'space-wizards:master' into cyborg-rebalance

  Nox38

  authored
  d9bc467

  Copy full SHA for d9bc467

• added super synth to music module, buffed service modules, added the rest of ScarKy0s changes

  Nox38

  committed
  5509415

  Copy full SHA for 5509415

• Merge branch 'master' into cyborg-rebalance

  Nox38

  committed
  ff8ac2e

  Copy full SHA for ff8ac2e

• Merge branch 'cyborg-rebalance' of

  Show description for c5e5368
  Nox38

  committed
  c5e5368

  Copy full SHA for c5e5368

• forgor

  Nox38

  committed
  590bff9

  Copy full SHA for 590bff9

• minor spelling mistake

  Nox38

  committed
  1c70c5c

  Copy full SHA for 1c70c5c

• Fixed things

  Nox38

  committed
  731543f

  Copy full SHA for 731543f

Commits on Feb 10, 2025

• Merge remote-tracking branch 'origin/master' into cyborg-rebalance

  Show description for 5b45600
  Nox38

  committed
  5b45600

  Copy full SHA for 5b45600

• Fixed merge conflicts again (something broke the first time)

  Nox38

  committed
  b8544d0

  Copy full SHA for b8544d0

• Oops, tool was still craftable!

  Nox38

  committed
  718294c

  Copy full SHA for 718294c

Commits on Feb 13, 2025

• fixed minor convention mistakes, changed cable module to start with 30 of each cable.

  Nox38

  committed
  9cc33ab

  Copy full SHA for 9cc33ab