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 01:49:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
48,081 Commits 55 Branches 0 Tags
2ad86e15c425fa3fdb8be95af5389a4b16953cfa
Commit Graph

2685 Commits

Author SHA1 Message Date
BongaTheProto
2ad86e15c4 Merge remote-tracking branch 'upstream/master' 2022-01-22 16:33:08 -05:00
SandPoot
28cc02d653 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-01-22 17:18:15 -03:00
silicons
2b726d7670 Merge pull request #15324 from Trilbyspaceclone/ashtree 
Ashen tree!
 2022-01-22 04:34:28 -08:00
Anonymous
4e02c56ab7 Boatcloak port 2022-01-21 13:38:44 +03:00
radar651
3bd65390d0 Hailer port 
Ported the hailer
 2022-01-20 16:50:10 -06:00
BongaTheProto
00532beeea Merge branch 'master' into pr/138 2022-01-19 12:51:57 -05:00
BongaTheProto
adc469ae71 icons fixed 2022-01-19 12:49:24 -05:00
BongaTheProto
370b6a0270 Merge pull request #128 from NullFag/i_will_become_back_my_money 
I will become back my money
 2022-01-19 02:50:39 -05:00
BongaTheProto
807d7a5a96 part 2 fix 2022-01-19 02:34:17 -05:00
BongaTheProto
87700527e3 part 1 fix 2022-01-19 01:55:30 -05:00
BongaTheProto
7937cc026a Update tgstation.dme 2022-01-19 00:36:33 -05:00
BongaTheProto
87d251d9a4 Revert "Revert "Merge remote-tracking branch 'upstream/master'"" 
This reverts commit 50d9931932.
 2022-01-19 00:22:58 -05:00
radar651
50d9931932 Revert "Merge remote-tracking branch 'upstream/master'" 
This reverts commit 301708f667, reversing
changes made to 172b207db7.
 2022-01-18 23:20:05 -06:00
radar651
319637988b Revert "tgstation.dme update for Update 48" 
This reverts commit 3ad0434c7b.
 2022-01-18 23:11:31 -06:00
radar651
3ad0434c7b tgstation.dme update for Update 48 
Nessary update
 2022-01-18 23:07:02 -06:00
BongaTheProto
3d99fc40d3 Revert "Revert "Merge pull request #135 from SPLURT-Station/research-table"" 
This reverts commit 2a1ee13ad4.
 2022-01-17 12:09:29 -05:00
BongaTheProto
f33f094327 Revert "Revert "Merge pull request #133 from jbox144/TK-hugs"" 
This reverts commit 040be053fc.
 2022-01-17 12:08:21 -05:00
BongaTheProto
f6dbf66e73 Revert "Revert "Merge pull request #132 from SPLURT-Station/milkjming"" 
This reverts commit a87acfb92f.
 2022-01-17 12:08:15 -05:00
BongaTheProto
040be053fc Revert "Merge pull request #133 from jbox144/TK-hugs" 
This reverts commit 4f6583b791, reversing
changes made to 3852bca1bd.
 2022-01-16 23:27:56 -05:00
BongaTheProto
a87acfb92f Revert "Merge pull request #132 from SPLURT-Station/milkjming" 
This reverts commit 00e0fd04c3, reversing
changes made to 8e70b187e5.
 2022-01-16 23:27:26 -05:00
BongaTheProto
2a1ee13ad4 Revert "Merge pull request #135 from SPLURT-Station/research-table" 
This reverts commit 4df10fbc47, reversing
changes made to 4e66b14f8c.
 2022-01-16 18:03:00 -05:00
BongaTheProto
932eaf9a07 Revert "Revert "Merge pull request #135 from SPLURT-Station/research-table"" 
This reverts commit abdf56b326.
 2022-01-16 16:24:25 -05:00
E
9b9925e3bb Merge remote-tracking branch 'origin/master' into i_will_become_back_my_money 2022-01-16 17:12:17 +01:00
BongaTheProto
abdf56b326 Revert "Merge pull request #135 from SPLURT-Station/research-table" 
This reverts commit 4df10fbc47, reversing
changes made to 4e66b14f8c.
 2022-01-16 04:27:59 -05:00
