git.smokeofanarchy.ru Git - space-station-14.git/commit

author	Boaz1111 <149967078+Boaz1111@users.noreply.github.com>
	Sun, 28 Apr 2024 05:46:53 +0000 (07:46 +0200)
committer	GitHub <noreply@github.com>
	Sun, 28 Apr 2024 05:46:53 +0000 (15:46 +1000)
commit	fe8ad485f274a5ee09f8fd04ffdf9e055095a548
tree	85d85044b866edd77079b898fc6c07c7e7732253	tree \| snapshot
parent	f544c9129870e9c34903cc8f76fdd6b3f1d463a5	commit \| diff

Circuit imprinter now uses less glass (#27310)

* moved from 9 sheets of glass to 5 sheets of glass for all circuit recipes

* Revert "moved from 9 sheets of glass to 5 sheets of glass for all circuit recipes"

This reverts commit 45bb8d40150cddbbe005f5d66d34532b79143f98.

* adresses merge conflict

* fixed error

* parents base computer board to base machine board

* Revert "parents base computer board to base machine board"

This reverts commit dec3a799a90b4a0cb121b6694ecf65d9a0abd6a3.

* other thing was causing errors, guess it's this now

Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/base_machineboard.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml		diff \| blob \| history
Resources/Prototypes/Recipes/Lathes/electronics.yml		diff \| blob \| history