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 20:26:47 +01:00
Code Issues Packages Projects Releases Wiki Activity
55,761 Commits 55 Branches 0 Tags
interactions-issues
Commit Graph
732 Commits
Author SHA1 Message Date
ariaworld 1f463a734c Merge branch 'spooktober-update' of https://github.com/ariaworld/S.P.L.U.R.T-Station-13 into spooktober-update 2023-11-17 23:26:33 +01:00
ariaworld e98019e91e Push, push, push. 2023-11-17 21:34:27 +01: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
SandPoot 0b6d743e22 go 2023-10-28 17:51:02 -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
BongaTheProto dca4dab806 Merge remote-tracking branch 'upstream/master' 2023-10-10 21:58:50 -05:00
SandPoot 42d03cb5ae in all seriousness, this can all be kept 2023-10-10 18:41:41 -03:00
SandPoot d4ea14c4ef push 2023-10-09 16:15:49 -03:00
BongaTheProtoandGitHub 27df3d0753 Merge pull request #840 from Comicao1/Races-port 
Teshari [TESTING]
 2023-09-10 23:59:28 -05:00
Comicao1 3cbf9ed3f0 Go on 2023-09-07 04:42:07 +03:00
Tsurupeta eca4935865 reftracking 2023-08-08 14:01:16 +03:00
Comicao1 99696963ba Merge remote-tracking branch 'upstream/master' into Races-port 2023-05-31 22:08:20 -03:00
WoolyAypa e1c9bb9775 Merge branch 'master' of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13 into Chastity-system 2023-05-28 13:39:05 -03:00
Comicao1 8ea081a410 Merge remote-tracking branch 'upstream/master' into Races-port 2023-05-09 04:57:41 -03: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
BongaTheProto dcd6fc9850 mmmm noodles 
yum
 2023-05-05 17:11:02 -05:00
KrissKr0ss 66aa1cb05c Revert "Merge pull request #15929 from JerryWester/revert-15894-modsuits" 
This reverts commit 48e713ff33, reversing
changes made to efb2d19cb9.
 2023-05-01 00:16:20 -05:00
Comicao1 454b3ff566 Teshari + much more to do 2023-04-02 23:15:24 -03:00
WoolyAypa f70e1e901e Merge branch 'master' of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13 into Chastity-system 2023-03-24 23:46:54 -03:00
BongaTheProto 57a7a516e6 Merge remote-tracking branch 'upstream/master' 2023-03-06 22:43:10 -05:00
SandPoot d63c2ebdd8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-03-05 12:35:35 -03:00
siliconsandGitHub 6efd3098d4 Merge pull request #15961 from zeroisthebiggay/sevakillmarktwo 
Removes the SEVA suit, replacing it with the HEVA suit - an ash-storm proof alternative.
 2023-03-04 23:36:36 -08:00
BongaTheProto 972df3f711 Merge remote-tracking branch 'upstream/master' 2023-02-16 16:30:59 -05:00
SandPoot 072087ec14 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-02-15 20:22:44 -03:00
SandPootandGitHub 2bf781580e Merge branch 'master' into new-decal-painter 2023-02-15 20:06:29 -03:00
Timothy TeakettleandGitHub 71de9c13e3 Merge pull request #15962 from SandPoot/contextual-screentips 
Contextual screentips -- Screentips now show you what items/objects can do
 2023-02-15 23:04:54 +00:00
WoolyAypa 078413e553 Merge branch 'master' of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13 into Chastity-system 2023-02-11 22:37:34 -03:00
BongaTheProtoandGitHub d9d617bf8d Merge branch 'Sandstorm-Station:master' into master 2023-02-10 16:53:13 -05:00
SandPoot 65c38e9828 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-02-10 02:18:08 -03:00
Comicao1 fe01f1c5da Veymed limbs (bounty) 2023-02-07 23:46:49 -03:00
SandPoot 5052f836e7 the stuff 2023-02-06 19:54:54 -03:00
SandPoot ed06e686e1 pushies. 2023-01-31 16:40:17 -03:00
zerothebigboy 091d9ec00f good 2023-01-30 00:01:22 -05:00
SandPoot 44913d5fff Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into new-decal-painter 2023-01-28 01:20:26 -03:00
SandPoot c60f36a42b files 2023-01-28 01:10:49 -03:00
BongaTheProtoandGitHub 9a67937ff7 Merge branch 'Sandstorm-Station:master' into master 2023-01-23 23:08:25 -05:00
SandPoot 122bc02af9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-01-23 20:58:51 -03:00
siliconsandGitHub 2d5e163916 Merge pull request #15947 from SandPoot/bitfield-updates 
Updates bitfields, admin side
 2023-01-23 13:02:28 -08:00
SandPoot 854a1c1b5c modified content 2023-01-22 14:09:10 -03:00
WoolyAypa 4cd6975b3b conflictos 2023-01-18 21:27:19 -03:00
BongaTheProto 21c3abdfb7 Merge remote-tracking branch 'upstream/master' 2023-01-18 04:20:45 -05:00
SandPoot e76ed6a1ea Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-01-17 22:26:56 -03:00
BongaTheProto 7d5fbe0412 the glooby update 
very slimy!
 2023-01-10 03:36:39 -05:00
SandPoot d743096f8a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-01-09 17:50:19 -03:00
Jerry WesterandGitHub ae347f3399 Revert "MODsuits" 2023-01-08 17:30:26 -07:00
SandPoot 82eff346c7 Merge Upstream 2023-01-07 22:52:22 -03:00
Darius d90fa375e1 Move heirloom lists to relevant files 
Port of the current TG heirloom system.

Heirlooms are now stored in job_types and species_types instead of a global list. Items used as heirlooms match their modern TG counterparts when possible.

Also fixes the ancient first aid kit, which is used for a heirloom.
 2023-01-04 13:57:54 -05:00