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 2026-08-22 12:16:40 +01:00
Code Issues Packages Projects Releases Wiki Activity
55,761 Commits 55 Branches 0 Tags
interactions-issues
Commit Graph
3464 Commits
Author SHA1 Message Date
BongaTheProto 2d1d665e41 Revert "Merge remote-tracking branch 'upstream/master'" 
This reverts commit c1c9fef224, reversing
changes made to 6767f48e82.
 2023-12-16 10:48:35 -05:00
BongaTheProto c1c9fef224 Merge remote-tracking branch 'upstream/master' 2023-12-15 18:12:47 -05:00
SandPoot 8cdb82a23f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-12-12 22:06:13 -03:00
deathride58andGitHub e729badcd2 Merge pull request #16039 from SandPoot/maptexts-(verb)-maptexts-(variable) 
Maptext()s the maptexts
 2023-12-12 19:21:17 -05:00
SandPoot e457f40328 maptext 2023-12-11 17:43:24 -03:00
BongaTheProto 700fd57efb Merge remote-tracking branch 'upstream/master' 2023-12-08 20:22:05 -05:00
SandPoot 42fdd30ba4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-12-05 17:47:58 -03:00
tgstation-server 6df8c9a9fe Update TGS DMAPI 2023-11-25 01:06:13 +00:00
SandPoot b290efc434 push 2023-11-22 14:11:17 -03:00
BongaTheProtoandGitHub 161f5a477a Merge pull request #978 from MysteryMan21333/Xenobiology 
[NON-MODULAR] Xenobiology V1.0
 2023-11-17 23:48:39 -05:00
SPLURT-Station ba2b94b7ba Update TGS DMAPI 2023-11-18 00:30:26 +00:00
SPLURT-Station cd5aba2e3d Update TGS DMAPI 2023-11-06 00:31:03 +00:00
BongaTheProto 37bbecefb4 Merge remote-tracking branch 'upstream/master' 2023-11-05 18:01:32 -05:00
SandPoot fd124b03e4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-11-03 21:27:30 -03:00
BlueWildroseandGitHub 720374a7ef Merge pull request #16022 from SandPoot/fix-loadout-runtime-not-spawning-items 
Fix loadout runtime (which prevents remaining items from spawning)
 2023-10-31 14:47:20 -06:00
SandPoot 0b6d743e22 go 2023-10-28 17:51:02 -03:00
BongaTheProtoandGitHub e9e96516bd Merge pull request #976 from SPLURT-Station/hate-upstream 
Moves flavor texts to the background tab
 2023-10-26 02:00:46 -05:00
SPLURT-Station f548d60fea Update TGS DMAPI 2023-10-25 00:29:11 +00:00
BongaTheProto bbc7e46021 Merge branch 'master' into hate-upstream 2023-10-22 21:25:06 -05:00
SPLURT-Station 2b34565643 Update TGS DMAPI 2023-10-23 00:30:04 +00:00
BongaTheProto 6e6bce8772 Merge remote-tracking branch 'upstream/master' into hate-upstream 2023-10-18 22:02:48 -05:00
SandPoot 45a94856c1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-10-18 18:24:11 -03:00
MysteryMan21333 06153ae98f Xenobiology V1.0 2023-10-14 07:15:46 -05:00
SandPoot 297ee64977 push 2023-10-12 15:45:35 -03:00
BongaTheProto 3230992305 Merge remote-tracking branch 'upstream/master' 2023-10-12 13:28:32 -05:00
SandPoot ee163aae68 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-10-12 02:40:12 -03:00
BlueWildroseandGitHub def4b38a46 Revert "[DNM] Updates firemanning, throwing stuff" 2023-10-11 13:52:03 -06:00
BlueWildroseandGitHub aff43910af Merge pull request #16007 from SandPoot/throwing-updat 
[DNM] Updates firemanning, throwing stuff
 2023-10-11 13:51:54 -06:00
tgstation-server b29219aa1a Update TGS DMAPI 2023-10-10 01:05:15 +00:00
SandPoot d4ea14c4ef push 2023-10-09 16:15:49 -03:00
SandPoot 5a90dabd3c stuff 2023-10-03 23:22:57 -03:00
BongaTheProtoandGitHub 31d43c4fe7 Merge pull request #947 from remuluson2/messy 
Adding Messy trait, Pref for getting splashed with cum
 2023-09-23 18:57:28 -05:00
BongaTheProtoandGitHub 73e71d041c Merge pull request #931 from Yawet330/master 
Compressed PR | Zombie Changes | Privacy stuffs
 2023-09-23 17:44:57 -05:00
BongaTheProto 085bb06e94 Merge remote-tracking branch 'upstream/master' 2023-09-16 14:32:38 -05:00
SandPoot 0b04af4b76 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-09-14 22:32:47 -03:00
BongaTheProtoandGitHub 27df3d0753 Merge pull request #840 from Comicao1/Races-port 
Teshari [TESTING]
 2023-09-10 23:59:28 -05:00
SandPoot 3c7e79d384 do after update 2023-09-09 15:39:49 -03:00
Comicao1 3cbf9ed3f0 Go on 2023-09-07 04:42:07 +03:00
Yawet330andGitHub 351ec8617c Updates Helpers to prevent CPR bug 2023-09-02 22:35:53 +01:00
Mateusz Dargiel e5a1325095 fixed indents, added cum_onto pref to all the uis 2023-09-02 13:48:26 +02:00
BongaTheProtoandGitHub 9b8ce2457d Merge pull request #938 from SPLURT-Station/tram-surname-station 
Ports modular ruins
 2023-08-25 00:32:33 -05:00
SPLURT-Station cf24b23f4f Update TGS DMAPI 2023-08-25 00:28:20 +00:00
BongaTheProto 887ac598c0 update rust_g (again) 
been a while huh
 2023-08-20 21:23:49 -05:00
BongaTheProto f58785708c update rust-g (again) 
I suppose this things gets rusty very quick
 2023-08-18 20:04:20 -05:00
BongaTheProto 3d421a7f12 Merge branch 'master' into pr/840 2023-08-13 14:43:09 -05:00
Tsurupeta d4ec25e748 all else 2023-08-08 14:01:18 +03:00
BongaTheProto 2b718295d3 Merge remote-tracking branch 'upstream/master' 2023-07-23 13:41:11 -05:00
SandPoot 8b66a57665 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-07-21 00:23:16 -03:00
LinandGitHub 77df8655e0 Merge pull request #15990 from SandPoot/lobby-collapse 
Collapsible lobby buttons
 2023-07-20 11:55:29 -05:00
BongaTheProto 650642d379 Merge remote-tracking branch 'upstream/master' 2023-07-20 00:23:25 -05:00