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-12 19:02:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
54,249 Commits 55 Branches 0 Tags
5116acad15f301d528039606cb63af6bff3bbcf2
Commit Graph

114 Commits

Author SHA1 Message Date
BongaTheProto
d08cb554e9 Merge branch 'master' into pr/660 2023-02-13 14:09:17 -05:00
BongaTheProto
ce464a6903 Merge remote-tracking branch 'upstream/master' 2023-02-11 21:25:29 -05:00
SandPoot
b62b5c3e12 fix more alt titles 2023-02-11 14:02:22 -03:00
BongaTheProto
8a53e33271 Merge branch 'master' into pr/660 2023-01-28 22:11:29 -05:00
BongaTheProto
620380e188 Merge remote-tracking branch 'upstream/master' 2023-01-21 13:15:29 -05:00
SandPoot
0ebcf0b72f stuff 2023-01-16 18:16:32 -03:00
Neyusha
580bd31e12 Stowaways Role 2022-12-27 11:45:20 +03:00
BongaTheProto
ee6823c69b Merge remote-tracking branch 'upstream/master' 2022-12-13 12:14:11 -05:00
Lin
7205781c47 Merge pull request #15892 from SandPoot/let's-sing-the-reference-clearing-song 
Solves some harddels
 2022-12-12 19:11:49 -07:00
SandPoot
8911fe5e0b clear em 2022-12-11 17:58:45 -03:00
BongaTheProto
a1c93d4767 Merge branch 'Sandstorm-Station:master' into master 2022-11-09 19:12:06 -05:00
Hatterhat
4a8abd0843 Revert "no more free money (#15375)" 
This reverts commit cb1848d06c.
 2022-10-31 00:01:44 -05:00
BongaTheProto
79fa770ab3 Merge remote-tracking branch 'upstream/master' 2022-10-13 11:21:32 -05:00
shellspeed1
cdb1fbb1e2 port of https://github.com/tgstation/tgstation/pull/54029/files# Aka this is where we get bounty cubes and remove the public bounty console. Credit to ArcaneMusic. 2022-09-18 21:55:10 -07:00
BongaTheProto
3341812b44 Merge remote-tracking branch 'upstream/master' 2022-08-20 17:16:19 -05:00
Putnam3145
5b221dc354 Makes signal commander work 2022-08-18 23:01:47 -07:00
BongaTheProto
9e7c5033cc Merge remote-tracking branch 'upstream/master' 2022-08-07 21:42:16 -05:00
Putnam3145
b2d816b825 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits 2022-08-07 17:59:28 -07:00
Letter N
b6d62780c2 fix 2022-08-04 11:06:16 +08:00
BongaTheProto
8652fc82a9 was less than I thought 
yeah this works ig
 2022-05-09 17:33:28 -05:00
Putnam3145
6199aa4d60 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits 2022-03-30 12:35:12 -07:00
DeltaFire
cb1848d06c no more free money (#15375) 2022-03-13 12:50:30 -07:00
Putnam3145
629ce5bea6 Station traits 2021-12-08 16:17:35 -08: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
LetterN
f7b898a2a9 frontend 2021-10-28 17:34:52 +08:00
Letter N
bcdf96f274 Revert "TGUI alerts, lists, inputs" 2021-10-28 12:17:29 +08:00
SandPoot
5aa12b4716 There's a bounty for this right? i spent nearly two full days at this 2021-10-05 18:10:32 -03:00
Hatterhat
9dbcfa24a5 i only KINDA tested this 2021-09-07 22:28:04 -05:00
Artur
82ccfc40dc /obj/screen --> /atom/movable/screen 2021-07-29 13:57:19 +03:00
Putnam
3b25f3e199 Started expanding auxgm a bit 2021-06-10 04:40:23 -07:00
Lin
715f86ef5c Merge pull request #14447 from LetterN/fixes-2 
Fixes laptop and tweaks stacks
 2021-03-22 19:52:42 -05:00
LetterN
86b8bbf727 no more free shipping 2021-03-21 21:44:04 +08:00
LetterN
8d9c4f55d6 no dumb names 2021-03-21 13:51:08 +08:00
LetterN
228105b391 laptop and closet decon fix 2021-03-16 14:47:28 +08:00
Letter N
45d6a5f87f it compiles, UNTESTED YET 2021-02-13 21:41:59 +08:00
Letter N
5b0a1077f4 Modular Cmp Updates 2021-02-12 18:29:00 +08:00
silicons
89c63a243f Update card.dm 2021-02-04 13:23:03 -07:00
silicons
ea07ad6e48 Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-13 15:41:28 -07:00
MrJWhit
893199679d Update arcade.dm 2021-01-11 08:46:12 -05:00
Letter N
98ff0a080e ImmursionAudio(TM) 2020-12-21 19:47:11 +08:00
Letter N
f04918bdca working code? 2020-08-21 15:09:49 +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
8f0f30f6f7 lazy datacore fix 2020-08-06 17:27:51 +08:00
Letter N
f2f6416105 fixes - radio, broken - crewmanifest, gastank controler 2020-08-05 20:34:09 +08:00
Letter N
e40470f553 h. Updates NTOS, and axes p2p filetransfer! 2020-07-30 20:54:13 +08:00
Letter N
0805265412 yet another batch. MAJOR: APC 2020-07-30 12:54:53 +08:00
Artur
5f9364c5f8 Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-13 16:20:54 +03:00
Artur
43951bf44e Ports https://github.com/tgstation/tgstation/pull/51152 2020-06-17 17:01:55 +03:00
Putnam
e8d7da56f4 Ported C++mos from yogs (help me) 2020-05-11 15:44:26 -07:00
Artur
f97f264fb7 Fixing more stuff 
Mint machine compile fixes and the syndicate contractor program.
 2020-04-23 20:09:42 +03:00