BongaTheProto
21819cb113 Revert "Revert "Merge pull request #135 from SPLURT-Station/research-table"" 
This reverts commit bf75ae492c.
 2022-01-16 02:05:53 -05:00
BongaTheProto
bf75ae492c Revert "Merge pull request #135 from SPLURT-Station/research-table" 
This reverts commit 4df10fbc47, reversing
changes made to 4e66b14f8c.
 2022-01-15 23:09:49 -05:00
SandPoot
0be2006542 Merge branch 'master' into research-table 2022-01-15 13:23:47 -03:00
SandPoot
730336145a Upload files 2022-01-15 13:20:15 -03:00
BongaTheProto
00e0fd04c3 Merge pull request #132 from SPLURT-Station/milkjming 
mmmm milk
 2022-01-15 04:13:56 -05:00
BongaTheProto
b61101c47b cumcumcumcumcumcumcum 
cumcumcumcumcumcumcum
 2022-01-15 04:03:34 -05:00
jbox1
f018662670 TK hugs 
Ported from AuStation, originally coded by yours truely. Simply lets players hug people telekinetically. And also headpat and boop.
 2022-01-15 16:42:45 +11:00
BongaTheProto
4eb967d3ea mmmm milk 
- Added milking machines
-  Added pleasuremaws
- Added a lot of deleted dogborg content
 2022-01-14 12:02:57 -05:00
BongaTheProto
582bea59f7 Moved these to another location 
someone plz tell me if they start appearing again now, in which case we may have a bit of a problem
 2022-01-13 13:48:10 -05:00
BongaTheProto
973ed1824c fix 
fix
 2022-01-11 13:46:40 -05:00
BongaTheProto
90d51421b7 redbot subsystem 
also added mamals because idfk why they weren't in in first place
 2022-01-11 08:36:53 -05:00
BongaTheProto
b4a1ebeddb why won't it just work 
this is for when people can't get in after registering for who knows what fucking reason
 2022-01-10 23:42:13 -05:00
E
2501966ab5 Merge remote-tracking branch 'origin/master' into i_will_become_back_my_money 
# Conflicts:
#	tgstation.dme
 2022-01-10 23:52:53 +01:00
E
b188540454 yeah this took way too long to do 2022-01-10 23:51:03 +01:00
BongaTheProto
397793a99d they couldn't breef 
:floyf:
 2022-01-08 13:49:59 -05:00
SandPoot
374aa33013 Fix + updates 2022-01-07 23:21:48 -03:00
BongaTheProto
1178e069fa Merge pull request #125 from SPLURT-Station/bot-bad-question-mark 
Discord bunker bypass
 2022-01-06 20:49:35 -05:00
BongaTheProto
fd8d76c1dc Merge conflig prevention™️ 
modularized the procs :3
 2022-01-06 20:15:02 -05:00
BongaTheProto
8156a18d1e tgs now 
it makes sense since it's all carried out in discord, right?
 2022-01-06 19:13:38 -05:00
BongaTheProto
61704cba70 Verbs ready 
these are the base verbs
 2022-01-06 18:56:03 -05:00
BongaTheProto
ff19e79b65 erm 
what the amogus
 2022-01-05 20:39:07 -05:00
BongaTheProto
3c67078182 Better token generation (now it actually works) 2022-01-05 13:47:40 -05:00
BongaTheProto
228156d4be Merge branch 'master' into tg-redbot-integration 2022-01-05 11:59:27 -05:00
BongaTheProto
91a6b73ae1 yeah 
name's cringe but that's literally what it is lol
 2022-01-05 04:09:12 -05:00
BongaTheProto
49a68bfc65 Join our discord or die 
I can't believe this is modular!
 2022-01-05 03:06:42 -05:00
James
a67efdc1fa TGUI Playtimes Panel 2022-01-05 05:22:53 +00:00