Commit Graph

185 Commits

Author SHA1 Message Date
Hawk-v3
9f3802b9a0 Revert "Adds in two new cells for sci to get!" 2019-10-09 16:14:07 +01:00
TrilbySpaceClone
c245955ead Suggestions 2019-10-05 22:20:05 -04:00
Trilbyspaceclone
5eae6a4200 Update power_cells.dm
Why did this complie locally?
2019-10-05 18:42:17 -04:00
TrilbySpaceClone
af68971451 maybe it just works
whom knows
2019-10-05 18:12:59 -04:00
Hawk_v3
691a1239f4 Merge from Vorestation 2019-09-29 21:53:09 +01:00
Heroman
3ea943f9ad Sorts vorestation-only rnd recipies 2019-09-26 18:41:54 +10:00
Novacat
794bf4c648 Update weapons.dm 2019-09-26 03:10:04 -04:00
Atermonera
0b31dcace5 Properly sorts all protolathe designs 2019-09-26 03:00:43 -04:00
Trilbyspaceclone
0a6dace356 Update medical.dm 2019-09-18 20:14:50 -04:00
Mechoid
ae48659a68 Exploration Expansion 1: Or, How I Learned To Love The Tree 2019-08-21 17:23:07 -04:00
Novacat
eced9eda28 Update circuits.dm 2019-08-08 16:30:08 -04:00
Andrew
9d93bea992 Allows Construction of Serenity in Robotics 2019-08-08 16:28:07 -04:00
Atermonera
60c415cf64 Adds shutoff valve monitor 2019-07-30 20:04:51 -04:00
Novacat
d5f0f35519 Merge pull request #5357 from Wickedtemp/master
Allows New Serenity Mech To Be Constructed
2019-07-17 17:35:41 -04:00
Atermonera
4f601a94b8 Merge pull request #6248 from Heroman3003/gpsing
Adds more GPS variety
2019-07-01 20:47:22 -04:00
Andrew
586ad2906e Adds Material Scanner to Protolathe (#6235)
* Adds Material Scanner to Protolathe

Adds the optical material scanner to the protolathe (the ones miners get).
Costs 50 steel and 50 glass (same as all the other HUDs)
Required tech is 3 magnet and 3 engineering (same as on the HUD)

Also adjusts the meson design so it actually uses its parent code like the other HUDs

* Changes sorting string
2019-06-28 21:22:09 -04:00
Wickedtemp
82422d9a75 Update circuits.dm 2019-06-22 00:02:58 -05:00
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