Commit Graph

30 Commits

Author SHA1 Message Date
Putnam3145
13834847e0 it works better when you're actually using a delta 2021-12-11 17:04:05 -08:00
DeltaFire
a4d71fcfa4 -debug comment 2021-09-16 03:18:52 +02:00
DeltaFire
b02825c679 uh oh 2021-09-16 03:14:24 +02:00
silicons
5b03f5b0ec more 2020-11-12 23:36:18 -07:00
Ghommie
8f6b31c26e Solving several issues. 2020-06-26 18:40:20 +02:00
Ghom
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
Ghommie
a194d7dafe merge conflict and job/dept discounts support. 2020-05-03 02:11:05 +02:00
Ghommie
1659e2804e Deletes lots of autoylathe copypasta. 2020-04-21 04:04:10 +02:00
Ghommie
4c6f1b622b Porting Goofconomy & co. 2020-04-17 07:48:11 +02:00
Seris02
16b5c83a3a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics 2020-01-13 12:53:52 +08:00
AffectedArc07
16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
Seris02
862acf2f06 ports hyper's genetics 2019-12-28 21:33:15 +08:00
kevinz000
02e8a73265 Merge pull request #9737 from Ghommie/Ghommie-cit326
Ports techweb backend refactor & co.
2019-11-14 16:45:09 -07:00
Ghommie
b2b1390bd3 Ports techweb backend refactor & co. 2019-11-07 05:07:38 +01:00
TrilbySpaceClone
5c4cd15762 Hmm 2019-11-03 11:05:45 -05:00
kevinz000
8b22c95479 Merge pull request #9606 from Ghommie/Ghommie-cit270
Unmodularize research.
2019-10-25 20:09:26 -07:00
Ghommie
6f19899dd2 Unmodularize research. 2019-10-24 23:28:15 +02:00
kappa-sama
4767a91ad2 Update _techweb.dm 2019-10-21 17:04:47 -04:00
kappa-sama
797d6b4795 copy paste spaghetti
forgive me
2019-10-21 09:23:33 -04:00
BlackMajor
7523c86071 Wasn't I supposed to do this in January 2019-06-10 22:55:38 +12:00
Poojawa
bc0d14c193 Continual updates until merged 2018-09-17 04:55:03 -05:00
Poojawa
284e9d0325 module things, jfc 2018-09-11 07:51:01 -05:00
deathride58
b1688405d9 and finally, the modules folder. Now I can publish and take a break 2018-07-02 01:19:37 -04:00
CitadelStationBot
37f2768380 [MIRROR] Adds a missing + in techwebs point adjustment code (#6845)
* Adds a missing + in techwebs point adjustment code

* Update _techweb.dm
2018-05-24 20:55:23 -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
b40980b0c1 [MIRROR] Fixes hidden node unlocking (#5731)
* Merge pull request #36013 from kevinz000/techwebs_hotfix_1

Fixes hidden node unlocking

* Fixes hidden node unlocking
2018-02-28 19:31:38 -06:00
kevinz000
a82d0e13ce Fixes RND 2017-12-22 00:58:46 -08:00
LetterJay
7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08: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