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 18:02:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,615 Commits 55 Branches 0 Tags
0d2eef3cc4b82fcc9301051cea390c493e7effa3
Commit Graph

38 Commits

Author SHA1 Message Date
Letter N
cf692e8426 subsystem upgrades 2020-12-14 15:28:59 +08:00
silicons
19f1e99a8c mass ports like 15 tg prs + counting (#13386) 
* changes

* ok

* changes

* sigh

* fixes

* changes

* fix

* fix

* alright

* fixes
git pus

* fix

* fix

* fix

* test

* ok

* Update code/modules/paperwork/ticketmachine.dm

Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>

* ok

* compile and other stuff

* ok

* fix

* fix

* Fix

* Update menu.dm

* Update view.dm

* Update preferences.dm

Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2020-10-10 12:20:33 +02:00
Artur
435565f1d8 Merge remote-tracking branch 'origin/master' into TGUI_Updoot 2020-09-21 00:16:12 +03:00
Letter N
fd2ec66757 Ports "Fix bicon(icon2html) showing full dmis, fix asset cache hashes being incorrect." (#13347) 2020-09-06 09:23:28 +02:00
Artur
3bef4ba35e TGUI updates + statpanel 2020-09-02 17:52:47 +03:00
Letter N
afe32406c0 Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT 2020-08-22 13:40:36 +08:00
Letter N
8d70e21239 the unexpected paperwork update. paperwork rp? And also includes ntnet upgrade because fuck it. 2020-08-20 19:40:47 +08:00
Letter N
3b7bca28b3 Functional* code 2020-08-20 13:50:33 +08:00
Letter N
610e25beb7 oops updates asset cache 2020-08-17 20:51:05 +08:00
lolman360
6f7badda41 Merge branch 'master' into plumb 2020-08-12 09:03:11 +10:00
Letter N
a4040ace26 hewwo have you tried to work? 2020-08-10 10:50:07 +08:00
lolman360
308d77da7c Merge branch 'master' into plumb 2020-08-09 22:48:18 +10:00
Letter N
a19e306137 less redtext - updates anomalies 2020-08-03 20:53:36 +08:00
Letter N
894ea242b4 asset cache update. may fuck shit up 2020-07-30 14:28:01 +08:00
lolman360
17d1fd0692 fixes 2020-07-22 12:42:46 +10:00
lolman360
0f1aa3c0ca 'lolman? did you test your code?' 
no i did not ms. kevinz
 2020-07-22 10:49:56 +10:00
Artur
5f9364c5f8 Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-13 16:20:54 +03:00
Letter N
eeedad21de ^w^ 2020-07-09 14:32:23 +08:00
Artur
6ee1eba56c Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-07-02 23:23:47 +03:00
silicons
bb67ab5ddd Merge pull request #12664 from Ghommie/Ghommie-cit827 
Porting a few asset cache related PRs.
 2020-07-02 01:49:27 -07:00
Ghommie
94f7dae62e Porting "Fix asset cache verification" and other tiny bits. 2020-07-01 16:24:12 +02:00
Letter N
b35e3f2b93 fix: R&D Console, Vending, and chem master 2020-07-01 19:07:03 +08:00
Artur
20245f7319 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-06-30 02:30:29 +03:00
Ghommie
5307676317 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit792 2020-06-29 06:55:35 +02:00
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
bac16dbf61 Trying to fix the examine bug.. 2020-06-17 16:13:10 +03:00
Letter N
151df41d1c asset cache + better minimaps 2020-05-31 16:15:09 +08:00
Artur
04dcd6a02c Dos2unix 2020-05-22 19:20:59 +03:00
Artur
bbbb4c611d Fixes asset cache 2020-05-19 21:13:00 +03:00
Artur
ee66a2d396 Ports https://github.com/tgstation/tgstation/pull/50991/ 2020-05-19 20:50:22 +03:00
Artur
c0881fb222 Ports https://github.com/tgstation/tgstation/pull/50759 2020-05-19 18:43:41 +03:00
Artur
5d53ead547 Fucky wucky gateway and ccslab 2020-04-27 10:43:08 +03:00
Artur
120615d472 Ports https://github.com/tgstation/tgstation/pull/44525, and 
And fixes to make stuff work
 2020-04-23 17:36:13 +03:00
Artur
a8aa2e2014 Updates modular computers, begins work on shuttle stuff. 2020-04-23 15:06:35 +03:00
Artur
0b34e20f56 https://github.com/tgstation/tgstation/pull/49330/ and https://github.com/tgstation/tgstation/pull/49982/ 2020-04-23 14:19:50 +03:00