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 2025-12-10 09:54:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
35,904 Commits 55 Branches 0 Tags
cf7678c7d4a27be369f9e8c616752d04ef1473bf
Commit Graph

1645 Commits

Author SHA1 Message Date
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
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
silicons
9222933d77 Merge pull request #12816 from timothyteakettle/wound-port 
ports part 1 of tg wounds
 2020-07-23 10:25:25 -07: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 Teakettle
75a2035774 Merge branch 'master' into wound-port 2020-07-21 01:10:51 +01:00
Lin
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 Teakettle
974b80a2fd Merge branch 'master' into wound-port 2020-07-18 21:45:24 +01:00
timothyteakettle
584e74590f port1 2020-07-17 02:01:33 +01:00
silicons
e03948dcba Merge pull request #12229 from Arturlang/TGUI-3.0 
[READY]TGUI 3.0
 2020-07-16 17:28:42 -07:00
Letter N
2afab07b4a https://github.com/tgstation/tgstation/pull/52255 2020-07-16 20:05:37 +08:00
Artur
5f9364c5f8 Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-13 16:20:54 +03:00
Lin
955d9fa0cc Merge pull request #12624 from Citadel-Station-13/policy 
policy configuration & support hooks for clone memory disorder
 2020-07-11 16:40:38 -05:00
silicons
08a6ef88e3 Merge pull request #12711 from LetterN/nerfs-cats 
[s] Updates goonchat [ready]
 2020-07-11 00:46:32 -07: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
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
05684e7196 no config filter thing yet, but the code for it is "ready" 2020-07-08 16:36:58 +08:00
Letter N
f757e54db9 muh immursion 2020-07-08 15:59:44 +08:00
Letter N
45a3c47608 removes fun 2020-07-08 15:10:49 +08:00
Artur
280d3de6c3 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-07-07 18:37:45 +03:00
Ghom
871993ce14 Merge pull request #12593 from silicons/autobunker 
adds verb to auto bunker override on linked servers
 2020-07-04 18:36:59 +02: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
silicons
e2975a44a1 Merge branch 'master' into policy 2020-07-02 01:23:19 -07: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
Putnam3145
ee2fedd4af Merge pull request #12390 from Ghommie/Ghommie-cit800 
Porting brain trauma updates: Curse of madness, cloning traumas, random brain trauma event.
 2020-06-29 12:44:33 -07:00
Lin
0a59453ce6 Merge pull request #12605 from Citadel-Station-13/silicons-patch-4 
adds line numbers to config errors
 2020-06-29 13:12:25 -05:00
Ghom
a8046d072a Merge pull request #12626 from Citadel-Station-13/silicons-patch-10 
prevents duplicate chatboxes from typing indicators by inserting 28 macros into the basic macro sets that just trigger a nonsensical verb that does nothing
 2020-06-29 19:27:07 +02:00
silicons
c88b7721ad Update policy.dm 2020-06-29 05:03:45 -07:00
silicons
836391075f Update config_entry.dm 2020-06-29 05:03:13 -07:00
silicons
ced24b8931 Update input.dm 2020-06-27 01:39:34 -07:00
silicons
0e2f3d0f04 Update input.dm 2020-06-27 01:29:26 -07:00
silicons
2a0b3ce036 typo 2020-06-26 23:48:56 -07:00
silicons
0df5aa083b policies and code hooks 2020-06-26 23:41:44 -07:00
silicons
9c70fa2136 Update configuration.dm 2020-06-24 20:40:57 -07:00
Ghommie
c5cbfa64e5 Porting further material datum features and improvements. 2020-06-24 20:45:17 +02:00
silicons
b367f76c62 autobunker 2020-06-24 07:49:45 -07:00
Ghommie
ae053a9a08 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit800 2020-06-23 03:12:49 +02:00
Ghommie
de77b7139c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-06-23 00:13:14 +02:00
Artur
c41d2e78be Conflicts!!! 2020-06-22 17:39:24 +03:00
Lin
2cd18f3dba Merge pull request #12557 from silicons/life 
Splits Life() into procs for physical and biological life processes in preparation for stasis beds
 2020-06-21 18:32:58 -05:00
Ghom
e31ce2edcf Merge pull request #12414 from LetterN/asset-cache-thing 
asset cache + better minimaps
 2020-06-19 23:09:09 +02:00
kevinz000
445d94f335 haha whew 2020-06-17 21:32:10 -07:00
deathride58
1a40fa73fb fixes an upstream oversight that completely bricks a downstream's atmos 2020-06-17 15:24:17 -04:00
SmArtKar
46c3e9e54d Shuttles 2020-06-16 18:16:14 +03:00
Artur
ceba739231 Cooonflicts 2020-06-16 01:23:42 +03:00