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

315 Commits

Author SHA1 Message Date
BongaTheProto
93016e7568 Merge branch 'Sandstorm-Station:master' into master 2022-02-16 16:03:32 -05:00
SandPoot
765e50eafe Finishes with the warnings. 2022-02-16 17:26:26 -03:00
BongaTheProto
6b429a0843 I'm waking up 
to ash and dust
I wipe my ass and I slap my nuts
 2022-02-13 13:02:42 -05:00
BongaTheProto
4512705548 Merge remote-tracking branch 'upstream/master' 2022-02-12 02:26:31 -05:00
SandPoot
84b0692962 Makes a bunch of our stuff use balloon_alert() (#228) 2022-02-10 22:50:27 -03:00
SandPoot
44c82da16c Update pistol.dm 2022-02-10 22:34:01 -03:00
Anonymous
70c1b8984b Changes to alt job titles 2022-02-09 14:46:34 +03:00
BongaTheProto
9cc2e75632 Merge branch 'Sandstorm-Station:master' into master 2022-02-05 14:25:25 -05:00
SandPoot
9d82c26c1c bad water 2022-02-05 16:04:49 -03:00
BongaTheProto
024cf30c95 Merge branch 'Sandstorm-Station:master' into master 2022-02-05 01:39:29 -05:00
SandPoot
3bbe8d199c emergency merge 2022-02-05 00:48:43 -03:00
BongaTheProto
48e6112c7b Merge remote-tracking branch 'upstream/master' 2022-02-04 13:44:04 -05:00
SandPoot
a0c181a721 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-02-04 15:13:32 -03:00
BongaTheProto
fca6400273 Merge branch 'Sandstorm-Station:master' into master 2022-02-04 11:56:50 -05:00
SandPoot
805ff012fc Fix drinks (#225) 2022-02-04 11:20:21 -03:00
BongaTheProto
5b7b90c47d Merge branch 'Sandstorm-Station:master' into master 2022-02-01 17:43:48 -05:00
SandPoot
d1d0566bdc Fixes the duster (#224) 2022-02-01 19:30:24 -03:00
BongaTheProto
9e01433882 Merge remote-tracking branch 'upstream/master' 2022-01-31 01:23:59 -05:00
SandPoot
b661a86b93 Adds some hella cool clothing (#223) 2022-01-30 21:13:44 -03:00
SandPoot
ef1e5bae16 Adds a command for admins to easily end the shift (calls shuttle) + misc stuff (#222) 2022-01-30 21:09:11 -03:00
BongaTheProto
ffe91d18b2 fix 2022-01-23 15:52:21 -05:00
BongaTheProto
e60c7fc091 oops! All splurt 
mmm module
 2022-01-23 15:15:37 -05:00
BongaTheProto
8bdf3fe59a Merge pull request #141 from NopemanMcHalt/moreborgs 
[NON-MODULAR] More Borgs
 2022-01-21 02:56:54 -05:00
BongaTheProto
4ac125e1d3 Update belly.dm 
No more popped bellies
 2022-01-20 19:22:11 -05:00
Anonymous
af9c71186c RoboMaids! 
Existed in the old (pre-tg) skyrat code.
 2022-01-20 21:28:52 +03:00
Anonymous
6929e7dd6a Borg Icons stage 2 
Normal borg sprites implemented.
 2022-01-20 15:29:20 +03: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
c0d34fb88e lil machine boost 2022-01-17 20:37:20 -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
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
E
9b9925e3bb Merge remote-tracking branch 'origin/master' into i_will_become_back_my_money 2022-01-16 17:12:17 +01:00
E
75fd7596c6 seriously how unconcious was i when making that 2022-01-16 01:15:06 +01: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
4eb967d3ea mmmm milk 
- Added milking machines
-  Added pleasuremaws
- Added a lot of deleted dogborg content
 2022-01-14 12:02:57 -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
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
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
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
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
21546e2c6b ig this makes sense 2021-12-24 00:23:18 -05:00
StrangeWeirdKitten
2fab1b181e ops 2021-12-15 20:33:46 -07:00
StrangeWeirdKitten
90b15aaa44 quick fix 2021-12-15 20:26:24 -07:00