Commit Graph
12 Commits
Author SHA1 Message Date
SpaceLoveSs13andGitHub 84fe9b9901 Techweb defines (#28501)
* techweb

* more

* more2
2024-06-30 17:38:51 +05:30
065fc837a6 [MIRROR] New Tech Tree (#28226)
* New Tech Tree

* ew

* wew

* e

* Modular Fix all

* Bluespace bag fix

* fixes broke

* Remove drill bit

* more fixes

* Update scipaper_partner.dm

* Update powerator.dm

---------

Co-authored-by: Andrew <mt.forspam@gmail.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
Co-authored-by: SpaceLoveSs13 <68121607+SpaceLoveSs13@users.noreply.github.com>
2024-06-21 09:55:26 +05:30
28abe4d246 More nova ports (#26018)
* https://github.com/NovaSector/NovaSector/pull/297

* https://github.com/NovaSector/NovaSector/pull/277

* Space Ruin - Space hotel Pipenet, Powernet and disposal fixes (#253)

* stinky

* 1

* Updates status (#270)

* Updates status

* Update world.dm

* https://github.com/NovaSector/NovaSector/pull/130

* fex

---------

Co-authored-by: Zergspower <Griffinj88@yahoo.com>
Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com>
2024-01-06 16:51:59 +00:00
8314290832 [MIRROR] Experimental Mineral Balance PR. [MDB IGNORE] (#21784)
* Experimental Mineral Balance PR. (#75437)

Good morning fokes, this PR is going to attempt to tweak around some of
the values of mineral costs in-game in the hopes of making the mineral
economy more engaging to the base gameplay loop, in the hopes that by
making it more self-realized, it would allow for better integration with
the rest of the gameplay loop as well as so that it doesn't completely
overshadow the credit economy. That said, **this pr only makes changes
to mined and station minerals**.

So, the base change is as follows: items with designated costs of
minerals below 1000 minerals, as designated in #75052 as
`SMALL_MATERIAL_AMOUNT`, have been left alone. Any item above 1000 or
2000, from `HALF_SHEET_MATERIAL_AMOUNT` and `SHEET_MATERIAL_AMOUNT` have
been adjusted, as sheets will now contain **100 minerals each**.

For example, if an object costed 4000 iron, 1000 glass, and 500 diamond
with the old numbers, with the changes to these defines, that item would
cost 2000 iron, 500 glass, and 500 diamond.

* Experimental Mineral Balance PR.

* materials

* more mats

* more mats

* Update medical_designs.dm

---------

Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
Co-authored-by: lessthanthree <83487515+lessthnthree@users.noreply.github.com>
2023-06-12 13:04:33 -07:00
5e9d2379bf [MIRROR] Stock Part Resprite [MDB IGNORE] (#21014)
* Stock Part Resprite

* wew

* alright

---------

Co-authored-by: Thunder12345 <Thunder12345@users.noreply.github.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
2023-05-09 04:10:18 +01:00
bdd6e2e477 [MIRROR] Renames Datum Parts above tier 1 accordingly to their tier. [MDB IGNORE] (#18771)
* Renames Datum Parts above tier 1 accordingly to their tier.

* Makes it so all of our machine also use the datum stock parts, because that's also important

---------

Co-authored-by: SyncIt21 <110812394+SyncIt21@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
2023-02-03 16:59:29 -05:00
ZergspowerandGitHub 1c5549831e The great Unfuckening of all the tech/mechfab categories (#18673)
* Finally Sanity

* Update robot_items.dm

* leftover

* multi-cell oops

* tweak

* suggested

* Match upstream Research category for integrations sake

* Revert "Match upstream Research category for integrations sake"

This reverts commit 5ad819888368c07ee992bc9facf36872a12041fb.

* Fixes Newlines
2023-01-21 16:41:45 -05:00
5c6c91144c [MIRROR] Changes the missing food icon test to cover ALL /obj's [MDB IGNORE] (#18139)
* Changes the missing food icon test to cover ALL /obj's

* Update implant.dm

* Hopefully fixes all the failing integration tests!

* Fixes more missing icons

* Even more icon fixes

* Hopefully that was all of them

* Okay now SURELY that's all of them

* I'm tired of this shit man

* Hopefully that's all, for real this time!

Co-authored-by: ShizCalev <ShizCalev@users.noreply.github.com>
Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
2022-12-28 19:30:05 -05:00
ead1aa0b76 [MIRROR] TGUI for Techfabs II: The Great Recategorizing (AND ICONS) (AND MECHFABS) (AND AUTOLATHES) [MDB IGNORE] (#16616)
* TGUI for Techfabs II: The Great Recategorizing (AND ICONS) (AND MECHFABS) (AND AUTOLATHES)

* Still doesn't compile but there's no more conflicts

* [PR PR] Makes #16616 Compile And Work (#16656)

Oh hey, it compiles!

Co-authored-by: scriptis <scriptif@gmail.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
Co-authored-by: RimiNosha <106692773+RimiNosha@users.noreply.github.com>
2022-10-06 11:54:38 +01:00
d7ef0f27cb [MIRROR] Converts all research categories into defines [MDB IGNORE] (#15599)
* Converts all research categories into defines

* this took an hour

* h

* update research categories include

* update research categories include

Co-authored-by: Seth Scherer <supernovaa41@gmx.com>
Co-authored-by: John Doe <gamingskeleton3@gmail.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
2022-08-17 17:16:38 +00:00
86c72f9302 [MIRROR] Lathe taxes now checks departmental flags [MDB IGNORE] (#13563)
* Lathe taxes now checks departmental flags

* Update tool_designs.dm

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
2022-05-17 21:42:51 +01:00
GandalfandGitHub b32b65fbe3 Mutants - HNZ1 - A medical and scientific adventure! (#4664)
* aaa

* AAAAAAAA

* aaa

* aaaaa

* aaa

* Update zombie_cure.dm

* Update zombie_techweb.dm

* Update zombie_cure.dm

* Update zombie_cure.dm

* a

* THEY ARE MUTANTS, NOT ZOMBIES

* aaaaa

* aaaa

* Update mutant_event.dm

* aaaaa

* aaaa

* Update mutant_cure.dm

* Update mutant_cure.dm

* aaaaaaaaaaaa

* Update mutant_parts_greyscale.dmi

* aaaa

* Create research2.dmm

* 0

* Update mutant_datum.dm

* Update research2.dmm

* aaaa

* Update mutant_datum.dm

* aaaa

* aaaa

* Update mutant_cure.dm

* Update mutant_cure.dm

* Update mutant_cure.dm

* Update mutant_datum.dm
2021-04-10 18:32:09 +01:00