Commit Graph

171 Commits

Author SHA1 Message Date
silicons
ea21151462 LF 2020-12-20 18:55:45 -07:00
dependabot[bot]
b786392e79 Bump pillow from 7.0.0 to 7.1.0 in /tools/mapmerge2
Bumps [pillow](https://github.com/python-pillow/Pillow) from 7.0.0 to 7.1.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/7.0.0...7.1.0)

Signed-off-by: dependabot[bot] <support@github.com>
2020-11-19 07:10:29 +00:00
silicons
5b03f5b0ec more 2020-11-12 23:36:18 -07:00
tgstation-server
ce8dba6062 Update TGS DMAPI 2020-11-07 00:37:22 +00:00
GrayRachnid
dc0b62879f Skip app execution aliases when searching for Python (#53569) (#13608)
Co-authored-by: Tad Hardesty <tad@platymuus.com>
2020-10-24 21:12:03 +02:00
Letter N
047a7c0fc0 nammed areas moment 2020-09-06 09:37:54 +08:00
Letter N
1ca9e2acd9 poggers 2020-09-06 08:43:09 +08:00
Letter N
37b2d5c654 Travis Updates 2020-09-05 10:36:39 +08:00
Letter N
f283917aca aaaaaaa 2020-08-22 17:42:25 +08:00
Letter N
a95cb5472d missing tools moment 2020-08-15 17:04:48 +08:00
Letter N
15e659fc9c tguichat and tgui4.1? 2020-08-15 16:08:10 +08:00
silicons
448809d25f Update github_webhook_processor.php (#13034) 2020-08-09 16:11:28 +02:00
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