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

2851 Commits

Author SHA1 Message Date
BongaTheProto
281eafdcdd Merge remote-tracking branch 'upstream/master' 2022-02-16 18:10:40 -05:00
SandPoot
65face48e9 Fix saves 2022-02-16 19:53:16 -03:00
BongaTheProto
93016e7568 Merge branch 'Sandstorm-Station:master' into master 2022-02-16 16:03:32 -05:00
SandPoot
bf69229ada Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-02-16 17:18:56 -03:00
BongaTheProto
d0563e1462 fix fix and reinstaurate 
temporarily fixes the fucking 300000 space.dm runtimes and also readds the forced fem and masc stuff
 2022-02-16 00:43:05 -05:00
silicons
ce6e8c99c6 fixes 2022-02-15 21:56:36 -07: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
f18f566e4d Merge remote-tracking branch 'upstream/master' 2022-02-04 00:16:28 -05:00
SandPoot
2d0637221a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-02-04 00:59:26 -03:00
Linzolle
ab6f305805 Merge branch 'pokerchips' of github.com:Citadel-Station-13/Citadel-Station-13 2022-02-01 21:50:26 -07:00
BongaTheProto
9ce527e068 Merge remote-tracking branch 'upstream/master' 2022-01-26 00:20:29 -05:00
SandPoot
e8c8d2b0ef Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-01-25 11:38:07 -03:00
silicons
9205545d16 Merge pull request #15317 from LetterN/what-should-i-name-this-branch 
TGUI hardsync & stuff
 2022-01-25 00:06:59 -08:00
BongaTheProto
e60c7fc091 oops! All splurt 
mmm module
 2022-01-23 15:15:37 -05:00
Putnam3145
07bd8437da I missed a couple 2022-01-22 17:04:18 -08:00
Putnam3145
a408957bc6 Various chem tweaks 2022-01-22 16:40:05 -08:00
LetterN
18b7069f1f Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2022-01-11 09:49:38 +08:00
BongaTheProto
9a76d328c4 Merge remote-tracking branch 'upstream/master' 2021-12-31 21:17:10 -05:00
SandPoot
9a633b5395 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-12-31 14:07:43 -03:00
DeltaFire
051f5780db tweaks 
Synthtissue borrowed health capped at 250, gradually flips from clonedamage towards toxdamage within 45 cycles.

Restores organ healing for strange reagent, but only in a very weak fashion (5 heal for failing organs)
 2021-12-31 00:16:49 +01:00
Lin
0ba9f4254c Merge pull request #15435 from TripleShades/aaaaa 
Festive Station Fixes
 2021-12-28 21:35:28 +00: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
TripleShades
b3d71081b7 Update turfs.dm 2021-12-25 16:59:48 -05:00
TripleShades
2de8cafa49 fuck 2021-12-24 20:31:17 -05:00
BongaTheProto
31103f5dc0 Revert "why was this removed" 
This reverts commit 1a7d558308.
 2021-12-24 17:48:31 -05:00
BongaTheProto
1a7d558308 why was this removed 
d
 2021-12-24 17:03:00 -05:00
TripleShades
0089b44df2 a 2021-12-23 17:57:15 -05:00
LetterN
fab4b07be5 Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2021-12-21 07:59:33 +08:00
BongaTheProto
a24e6264cc Merge branch 'Sandstorm-Station:master' into master 2021-12-16 12:24:47 -05:00
SandPoot
24e342b7fc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-12-16 10:33:03 -03:00
Putnam3145
f50dafe141 Fixes SDGF nutrition growth not to be exponential 2021-12-13 17:01:22 -08:00
BongaTheProto
65696e53c7 aaaaaaa 
aaaaaaaaaa
 2021-12-13 01:30:47 -05:00
BongaTheProto
c7bd65b1a6 Merge remote-tracking branch 'upstream/master' 2021-12-08 15:01:52 -05:00
SandPoot
ca74834260 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-12-08 15:17:23 -03:00
Lin
76fbc0994f ball map weather (#15405) 2021-12-08 18:49:43 +01:00
BongaTheProto
58e75ee58b Merge remote-tracking branch 'upstream/master' 2021-12-07 10:32:42 -05:00
BongaTheProto
c3068fc135 "Small" climax revamp (#203) 2021-12-07 10:57:35 -03:00
StrangeWeirdKitten
196cebff53 Merge branch 'master' into Lewd-Clothes 2021-12-02 20:14:16 -07:00
StrangeWeirdKitten
11715f36ba Finishing Touches 
The PR is now finished.
 2021-12-02 19:51:28 -07:00
E
7e2e6797cf r 2021-12-02 01:04:10 +01:00
E
52d4143c83 yeet 2021-12-02 00:59:39 +01:00
BongaTheProto
41bcf2ec17 Merge branch 'Sandstorm-Station:master' into master 2021-11-30 21:38:45 -05:00
SandPoot
a49a1c625d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-11-30 22:25:44 -03:00
Lin
e506bc50dc Merge pull request #15335 from DeltaFire15/synth-chem-time 
Synth / IPC kinda-buffs - Chemwarfare Edition
 2021-12-01 00:39:02 +00:00
E
333f0a7da8 megres with boob 2021-11-29 17:30:51 +01:00
E
072a102436 h 2021-11-29 17:25:44 +01:00
E
60d74dab61 why 2021-11-29 16:21:58 +01:00
BongaTheProto
4b4dc210c8 Merge branch 'Sandstorm-Station:master' into master 2021-11-27 19:44:41 -05:00
SandPoot
73577046a1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-11-27 20:55:14 -03:00