silicons
|
c70d7a24e0
|
fixes
|
2020-12-11 05:14:38 -07:00 |
|
silicons
|
13391d2af6
|
fix
|
2020-12-11 05:09:29 -07:00 |
|
The0bserver
|
6d1ace27f7
|
Initial Commit: Mapping is painful
|
2020-11-18 00:38:35 -05:00 |
|
BlackMajor
|
1943a2fdd7
|
Merge pull request #13246 from silicons/anomaly_manufacturing
anomaly manufacturing port from tg. supermatter anomaly generation nerfed to 20% rather than removed
|
2020-09-06 17:53:35 +12:00 |
|
raspy-on-osu
|
4c8983f006
|
init
|
2020-09-04 22:13:56 -04:00 |
|
silicons
|
b2a38a09a1
|
circuit
|
2020-08-23 05:59:24 -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
|
562b57095d
|
mowing down the experimental cloner copypasta.
|
2020-07-05 03:04:53 +02:00 |
|
Ghommie
|
c5cbfa64e5
|
Porting further material datum features and improvements.
|
2020-06-24 20:45:17 +02:00 |
|
kevinz000
|
1b5ea90c8f
|
sigh
|
2020-06-18 08:16:05 -07:00 |
|
SmArtKar
|
46c3e9e54d
|
Shuttles
|
2020-06-16 18:16:14 +03:00 |
|
Ghom
|
1c3bfa623f
|
Merge pull request #12175 from Detective-Google/snaxi2
Adds a New map, Snow Taxi (A vgstation13 map port)
|
2020-06-02 23:48:50 +02:00 |
|
Ghom
|
0a6b755eff
|
Apotechary chem dispenser nerf. (#12292)
* Apotechary chem dispenser nerf.
* Spelling and build_path.
|
2020-05-24 13:20:32 -07: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 |
|
Detective Google
|
6e5e1b249f
|
Merge remote-tracking branch 'upstream/master' into snaxi2
|
2020-05-12 18:38:28 -05:00 |
|
Detective Google
|
424133c48a
|
adds the actual snow taxi to snaxi
|
2020-05-09 22:20:26 -05:00 |
|
Ghommie
|
a194d7dafe
|
merge conflict and job/dept discounts support.
|
2020-05-03 02:11:05 +02:00 |
|
Ghommie
|
54e76e8ffb
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit697
|
2020-05-01 21:49:52 +02:00 |
|
Ghommie
|
94f014589d
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685
|
2020-04-25 17:09:34 +02:00 |
|
Ghommie
|
0c1c879fb4
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit697
|
2020-04-25 02:49:59 +02:00 |
|
Ghommie
|
e0a51903a1
|
Not yet implemented design security level requirements.
|
2020-04-24 00:51:04 +02:00 |
|
Ghommie
|
42201343a9
|
Backward 512 compatibility removal.
|
2020-04-23 00:59:23 +02:00 |
|
Ghommie
|
1659e2804e
|
Deletes lots of autoylathe copypasta.
|
2020-04-21 04:04:10 +02:00 |
|
Ghommie
|
87a6bd013c
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685
|
2020-04-17 21:57:21 +02:00 |
|
Ghommie
|
4c6f1b622b
|
Porting Goofconomy & co.
|
2020-04-17 07:48:11 +02:00 |
|
jjpark-kb
|
4a38b2870a
|
fix youtool
|
2020-04-17 01:02:52 -04:00 |
|
Kraseo
|
a8759b048e
|
smashes the tyranny of public mining
|
2020-03-31 23:32:15 +02:00 |
|
Seris02
|
c3ec44b0d0
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics
|
2020-02-22 19:54:10 +08: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 |
|
Seris02
|
2d9c8ce8fc
|
fixing merge conflicts
|
2020-02-15 15:41:52 +08:00 |
|
TrilbySpaceClone
|
06fd6645b3
|
And it wokrs
|
2020-02-04 16:01:22 -05:00 |
|
Ghommie
|
95db5084ab
|
Screw commit history.
|
2020-02-02 01:26:04 +01:00 |
|
Seris02
|
9761d68f4b
|
more merge conflict fixes
|
2020-01-24 10:14:31 +08:00 |
|
Seris02
|
718ff58e0b
|
fixes + advanced injectors
|
2020-01-19 15:17:57 +08:00 |
|
r4d6
|
5084146400
|
Port
|
2020-01-18 18:46:22 -05:00 |
|
r4d6
|
ce16c91b2f
|
Code changes
|
2020-01-16 14:08:14 -05: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 |
|
kevinz000
|
4b4864740b
|
Merge pull request #10522 from Hatterhat/syndi-sleeper
printable syndicate sleepers - this is blackmajors fault im not gonna lie
|
2020-01-12 00:40:17 -08:00 |
|
Seris02
|
ac4489c6a8
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics
|
2020-01-11 13:55:29 +08:00 |
|
Hatterhat
|
b5f8e46941
|
this is blackmajors fault im not gonna lie
|
2020-01-10 23:41:30 -06:00 |
|
Lin
|
fb94bf5fa0
|
Merge pull request #10482 from kappa-sama/modularthing
modular citadel file destruction but only slightly
|
2020-01-11 00:30:58 +00:00 |
|
Ghommie
|
825b4f01c2
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
|
2020-01-10 02:26:19 +01:00 |
|
kappa-sama
|
35353996bd
|
lazy copypaste
|
2020-01-08 16:36:53 -05:00 |
|
Hatterhat
|
5142a0e4ae
|
that should probably be there
|
2020-01-04 02:07:19 -06:00 |
|
Hatterhat
|
186194418e
|
tg 43454+43688 port, tweaks w/ trilby, db crate
|
2020-01-04 01:33:32 -06:00 |
|
Seris02
|
862acf2f06
|
ports hyper's genetics
|
2019-12-28 21:33:15 +08:00 |
|
Ghommie
|
57cecd2499
|
work
|
2019-12-25 06:54:44 +01:00 |
|
Linzolle
|
70e50e57cd
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update
|
2019-12-17 20:21:49 -06:00 |
|