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 21:32:05 +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
1106d49cd7 Merge branch 'Sandstorm-Station:master' into master 2022-03-02 15:24:52 -06:00
SandPoot
aa0edcb6a4 fix 2022-03-02 13:51:49 -03:00
Anonymous
a34fe9cf87 STANDING HERE I REALIZE 2022-02-28 17:34:30 +03:00
Anonymous
54d73bba12 Junior/Trainee alt titles 2022-02-28 17:21:19 +03:00
BongaTheProto
ddd36b40cf Merge part 2 
Yeah this should fix everything with the update
 2022-02-27 14:39:07 -05:00
BongaTheProto
54aec9bd98 Merge remote-tracking branch 'upstream/master' 2022-02-27 14:38:06 -05:00
SandPoot
fb7a24b333 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-02-27 14:17:53 -03:00
BongaTheProto
70a4588e89 Merge branch 'master' into lewdeded 2022-02-25 15:04:37 -05:00
BongaTheProto
e1f1848904 yeah 
ok that should be it
 2022-02-25 15:03:59 -05:00
BongaTheProto
c9844ca88b Merge branch 'Sandstorm-Station:master' into master 2022-02-25 11:06:29 -06:00
BongaTheProto
19522c80ae oopsie (#230) 2022-02-25 06:04:28 -03:00
BongaTheProto
00f19c0cf6 inflation = secured 
mmmmm cumflation...,~
 2022-02-24 18:30:38 -05:00
Daggertail
4066ecc23c Give borgs balls! 
why do the carbons hoard all the good balls?
 2022-02-17 11:45:12 -06:00
BongaTheProto
4024b20c39 Merge pull request #191 from SPLURT-Station/this-will-soon-be-a-cum-nuke 
Ports RBMK
 2022-02-17 03:32:54 -05:00
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
0edfca6f3b Merge branch 'master' into this-will-soon-be-a-cum-nuke 2022-02-13 13:44:19 -05:00
BongaTheProto
b437b03b48 Merge remote-tracking branch 'upstream/master' 2022-02-13 13:40:33 -05: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
SandPoot
5dc331c406 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-02-13 11:51:07 -03: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
3fa9c9916f Merge branch 'Sandstorm-Station:master' into master 2022-01-19 15:39:16 -05:00
SandPoot
a2374fe658 Nerf sheltered 2022-01-19 14:57:28 -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
SandPoot
3911629b38 Upload files 2022-01-18 17:11:54 -03:00
BongaTheProto
1819f15d85 Update _interaction.dm 2022-01-17 21:22:51 -05:00
BongaTheProto
c0d34fb88e lil machine boost 2022-01-17 20:37:20 -05: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