cyberpresidentvanellope/Sandstorm-Station-13
1
0
Fork 0
mirror of https://github.com/Sandstorm-Station/Sandstorm-Station-13.git synced 2026-08-19 03:07:20 +01:00
Code Issues Packages Projects Releases Wiki Activity
38,600 Commits 8 Branches 0 Tags
machine-changes
Commit Graph
1432 Commits
Author SHA1 Message Date
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
Letter N 2afab07b4a https://github.com/tgstation/tgstation/pull/52255 2020-07-16 20:05:37 +08:00
Enric GabrielandGitHub 7e533b336d fix the thing please (#24) 2020-07-14 22:24:20 -03:00
Enric GabrielGitHubcrazyraio2
 		b5f77eeb66 Ports a lot of stuff from all around (#23) 
* shhh

* checks the thing

* please don't hurt me, it is my first time

* there, much better

* this is huge

Co-authored-by: crazyraio2 <44246096+crazyraio2@users.noreply.github.com>
 2020-07-14 01:31:52 -03:00
Artur 5f9364c5f8 Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-13 16:20:54 +03:00
Enric Gabriel beec77b17d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-07-11 20:04:30 -03:00
siliconsandGitHub 08a6ef88e3 Merge pull request #12711 from LetterN/nerfs-cats 
[s] Updates goonchat [ready]
 2020-07-11 00:46:32 -07:00
Enric Gabriel 7b593d16fb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-07-11 03:13:42 -03:00
silicons 630d65dfec done 2020-07-10 00:08:53 -07:00
silicons 214b95445e status panel 2020-07-09 23:59:51 -07:00
silicons 9c9c611285 ok 2020-07-09 23:34:35 -07:00
Enric Gabriel e53a0b4cb6 emotes too 2020-07-09 16:04:14 -03:00
Enric Gabriel 62cba3888e possibly fixes doubled stuff on research and forces say_indicator 2020-07-09 16:01:59 -03:00
Putnam a625d6562b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real 2020-07-08 22:02:03 -07:00
Letter N 45a3c47608 removes fun 2020-07-08 15:10:49 +08:00
Artur 7781296fb9 DNA CONSOLE FIX 2020-07-03 11:09:55 +03:00
Artur 365aadec54 Trying to fix the dna t 2020-07-03 00:55:18 +03:00
Artur 6ee1eba56c Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-07-02 23:23:47 +03:00
Enric GabrielandGitHub 72f993fdbd Pulls #1706 from Skyrat (#18) 2020-07-02 02:20:27 -03:00
Enric Gabriel f5bd261e38 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-06-30 22:01:51 -03:00
Artur 20245f7319 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-06-30 02:30:29 +03:00
Ghommie 9dc4b99620 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-06-30 00:49:06 +02:00
Enric Gabriel a7ce0b7ece Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-06-29 17:35:25 -03:00