shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,172 Commits 5 Branches 0 Tags
f8f278dfd58e6dfef752d3593ae474389fc429dd
Commit Graph
408 Commits
Author SHA1 Message Date
LetterJayandGitHub 1471b6cac6 Merge branch 'master' into upstream-merge-30297 2017-09-13 06:41:37 -05:00
LetterJayandGitHub a960b63b0a Merge branch 'master' into upstream-merge-30056 2017-09-13 06:08:59 -05:00
LetterJay c2a41c9b51 commit 2017-09-13 06:04:22 -05:00
Kyle Spier-SwensonandCitadelStationBot 3da71799ab Garbage collection tweaks and refactors. (#30118) 
* Garbage collection queuing rewriting

* Some Tweaks

* Fixes some queue tracking oddities

* More tweaks

* Remove the middle two queue steps. tis was a silly idea

* New logging.

We store logging datums for use in tracking the stats of shit qdeleted

Added logging for destroy time as well as hard delete time, per type. As well as a few others

* Fix compile for testing

* Does the cyberboss

* does the antur
 2017-09-13 01:47:12 -05:00
LetterJayandGitHub cd0997aa1e Merge branch 'master' into upstream-merge-30297 2017-09-12 23:36:35 -05:00
LetterJayandGitHub c785e53563 Update failsafe.dm 2017-09-12 03:08:20 -05:00
LetterJayandGitHub dac6cc56e4 Merge branch 'master' into upstream-merge-30494 2017-09-12 02:40:24 -05:00
LetterJayandGitHub f60d57520b Merge branch 'master' into upstream-merge-29839 2017-09-11 23:22:39 -05:00
LetterJay c3ef612490 Ports MSO's fading note system 2017-09-11 23:07:30 -05:00
LetterJayandGitHub 935ae98f4a Merge branch 'master' into upstream-merge-29839 2017-09-11 18:03:51 -05:00
LetterJayandGitHub c7ae892e8d Update persistence.dm 2017-09-11 15:53:35 -05:00
LetterJayandGitHub e0e552829c Update persistence.dm 2017-09-11 15:47:18 -05:00
KorPhaeronandCitadelStationBot d05fdb0eb0 Makes the station Z level into a list instead of a single define 2017-09-11 12:40:35 -05:00
kingofkosmosandCitadelStationBot 63122795f9 Adds missing span-endings 2017-09-11 07:10:09 -05:00
Jordan BrownandCitadelStationBot 92b78d3298 [s] Adds a security token to all admin hrefs 2017-09-08 21:16:02 -05:00
JJRcopandCitadelStationBot 00dd2f283b Adds Internet admin midi (#30457) 
* Adds Internet admin midi

* Moves global regex into proc (shell_url_scrub)

* Moves shelleo to world
Adds quotes around the command in shelleo, to encapsulate it

* Admins can stop playing web sounds

* Revised internet midi extension order
Moved m4a to least preferred,
as it can potentially carry non-aac or non-mpeg-3 audio

* Kills \n in web sound

* play_web_sound availability based on config

* play web sound and shelleo tweaks

istypeless for in play web sound & readability parenthesis around binary AND
add return index defines for shelleo proc

* Security fix for play web sound
 2017-09-08 09:32:29 -05:00
PoojawaandGitHub ce787e7726 Reverts sav file persistance for poly/pun-pun (#2654) 
* Reverts sav file persistance for poly/pun-pun

* makes sure poly writes to poly
 2017-09-08 06:58:08 -05:00
LetterJayandGitHub 21a72cd04c Merge pull request #2640 from Citadel-Station-13/upstream-merge-30436 
[MIRROR] More timer debugging for the debug gods.
 2017-09-07 10:22:45 -05:00
LetterJayandGitHub 31102d0ec4 Merge pull request #2608 from Citadel-Station-13/upstream-merge-30262 
[MIRROR] Soft crit, except not terrible
 2017-09-07 10:01:35 -05:00
Kyle Spier-SwensonandCitadelStationBot 4b02f01a66 More timer debugging for the debug gods. (#30436) 
* More timer debugging for the debug gods.

* Its times like this I wish I could amend commit from the web interface

* git commit -a -amend&&git push --force
 2017-09-07 09:59:28 -05:00
LetterJay 8299cf576c this sure was FUN 2017-09-07 09:47:56 -05:00
LetterJayandGitHub a16ba4e4cd Merge pull request #2445 from Citadel-Station-13/upstream-merge-29953 
[MIRROR] Add logging of deathgasp last words and suicide stats to the death table
 2017-09-06 10:11:16 -05:00
LetterJayandGitHub 00199af27d Merge branch 'master' into upstream-merge-29866 2017-09-06 09:21:53 -05:00
LetterJayandGitHub 72a8f7aa54 Merge branch 'master' into upstream-merge-29953 2017-09-06 09:17:57 -05:00
LetterJayandGitHub b6f6970ebb Update disease.dm 2017-09-06 09:06:59 -05:00
LetterJayandGitHub 1f872675b0 Update disease.dm 2017-09-06 09:06:30 -05:00
LetterJay af409af9cf additional files 2017-09-05 16:29:25 -05:00
LetterJayandPoojawa 92e055be97 Quick sync (#2587) 
* sync since the mirror was down

* fucking byond

* can't forget these
 2017-09-04 04:38:49 -05:00
LetterJayandGitHub 3e0ead1204 Merge branch 'master' into upstream-merge-29105 2017-09-02 07:11:32 -05:00
LetterJayandGitHub 7617164617 Update blackbox.dm 2017-09-02 06:50:35 -05:00
LetterJayandGitHub 4a1bb5addb Update configuration.dm 2017-09-02 06:49:21 -05:00
LetterJay 96c790a81f Unruntimes fdel on savefiles 2017-09-02 05:23:35 -05:00
LetterJayandGitHub b1302230c0 Merge pull request #2560 from Citadel-Station-13/upstream-merge-30121 
[MIRROR] Converts npc saves to jsons
 2017-09-02 05:20:31 -05:00
kevinz000 e8bb79d7c9 kk 2017-09-01 07:12:08 -07:00
kevinz000 b193d77c1c hm 2017-09-01 03:36:18 -07:00
kevinz000 41318e715c Merge branch 'master' into custom_roundstart_items 2017-08-31 18:23:56 -07:00
CitadelStationBot c2a792d577 Converts npc saves to jsons 2017-08-30 08:01:36 -05:00
kevinz000andGitHub 93647d77ad [DNM] Fixes the codebase (#2556) 
* fixes stuff

* goddamnit flags
 2017-08-30 00:08:40 -07:00
kevinz000 967d0c5dee Merge pull request #2542 2017-08-29 22:39:45 -07:00
kevinz000 0925cb108b wew 2017-08-29 22:09:42 -07:00
CitadelStationBot 6882163ef6 Moves comms settings into a new config file 2017-08-29 17:01:16 -05:00
kevinz000 5f5065eb46 kek 2017-08-29 09:59:57 -07:00
kevinz000 62a358574c sync 2017-08-29 02:37:34 -07:00
LetterJayandkevinz000 188193eb61 here we go again (#2456) 2017-08-24 19:24:25 -07:00
CitadelStationBotandkevinz000 fce68d3b76 Removes text restriction on add/set_details (#2474) 2017-08-24 18:31:41 -07:00
CitadelStationBotandkevinz000 e8b1e104ee [MIRROR] ssgarbage now runs every 2 seconds. (#2461) 
Lets hope this fixes some lag - [MIRROR] ssgarbage now runs every 2 seconds.
 2017-08-24 18:29:37 -07:00
CitadelStationBotandkevinz000 483d31dee8 reduces communications cooldown (#2483) 2017-08-24 18:27:47 -07:00
kevinz000andGitHub 35b7b93b24 ok this is going to be a pain in the ass ain't it (#2458) 
lets hope nothing blows up this time (Flags PR but it works!)
 2017-08-22 05:01:38 -07:00
kevinz000andGitHub 6a309b5996 Revert "[MIRROR] Replace all secondary flags with bitflags stored in the flags_2 var" (#2457) 
ok you know what yeah i think i'll properly mirror https://github.com/Citadel-Station-13/Citadel-Station-13/pull/2411
 2017-08-22 04:04:21 -07:00
LetterJay b01a24c95b my eyes hurt 2017-08-22 01:42:20 -05:00