Code

Golems#295

Code

Open

Ermucat wants to merge 52 commits intoss14-harmony:masterss14-harmony/ss14-harmony:masterfrom Ermucat:Golems64Ermucat/GoonCave-14:Golems64Copy head branch name to clipboard

+1,379

Commits

Commits on Dec 7, 2024

• Commit

  Ermucat

  committed
  9d563a1

  Copy full SHA for 9d563a1

• commit

  Ermucat

  committed
  d00d3db

  Copy full SHA for d00d3db

• Made it syndiecate contra

  Ermucat

  committed
  19f2d97

  Copy full SHA for 19f2d97

Commits on Dec 8, 2024

• Moving Files into harmony folders

  Ermucat

  committed
  8126f2d

  Copy full SHA for 8126f2d

• Moving more things

  Ermucat

  committed
  e14f72e

  Copy full SHA for e14f72e

• Removing things?

  Ermucat

  committed
  9de7014

  Copy full SHA for 9de7014

• Move smugglers name from uplink catalog to harmony uplink catalog

  Ermucat

  committed
  dc235ef

  Copy full SHA for dc235ef

• Fixes Sprite, and hopefully fixes test error

  Ermucat

  committed
  79d7db0

  Copy full SHA for 79d7db0

Commits on Dec 9, 2024

• Fixes Unneeded Spaces, fixed Name

  Ermucat

  committed
  617a01e

  Copy full SHA for 617a01e

Commits on Dec 15, 2024

• Update uplink-catalog.ftl

  Show description for 4a2046d
  FluffMe

  authored
  4a2046d

  Copy full SHA for 4a2046d

• Update satchel.yml

  Show description for a475e2d
  FluffMe

  authored
  a475e2d

  Copy full SHA for a475e2d

Commits on Jan 8, 2025

• plun

  Ermucat

  committed
  4eddc46

  Copy full SHA for 4eddc46

• added inventory

  Ermucat

  committed
  4539d27

  Copy full SHA for 4539d27

• Radio Channels and Golum Parts and WHATEVER ELSE AHHH

  Ermucat

  committed
  86077f9

  Copy full SHA for 86077f9

• bluh

  Ermucat

  committed
  c126cef

  Copy full SHA for c126cef

Commits on Jan 9, 2025

• pluh

  Ermucat

  committed
  181f3f1

  Copy full SHA for 181f3f1

• pluh

  Ermucat

  committed
  cf76c51

  Copy full SHA for cf76c51

• dyurr

  Ermucat

  committed
  55c7fef

  Copy full SHA for 55c7fef

• Delete Resources/Prototypes/_Harmony/Actions/types.yml

  Show description for 8cf23f4
  Ermucat

  authored
  8cf23f4

  Copy full SHA for 8cf23f4

• Delete Resources/Prototypes/_Harmony/Entities/Clothing/Back/satchel.yml

  Show description for bb6da03
  Ermucat

  authored
  bb6da03

  Copy full SHA for bb6da03

• Delete Resources/Prototypes/_Harmony/Entities/Objects/Misc/subdermal_implants.yml

  Show description for ebb4054
  Ermucat

  authored
  ebb4054

  Copy full SHA for ebb4054

• Delete Resources/Prototypes/_Harmony/Catalog/uplink_catalog.yml

  Show description for 440d522
  Ermucat

  authored
  440d522

  Copy full SHA for 440d522

• Revert "Delete Resources/Prototypes/_Harmony/Catalog/uplink_catalog.yml"

  Show description for c26e5f3
  Ermucat

  committed
  c26e5f3

  Copy full SHA for c26e5f3

• Update uplink_catalog.yml

  Show description for 289869f
  Ermucat

  authored
  289869f

  Copy full SHA for 289869f

• Revert "Update uplink_catalog.yml"

  Show description for 71972a3
  Ermucat

  committed
  71972a3

  Copy full SHA for 71972a3

• Merge branch 'ss14-harmony:master' into Feature/SmugglersSatchel

  Ermucat

  authored
  a3d8b74

  Copy full SHA for a3d8b74

• a

  Ermucat

  committed
  dceb02e

  Copy full SHA for dceb02e

• RAHHH

  Ermucat

  committed
  7979062

  Copy full SHA for 7979062

• Janitorial Commit

  Ermucat

  committed
  da274e7

  Copy full SHA for da274e7

• major bug fixes like holy I made it an actually functioning feature (somewhat)

  Ermucat

  committed
  94bf8bf

  Copy full SHA for 94bf8bf

• YAML FIX

  Ermucat

  committed
  689d889

  Copy full SHA for 689d889

• More YAML errors? Yes please

  Ermucat

  committed
  641cca2

  Copy full SHA for 641cca2

• wah

  Ermucat

  committed
  3faae11

  Copy full SHA for 3faae11

• PLEASE WORK GOD WHY WONT THIS COMPONENT WORK I HATE EDITING COMPOTENTDS IF I HA

  Ermucat

  committed
  643391a

  Copy full SHA for 643391a

• Reverts stuff

  Ermucat

  committed
  50273cf

  Copy full SHA for 50273cf

• So everthing works now, HexCode is still screwed and Golems are still missing their rear end, but we have no more fatal errors, this 12 hour, sleep-deprived escapade of an idea is finally over

  Ermucat

  committed
  fc42d7f

  Copy full SHA for fc42d7f

• Adds plasteel golems

  Ermucat

  committed
  ae88a39

  Copy full SHA for ae88a39

Commits on Jan 10, 2025

• Sprite Fixes

  Ermucat

  committed
  22802f7

  Copy full SHA for 22802f7

• aaaa

  Ermucat

  committed
  ac95020

  Copy full SHA for ac95020

• Copyright (:

  Ermucat

  committed
  82f5cb9

  Copy full SHA for 82f5cb9

• DIE PLASMA GOLEM DIE

  Ermucat

  committed
  f17454d

  Copy full SHA for f17454d

• Forgot I was experimenting and it test failed my bad

  Ermucat

  committed
  c138832

  Copy full SHA for c138832

• Merge branch 'Golems64' of https://github.com/Ermucat/GoonCave-14 into Golems64

  Ermucat

  committed
  928577c

  Copy full SHA for 928577c

• Fixing a small bugfix instead of fixing a test fail that appeared out of thin air

  Ermucat

  committed
  3cda924

  Copy full SHA for 3cda924

• guh

  Ermucat

  committed
  cb6143a

  Copy full SHA for cb6143a

Commits on Jan 11, 2025

• I believe this is what is causing the error, only other thing I can find in error log is something about a PdaType? Which ive never touched

  Ermucat

  committed
  861fd59

  Copy full SHA for 861fd59

• Tweaked Golem punched and gave Golem Cores new sprites

  Ermucat

  committed
  003db5a

  Copy full SHA for 003db5a

Commits on Jan 12, 2025

• Vocabulary changes, golem description, new sprite for golem core, unique names for golem cores

  Ermucat

  committed
  e7896e1

  Copy full SHA for e7896e1

• Fixed construction menu

  Ermucat

  committed
  187d0b7

  Copy full SHA for 187d0b7

Commits on Jan 13, 2025

• Added a guidebook entry

  Ermucat

  committed
  7db58b6

  Copy full SHA for 7db58b6

Commits on Jan 19, 2025

• 50 COMMITS BABY YEAHHHHHHHHHHHH (also balance and color changes as well as fixing test fail hopefully)

  Ermucat

  committed
  7815bdd

  Copy full SHA for 7815bdd

• My bad

  Ermucat

  committed
  3fa48cb

  Copy full SHA for 3fa48cb