shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
19,414 Commits 5 Branches 0 Tags
40d9dee654d9529fc4a13cfd563b22c4ebcb7fae
Commit Graph
131 Commits
Author SHA1 Message Date
deathride58andkevinz000 2d818a6dd8 what kind of sadist uses spaces anyways - fixes indentation inconsistency in dmm.py (#7663) 2018-10-19 00:37:37 -07:00
Poojawa 91620218e4 some cherrypicked TG fixes and tweaks 2018-10-12 05:37:36 -05:00
Poojawa d231018a3a Flashy flash and Gondola Pods 
and cult effect addition, fixes CTF
 2018-09-21 02:48:17 -05:00
Poojawa cb342866d6 a few last minute changes from TG 
also changes His Grace from 25 to 10 requirments
 2018-09-18 23:12:29 -05:00
Poojawa bc0d14c193 Continual updates until merged 2018-09-17 04:55:03 -05:00
Poojawa 46e805af28 Work you fucking whore 2018-09-11 13:49:48 -05:00
Poojawa 8fa0212d25 make build.sh excutable 2018-09-11 13:41:59 -05:00
Poojawa fddaa7a4df maybe? 2018-09-11 13:25:43 -05:00
Poojawa fa70720cc1 Map Conversions 2018-09-11 08:58:34 -05:00
Poojawa 9b376dac92 Adds a fuckload of tool updates 
also updates tgui
 2018-09-05 06:38:33 -05:00
Kyle Spier-Swensonandletterjay 61052ca487 Make travis use -verbose to get all the runtimes without limit (#38816) 2018-07-01 05:40:34 -05:00
Jordan Brownandletterjay 9e12b92eea Adds SQL to travis. Other travis optimizations 2018-06-11 22:30:35 -05:00
Tad Hardestyandletterjay c1fcc0a86e Fix typo in Python dependencies file (#38080) 2018-05-27 11:40:31 -05:00
Jordan Brownandletterjay e37a9a36ed Merge pull request #37976 from AutomaticFrenzy/patch/dmi-merger 
Add a Python script to fix DMI conflicts
 2018-05-25 10:55:33 -05:00
Tad Hardestyandletterjay 111ad79eab Use spritesheets to reduce time spent sending PNG assets by 90+% 2018-05-09 22:44:57 -05:00
Jordan BrownandCitadelStationBot 482e83ce89 Merge pull request #37463 from praisenarsie/patch-39 
Renames praisenarsie to Frozenguy5 in credits
 2018-04-26 15:28:02 -05:00
vuonojenmustaturskaandCitadelStationBot c8a91e0d13 Fixes runtime condenser (#37193) 
* Fixes runtime condenser

* stray comment
 2018-04-16 04:35:26 -05:00
Bjorn NeergaardandCitadelStationBot f56e139fda Use a rust DLL for logging (#36858) 
By moving our logging to a DLL we see a drop in CPU/real time of 2-3 orders of magnitude. This is due to BYOND opening and closing file handles on every write, causing incredible amounts of unneeded overhead. The logging library also handles timestamps for us, further increasing performance gains.

This library will also allow for further offloading in the future, such as completely replacing file2text() and friends.

A pre-compiled DLL is bundled, but Linux users will have to compile manually. Directions can be found at the rust-g repo.

Log output is enhanced with millisecond time stamps:

[2018-04-01 15:56:23.522] blah blah blah

This includes runtimes as well, which benefit from the same timestamp improvements and no longer have hacky splitting code to add their own timestamps.

Log shutdown is handled in a dedicated proc called as late as possible, as rust-g integration expands this will be factored out into a generic native code shutdown proc.
 2018-04-10 17:02:44 -05:00
Poojawaanddeathride58 5fa001c10f things with stuff (#6233) 
* buncha things from upstream

* datums globals, onclick

* datums

* game folder, holy shit mirror bot why

* modules

* icons

* dme

* compiles cleanly

* tools purge

* updates maps

* double check just because. and wew lad

* incidentally, this needs more work first

* some things

* weh

* sound cleanup and icons

* reeeee

* compile issues

* oh look, fresh code sync

* cleans up some unused icons

* dirty vars

* reeeeeeeeeeeeeeee

* wew lad. fuck off with this already
 2018-04-07 23:07:09 -04:00
CitadelStationBotandPoojawa bcc360d0d9 [MIRROR] Fixes omega detective office + prepare_maps change (#6110) 
* Fixes omega detective office + prepare_maps change (#36691)

* Fixes Omega Detectives office

* Mentions mapmerge isntead of run map merge

* Fixes omega detective office + prepare_maps change
 2018-03-26 04:31:41 -05:00
CitadelStationBotandPoojawa 67e6c464c3 [MIRROR] Test merge candidate is removed on commit push (#5878) 
* Test merge candidate is removed on commit push (#36266)

* Test merge candidate is removed on commit push
 2018-03-10 07:38:19 -06:00
CitadelStationBotandPoojawa 5776be9c1e [MIRROR] Fixes unicode changelog tags (#5679) 
* Fixes unicode changelog tags (#35905)

* Fixes unicode changelog tags
 2018-02-24 06:11:09 -06:00
LetterJayandGitHub d7a7bea995 Merge pull request #5439 from Citadel-Station-13/upstream-merge-35512 
[MIRROR] Split up Revert/Removal
 2018-02-13 06:28:42 -06:00
LetterJayandGitHub de4869542c Merge pull request #5443 from Citadel-Station-13/upstream-merge-35551 
[MIRROR] Tests give 3 GBP
 2018-02-13 06:28:33 -06:00
Jordan BrownandCitadelStationBot 16de4e4c90 Disables max errors on travis compile (#35550) 2018-02-12 12:49:01 -06:00
Jordan BrownandCitadelStationBot b6ca568ac1 Tests give 3 GBP (#35551) 2018-02-12 12:47:48 -06:00
Jordan BrownandCitadelStationBot 8c28ac1a1a Split up Revert/Removal 2018-02-12 09:22:07 -06:00
Jordan BrownandCitadelStationBot d1fea8e4f7 Removes Map Merge 1 2018-02-11 13:03:47 -06:00
CitadelStationBotandPoojawa afb0b08837 [MIRROR] Fixes servant cyborgs with the Standard module not having Abscond (#5266) 
* Fixes servant cyborgs with the Standard module not having Abscond

* Update clockwork_slab.dm

* Update clockwork_slab.dm
 2018-02-05 01:39:36 -06:00
CitadelStationBotandPoojawa 0bb8649794 [MIRROR] Fix map keys overflowing earlier than expected (#5259) 
* Merge pull request #35133 from AutomaticFrenzy/patch/key-overflow-fix

Fix map keys overflowing earlier than expected

* Fix map keys overflowing earlier than expected
 2018-02-04 22:35:52 -06:00
CitadelStationBotandPoojawa 59fc595ba3 [MIRROR] Fix hook installation on Linux (#5244) 
* Merge pull request #35161 from AutomaticFrenzy/patch/hook-install

Fix hook installation on Linux

* Fix hook installation on Linux
 2018-02-04 22:21:05 -06:00
Poojawa 56232d5d60 Maps and misc 2018-01-31 06:20:26 -06:00
PoojawaandGitHub 03086dfa91 Tg 1 28 sync testing/confirmation (#5178) 
* maps, tgui, tools

* defines and helpers

* onclick and controllers

* datums

fucking caught that hulk reversal too.

* game and shuttle modular

* module/admin

* oh god they fucking moved antag shit again

* haaaaate. Haaaaaaaaaate.

* enables moff wings

* more modules things

* tgstation.dme

before I forget something important

* some mob stuff

* s'more mob/living stuff

* some carbon stuff

* ayy lmaos and kitchen meat

* Human stuff

* species things

moff wings have a 'none' version too

* the rest of the module stuff.

* some strings

* misc

* mob icons

* some other icons.

* It compiles FUCK BORERS

FUCK BORERS
 2018-01-29 04:42:29 -06:00
Jordan BrownandCitadelStationBot 497dcd9d9e Merge pull request #34895 from JJRcop/patch-16 
#34889 Fixes possible issue with set_labels
 2018-01-24 14:51:59 -06:00
Jordan BrownandCitadelStationBot 46692c87b4 Disable ruins for test run mode (#34653) 
* Disable ruins for test run mode

* Fix

* Actually, let's enable them all

* That never happened
 2018-01-20 05:28:45 -06:00
Tad HardestyandCitadelStationBot f62aa9e21f Add READMEs to hooks and mapmerge2 directories (#34511) 2018-01-18 21:27:04 -06:00
deathride58andGitHub e14795291d Merge pull request #4889 from Citadel-Station-13/upstream-merge-34319 
[MIRROR] Fails travis on common mapping mistakes
 2018-01-17 20:12:39 +00:00
LetterJayandGitHub 78c33f32ba Update github_webhook_processor.php 2018-01-17 02:36:51 -06:00
orangesandCitadelStationBot c9afc3e53d Merge pull request #34319 from ShizCalev/travis-maps 
Fails travis on common mapping mistakes
 2018-01-16 14:37:26 -06:00
Jordan BrownandCitadelStationBot 2b035d94c0 Fixes webhook diff selecting partial match 2018-01-16 07:43:03 -06:00
AnturKandCitadelStationBot 597111234e Enforces utf-8 encoding on all changelog files. (#34434) 
* Enforces utf-8 encoding on all changelog files.

* Lets python3 use pip

* py2.7 begone
 2018-01-14 12:39:49 -06:00
Tad HardestyandCitadelStationBot 12da7d5dec Fix the batch file method of mapmerge2 and save a .before (#34361) 2018-01-12 09:44:00 -06:00
Jordan BrownandCitadelStationBot 32052fd06f Fixes BUILD_TESTING logic being inverted (#34201) 2018-01-10 03:11:40 -06:00
deathride58andGitHub d4cf5d2eba Merge branch 'master' into upstream-merge-34067 2018-01-08 20:01:59 +00:00
Jordan BrownandCitadelStationBot 065b616af8 Removes standard resources from config tree 2018-01-07 20:32:08 -06:00
deathride58 c4501563b1 tools sync, fixes minor regression in traumas.json. travis is broken too 2018-01-04 11:00:50 -05:00
Jordan BrownandCitadelStationBot 2c350fcb6c Autotag .github => GitHub (#33965) 2018-01-01 04:01:33 -06:00
Tad HardestyandCitadelStationBot 61f00cbfb0 Add a new and improved mapmerge (#33869) 
Key benefits of the new mapmerge include: multi-Z support, effective
reuse of deleted keys, automatic handling of key overflow, and utilizing
a git pre-commit hook to eliminate the need to run batch files manually.
 2017-12-29 00:28:25 -06:00
Jordan BrownandCitadelStationBot 636a87ab8f The runtime condenser now supports taking input from stdin and outputting on stdout 2017-12-21 00:45:37 -06:00
LeoandCitadelStationBot 0dc826735b Adds a python script to load jsons to prevent any syntax error on them (#33001) 
* Adds a python script to load jsons to prevent any syntax error on them

* Corrects identation on hallucination.json
 2017-11-24 12:59:41 -06:00