SandPoot
0b990039e3
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2024-01-16 18:00:55 -03:00
SandPoot
c7a2565255
stop this nonsense
2024-01-05 00:28:56 -03:00
SandPoot
bb7d894944
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-12-15 17:33:44 -03:00
Putnam3145
13834847e0
it works better when you're actually using a delta
2021-12-11 17:04:05 -08:00
SandPoot
e21a8445e2
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-12-10 14:53:39 -03:00
Putnam3145
f21be027d0
am i just eternally wrong
2021-12-08 16:26:34 -08:00
Putnam3145
5ff8d7c356
grammar unfix
2021-12-08 12:02:07 -08:00
Putnam3145
36c60830dd
should be rounded
2021-12-07 21:17:07 -08:00
Putnam3145
db4c9c1b06
Makes science points show actual change
2021-12-07 21:12:46 -08:00
SandPoot
2627ae7aa1
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-09-09 23:17:18 -03:00
silicons and GitHub
448199665d
Update research.dm
2021-09-08 23:10:24 -07:00
SandPoot
dbf3b3f057
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-07-28 14:22:48 -03:00
Putnam3145
f1560cb807
fixing a bunch of unit test/runtime issues
2021-07-25 18:40:11 -07:00
Enric Gabriel
499fec6a16
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
2020-09-06 10:42:43 -03:00
silicons
bd5766a8be
changes
2020-08-23 05:27:53 -07:00
Enric Gabriel and GitHub
7e533b336d
fix the thing please ( #24 )
2020-07-14 22:24:20 -03:00
b5f77eeb66
Ports a lot of stuff from all around ( #23 )
...
* shhh
* checks the thing
* please don't hurt me, it is my first time
* there, much better
* this is huge
Co-authored-by: crazyraio2 <44246096+crazyraio2@users.noreply.github.com >
2020-07-14 01:31:52 -03:00
Ghom and GitHub
0d7d2071ec
Merge pull request #12232 from Trilbyspaceclone/patch-379
...
Makes seed points take into acount more varables so that you can get more points!
2020-06-02 23:50:14 +02:00
Ghom and GitHub
ab5d65a454
Porting the BEPIS research machinery. ( #12277 )
...
* Initial B.E.P.I.S port.
* All nodes but sticky tape are in. Sweet.
* Mapping the BEPIS :DDD
* ah
* deers.
2020-05-24 13:05:15 -07:00
Trilbyspaceclone and GitHub
11f3d19edf
brute force
2020-05-12 15:02:37 -04:00
Trilbyspaceclone and GitHub
c5c11a7937
i hope we use PENDAS
2020-05-12 14:53:06 -04:00
Trilbyspaceclone and GitHub
72fbd8ec87
6 rather the 4 miss-keyed
2020-05-12 14:27:32 -04:00
Trilbyspaceclone and GitHub
88394151d8
Update research.dm
2020-05-12 14:22:05 -04:00
Ghommie
95db5084ab
Screw commit history.
2020-02-02 01:26:04 +01:00
TrilbySpaceClone
ccfaa294bc
Update research.dm
2020-01-14 10:40:47 -05:00
TrilbySpaceClone
43dcb70718
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Seed-to-points
2020-01-13 03:27:01 -05:00
AffectedArc07
16a37e2769
Standardises all files from CRLF to LF
2020-01-12 14:28:01 +00:00
TrilbySpaceClone
29e7c49627
Pss got any of the good stuf Hydro?
2020-01-11 13:07:02 -05:00
Ghommie
2f76c9a8fc
weird.
2019-11-07 06:51:55 +01:00
Ghommie
25eaf0f684
WARNING doesn't output infos on travis runs, damnit.
2019-11-07 05:52:56 +01:00
Ghommie
b2b1390bd3
Ports techweb backend refactor & co.
2019-11-07 05:07:38 +01:00
nik707 and GitHub
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 and GitHub
d2e0fbb9ea
Forces a retry on Trivs
2018-10-10 22:10:55 -04:00
kevinz000 and GitHub
87e53bea00
Update research.dm
2018-10-10 17:05:34 -07:00
Trilbyspaceclone and GitHub
150cc6f8a5
Adds in the rest of the gang
2018-10-09 18:50:57 -04:00
Trilbyspaceclone and GitHub
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 and GitHub
20eca82aed
Re adds in cores, Poojawa is correct here
2018-09-02 19:11:30 -04:00
Trilbyspaceclone and GitHub
c59bac3116
list
2018-09-01 20:39:37 -04:00
Trilbyspaceclone and GitHub
384d760338
adds oil slime core
2018-09-01 20:27:47 -04:00
Trilbyspaceclone and GitHub
d3af787938
Fixes core DA and add slime core DA
2018-09-01 20:22:19 -04:00
kevinz000 and GitHub
4608a040c1
Update research.dm
2018-08-14 23:05:49 -07:00
Trilbyspaceclone and kevinz000
845838d2b2
Buffs sci correctly this time ( #7459 )
2018-08-13 10:25:35 -07:00
deathride58 and GitHub
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 and GitHub
2f77e5894c
Update research.dm
2018-06-26 16:39:22 -07:00
AnturK and letterjay
09414f87d4
Fixes R&D display runtime ( #38501 )
2018-06-16 06:15:40 -05:00
kevinz000 and GitHub
052f752c22
techwebs nerf
2018-06-12 14:24:55 -07:00
CitadelStationBot and kevinz000
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 and letterjay
d54667c81b
[READY]Refactors techwebs to have different types of points - PR HAS NO GAMEPLAY IMPACT
2018-05-19 18:51:51 -05:00
SandPoot