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-17 05:12:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,604 Commits 55 Branches 0 Tags
901b93e534a880bb2b014dbbd5f80c149e6ec01a
Commit Graph

526 Commits

Author SHA1 Message Date
BongaTheProto
f6dbf66e73 Revert "Revert "Merge pull request #132 from SPLURT-Station/milkjming"" 
This reverts commit a87acfb92f.
 2022-01-17 12:08:15 -05:00
SandPoot
a05809d24d LOG_ATTACK & LOG_VICTIM 2022-01-17 02:13:16 -03: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
E
75fd7596c6 seriously how unconcious was i when making that 2022-01-16 01:15:06 +01: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
E
66923ea82f i am fucking retard 2022-01-15 03:02:47 +01:00
BongaTheProto
9eeb639dc9 oop 2022-01-14 12:11:17 -05: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
3db06f5850 Merge branch 'Sandstorm-Station:master' into master 2022-01-13 15:32:52 -05:00
SandPoot
669de65fa6 fix fleshlights 2022-01-13 17:25:30 -03:00
BongaTheProto
5cccf484b7 Merge branch 'Sandstorm-Station:master' into master 2022-01-11 20:24:10 -05:00
SandPoot
511be2f745 no EZ mode 2022-01-11 18:14:15 -03: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
0de6f8b2e7 Merge remote-tracking branch 'upstream/master' 2022-01-08 12:56:44 -05:00
SandPoot
2c2b60e4d7 ghost proof 2022-01-08 13:30:23 -03:00
SandPoot
747a4c31aa sensitive info 2022-01-08 13:23:47 -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
61704cba70 Verbs ready 
these are the base verbs
 2022-01-06 18:56:03 -05:00
Anonymous
2b91df79d4 Ports bootybots and qualified doctor from Hyper 2022-01-07 02:22:08 +03:00
Uso15
a512209901 Sec bikini armor fix 2022-01-04 13:22:24 -06:00
James
64e65d9391 Throatfucking now actually does noticeable oxy damage 2022-01-02 23:18:12 +00:00
James
0c24c8dabd Correctly logs ERP verb actions instead of most saying 'ass-slapped' 2022-01-02 23:17:19 +00:00
BongaTheProto
9a76d328c4 Merge remote-tracking branch 'upstream/master' 2021-12-31 21:17:10 -05:00
SandPoot
d46990f902 Finishing the strip menu 2021-12-31 14:26:32 -03:00
SandPoot
9a633b5395 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-12-31 14:07:43 -03:00
BongaTheProto
28d38eb2fd Update leash.dm 2021-12-30 04:12:57 -05:00
BongaTheProto
b74ca450e5 nwo i se... 
tfw seggsclaws give you a better understanding of things
 2021-12-30 02:03:26 -05:00
BongaTheProto
a8498bd326 now its a config 
ghghghgjglgngbg
 2021-12-27 16:35:12 -05:00
BongaTheProto
b484927e55 Inverse milking moment (#216) 
* smol micro runtime fix

:3

* blepppppp

lots of c

* Delete .NETFramework,Version=v4.0,Profile=Client.AssemblyAttributes.cs

* Delete UnstandardnessTestForDM.csproj.AssemblyReference.cache
 2021-12-27 17:52:14 -03:00
BongaTheProto
16201fa65f Merge remote-tracking branch 'upstream/master' 2021-12-27 15:50:59 -05:00
SandPoot
946d8b3c26 Modifies interaction prefs on the interaction menu (#218) 2021-12-27 17:19:55 -03:00
BongaTheProto
354b050cf2 Merge branch 'pr/102' 2021-12-27 01:19:04 -05:00
BongaTheProto
003344001b blepppppp 
lots of c
 2021-12-27 00:46:26 -05:00
BongaTheProto
8df2beaf2b wahoo 
aaaaahadfljasdljfalsdjfsj
 2021-12-26 17:10:26 -05:00
BongaTheProto
eab156b069 Merge pull request #92 from Kamatii/borg-resize-fix 
Borg resize fix
 2021-12-24 13:18:11 -05:00
BongaTheProto
21546e2c6b ig this makes sense 2021-12-24 00:23:18 -05:00
Hartmann-von-Berlichingen
eb09e43871 oopsie, fixed 2021-12-23 15:56:58 +03:30
Hartmann-von-Berlichingen
d4a971d532 making sure it works after the update 2021-12-23 15:52:48 +03:30
BongaTheProto
9414adefd5 Merge branch 'master' into pr/92 2021-12-22 16:21:17 -05:00
BongaTheProto
317d31edfc Revert "modular_splurt'd teh code uwu" 
This reverts commit f8f94e4259.
 2021-12-22 15:57:11 -05:00