cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 09:54:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,547 Commits 55 Branches 0 Tags
05e2b6a4418984598558978ad91b2d249230e8cf
Commit Graph

195 Commits

Author SHA1 Message Date
keronshb
69b5164103 Merge branch 'master' into RemoteMoodResearch 2020-01-16 15:50:11 -05:00
Hatterhat
0773f1b7fa sweet merciful FUCK what is this merge 2020-01-12 02:53:30 -06:00
kevinz000
60524fb9c7 Merge pull request #10416 from r4d6/RCD-Updates 
Massive RCD Port & Updates
 2020-01-12 00:45:21 -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
Ghom
34502cab1d Merge pull request #10247 from Seris02/atmosfirelock 
ATMOS Firelocks and more
 2020-01-11 15:29:25 +01:00
Hatterhat
b5f8e46941 this is blackmajors fault im not gonna lie 2020-01-10 23:41:30 -06:00
Hatterhat
102e973737 considering these are basic nodes 2020-01-09 18:39:31 -06:00
Hatterhat
04aa0eda5a tg 40046, 41695, 46726 - hope i didnt forget smth 2020-01-09 18:35:13 -06:00
r4d6
581654f13f Add RPD to research 2020-01-09 13:55:31 -05:00
keronshb
a7af5203e7 This is a test to see if they all work together 
Title
 2020-01-06 20:29:44 -05:00
keronshb
35cd77d433 Adds the nanite remote for some programs 
Adds a new remote function from tg
 2020-01-06 20:28:33 -05:00
Seris02
519d379cdf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into atmosfirelock 2020-01-03 17:42:53 +08: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
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
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
keronshb
390cfd8b64 Nanite ports from /tg/ 
Ports a couple of the newer nanite features from /tg/
 2019-12-28 16:56:17 -05:00
Hatterhat
681508482c magazine metal cost tweaks, speedloader in AIB 2019-12-24 04:15:25 -06: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
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
BlackMajor
83a707ee93 Removes medihounds, same treatment as janihounds 2019-12-13 13:48:22 +13:00
Ghommie
3d42744d8a conflict with a certain framework for tech node discounts or something I guess. 2019-12-07 00:38:32 +01:00
Ghommie
7cb2092fcb typo 2019-12-07 00:04:05 +01:00
Ghommie
ae94e1cfbe Fixed alien tech node not being unlockable with subtypes of the accepted items. 2019-12-06 23:45:36 +01:00
Linzolle
cc54e5230f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update 2019-11-25 21:01:25 -06:00
GrayRachnid
0b60d5e6ef derp 2019-11-24 17:48:09 -05:00
GrayRachnid
c8e52fb8e1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into disablesnolegs 2019-11-22 15:24:15 -05:00
Hatterhat
f161b01f6b ayytech plants 2019-11-19 17:26:44 -06:00
Lin
6aa6eaafe6 Merge branch 'master' into abductor-update 2019-11-15 23:24:51 +00:00
kevinz000
4c89b8c33f Merge pull request #9628 from Trilbyspaceclone/Cargo_MKII 
[Ready] [Testmerge] MK II Cargo Rework - Sell harder edition
 2019-11-14 16:00:45 -07:00
TrilbySpaceClone
6e328ea1b1 art of the deal 2019-11-11 07:26:12 -05:00
TrilbySpaceClone
82b148b7b7 Merge branch 'master' into Cargo_MKII 2019-11-03 17:53:06 -05:00
TrilbySpaceClone
a8248c68f4 perhaps 2019-11-03 12:53:02 -05:00
TrilbySpaceClone
5c4cd15762 Hmm 2019-11-03 11:05:45 -05:00
Ghommie
b17346a44e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit220 2019-10-30 14:46:42 +01:00
Linzolle
52b6e659c1 Merge branch 'abductor-update' of https://github.com/Linzolle/Citadel-Station-13 into abductor-update 2019-10-29 23:59:16 -05:00
Linzolle
266f1ff958 Merge remote-tracking branch 'upstream/master' into abductor-update 2019-10-29 23:58:01 -05:00
kevinz000
da387bfdf4 Merge pull request #9620 from YakumoChen/proto_beanbag 
Adds Beanbag Slugs to Seclathe
 2019-10-27 16:13:31 -07:00
YakumoChen
325de79b3a adds beanbag slug to starter node 2019-10-26 10:22:50 +00:00
Lin
dbaf5a54e6 Merge branch 'master' into abductor-update 2019-10-25 06:17:24 +00:00
kevinz000
d8fc3e7211 Merge pull request #9564 from kappa-sama/aliumtators 
The syndicate are led by aliens.
 2019-10-24 18:49:48 -07:00