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-09 16:07:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,010 Commits 55 Branches 0 Tags
22797eb47dcbfa2cce04b630beaa3c8b1d14f493
Commit Graph

253 Commits

Author SHA1 Message Date
Artur
22797eb47d Fixing interfaces... 2020-05-22 16:34:57 +03:00
Artur
6192a0646c Fucks with the clockwork slab UI 2020-05-21 18:45:19 +03:00
Artur
d1d3774e1a Fucked up a little 2020-05-14 14:13:54 +03:00
Artur
5b7d9a9008 Merge conflict fix 2020-05-13 12:37:18 +03:00
Artur
ccae3aebd5 Trying to get the sleeper and clockworkslab to work 2020-05-08 19:50:49 +03:00
Artur
b2d8e70998 Chemheater and sleeper fixes 2020-05-07 20:00:34 +03:00
Artur
942c2feed8 Gives the chem heater PH display 2020-05-07 19:33:49 +03:00
Artur
9212969657 Makes it prim and proper 2020-05-07 19:31:09 +03:00
Artur
50881d42fd Reverting changes for citadels modifications 2020-05-07 18:56:38 +03:00
Artur
f3ee184672 Clockwerkslab 
Doesnt work yet.
 2020-05-06 21:23:12 +03:00
Artur
2ec9068cbf Hellish 2020-04-29 09:55:11 +03:00
Artur
cfd9c3fe63 Fucking clockcult 2020-04-27 13:36:53 +03:00
Artur
5d53ead547 Fucky wucky gateway and ccslab 2020-04-27 10:43:08 +03:00
Artur
fe26034410 Kills old TGUI, hardsyncs TGUI to 3.0 2020-04-23 13:31:48 +03:00
Artur
321902c35a Ports https://github.com/tgstation/tgstation/pull/50225 2020-04-23 13:28:09 +03:00
Artur
80b47ec1c0 Ports https://github.com/tgstation/tgstation/pull/50497 2020-04-23 09:55:28 +03:00
dependabot[bot]
09e50d70e4 Bump minimist from 1.2.2 to 1.2.3 in /tgui 
Bumps [minimist](https://github.com/substack/minimist) from 1.2.2 to 1.2.3.
- [Release notes](https://github.com/substack/minimist/releases)
- [Commits](https://github.com/substack/minimist/compare/1.2.2...1.2.3)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-04-04 02:49:27 +00:00
dependabot[bot]
888cdbeaf6 Bump minimist from 1.2.0 to 1.2.2 in /tgui 
Bumps [minimist](https://github.com/substack/minimist) from 1.2.0 to 1.2.2.
- [Release notes](https://github.com/substack/minimist/releases)
- [Commits](https://github.com/substack/minimist/compare/1.2.0...1.2.2)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-03-13 23:43:45 +00:00
Kraseo
7206e5ee6e nearly forgot these as well 2020-03-01 23:31:14 +01:00
Kraseo
5da4e5fbcd parte 5: tgui and javascript torture 2020-03-01 22:57:39 +01:00
Kraseo
e3034720c6 forgot to add these lol 2020-03-01 22:08:11 +01:00
Seris02
6cc6aa12be yeehaw it's done 2020-02-05 16:54:57 +08:00
Artur
e7ddfdd8d8 Merge remote-tracking branch 'upstream/master' into TGUIs_Nexties 2020-02-02 13:31:54 +01:00
Seris02
18489e5b65 merge fixes 2020-02-02 11:51:26 +08:00
Artur
bb8eed7ae6 Initial Commit 2020-01-31 13:41:49 +01:00
Artur
255f2ce449 Testmerge Conflict fix? 2020-01-22 20:17:42 +01:00
Artur
f5ad854c2c Conflict fix 2020-01-20 13:50:52 +02:00
Seris02
47d1f46172 fixes and stuff 2020-01-19 15:53:32 +08:00
Seris02
fdf3871cb7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into hijackbackup 2020-01-18 18:30:51 +08:00
Seris02
04b34ec8ed hijack implant 2020-01-18 18:04:31 +08:00
Putnam
6d4f400f5c updated the tgui file for the conflict 2020-01-17 21:34:41 -08:00
Putnam
3788bc6676 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into more-atmos 2020-01-17 21:33:13 -08:00
keronshb
4dc85dd4ef the compile file for this 2020-01-16 16:28:11 -05:00
keronshb
69b5164103 Merge branch 'master' into RemoteMoodResearch 2020-01-16 15:50:11 -05:00
Artur
472d18403c Merge remote-tracking branch 'Upstream/master' into TGUIs_Nexties 2020-01-16 11:38:09 +02:00
Artur
6e4829e971 Really works properly now 2020-01-16 11:33:05 +02:00
Artur
2208aa0f09 citadelification 2020-01-15 09:49:18 +02:00
Artur
8b8a112d2c Ohkay 2020-01-15 09:41:33 +02:00
kevinz000
8725ffe916 Merge remote-tracking branch 'citadel/master' into nightshift_1 2020-01-10 06:12:59 -08:00
Putnam
c0be46e07f balancing/sanity checks 2020-01-10 04:23:43 -08:00
Putnam
36a6daa26f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into more-atmos 2020-01-09 19:09:38 -08:00
Putnam
bdda3f940c it works 2020-01-09 18:55:56 -08: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
kevinz000
aac1b42b8f nightshift improvements 2020-01-03 00:01:48 -08:00
BlackMajor
8085022d97 Couple of changes. Starting on the point bank. 2019-12-31 23:28:30 +13:00
Ghommie
4502d7b795 Ports improved and simplier fire alarms. 2019-12-12 22:44:20 +01:00
Ghommie
8615c0ea8f Merge branch 'Ghommie-cit394' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit394 2019-12-03 02:32:59 +01:00
Putnam
1b310d41bf Filters are now volume-based. 2019-11-29 21:23:08 -08:00
Ghommie
d3bce1bbcd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2019-11-27 02:59:08 +01:00
Ghommie
4e05c27cdb Updating supply pods code. 2019-11-27 01:54:10 +01:00