Commit Graph

159 Commits

Author SHA1 Message Date
Artur
5f9364c5f8 Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-13 16:20:54 +03:00
Putnam
835dd722e5 monster told me this would fix it 2020-07-09 02:31:38 -07:00
Artur
5b7d9a9008 Merge conflict fix 2020-05-13 12:37:18 +03:00
Ghom
e24f36bc14 bumping up mapmerge requirements.txt 2020-05-01 21:08:50 +02:00
Artur
0b34e20f56 https://github.com/tgstation/tgstation/pull/49330/ and https://github.com/tgstation/tgstation/pull/49982/ 2020-04-23 14:19:50 +03:00
CitadelStationBot
c701a19864 Update github_webhook_processor.php 2020-04-09 09:13:25 -05:00
CitadelStationBot
b2ae6ae521 Update github_webhook_processor.php 2020-04-09 09:11:47 -05:00
Ghommie
86898cc451 Force pushed updates 2020-03-22 01:43:19 +01:00
Ghommie
0caabe8018 Porting tgs DMAPI and script updates, as well as getrev updates and something bout OoM. 2020-02-11 15:23:03 +01:00
Ghommie
6152ac9235 tgstation PR #48090 2020-02-09 00:56:31 +01:00
Ghommie
c665ed7e36 Cecilia need helpies in maint, nya 2020-02-09 00:05:17 +01:00
Artur
3fe246ad45 Redo 2020-02-08 13:47:25 +01:00
Artur
65d1552208 Lets see if this works 2020-02-08 13:46:58 +01:00
Artur
b615be1248 Should hopefully work.. 2020-02-07 18:20:09 +01:00
AffectedArc07
835500980b Hotfix for CI line endings 2020-01-17 16:00:15 +00:00
AffectedArc07
8191716868 CI to check for wrong line ending 2020-01-13 11:53:36 +00:00
AffectedArc07
16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
Ghommie
977340c641 ahaha yea nope. 2019-11-27 22:50:11 +01:00
Ghommie
eef3ec090d i wonder if chmod permissions are retained after resetting a branch. 2019-11-27 22:43:15 +01:00
Ghommie
279c22b781 lentext to length. 2019-11-09 23:17:04 +01:00
dependabot[bot]
22c87b0791 Bump pillow from 5.1.0 to 6.2.0 in /tools/mapmerge2
Bumps [pillow](https://github.com/python-pillow/Pillow) from 5.1.0 to 6.2.0.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/master/CHANGES.rst)
- [Commits](https://github.com/python-pillow/Pillow/compare/5.1.0...6.2.0)

Signed-off-by: dependabot[bot] <support@github.com>
2019-10-29 14:09:47 +00:00
Poojawa
dcbcf704da I accidentally all the maps. whoops 2019-08-04 06:27:28 -05:00
Ghommie
84bb5d90ce newlines. 2019-06-13 22:54:41 +02:00
Ghommie
27b7010181 Proof of my asinine acts. 2019-06-13 22:52:12 +02:00
Ghommie
0206a534b0 add in spaces. 2019-06-13 22:20:47 +02:00
Ghommie
c37c432de6 port "PR to make travis use xenial and to make it work" 2019-06-13 22:18:13 +02:00
Poojawa
bc619ae7d9 Tool folder and backend TG sync 2019-04-13 22:56:51 -05:00
Poojawa
b393789f19 Character Creation Overhaul (#7987)
* Rebase fail. good thing I made back ups. c:

* Tails more or less done

* wouldn't update cleanly otherwise

* It's completly working now. holy fuck I did it

Just need the refurbished body markings done, then to chop 'em up for full PR status

* MARKINGS DONE AAAAAAAAAAAAA

* fixes digi legs that didn't convert correctly

* ports the refractored preferences

Kinda ugly now tbh. but fuckit

* quality sweep, things should should properly now in general

* Taurs converted and improved! BODYMARKING -> MATRIXED

* oops. s'what I get for not compile checking

* remember to throw shade at furries

* vigorously update markings upon switching species and colors

* re-adds old wolf ears, Big Wolf fixes snout bugs

* few more snout tweaks

* cut the lists, cut everything. reeee

* This code I s2g

* Adds context clues to preferences

Hopefully people will read them before making an OOC fuss

* Fixes hands and feet markings with this one weird trick

remember kids, proper layering and order of operations is important

* Sprite tweaking and polishing

Sergal stuff being worked on

* a few QoL things for species swapping

* how the fuck did I miss these markings

* fleshes out sprites in preperation for marking experimentation later

* fixes catboy problems

* Mam_snout is a thing now,

* pixel adjusted tails, cleaned up wah tail a bit better

also gets digitgate legs missing pixels fixed

* cleans up more shit. ree

* force "plain" instead of none to avoid missing pixel reports

* tweaks to reinspire mapdiff

* Clean up Preference UI

Looks a little better now

* k

* doubly ensure None markings aren't valid

* reee spessman barbie

* brightens pixels around tiger head markings

* YEENS

* Cat ears tweaked because it triggers Kev otherwise

* another session of quality control

* Crows and crow accessories

* husk fixes

* works good enough, mission accomplished

* fixes the proc properly

* cleans up brute force code that isn't needed

* c a t
2019-02-22 05:59:05 -08:00
deathride58
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-Swenson
61052ca487 Make travis use -verbose to get all the runtimes without limit (#38816) 2018-07-01 05:40:34 -05:00
Jordan Brown
9e12b92eea Adds SQL to travis. Other travis optimizations 2018-06-11 22:30:35 -05:00
Tad Hardesty
c1fcc0a86e Fix typo in Python dependencies file (#38080) 2018-05-27 11:40:31 -05:00
Jordan Brown
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 Hardesty
111ad79eab Use spritesheets to reduce time spent sending PNG assets by 90+% 2018-05-09 22:44:57 -05:00
Jordan Brown
482e83ce89 Merge pull request #37463 from praisenarsie/patch-39
Renames praisenarsie to Frozenguy5 in credits
2018-04-26 15:28:02 -05:00
vuonojenmustaturska
c8a91e0d13 Fixes runtime condenser (#37193)
* Fixes runtime condenser

* stray comment
2018-04-16 04:35:26 -05:00
Bjorn Neergaard
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
Poojawa
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
CitadelStationBot
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
CitadelStationBot
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
CitadelStationBot
5776be9c1e [MIRROR] Fixes unicode changelog tags (#5679)
* Fixes unicode changelog tags (#35905)

* Fixes unicode changelog tags
2018-02-24 06:11:09 -06:00