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
54,249 Commits 55 Branches 0 Tags
5116acad15f301d528039606cb63af6bff3bbcf2
Commit Graph

57 Commits

Author SHA1 Message Date
SandPoot
072087ec14 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-02-15 20:22:44 -03:00
SandPoot
c60f36a42b files 2023-01-28 01:10:49 -03:00
SandPoot
a0c181a721 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-02-04 15:13:32 -03:00
SandPoot
29be8573ea Upload files 2022-02-02 02:01:04 -03:00
SandPoot
e8c8d2b0ef Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-01-25 11:38:07 -03:00
SandPoot
d46990f902 Finishing the strip menu 2021-12-31 14:26:32 -03:00
SandPoot
8510dcc08a Ports tgui stripping (finally) (#15401) 
* Upload files

* Update items.dm

* Update files

* Update files

* Update strippable.dm

* Update strippable

* Update strippable.dm

* Upload files

* Update files

* Update files

* Update files

* update files

* Update files

* Update dog.dm

* Update strippable.dm

* Update equipping

* Update strippable.d

* Upload files

* Upload files

* Update monkey.dm
 2021-12-30 07:40:15 +01:00
LetterN
99019166e4 i think it works 
MAJOR antag backend update
- you cannot bruteforce the pen anymore
- uplink now uses bitflag to lock purchases
- poplock is handled entirely by the buyable uplink items
- tgui antag intro (for selected ones)
 2021-10-30 11:45:50 +08:00
silicons
d6d037de43 Merge pull request #15232 from Putnam3145/minesweeper-removal 
Removes minesweeper
 2021-10-27 05:11:48 -07:00
Putnam3145
dc22e02a1b Removes minesweeper 2021-10-01 23:08:08 -07:00
SandPoot
b23b88524d Upload files 2021-09-28 22:03:17 -03:00
LetterN
12ae614833 fix1 2021-09-08 10:22:55 +08:00
silicons
4289b8be1e Merge remote-tracking branch 'citadel/master' into backend_sync 2021-04-28 22:34:17 -07:00
silicons
7cc6bba5ff fixes 2021-04-28 22:27:09 -07:00
SandPoot
f40f4c8257 upload files 2021-04-23 19:30:28 -03:00
Letter N
34697acf74 missing icon fix & stop throwing out parts 2021-03-05 19:29:52 +08:00
Letter N
f2f97f5855 ae 2021-03-04 22:01:46 +08:00
Letter N
5897cfd97b when tgui 
subscript text
 2021-03-04 16:39:44 +08:00
Letter N
834e4730b3 not existing 2021-02-09 15:44:49 +08:00
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