cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 19:52:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
35,766 Commits 5 Branches 0 Tags
ba36df71a7657bf6656c7b19f81b51e5b27875dc
Commit Graph

82 Commits

Author SHA1 Message Date
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
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