r4d6
|
aedf634355
|
Fix mats.
|
2020-01-03 03:15:30 -05:00 |
|
r4d6
|
94cd2ea108
|
Merge branch 'RCD-Updates' of https://github.com/r4d6/Citadel-Station-13 into RCD-Updates
|
2020-01-03 03:13:21 -05:00 |
|
r4d6
|
3f5d4ad835
|
remove a duplicate comment
|
2020-01-03 03:13:03 -05:00 |
|
r4d6
|
7347cb0ba6
|
Merge branch 'master' into RCD-Updates
|
2020-01-03 03:09:11 -05:00 |
|
r4d6
|
58a986696f
|
Add RCD and RPD to Engie's protolathe
Half-port with bonus : https://github.com/tgstation/tgstation/pull/47289
|
2020-01-03 02:46:25 -05:00 |
|
r4d6
|
5c94e02eac
|
Add simple RCD Circuits
Port : https://github.com/tgstation/tgstation/pull/45357
|
2020-01-03 02:32:43 -05:00 |
|
Trilbyspaceclone
|
2931cb6757
|
Merge branch 'master' into glassware
|
2020-01-02 20:30:20 -05:00 |
|
Ghommie
|
4d06d231f8
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
|
2020-01-02 17:49:01 +01:00 |
|
BlackMajor
|
08d042901c
|
thank you github
|
2020-01-02 22:16:47 +13:00 |
|
BlackMajor
|
aabb39a364
|
Revert "Merge branch 'master' into Yeehaw"
This reverts commit 30e3edaac1, reversing
changes made to 62c8fce043.
|
2020-01-02 22:06:31 +13:00 |
|
BlackMajor
|
30e3edaac1
|
Merge branch 'master' into Yeehaw
|
2020-01-02 22:03:58 +13:00 |
|
BlackMajor
|
3239acf74d
|
Sync
|
2020-01-02 22:02:55 +13:00 |
|
kevinz000
|
ec67a38093
|
Merge pull request #10330 from keronshb/keronnanite
More nanites from /tg/station
|
2019-12-31 19:32:05 -08:00 |
|
BlackMajor
|
8085022d97
|
Couple of changes. Starting on the point bank.
|
2019-12-31 23:28:30 +13:00 |
|
Seris02
|
54f859fe06
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics
|
2019-12-31 17:52:49 +08:00 |
|
keronshb
|
baf8b28f3a
|
Fixes Reduced Diagnostics and adds disks
Fixes reduced diagnostics not working properly and adds program disks for each of the new nanites.
|
2019-12-29 16:03:38 -05:00 |
|
Seris02
|
b96bcf6eec
|
tiny fix
|
2019-12-29 23:47:30 +08:00 |
|
Seris02
|
9b3654e4ff
|
telescopic IVs
|
2019-12-29 23:26:53 +08:00 |
|
BlackMajor
|
375e59a77d
|
Merge branch 'master' into Yeehaw
|
2019-12-29 22:12:40 +13:00 |
|
BlackMajor
|
206a5e168a
|
More mining changes
|
2019-12-29 20:15:49 +13:00 |
|
Ghommie
|
37441437d1
|
a
|
2019-12-28 23:02:28 +01:00 |
|
keronshb
|
390cfd8b64
|
Nanite ports from /tg/
Ports a couple of the newer nanite features from /tg/
|
2019-12-28 16:56:17 -05:00 |
|
Seris02
|
862acf2f06
|
ports hyper's genetics
|
2019-12-28 21:33:15 +08:00 |
|
Ghommie
|
21cfb2914b
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
|
2019-12-27 17:49:59 +01:00 |
|
Ghommie
|
b4c0433d6d
|
more work.
|
2019-12-27 17:45:19 +01:00 |
|
BlackMajor
|
4e1a9b83cf
|
Pushing work for tonight.
|
2019-12-28 01:01:26 +13:00 |
|
Ghommie
|
53d142b4c0
|
more work.
|
2019-12-25 01:34:33 +01:00 |
|
Hatterhat
|
681508482c
|
magazine metal cost tweaks, speedloader in AIB
|
2019-12-24 04:15:25 -06:00 |
|
Ghommie
|
e74339ce8b
|
Jfc that's a lot of work!
|
2019-12-23 04:24:13 +01:00 |
|
Trilbyspaceclone
|
0b63e79098
|
Merge branch 'master' into glassware
|
2019-12-21 15:41:45 -05:00 |
|
Ghom
|
2bc401e2d2
|
Merge pull request #10096 from Citadel-Station-13/kevinz000-patch-123
nanites can no longer spread through atmospherics-blocking objects
|
2019-12-21 16:48:56 +01:00 |
|
Ghom
|
5c3d3f4cc5
|
Is merging someone else's PR you personally fixed considerable as self-merging?
|
2019-12-21 16:40:32 +01:00 |
|
Ghom
|
4624a1739a
|
typo
|
2019-12-21 16:30:02 +01:00 |
|
Ghom
|
19fc981cc1
|
Merge pull request #9596 from Linzolle/abductor-update
Bring abductors up-to-date with /tg/.
|
2019-12-21 11:15:29 +01:00 |
|
Ghom
|
1748a5ee4b
|
Merge pull request #10054 from kappa-sama/patch-10
autolathe .357 speedloaders->bullets, surplus rifle bullets in hacked lathe
|
2019-12-20 13:27:35 +01:00 |
|
Seris02
|
61ab3685f1
|
atmos firelock, changes to temp blocking
|
2019-12-20 14:14:01 +08: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 |
|
Trilbyspaceclone
|
ddd3676903
|
Merge branch 'master' into glassware
|
2019-12-17 15:18:30 -05:00 |
|
Putnam3145
|
c0e548427b
|
Merge pull request #10076 from Ghommie/Ghommie-cit437
Fixes alien tech node not being unlockable with subtypes of the accepted items.
|
2019-12-17 11:58:39 -08:00 |
|
Putnam3145
|
c39a5d0462
|
Merge pull request #10011 from Arturlang/Bloodsuckers
Bloodsuckers, or, yknow, vampires.
|
2019-12-15 14:41:36 -08:00 |
|
BlackMajor
|
83a707ee93
|
Removes medihounds, same treatment as janihounds
|
2019-12-13 13:48:22 +13:00 |
|
kevinz000
|
41a61cffa7
|
Update utility.dm
|
2019-12-11 14:46:05 -07:00 |
|
Ghommie
|
651370c5b4
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit450
|
2019-12-11 21:10:24 +01:00 |
|
Ghommie
|
19a3aca619
|
I fear for my powernet
|
2019-12-10 15:33:15 +01:00 |
|
Ghommie
|
414d4b7a90
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit408
|
2019-12-09 00:04:22 +01:00 |
|
Linzolle
|
1e2a4f606c
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update
|
2019-12-08 14:17:00 -06:00 |
|
TrilbySpaceClone
|
e5c8f7bf06
|
Merge branch 'master' into glassware
|
2019-12-07 12:50:32 -05:00 |
|
Artur
|
4711eb0987
|
Merge remote-tracking branch 'upstream/master' into Bloodsuckers
|
2019-12-07 15:53:11 +02:00 |
|
kevinz000
|
2e0b019bd7
|
Update utility.dm
|
2019-12-07 03:11:54 -07:00 |
|
Ghommie
|
3d42744d8a
|
conflict with a certain framework for tech node discounts or something I guess.
|
2019-12-07 00:38:32 +01:00 |
|