Commit Graph

113 Commits

Author SHA1 Message Date
ShadowLarkens
e60a98da74 We're close, I can feel it 2020-07-21 17:52:38 -07:00
ShadowLarkens
462c8ccac9 Once again, I am asking for your support 2020-07-21 17:46:55 -07:00
ShadowLarkens
5e86d718fd Let's try again with less failure 2020-07-21 17:39:19 -07:00
ShadowLarkens
8ed4d6e173 Attempt to compile TGUI as part of TRAVIS 2020-07-21 17:35:15 -07:00
Leshana
ce9a9cbed1 Make failing unit tests actually fail travis checks. 2020-04-30 19:24:10 -04:00
Aronai Sieyes
24164b8929 Merge into jobby travis.yml 2020-03-24 18:58:31 -04:00
Aronai Sieyes
19d2dad065 Rewrite how Travis works
Moves script files out into a separate directory, and creates a jobs matrix to allow naming of jobs and specific jobs to not download all the deps if they don't need to.
2020-03-17 18:47:52 -04:00
Arokha Sieyes
47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
Atermonera
c8a59aa5f7 513 Compatability 2019-12-15 14:48:14 -05:00
dependabot[bot]
8b3096b06e 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-22 21:50:18 +00:00
Rykka
7ed11de790 Somehow this one had /_maps/ instead of /maps/ too 2019-09-24 04:22:10 -06:00
Rykka
4fc7887bc3 Update for clarity 2019-09-24 04:19:43 -06:00
Rykka
027600ab7e Updates readmes to be more clear. 2019-09-24 04:16:13 -06:00
Rykka
ab7740eb7f Fixes mapmerge.bat 2019-09-24 04:04:33 -06:00
Neerti
585b688709 Adds Identification System, New Autoinjectors 2019-03-27 02:25:55 -04:00
Arokha Sieyes
49d417dcf6 Stop using old pygit2 because it's terrible on windows 2018-10-06 13:00:01 -04:00
Arokha Sieyes
e3690cf196 New mapmerge2 2018-10-06 12:33:10 -04:00
Arokha Sieyes
eaf45ccc08 New hooks folder 2018-10-06 12:33:04 -04:00
Arokha Sieyes
dd7c6533a5 Clean up unused merge things 2018-10-06 12:32:41 -04:00
Leshana
958d78b418 Adds a nice script required for the PR mirror thing to work. 2018-05-27 01:09:56 -04:00
Arokha Sieyes
bca4a60a8e Update MapMerge2 2018-04-19 13:16:31 -04:00
Leshana
02221ac7bf Implements a utility to test NanoUI templates outside of BYOND.
Useful for rapid development and previewing of the HTML.
2018-02-18 19:48:57 -05:00
Aronai Sieyes
03a3309f1a BAD README 2018-02-03 01:26:13 -05:00
Aronai Sieyes
93958c8090 Merge pull request #2944 from VOREStation/aro-mapmergedoc
Mapmerge2 Readme
2018-02-03 01:16:02 -05:00
Aronai Sieyes
34ec1b15c1 Mapmerge2 Readme 2018-02-03 00:41:05 -05:00
Arokha Sieyes
4d559b4c63 TGM guys! 2018-02-02 23:26:40 -05:00
Arokha Sieyes
a1564b4b54 DMM by default for dmm.py 2018-01-28 16:47:42 -05:00
Arokha Sieyes
9dabf02163 Fixes some stuff 2018-01-28 16:09:21 -05:00
Arokha Sieyes
ae08a6896f Add MapMerge2 from /tg/ 2018-01-27 23:38:52 -05:00
Unknown
50c3e40a22 Adds mapmergePY
More or less because I CBA to install java right now.
2017-05-26 20:05:38 -07:00
Yoshax
339b91dd7c Updates map merge tools to work for Tether, maybe, I hope? 2017-05-21 17:06:36 +01:00
Leshana
5dac8b91b6 Merge branch 'master' of ../Polaris into polaris-sync 2017-04-18 19:35:59 -04:00
MagmaRam
40ea024cc5 Adds some instructions on How to update the changelogs
It's mostly nicked from /tg/'s wiki page, but has some other stuff, too.
2017-04-17 11:45:28 -05:00
Leshana
6eee55c983 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync
# Conflicts:
#	code/modules/client/preference_setup/general/03_body.dm
#	code/modules/mob/new_player/sprite_accessories.dm
#	html/changelogs/.all_changelog.yml
#	icons/mob/human_races/markings.dmi
#	vorestation.dme
2017-04-01 19:19:42 -04:00
Anewbe
dc58616dc8 Merge pull request #3153 from Yoshax/iconsplitting
'Improved' solution to the full uniform.dmi problem
2017-03-28 18:22:04 -05:00
Arokha Sieyes
1ba87bea73 Merge polaris sync 2017-03-28 12:24:46 -04:00
Anewbe
fb03579495 Merge pull request #3142 from VOREStation/humancutter
Human Scissors tool
2017-03-27 23:29:55 -05:00
Yoshax
3a483995e0 Splits rolled down suits and rolled up sleeves into their own icon files 2017-03-27 03:39:11 +01:00
Yoshax
c6d8d3e51c Creates a tool for splitting dmis 2017-03-27 03:34:23 +01:00
Arokha Sieyes
4c35144615 Human Scissors tool
Adds a tool to the tools folder called HumanScissors that I wrote. As the readme explains, it takes every iconstate in SpritesToSnip.dmi, and cuts them with CookieCutter.dmi sprites. So if you load a single 4-direction race sprite into SpritesToCut.dmi and load all the bodypart icons into CookieCutter.dmi (which I put in there already since that's probably what people will use it for), you get the output of the race sprite cut up into ready-to-use bodypart sprites. The output will contain names based off the names in SpritesToSnip.dmi and CookieCutter.dmi.
2017-03-26 00:01:16 -04:00
Arokha Sieyes
d6c04b78e9 Dynamic Shuttles - Map Changes
Updates all the shuttle turfs.
2017-03-25 20:46:31 -04:00
Arokha Sieyes
ee25004483 More map stuff. 2017-03-03 00:19:15 -05:00
Kelenius
7fb2c0d467 Ports tag matcher update
https://github.com/Baystation12/Baystation12/pull/12218
2016-03-11 12:32:20 +03:00
Kelenius
16f7b42640 Enables tag matcher and
https://github.com/Baystation12/Baystation12/pull/11642
2016-03-11 11:39:05 +03:00
Zuhayr
7c3993b68b Revert "Revert "Bay update."" 2016-02-07 16:33:30 +10:30
Zuhayr
98d983577c Revert "Bay update." 2016-02-07 16:07:05 +10:30
Zuhayr
e557a71fdc Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 2016-01-20 08:01:14 +10:30
PsiOmegaDelta
e56810e735 Merge pull request #11721 from Baystation12/master
Dev-freeze
2015-12-21 09:37:02 +01:00
PsiOmegaDelta
8b3724e3e3 Ports Kun-Peng's general map merge scripts.
These backups all *.dmm files in the maps folder, rather than those with specific names.
2015-12-19 22:01:38 +01:00
GinjaNinja32
c9cc842e51 fix clean_map_git.sh, fix mapfiles being saved with LF endings 2015-12-19 20:35:14 +00:00