Commit Graph

168 Commits

Author SHA1 Message Date
Wickedtemp
328c88f175 Update circuits.dm 2019-06-21 02:40:38 -05:00
mistyLuminescence
e50b9d0cc0 Serenity (#6208)
* Serenity

* travis

* adminspawn

* I greatly appreciate all detailed and informative feedback provided. Per request, the Serenity is currently adminspawn-only; a new PR will be made in two weeks to add it to Robotics and resolve any issues encountered during the testing period.

* Comments out circuit for two-week testing period
2019-06-21 00:14:05 -04:00
Mechoid
07cceab5bc Fixes the Chargeblade's tech cost. (#6216)
* Fixes the Chargeblade's tech cost.

* Update illegal.dm
2019-06-16 21:17:26 -04:00
Neerti
5a3040a08d Merge pull request #6183 from Mechoid/FixPrecursotechOversights
Fixes some Precursotech oversights.
2019-05-31 22:18:00 -04:00
Atermonera
8e724ad32c Merge pull request #6133 from Heroman3003/cart-tweek
Minor PDA cartridge tweaks
2019-05-01 14:08:33 -04:00
Neerti
16b3b58259 [REVIEW] Ports Modular Computers from Baystation 2019-04-28 22:06:40 -04:00
Layla Crosse/Occula Drenn
dde5133e03 Research QoL changes (#6042)
* Research QoL changes

* Reverts changes relating to blanket print times and Protolathe storage

* Actually changes the design print time.

Why do you hate me github.

* Fixes an enter key error caused by the editor.

* Actually does all of the things I needed to do like a smart person

Which apparently I am not.

* Fixes a newline

Because goddamn it the online editor hates me too.
2019-04-17 04:51:29 -04:00
Novacat
f391ddad02 Merge pull request #5038 from VOREStation/upstream-merge-6028
[MIRROR] Precursotech Tools
2019-04-14 02:29:25 -04:00
Neerti
9c28b82c6c Merge pull request #6028 from Mechoid/Precursotech_Tools
Precursotech Tools
2019-04-14 02:20:07 -04:00
Neerti
94e6cc402b Merge pull request #6027 from Mechoid/Precursotech_Sword
Anomalotech Charge Sword
2019-04-14 01:21:05 -04:00
Neerti
fc7c6f38b4 Base features for Precursotech and Anomalotech Expansion 2019-04-13 22:44:52 -04:00
Unknown
f653b21d41 Removes Phase weapons from R&D 2019-03-29 23:07:50 -04:00
Spades
a184e67c93 Changes (R&D made) Saber SMG to Advanced SMG 2019-03-28 18:22:23 -04:00
Anewbe
f1507ebfa2 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into is_tool 2018-08-04 11:20:02 -05:00
Anewbe
7f84aeab9f Merge branch 'master' of https://github.com/PolarisSS13/Polaris into is_tool 2018-08-02 22:35:14 -05:00
atermonera
ef6c5abf15 Refactors supply controller.
Supply consoles now run nanoUI
2018-07-31 19:11:02 -07:00
Kates
535cca9d0e Saber fix. (#5384)
* Saber fix.

* Saber fix 2: Electric boogaloo

* parenthèse

* "And another one"

* Actually fixes the indentation

* Balance revert
2018-07-10 23:49:11 -05:00
Anewbe
86901354fc More Phase Guns (#5276)
* Adds new Phase weapons

* Fixes a thing

* Puts phase weapons in cargo

* Moves research designs, adds phase weapons

* Comments out a duplicate design

* Corrects duplicate design ID

* Last commit on this PR, I swear
2018-06-17 10:35:03 -07:00