shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,292 Commits 5 Branches 0 Tags
cbbf29236e2500a1e3035c880fce08fd9fe5ded5
Commit Graph
389 Commits
Author SHA1 Message Date
Jordan BrownandCitadelStationBot 659c92a0d6 Fixes SSqueak not returning ..() 2017-09-28 10:43:16 -05:00
deathride58 226ad9ddde adjustments 2017-09-28 01:10:42 -04:00
deathride58 9bdc80ba82 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into crewobjectivesandmiscreants 2017-09-27 23:44:22 -04:00
LetterJayandGitHub 7a0ffb8a67 Merge pull request #2941 from Citadel-Station-13/upstream-merge-30888 
[MIRROR] Refactors cinematics.
 2017-09-27 23:42:35 -04:00
LetterJayandGitHub d8de375ada Merge pull request #2936 from Citadel-Station-13/upstream-merge-30969 
[MIRROR] DisplayTimeText mk2
 2017-09-27 23:39:03 -04:00
LetterJayandGitHub 69fa79f974 Update ticker.dm 2017-09-27 15:33:42 -05:00
LetterJayandGitHub 0387f81ed5 Update ticker.dm 2017-09-27 15:16:05 -05:00
Ashe HiggsandCitadelStationBot e575bd6685 (Ready) Clockwork Cult Rework: Proof-of-concept 2017-09-26 15:22:09 -05:00
AnturKandCitadelStationBot fd0bc465cc Refactors cinematics. 2017-09-26 04:20:59 -05:00
ShizCalevandCitadelStationBot 169aa85d9c DisplayTimeText mk2 2017-09-24 18:59:57 -05:00
orangesandCitadelStationBot 6278d49662 Href tokens 2017-09-24 17:34:37 -05:00
vuonojenmustaturskaandCitadelStationBot d111c582b4 Meteors can now qdel normally (#30970) 2017-09-23 23:35:14 -05:00
CitadelStationBotandPoojawa 3aafe338af [MIRROR] Fixes adjust config (#2723) 
* Fixes adjust config

* Update configuration.dm

* Update game_options.txt

* fixes persistance
 2017-09-22 23:02:09 -05:00
CitadelStationBotandPoojawa e783c39419 [MIRROR] Mice spawn now chooses correct z-level (#2887) 
* Merge pull request #30897 from AutomaticFrenzy/squeakFix

Mice spawn now chooses correct z-level

* Mice spawn now chooses correct z-level

* Update squeak.dm
 2017-09-22 04:47:08 -05:00
orangesandCitadelStationBot 41277ff110 Removes old debug text 2017-09-21 06:30:11 -05:00
deathride58 fb7f2d0ab8 fixes all the roundstart related issues 2017-09-20 16:03:56 -04:00
CitadelStationBotandPoojawa 6e79861679 [MIRROR] fix black box runtimes (#2863) 
* fix black box runtimes

* fix black box runtimes
 2017-09-20 01:03:17 -05:00
deathride58 fac0e75103 blegh 2017-09-19 20:49:42 -04:00
CitadelStationBotandPoojawa ecce4cf138 [MIRROR] New DCS signals (#2741) 
* New DCS signals

* Update atoms.dm

* actually ports comsigs
 2017-09-19 07:00:08 -05:00
CitadelStationBotandPoojawa 1edd7b82d1 [MIRROR] Minor weather code split/refactor (#2837) 
* Minor weather code split/refactor

* Delete weather_types.dm

* Update radiation_storm.dm
 2017-09-18 01:46:41 -05:00
CitadelStationBotandPoojawa a94a8f9ab4 [MIRROR] Enables Dead OOC at round-end (#2835) 
* Enables Dead OOC at round-end (#30716)

* Enables Dead OOC at roundend

* proc

* proc #2

* Enables Dead OOC at round-end
 2017-09-17 22:20:15 -05:00
CitadelStationBotandPoojawa 08083581c3 [MIRROR] (Hopefully) Lessens preferences and manifest injection lag (#2796) 
* (Hopefully) Lessens preferences and manifest injection lag

* Update datacore.dm

* Update preferences_setup.dm
 2017-09-17 11:59:40 -05:00
CitadelStationBotandPoojawa 1cca85a58e [MIRROR] Fixes null modes being picked (#2802) 
* Fixes null modes being picked

* Fixes null modes being picked
 2017-09-17 11:58:33 -05:00
PoojawaandGitHub dd4f68dfee Cleans up .rej spam and the empty file from #2792 (#2818) 
* Cleans up .rej spam and the empty file from #2792

* Update tgstation.dme
 2017-09-17 11:56:55 -05:00
deathride58andGitHub c4e3b778b3 Merge branch 'master' into crewobjectivesandmiscreants 2017-09-17 02:26:07 +00:00
AnturKandCitadelStationBot 556e6806f8 Fixes ReportDeath 2017-09-15 05:15:06 -05:00
CitadelStationBotandPoojawa d86060dcff [MIRROR] Lobby music won't be the same as the last round (#2727) 
* Merge pull request #30636 from Cyberboss/NoDupeMusic

Lobby music won't be the same as the last round

* Lobby music won't be the same as the last round
 2017-09-14 07:51:34 -05:00
CitadelStationBotandPoojawa 82d0aae420 [MIRROR] Changes shuttle port direction var from an angle to a dir (#2613) 
* Changes shuttle port direction var from an angle to a dir

* actually ports the directions

* Update shuttle.dm

* how
 2017-09-13 20:39:55 -05:00
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 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
Jordan BrownandCitadelStationBot 92b78d3298 [s] Adds a security token to all admin hrefs 2017-09-08 21:16:02 -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
deathride58 3d4d2d7024 Adjustments, adds a basic objective for roboticists 2017-09-04 22:04:52 -04:00
deathride58 2ade816524 More objectives 2017-09-04 17:47:01 -04:00
deathride58 2e0c36024e Small cleanup 2017-09-04 15:41:22 -04:00