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-17 09:46:59 +01:00
Code Issues Packages Projects Releases Wiki Activity
55,761 Commits 55 Branches 0 Tags
interactions-issues
Commit Graph
7014 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
BongaTheProtoandGitHub bb458c8cc1 Merge pull request #1014 from Yawet330/secfix2 
yippee - I spent 2 hours looking for security exploits
 2023-12-13 22:44:13 -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 3e45c18ab4 Merge pull request #16038 from SandPoot/fix-lava+borgs 
Deals with lava plus a lot of borg stuff
 2023-12-12 19:25:13 -05:00
deathride58andGitHub 4e39bef762 Merge pull request #16040 from SandPoot/better-countdown-effect 
Makes countdown objects follow their targets better
 2023-12-12 19:21:51 -05:00
SandPoot f95f776547 push 2023-12-11 18:30:19 -03:00
SandPoot e457f40328 maptext 2023-12-11 17:43:24 -03:00
SandPoot 36f3edaf4c push 2023-12-10 15:16:51 -03:00
SandPoot c36105ef88 holy hell 2023-12-07 23:08:17 -03:00
BongaTheProtoandGitHub 5fa6d54bb1 Update code/game/objects/structures/crates_lockers/closets/genpop.dm 2023-12-04 14:56:42 -05:00
BongaTheProtoandGitHub fce4ddfbea Update code/game/objects/structures/crates_lockers/closets/genpop.dm 2023-12-04 14:56:36 -05:00
Yawet330 2325928610 yippee 2023-11-29 16:49:36 +00:00
ariaworld 3805388363 Modularize, RAHHHH! 2023-11-19 03:03:30 +01:00
ariaworld 7bc56f700b Add: New lines for linters. 2023-11-18 18:29:50 +01:00
ariaworldandGitHub d10a773e3f Merge branch 'SPLURT-Station:master' into spooktober-update 2023-11-18 15:01:21 +01:00
ariaworld e98019e91e Push, push, push. 2023-11-17 21:34:27 +01:00
ariaworld 23f141965e First draft. 2023-10-31 14:03:34 +01:00
MysteryMan21333 06153ae98f Xenobiology V1.0 2023-10-14 07:15:46 -05:00
BlueWildroseandGitHub def4b38a46 Revert "[DNM] Updates firemanning, throwing stuff" 2023-10-11 13:52:03 -06:00
BongaTheProto cd026aaddb Merge remote-tracking branch 'upstream/master' 2023-10-05 13:38:12 -05:00
SandPootandGitHub c3735c05ac Merge branch 'master' into throwing-updat 2023-10-04 15:15:15 -03:00
SandPoot 5a90dabd3c stuff 2023-10-03 23:22:57 -03:00
SandPoot da9d3f1ba0 Merge commit 'af33de25b4732bf6234304bb3cee88c81e65538a' of https://github.com/Citadel-Station-13/Citadel-Station-13 into pr/SmiLeYre/346 2023-10-03 18:57:44 -03:00
LinandGitHub bae4216c20 Merge pull request #16003 from SandPoot/held-plushies 
Adds held sprites to plushes
 2023-10-03 17:51:26 -04:00
SandPoot af33de25b4 the commit 2023-10-03 14:22:05 -03:00
BongaTheProtoandGitHub 872b687de2 Merge branch 'Sandstorm-Station:master' into master 2023-10-02 21:01:43 -05:00
SandPoot cd12c202c4 updates, modularizing and generally making the code better 2023-10-02 22:53:21 -03:00
Марк e8c0eaa1c1 Plushies. 2023-10-03 04:04:54 +05:00
SandPoot 5945726d63 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-10-02 15:21:26 -03:00
SandPoot a034a96fc2 part 2 2023-10-02 13:54:40 -03: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
SandPoot 3c7e79d384 do after update 2023-09-09 15:39:49 -03:00
Tsurupeta d4ec25e748 all else 2023-08-08 14:01:18 +03:00
Tsurupeta d4f3793f8f QDEL_IN improvements 2023-08-08 14:01:16 +03:00
BongaTheProtoandGitHub 835f7c76f2 Merge branch 'Sandstorm-Station:master' into master 2023-07-26 18:35:43 -05:00
SandPoot ebd9cedbfb this 2023-07-26 17:28:29 -03:00
BongaTheProto e87e828638 Merge remote-tracking branch 'upstream/master' 2023-07-25 22:47:02 -05:00
SandPoot ef186347ca Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-07-23 18:56:20 -03:00
SandPoot 19ee7f8bd2 some hints 2023-07-19 20:51:25 -03:00
Satile1 61ef0f337e Hotel Radio channel! Mapping fixes and flavour 2023-05-25 17:09:21 +01:00
BongaTheProtoandGitHub 2dbd0a45e5 Update items.dm 2023-05-06 18:59:11 -05:00
BongaTheProto c72c8c145d Merge branch 'master' into pr/623 2023-05-06 18:45:19 -05:00
BongaTheProto 5116acad15 Merge remote-tracking branch 'upstream/master' 2023-05-06 18:31:55 -05:00
SandPoot 7038059ab5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-05-06 10:47:06 -03:00
Jerry WesterandKrissKr0ss 31e87bc2d7 Safeguard suit 2023-05-01 00:26:56 -05:00
Jerry WesterandKrissKr0ss 22309324dc whitespace should not be syntax grrr 2023-05-01 00:23:09 -05:00
Jerry WesterandKrissKr0ss 8271cf9bc1 move rescue plating to CMO locker 2023-05-01 00:22:59 -05:00
Jerry WesterandKrissKr0ss 44c029176c remove signals_atom_movable.dm, revert jetpack 2023-05-01 00:19:48 -05:00