Commit Graph

13 Commits

Author SHA1 Message Date
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