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,734 Commits 55 Branches 0 Tags
c41d2e78be29602fdbf778627bb37f659020fe2e
Commit Graph

273 Commits

Author SHA1 Message Date
Artur
c41d2e78be Conflicts!!! 2020-06-22 17:39:24 +03:00
Artur
92a60d6e68 Makes it actually work 2020-06-17 17:37:03 +03:00
Artur
7055e6c47a Ports https://github.com/tgstation/tgstation/pull/51585 2020-06-17 17:07:42 +03:00
Artur
43951bf44e Ports https://github.com/tgstation/tgstation/pull/51152 2020-06-17 17:01:55 +03:00
Artur
d22520d621 chmod permission fixes for travis 2020-06-16 02:01:44 +03:00
Artur
86331912e7 Fucking vr sleeper aaa 2020-06-16 01:18:59 +03:00
Artur
607ddf011e Fixes vrsleeper and shit 2020-06-11 17:40:33 +03:00
Artur
ec3c15ef0d TCOMMS porting 2020-06-09 11:24:08 +03:00
Artur
094a1b6f62 More vr sleeper work and map fix 2020-06-09 11:06:16 +03:00
Artur
19949b842b Transfer valve and VR sleeper 2020-06-09 11:05:54 +03:00
Artur
33c5dfb28e TTV TGUI, VR sleeper work. 2020-06-08 12:28:16 +03:00
Artur
4fe9e788ac Makes it actually nicely work 2020-06-01 20:42:58 +03:00
Artur
8c5005d572 Vrsleeper works, linkage for art and bepis 2020-06-01 19:15:19 +03:00
Artur
e8547f7248 Trying to fix the vr sleeper. 2020-06-01 18:41:19 +03:00
Artur
85a1d0f957 VrSleeper(WIP) and hypnochair 2020-06-01 12:47:37 +03:00
Artur
a6d7a33669 Exploit fixes for pappah 2020-05-29 18:23:33 +03:00
Artur
3c973816d1 Ports https://github.com/tgstation/tgstation/pull/51125/ 2020-05-27 12:48:25 +03:00
Artur
04dcd6a02c Dos2unix 2020-05-22 19:20:59 +03:00
Artur
d5b891552f Updates clockworkslab 2020-05-22 17:15:57 +03:00
Artur
ff57c5a294 Fixes APC and makes sleeper work again 2020-05-22 16:44:21 +03:00
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