Commit Graph

24 Commits

Author SHA1 Message Date
silicons
317f33b4e5 fixes 2020-12-11 05:14:23 -07:00
silicons
5b03f5b0ec more 2020-11-12 23:36:18 -07:00
lolman360
f977ac7180 e e e ee ee 2020-08-11 17:08:21 +10:00
lolman360
c07e5d544b wweeee 2020-07-22 11:27:26 +10:00
Ghommie
c5cbfa64e5 Porting further material datum features and improvements. 2020-06-24 20:45:17 +02:00
Ghommie
43acf79dd3 oh wow 2020-06-19 21:55:01 +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
Ghommie
736760ac06 Minesweeper oopsies etcetera. 2020-04-01 04:39:36 +02:00
Ghommie
8fbfd07692 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 2020-02-22 00:55:32 +01:00
kevinz000
14fdd90618 Nerfs public autolathes (#10970) 2020-02-16 07:37:24 +01:00
Ghommie
95db5084ab Screw commit history. 2020-02-02 01:26:04 +01:00
Hatterhat
b5f8e46941 this is blackmajors fault im not gonna lie 2020-01-10 23:41:30 -06:00
Hatterhat
f161b01f6b ayytech plants 2019-11-19 17:26:44 -06: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
Poojawa
7d65ddb417 bug blood, ipc/slime hearts, blood gen protolathe
we're all gucchi now boys
2019-08-04 04:07:44 -05:00
Trilbyspaceclone
633bea1ad2 Update machine_designs_sci.dm 2019-05-24 22:56:44 -04:00
Trilbyspaceclone
a43e4a6ca1 Update machine_designs_medical.dm 2019-05-24 22:55:59 -04:00
Trilbyspaceclone
1ff9489901 Update machine_designs_sci.dm 2019-05-24 22:37:59 -04:00
Trilbyspaceclone
1f1926a70e Create machine_designs_all_misc.dm 2019-05-11 12:26:56 -04:00
Trilbyspaceclone
172d56ace5 Add files via upload 2019-05-11 11:41:56 -04:00