cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,429 Commits 6 Branches 0 Tags
7453414faa1b0963ba3fd63a57ea033b521b0069
Commit Graph

69 Commits

Author SHA1 Message Date
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
Neerti
85cb9c92a0 Makes map merger clean colony maps. Band-aid fix for now. 2015-07-21 09:27:45 -04:00
PsiOmegaDelta
772488fadc Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	.travis.yml
	code/setup.dm
	maps/exodus-1.dmm
	maps/exodus-5.dmm
 2015-06-17 09:33:34 +02:00
PsiOmegaDelta
641df4a530 Use of invalid prefixes in changelogs no longer silently fail in Travis. 2015-06-16 11:25:56 +02:00
PsiOmegaDelta
06a1ece4b8 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/ZAS/Controller.dm
	code/datums/mind.dm
	code/game/objects/items/devices/scanners.dm
	code/game/objects/items/stacks/sheets/glass.dm
	code/modules/materials/materials.dm
	code/modules/mob/living/carbon/brain/posibrain.dm
	code/modules/mob/living/silicon/pai/pai.dm
 2015-06-16 10:52:33 +02:00
PsiOmega
90c71d00f1 Travis span matcher script 
A slightly overkill script to ensure each file contains as many opening span tags as closing.
Almost implemented to allow checking multiple pairs of tags.
 2015-06-14 17:37:35 +02:00
mwerezak
0527e4b05f Adds dmitool import iconstate splicing 
Adds the ability to splice in specific directions and/or frames when
importing icon states with dmitool.
 2015-06-13 12:19:42 -04:00
mwerezak
1cbfff09d7 Adds python wrapper for dmitool 2015-06-12 00:06:58 -04:00
mwerezak
c38d88c06a Updates dmitool to be able to insert specific directions 
Adds a direction option to the import command, that causes the imported
icon state is overwrites the specified direction, if nodup is set.
Otherwise, the direction is overwritten on a copy.
 2015-06-12 00:01:41 -04:00
PsiOmega
864d18caff Updates the list of valid log prefixes. 2015-06-01 10:12:24 +02:00
PsiOmega
c46578c810 AddToChangelog removal. 
Removes the source for the old changelog tool.
 2015-05-25 20:35:08 +02:00
PsiOmega
a1ff266981 Updates the event probability sheet with the new events. 2015-05-10 10:58:46 +02:00
PsiOmega
3edfbf0040 Moves us to the changelog system used by /vg/, /tg/, and others. 
Cleans up the HTLM folder, removing unused files.
Will also attempt include /tg/'s "You have unread changelog entries" notification on join.
 2015-04-18 13:00:28 +02:00
PsiOmega
93ac826f02 Adds more events, misc event changes. 
Only two more this time:
Random space dust attack.
Random gravity failure.

Moves space vines from moderate to major events, due to its now more dangerous nature.

Removes now irrelevant alien/ninja customized event handlers.

Adds Excel sheet for aiding in event probability calculations.
 2015-03-31 13:07:27 +02:00
Chinsky
3ddd0b480f Merge pull request #8061 from Baystation12/master 
master -> wiz
 2015-02-06 10:41:12 +03:00
GinjaNinja32
f4435503cc Linux versions of PsiOmegaDelta's git_merge_installer scripts 2015-02-04 10:12:11 +00:00
PsiOmega
0673c9179b Git Merge Installers 
There are now two basic bat scripts in dmitool and mapmerge which painlessly inserts the necessary lines for the commit tools to work into .git/config.
 2015-02-03 22:02:50 +01:00
GinjaNinja32
aeff099189 Fixes compiled jar being compiled under Java 8 2015-02-03 14:50:39 +00:00
Zuhayr
704d668b18 Merge pull request #7732 from GinjaNinja32/dmitool 
[dmitool] Add importing PNG files as icon_states
 2015-01-09 06:41:38 +10:30
=
cb11a95aa7 Fix clean_map_git.sh 2015-01-07 20:22:55 +00:00
=
73da1156a2 Various improvements; options, version, info 
Adds options to PNG importing so that any valid DMI file can be entirely built from PNG files and DMITool.
Adds version string and "version" command
Adds info command to get a list of states easily (the only way previously was to print the descriptor with "dmitool -vvvv verify $file" and parse with e.g. grep/sed)
 2015-01-07 17:26:21 +00:00
GinjaNinja32
c49f0f2f89 Add importing PNG files as icon_states 2014-12-02 23:32:05 +00:00
GinjaNinja32
b7032cafca Update help text, guard against illegal values 2014-11-30 20:15:43 +00:00
GinjaNinja32
9018892947 Update DMI state extraction 2014-11-30 20:05:10 +00:00
PsiOmegaDelta
6adc68bbd1 Merge pull request #7145 from GinjaNinja32/dmitool 
DMI tool thingy. Is able to do many things with DMI files.
 2014-11-29 09:48:47 +01:00
GinjaNinja32
627626c49d Automatic DMI merge stuff 2014-11-26 21:28:40 +00:00
GinjaNinja32
a17cb4c7d2 Slightly more sensible defaults for diff output with +q 2014-11-26 20:58:30 +00:00
GinjaNinja32
d9a6b5ad11 DMI tool initial commit 2014-11-26 20:32:24 +00:00
PsiOmega
e4127843a6 Z-level split. 
Splits each individual Z-level into its own map file.
 2014-11-24 12:40:12 +01:00
Whitellama
f3091cb215 Updated changelog 2014-07-26 17:52:16 -07:00
Mloc-Hibernia
281a26b979 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>

Conflicts:
	code/modules/mob/living/silicon/robot/robot_modules.dm
 2014-07-18 13:08:12 +00:00