cyberpresidentvanellope/Sandstorm-Station-13
1
0
Fork 0
mirror of https://github.com/Sandstorm-Station/Sandstorm-Station-13.git synced 2026-08-22 12:47:43 +01:00
Code Issues Packages Projects Releases Wiki Activity
50,585 Commits 8 Branches 0 Tags
master
Commit Graph
2004 Commits
Author SHA1 Message Date
Hatterhat eb69035240 holy shit i despise the copypaste on this one 2020-08-17 12:39:49 -05:00
Enric Gabriel cf2c21ea52 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-17 12:06:32 -03:00
Letter N 610e25beb7 oops updates asset cache 2020-08-17 20:51:05 +08:00
Hatterhat 8cd45c7275 hey travis are you workin yet bro 2020-08-16 01:36:41 -05:00
Detective Google 016fd2ac3c woo yeah yeah woo 2020-08-15 23:55:52 -05:00
SandPootandGitHub 518c70e6ed Some Cit reverts and skyrat features. (#46) 2020-08-15 13:29:50 -03:00
Enric Gabriel bae8c236f6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-09 18:34:33 -03:00
lolman360andGitHub 308d77da7c Merge branch 'master' into plumb 2020-08-09 22:48:18 +10:00
Letter N f1c4a7f6ac Merge remote-tracking branch 'origin/master' into TGUI-4 2020-08-09 14:54:16 +08:00
Enric Gabriel 55a116fd76 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-07 21:24:04 -03:00
siliconsandGitHub 1586625e6b Merge pull request #12960 from timothyteakettle/loadout-you-say 
loadout changes part 1: adds subcategories to the loadout
 2020-08-06 21:59:13 -07:00
Hatterhat e85b6a490b minimum spawns subsystem - squashed 2020-08-06 16:21:28 -05:00
Letter N 333ca2cc7b Merge remote-tracking branch 'origin/master' into TGUI-4 2020-08-06 18:26:04 +08:00
Enric Gabriel e4f7092490 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-05 22:52:22 -03:00
siliconsandGitHub ed5aa7c9f7 Merge pull request #12994 from kappa-sama/patch-37 
removes dildo
 2020-08-05 15:27:29 -07:00
siliconsandGitHub 2d697e1867 Merge pull request #12926 from GlitchyCore/master 
Adds a new fun round end sound
 2020-08-05 15:14:20 -07:00
Enric Gabriel 8558cc8747 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-04 01:48:59 -03:00
kappa-samaandGitHub 178976f5e5 no 2020-08-01 16:54:21 -04:00
Letter N b376a6b6c4 Merge remote-tracking branch 'origin/master' into TGUI-4 2020-07-30 14:43:52 +08:00
Timothy Teakettle 31963b32a4 subcategories cool 2020-07-29 17:14:07 +01:00
Timothy TeakettleandGitHub 9721025582 Merge branch 'master' into wounds-part-2 2020-07-29 15:47:44 +01:00
Enric Gabriel 935901593b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-07-29 09:52:32 -03:00
LinandGitHub 81a7542aa6 Merge pull request #12834 from silicons/clickcd_experimental 
Experimental hybrid clickdelay system (No seriously I'm trying my best to not call it Minecraft attack delays)
 2020-07-28 21:51:10 -05:00
Timothy Teakettle 721e018aec loadout stuff 2020-07-28 22:52:00 +01:00
Enric Gabriel b942c9f162 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-07-28 14:46:58 -03:00
GlitchyCore cf7678c7d4 hey let's forget to add the filetype to this instead of making sure it would actually work 2020-07-27 14:41:10 -05:00
GhomandGitHub f946a157f4 Update mapping.dm 2020-07-27 14:54:46 +02:00
GhomandGitHub 7e18e7a7a8 Update mapping.dm 2020-07-27 14:52:05 +02:00
Ghommie f1c242aadc Fixing new bugs and stuff. 2020-07-27 14:16:01 +02:00
GlitchyCore 0e780d4ba0 hey you know what it'd be good if the filepath was actually there instead of the the .ogg name 2020-07-26 16:59:26 -05:00
GlitchyCore e9b397cbad ADDS END ROUND SOUND 2020-07-26 16:41:48 -05:00
timothyteakettle 315e7e1f99 bugfixes 2020-07-24 23:49:15 +01:00
Timothy Teakettle 7fb55a02a5 section one 2020-07-24 22:34:22 +01:00
Enric Gabriel ba3da94e74 fix some positioning stuff + revert forced _indicator on some binds 2020-07-24 00:08:08 -03:00
Enric Gabriel e0fdf3dce9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 / merge conflicts 2020-07-23 19:14:58 -03:00
silicons d30acd5b09 smooth 2020-07-23 13:49:17 -07:00
siliconsandGitHub 9222933d77 Merge pull request #12816 from timothyteakettle/wound-port 
ports part 1 of tg wounds
 2020-07-23 10:25:25 -07:00
Enric Gabriel 36970c378b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-07-22 12:06:12 -03:00
Letter N d5a6a3ecd9 actual code chang 2020-07-22 12:02:31 +08:00
Letter N 49941ea2e6 code, still not enabled 2020-07-22 10:27:37 +08:00
lolman360 0f1aa3c0ca 'lolman? did you test your code?' 
no i did not ms. kevinz
 2020-07-22 10:49:56 +10:00
Enric Gabriel f0904c6b10 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-07-21 01:19:25 -03:00
Putnam 3faa9d6f13 Chat queue optimization. 
To be exact, makes it only do the expensive text replacement when there's a client to receive the text.
 2020-07-20 19:58:44 -07:00
Timothy TeakettleandGitHub 75a2035774 Merge branch 'master' into wound-port 2020-07-21 01:10:51 +01:00
LinandGitHub f7355dde62 Merge pull request #12728 from silicons/vote 
"I didn't see the map vote" - Adds a stat vote panel for plurality and approval voting as an alternative to the regular popups.
 2020-07-20 18:17:45 -05:00
Timothy TeakettleandGitHub 974b80a2fd Merge branch 'master' into wound-port 2020-07-18 21:45:24 +01:00
Enric Gabriel 05593f84a0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-07-16 22:13:13 -03:00
timothyteakettle 584e74590f port1 2020-07-17 02:01:33 +01:00
siliconsandGitHub e03948dcba Merge pull request #12229 from Arturlang/TGUI-3.0 
[READY]TGUI 3.0
 2020-07-16 17:28:42 -07:00
Enric Gabriel 310b0e4e91 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-07-16 14:53:25 -03:00