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-16 21:02:35 +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
a0e02ce288 Merge branch 'Sandstorm-Station:master' into master 2022-05-18 18:53:09 -07:00
BongaTheProto
78c722f20a Fixes lust saves and adds stepping logs (#252) 2022-05-18 22:45:32 -03:00
BongaTheProto
a5765361fc Merge branch 'master' into prefs-update 2022-05-18 14:40:43 -05:00
Anonymous
7861c5d458 I never asked for this 2022-05-16 23:54:09 +03:00
BongaTheProto
603a3fbe9b Merge branch 'master' into prefs-update 2022-05-16 15:00:20 -05:00
BongaTheProto
2593c92f6a Merge pull request #317 from JerryWester/master 
"Portal Fleshlight & Underwear" overhaul
 2022-05-16 07:34:08 -07:00
BongaTheProto
e497294a1e Merge branch 'master' into prefs-update 2022-05-12 21:47:09 -05:00
BongaTheProto
f4b9585c12 Merge remote-tracking branch 'upstream/master' 2022-05-12 20:47:56 -05:00
SandPoot
5c5bb3c5c0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-05-12 18:09:56 -03:00
Jerry Wester
9eba0c6ac8 no more multiple fleshlights linked to underwear 2022-05-12 00:38:25 -06:00
ProbablyCarl
0699d359d3 PosiQoL 
- - -
Yup
 2022-05-11 22:54:56 -04:00
BongaTheProto
805968e8c3 Merge branch 'master' into prefs-update 2022-05-11 10:51:56 -05:00
BongaTheProto
80bb0aad57 Merge pull request #328 from Toxici11i/4 
Fixes
 2022-05-10 17:47:16 -05:00
BongaTheProto
9b1fdaf81a Merge branch 'Sandstorm-Station:master' into master 2022-05-10 16:57:20 -05:00
Toxici11i
7b7c2908dc wah 2022-05-10 22:29:53 +01:00
SandPoot
616efb0ac3 bad check 2022-05-10 18:16:06 -03:00
Jerry Wester
359fb50851 fix grammar 2022-05-10 01:48:55 -06:00
Jerry Wester
e885fa35f7 Merge branch 'master' of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13 2022-05-10 01:33:22 -06:00
Jerry Wester
27b1099590 mossy can be thanked for this commit 2022-05-09 22:37:35 -06:00
BongaTheProto
b59cbac7a0 Update sif.dm 
I hate these too but I hate even more the unnecessary warnings in my vscode
 2022-05-09 07:27:55 -05:00
BongaTheProto
6306d05a18 Merge branch 'master' into prefs-update 2022-05-08 15:23:53 -05:00
BongaTheProto
b58859dab9 Merge pull request #321 from Toxici11i/master3 
Massive update.
 2022-05-08 15:16:40 -05:00
Jerry Wester
08f4f0173f remove item interactions, bug fixes, finalization 2022-05-07 21:28:19 -06:00
BongaTheProto
ac7b1f25aa Merge branch 'master' into prefs-update 2022-05-07 12:52:38 -05:00
BongaTheProto
b8f315cd28 Merge remote-tracking branch 'upstream/master' 2022-05-07 12:07:56 -05:00
SandPoot
5e021efa6c yeaaaa no 2022-05-07 12:49:42 -03:00
Jerry Wester
6a92e472bb add sprites (thank you @Moltov#6925), etc. 2022-05-06 22:30:41 -06:00
BongaTheProto
ec0583efc2 Merge branch 'master' into prefs-update 2022-05-06 19:15:50 -05:00
BongaTheProto
5328595b3e Merge remote-tracking branch 'upstream/master' 2022-05-06 19:07:05 -05:00
Toxici11i
8f91555dd7 Massive update. 
Signed-off-by: Toxici11i
 2022-05-06 22:29:33 +01:00
BongaTheProto
b21f3bc3e6 this somehow works, ok? 
aaa
 2022-05-06 15:42:19 -05:00
Jerry Wester
fc9f4da591 portal-ception 2022-05-06 12:56:53 -06:00
SandPoot
771f468ba6 Interaction Panel Upgrade Again! (#250) 
* Upload files

* command is now deprecated

* cooldown defines!
 2022-05-06 14:58:58 -03:00
Jerry Wester
cd2c6975c3 fix "mouth" color 2022-05-06 10:31:08 -06:00
Jerry Wester
46ac78099d add mouth target, organize shit 2022-05-06 10:18:08 -06:00
Jerry Wester
c1a70740a0 no more butts, only anuses. anuses? ani? 2022-05-05 22:34:13 -06:00
Jerry Wester
23623b896f Merge branch 'master' of github.com:JerryWester/S.P.L.U.R.T-Station-13 2022-05-05 12:47:53 -06:00
Jerry Wester
24da462693 you can put your dick in it, but in reverse 2022-05-05 12:47:40 -06:00
SandPoot
50b6995251 let's avoid vars 2022-05-04 22:46:22 -03:00
SandPoot
30756d4f80 performance help 2022-05-04 18:08:31 -03:00
BongaTheProto
1acb13ba29 Update tetris.dm 2022-05-03 10:00:03 -05:00
Anonymous
9ae44ab1ee Modularizes Alt Job Titles of the SPLURT 
(I just wanted to add Bard alt title wtf happening Edition)
 2022-05-01 22:09:42 +03:00
NopemanMcHalt
67416cce60 Adds "bard" as an alternative assistant title 
Lazy webedit Edition
 2022-05-01 20:18:05 +03:00
BongaTheProto
587051c249 Merge branch 'Sandstorm-Station:master' into master 2022-04-27 16:13:35 -05:00
SandPoot
1b62569d2b handle signals correctly 2022-04-27 17:51:58 -03:00
Iosyf
d148cbf86c ignore this 
minor linters errors fixes
 2022-04-26 00:11:59 +03:00
Iosyf
7fb520890e tgui and tetris patches 
tgui - was chugging hard because of how some lewd bodypart clothes coverage checks
tetris - was being exploited to crash the server as it had no prize limits
 2022-04-25 23:26:20 +03:00
BongaTheProto
d0dda61961 Merge remote-tracking branch 'upstream/master' 2022-04-21 19:30:57 -05:00
SandPoot
cfa10bf239 Fixes an immense amount of runtimes. (#247) 2022-04-21 15:56:36 -03:00
BongaTheProto
56ce2acbcb Merge remote-tracking branch 'upstream/master' 2022-04-21 09:59:13 -05:00