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-19 10:47:00 +01:00
Code Issues Packages Projects Releases Wiki Activity
55,761 Commits 55 Branches 0 Tags
interactions-issues
Commit Graph
1384 Commits
Author SHA1 Message Date
BongaTheProtoandGitHub 27df3d0753 Merge pull request #840 from Comicao1/Races-port 
Teshari [TESTING]
 2023-09-10 23:59:28 -05:00
Comicao1 cec654a181 Modularizes stuff that needs to me modularized 2023-09-07 22:07:26 +03:00
Comicao1 3cbf9ed3f0 Go on 2023-09-07 04:42:07 +03: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
BongaTheProtoandGitHub 2ede3a6f60 Merge pull request #913 from JMoldy/vomitfix 
Makes vomiting clear some disgust
 2023-07-26 19:41:45 -05:00
JMoldy 42b1aa7693 Makes vomiting clear some disgust 2023-07-26 16:49:13 -05: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
Comicao1 68c2381fd6 Hahaw 2023-05-14 13:21:10 -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
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
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
SandPoot ed06e686e1 pushies. 2023-01-31 16:40:17 -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
DariusandGitHub 791f89a179 Prevent nutriment pump with no process food trait (#15941) 
Prevents the nutriment pump implant from functioning on mobs with TRAIT_NO_PROCESS_FOOD., as this behavior appears to be unintended.
 2023-01-14 04:51:42 +01: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
siliconsandGitHub 23327fa268 Merge pull request #15894 from JerryWester/modsuits 
MODsuits
 2023-01-07 14:07:28 -08:00
BongaTheProto a04476b38d Merge remote-tracking branch 'upstream/master' 2022-12-16 20:39:53 -05:00
SandPoot 011dd2e817 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-12-16 16:47:19 -03:00
LinandGitHub 7d0c3df2ad Merge pull request #15755 from timothyteakettle/dullahan-2-electric-boogaloo 
dullahans 2: electric boogaloo
 2022-12-14 19:07:59 -07:00
Jerry WesterandGitHub 32a5d02434 Merge branch 'master' into modsuits 2022-12-13 19:18:24 -07:00
BongaTheProto ee6823c69b Merge remote-tracking branch 'upstream/master' 2022-12-13 12:14:11 -05:00
SandPoot f4b7513f10 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-12-13 01:35:33 -03:00
LinandGitHub 7205781c47 Merge pull request #15892 from SandPoot/let's-sing-the-reference-clearing-song 
Solves some harddels
 2022-12-12 19:11:49 -07:00
Jerry Wester f7ac3c7624 beeg commit 2022-12-11 20:32:35 -07:00
SandPoot 8911fe5e0b clear em 2022-12-11 17:58:45 -03:00
BongaTheProto 9cdaffc417 Merge remote-tracking branch 'upstream/master' 2022-09-18 23:40:20 -05:00
SandPoot cc9c36bd13 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-09-17 22:48:51 -03:00
shellspeed1andGitHub b8f7bb00c9 Fixes encoded langauge so people can speak it, also redoes xeno tongue so it can speak same langauges as rest of crew. (#15845) 2022-09-17 13:44:29 -07:00
Pin-alternative 9e377c644b Merge remote-tracking branch 'upstream/master' into cursed 2022-08-23 07:41:40 +10:00
SandPoot 550db1b6ee Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-08-20 17:27:19 -03:00
siliconsandGitHub 2865dc6416 Merge pull request #15779 from Linzolle/radial-surgery 
radial menu surgery
 2022-08-20 12:24:56 -07:00
siliconsandGitHub 4f82820062 Merge pull request #15781 from zeroisthebiggay/breadbay 
the great medbay resprite PR: ported from a freshly merged TG PR
 2022-08-20 12:24:46 -07:00
SandPoot 6b481d2d66 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-08-19 23:29:29 -03:00
zeroisthebiggayandGitHub a600ea86b9 midround pr get trolled 2022-08-17 00:59:07 -04:00
Linzolle ee3ced89ef less list instantiation man good 2022-08-12 14:27:12 -07:00
Linzolle e5ee36c182 add radial menu to organ manip 2022-08-12 14:11:03 -07:00
zerothebigboy 1bc3796b06 watchmegetgitbanned 2022-08-11 19:17:16 -04:00
Timothy Teakettle 5d925412b1 Update organ_internal.dm 2022-08-09 16:37:39 +01:00
Timothy Teakettle e71686d8ac fixes 2022-08-09 11:59:10 +01:00
Timothy Teakettle 818e564c92 stable 2022-08-05 15:44:40 +01:00
Timothy Teakettle 7ed2ee82bf core changes 2022-08-04 14:11:42 +01:00
Pin-alternative 32018d15dc Merge remote-tracking branch 'upstream/master' into cursed 2022-08-02 10:26:30 +10:00