nik707
59dc18d904
Merge pull request #7637 from Trilbyspaceclone/Slimey_points
...
[READY] More Slime core deconstruction, now with Cross bread slime cores! (Best Grammar! 100% ready for merging PDM!!)
2018-11-20 19:49:25 -06:00
Trilbyspaceclone
d2e0fbb9ea
Forces a retry on Trivs
2018-10-10 22:10:55 -04:00
kevinz000
87e53bea00
Update research.dm
2018-10-10 17:05:34 -07:00
Trilbyspaceclone
150cc6f8a5
Adds in the rest of the gang
2018-10-09 18:50:57 -04:00
Trilbyspaceclone
5d08d7999f
Starting with organge!
2018-10-08 22:49:59 -04:00
Poojawa
834a94b97d
some compile fixes
2018-09-11 09:23:20 -05:00
Poojawa
09512a6001
Controllers
2018-09-11 02:04:10 -05:00
Trilbyspaceclone
20eca82aed
Re adds in cores, Poojawa is correct here
2018-09-02 19:11:30 -04:00
Trilbyspaceclone
c59bac3116
list
2018-09-01 20:39:37 -04:00
Trilbyspaceclone
384d760338
adds oil slime core
2018-09-01 20:27:47 -04:00
Trilbyspaceclone
d3af787938
Fixes core DA and add slime core DA
2018-09-01 20:22:19 -04:00
kevinz000
4608a040c1
Update research.dm
2018-08-14 23:05:49 -07:00
Trilbyspaceclone
845838d2b2
Buffs sci correctly this time ( #7459 )
2018-08-13 10:25:35 -07:00
deathride58
891bdd718d
Merge pull request #7083 from Citadel-Station-13/kevinz000-patch-8
...
nerfs techwebs passive generation, pushes back full max time by 15 minutes
2018-07-06 01:38:42 -04:00
kevinz000
2f77e5894c
Update research.dm
2018-06-26 16:39:22 -07:00
AnturK
09414f87d4
Fixes R&D display runtime ( #38501 )
2018-06-16 06:15:40 -05:00
kevinz000
052f752c22
techwebs nerf
2018-06-12 14:24:55 -07:00
CitadelStationBot
8502508c21
[MIRROR] Anomalies can now be deconstructed for techwebs for 10k points ( #6850 )
...
* Anomalies can now be deconstructed for techwebs for 10k points
* Update research.dm
2018-05-27 17:26:36 -07:00
kevinz000
d54667c81b
[READY]Refactors techwebs to have different types of points - PR HAS NO GAMEPLAY IMPACT
2018-05-19 18:51:51 -05:00
CitadelStationBot
c8107c52cc
[MIRROR] Adjusts fire priorities of flightpacks, research, networks, and fields. ( #5809 )
...
* Adjusts fire priorities of flightpacks, research, networks, and fields. (#36129 )
* Fire priorities
* research lower not higher
* Don't need to keep timing if it's automatically compensating for missed ticks.
* Spelling
* spelling
* Adjusts fire priorities of flightpacks, research, networks, and fields.
2018-03-05 13:01:49 -06:00
Jordan Brown
c36f144d9e
Merge pull request #35792 from DaedalusGame/bitconnect
...
Fixes multiserver mining formula
2018-02-19 22:09:55 -06:00
deathride58
1acdd3ce5c
controllers sync
2018-01-03 23:23:11 -05:00
LetterJay
d3f6cf4dd8
Merge branch 'master' into upstream-merge-33537
2017-12-30 13:14:48 -06:00
Buggy123
2c40a61968
Increases research point income by 33% ( #33857 )
2017-12-29 02:55:10 -06:00
LetterJay
7af461539f
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
2017-12-16 13:08:50 -06:00
oranges
75753a4dfd
Defines all subsystem priority values
2017-12-15 17:00:50 -06:00
kevinz000
253c819bc1
TG Sync 12/15/17
...
s
s
2017-12-15 06:27:57 -08:00
CitadelStationBot
cc0b768c72
[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES ( #4014 )
...
* [READY] RND TECHWEBS + DEPARTMENTAL LATHES
* resetting all the maps because we can worry about them later.
* Regexing
* I'm fucked
* Fixes
* .
* maps
* bleh
* ree
* fixes
2017-12-11 16:36:38 -08:00
