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
GinjaNinja32
2248b23c4e
dmimerge should be executable
2015-12-10 11:42:47 +00:00
Neerti
e52a0ea332
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into sync_to_bay_10/10/2015
...
Conflicts:
.travis.yml
code/game/gamemodes/changeling/changeling_powers.dm
code/game/gamemodes/changeling/modularchangling.dm
code/game/turfs/simulated.dm
code/global.dm
icons/misc/fullscreen.dmi
polaris.dme
2015-10-10 23:17:26 -04:00
PsiOmegaDelta
bd3b4c5d81
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-09-19 21:37:05 +02:00
PsiOmegaDelta
de9e68cdcd
Merge pull request #11151 from Baystation12/master
...
Dev-freeze
2015-09-19 21:25:15 +02:00
PsiOmegaDelta
924359d858
Backports map merge fix.
2015-09-19 09:30:08 +02:00
Zuhayr
0c56bdd448
Merge pull request #10266 from PsiOmegaDelta/150722-TagPairs
...
Makes it possible to define multiple tag pairs for the Travis check.
2015-09-07 13:57:09 +09:30
Neerti
a9dda6cf3f
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 9/6/2015_baymerge
...
Conflicts:
.travis.yml
code/game/gamemodes/cult/cult.dm
code/game/gamemodes/heist/heist.dm
code/game/gamemodes/ninja/ninja.dm
code/game/gamemodes/nuclear/nuclear.dm
code/game/gamemodes/traitor/traitor.dm
code/game/gamemodes/wizard/wizard.dm
code/game/jobs/job/civilian.dm
code/game/jobs/job/medical.dm
code/game/jobs/job/security.dm
code/game/objects/structures/lattice.dm
code/global.dm
code/modules/projectiles/ammunition/boxes.dm
code/modules/reagents/Chemistry-Recipes.dm
config/example/config.txt
polaris.dme
2015-09-06 18:26:06 -04:00
Atlantis
c246dece15
Fixes Mapmerge
...
- Changes mapmerge in a way GinjaNinja32 recommended in PR #10899
2015-09-01 03:00:58 +02:00
PsiOmegaDelta
77d0bbd643
Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs
...
Conflicts:
code/game/gamemodes/changeling/modularchangling.dm
2015-08-13 08:09:28 +02:00
Neerti
d911badae8
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 8/7/2015_bay_merge
...
Conflicts:
.travis.yml
polaris.dme
2015-08-07 20:25:57 -04:00
PsiOmegaDelta
03578d4ea3
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-08-06 08:12:38 +02:00
GinjaNinja32
76656a0cf1
Recompile dmitool.jar under Java 7 instead of Java 8
2015-08-05 21:39:59 +01:00
PsiOmegaDelta
688b8b52f7
Makes it possible to define multiple tag pairs to check for.
2015-07-27 09:32:25 +02:00
Neerti
1401608553
Steals from KP instead of /tg/. Map merge will now clean all maps.
2015-07-21 09:37:48 -04:00
