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-28 07:07:08 +01:00
Code Issues Packages Projects Releases Wiki Activity
55,761 Commits 55 Branches 0 Tags
interactions-issues
Commit Graph
22590 Commits
Author SHA1 Message Date
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
miguelop1 cd2a1f9120 Detective_access_fix 2023-07-24 17:15:27 +01:00
SandPoot 7e51ef0b98 fix merge 2023-07-23 19:06:55 -03:00
SandPoot ef186347ca Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-07-23 18:56:20 -03:00
LinandGitHub b1f6271cb5 Merge pull request #15991 from SandPoot/screenhints 
Adds a couple hints to things
 2023-07-23 16:52:31 -05:00
BongaTheProto 2b718295d3 Merge remote-tracking branch 'upstream/master' 2023-07-23 13:41:11 -05:00
SandPoot 994ff214d5 ? 2023-07-23 15:06:20 -03: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
SandPoot 3645d00ec0 alright then 2023-07-19 21:15:52 -03:00
SandPoot 19ee7f8bd2 some hints 2023-07-19 20:51:25 -03:00
SandPoot 1ec6b97ea3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-07-19 18:01:35 -03:00
LinandGitHub 3c3f609541 Merge pull request #15989 from SandPoot/screentip-update 
Update screentips
 2023-07-19 15:53:38 -05:00
SandPoot 6ab934f6a1 pushies 2023-07-19 15:06:23 -03:00
SandPoot 217e23fc7f push 2023-07-18 15:22:24 -03:00
K4rlox 22fa3b5ee4 modified: code/modules/mining/equipment/resonator.dm 2023-07-18 18:44:19 +03:00
K4rlox cadccf56f1 modified: code/modules/mining/equipment/resonator.dm 2023-07-18 18:43:37 +03:00
K4rlox 76698153e9 nerfs the resonator 2023-07-18 18:42:15 +03:00
SPLURT-Station 85ceaf418d Update TGS DMAPI 2023-07-16 00:46:15 +00:00
BongaTheProtoandGitHub 8f2372c03c Merge pull request #895 from PhazeJump/suits-fixes-modular 
a good fix for the techpriest robes
 2023-07-15 13:25:16 -05:00
SPLURT-Station a74a4cbda2 Update TGS DMAPI 2023-07-15 00:40:08 +00:00
K4rlox ca9be76445 modified: code/modules/mining/equipment/resonator.dm 2023-07-10 12:32:15 +03:00
K4rlox d8ada81472 new file: code/modules/mining/equipment/resonator.dm 2023-07-10 12:32:15 +03:00
K4rlox d7274baab5 modified: code/modules/mining/equipment/resonator.dm 2023-07-10 12:27:32 +03:00
K4rlox 525a0421e0 modified: code/modules/mining/equipment/resonator.dm 2023-07-10 00:56:41 +03:00
ZatarraandGitHub a53fd33486 Merge branch 'SPLURT-Station:master' into STOMPSHIELDING 2023-07-08 22:07:41 -07:00
BongaTheProtoandGitHub a61ada1b72 Merge branch 'Sandstorm-Station:master' into master 2023-07-08 13:54:29 -05:00
PhazeJump defdf2f6b2 FIXING MY OWN SHIT CODE MAKES ME FUCKING SCREAM 
anyways
techpriest robes are now un-shitty-fixed and fixed again. Should be working properly now. No idea how to get the naga taur sprite working because it was supposed to be added in sand modular but sand modular was the one breaking it all so 🤷
 2023-07-07 11:22:42 +02:00
SandPoot c761fd9a83 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-07-06 17:24:05 -03:00
deathride58andGitHub 4e975c819e Merge pull request #15988 from SandPoot/fix-tooltips-again 
Fix tooltips AGAIN
 2023-07-06 15:29:40 -04:00
SandPoot 3fca781947 push 2023-07-06 16:12:40 -03:00
K4rlox 3f40ec9fef modified: code/modules/mining/equipment/resonator.dm 2023-07-03 00:12:58 +03:00
Zattarra 8475e0cfec Merge branch 'STOMPSHIELDING' of https://github.com/Zattarra/DATASTREAM into STOMPSHIELDING 
UH OH.
 2023-07-01 19:51:56 -07:00
Vhariik 294571aa36 Merge remote-tracking branch 'upstream/master' into pr/861 2023-06-26 21:48:33 -03:00
BongaTheProtoandGitHub d4f46d256f Merge pull request #790 from Comicao1/xenoarch-new 
Xenoarch Port
 2023-06-25 01:52:30 -05:00
SandPoot e07874972b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-06-25 01:01:18 -03:00
KrissKr0ssandGitHub 0212870845 Update SDQL_2.dm 2023-06-24 22:41:56 -05:00
BongaTheProtoandGitHub 2b2d5cf75f Merge pull request #885 from SPLURT-Station/sdql-exploit 
Require affirmative input from the admin to run sdql2 verbs
 2023-06-24 20:29:36 -05:00
BongaTheProto a5ccea762f Update SDQL_2.dm 2023-06-24 20:12:58 -05:00
Comicao1 35be2259e1 Update mine_items.dm 2023-06-23 20:55:00 -03:00
Comicao1 74502c25a8 Merge remote-tracking branch 'upstream/master' into xenoarch-new 2023-06-23 20:43:25 -03:00
Comicao1 0134cf769d Merge remote-tracking branch 'upstream/master' into Races-port 2023-06-23 20:41:41 -03:00
Vhariik 50abbe62d5 Merge remote-tracking branch 'upstream/master' into pr/861 2023-06-21 23:15:38 -03:00
BongaTheProto 148ae75649 Merge remote-tracking branch 'upstream/master' into upstream-update 2023-06-21 18:49:14 -05:00
SandPoot 15d52e5b15 update content 2023-06-20 15:39:24 -03:00
BongaTheProtoandGitHub 33a9c33e9f Merge pull request #856 from SPLURT-Station/make-code-better 
Genital equipment code cleaning
 2023-06-17 12:07:45 -05:00
Comicao1 f603a27723 Merge remote-tracking branch 'upstream/master' into Races-port 2023-06-15 12:50:53 -03:00