cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 02:09:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
63,151 Commits 8 Branches 0 Tags
3245498530b1f165cbc8ad757f79dd78985f3a35
Commit Graph

81 Commits

Author SHA1 Message Date
Novacat
3b147ee4c7 Merge pull request #9340 from VOREStation/compatible-rust-g 
Update librust_g.so with an Ubuntu 16.04 compatible version
 2020-11-24 00:54:42 +00:00
Chompstation Bot
19517fcede 13x Performance for Export chatlog, update rust_g to 0.4.6-vorestation 2020-10-20 03:19:38 +00:00
CHOMPStation2
7362e80bbd Update .travis.yml 2020-08-09 14:25:17 -07:00
Razgriz
f00fdebbb9 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into August2020UpstreamPull 
August2020UpstreamPull
 2020-08-09 02:58:18 -07:00
Razgriz
4e93f58b3e Update Minor 1528 2020-07-28 13:21:33 -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
CHOMPStation2
1a7b3b2193 Update Minor 1527 2020-07-19 15:02:29 -07:00
Razgriz
f8c7bb8225 Fix Travis? 
Trying a different version. Not sure what's going on yet.
 2020-05-23 22:01:47 -07:00
Razgriz
3dabdca3f3 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into May2020UpstreamPull2-2 2020-05-21 03:20:13 -07:00
Aronai Sieyes
1bd69bf2ed Update Travis to server version 2020-04-27 15:49:06 -04:00
TheFurryFeline
7666db9f78 Fix Travis Not Reading .dme 2020-04-23 14:27:32 -04:00
Erik
eb9c3cd387 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into UpstreamMergeApril2020 2020-04-11 16:53:35 -07:00
Aronai Sieyes
d7368a830d Update travis byond version 2020-03-19 21:19:33 -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
Aronai Sieyes
34e94e5027 Bump Travis up to 513.1513 since that's what the server's got 2020-03-11 11:49:52 -04:00
Razgriz
70beafbd27 Update .travis.yml 2020-01-06 01:48:09 -07:00
Unknown
6dd6940332 Updates Travis 2019-12-12 12:48:32 -05:00
Aronai Sieyes
47f62d98d7 Don't alter travis pls 2018-11-05 13:51:32 -05:00
Neerti
bcf58840d0 Merge pull request #5701 from lbnesquik/Kates-Ai-Manifest-Fix 
Update silicon manifest to discord dark theme.
 2018-10-30 18:42:47 -04:00
Arokha Sieyes
4311c2aa20 Update Travis so it does faster 
Sanic
 2018-10-13 17:43:58 -04:00
Leshana
86eac9c0b1 Implement rust-g library 2018-05-04 18:58:31 -04:00
Arokha Sieyes
6c686e6a2f Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync-04252018 
# Conflicts:
#	README.md
#	code/game/jobs/job/job.dm
#	code/modules/client/preference_setup/loadout/loadout_utility.dm
#	code/modules/mob/living/carbon/human/examine.dm
#	code/modules/mob/living/carbon/human/npcs.dm
#	code/modules/mob/living/carbon/human/species/station/prometheans.dm
#	html/changelogs/.all_changelog.yml
#	maps/RandomZLevels/Academy.dmm
#	maps/RandomZLevels/beach.dmm
#	maps/RandomZLevels/blackmarketpackers.dmm
#	maps/RandomZLevels/challenge.dmm
#	maps/RandomZLevels/example.dmm
#	maps/RandomZLevels/jungle.dmm
#	maps/RandomZLevels/listeningpost.dmm
#	maps/RandomZLevels/spacebattle.dmm
#	maps/RandomZLevels/stationCollision.dmm
#	maps/RandomZLevels/wildwest.dmm
#	maps/RandomZLevels/zresearchlabs.dmm
#	maps/northern_star/polaris-1.dmm
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	maps/southern_cross/southern_cross-7.dmm
#	maps/submaps/surface_submaps/mountains/CrashedMedShuttle1.dmm
#	maps/submaps/surface_submaps/plains/Boathouse.dmm
#	maps/submaps/surface_submaps/wilderness/Blackshuttledown.dmm
#	maps/submaps/surface_submaps/wilderness/Boombase.dmm
#	maps/submaps/surface_submaps/wilderness/DJOutpost1.dmm
#	maps/submaps/surface_submaps/wilderness/DecoupledEngine.dmm
#	maps/submaps/surface_submaps/wilderness/Drugden.dmm
#	maps/submaps/surface_submaps/wilderness/Rockybase.dmm
#	maps/submaps/surface_submaps/wilderness/Shack1.dmm
#	maps/virgo/virgo-6.dmm
#	vorestation.dme
 2018-04-25 17:23:33 -04:00
Arokha Sieyes
e5df2c165f Travis update for tag testing 2018-04-18 18:45:04 -04:00
Aronai Sieyes
7d3aec96fd Arranges lots of things into planes (#5072) 
* Rearranges a billion things into planes

* Make cryotubes fancy

* Update Travis

* Fix hiding logic
 2018-03-28 12:59:12 -07:00
Arokha Sieyes
e816b9a1ec Travis -> 512.1412 2018-02-28 20:08:16 -05:00
Arokha Sieyes
37240ecec2 Upgrade byond version for Travis 2018-02-26 20:40:13 -05:00
Arokha Sieyes
e10c98fe32 Make Travis run a build matrix, add new test 2018-01-27 15:17:26 -05:00
Arokha Sieyes
c18fa6c51a VS: Rearrange files, scream at Travis 2018-01-27 14:12:21 -05:00
Arokha Sieyes
e78a8114c3 VS: Travis in parallel 2018-01-27 14:12:20 -05:00
Leshana
c17227df9b Speedup Travis and Upgrade Byond used by Travis 
The first round of compiling done in travis build is to test the submaps.
It will complete faster if we do not include the main map during this round;
the main map gets compiled and checked in the second round anyway.
 2018-01-17 19:23:35 -05:00
killer653
3a2093ef40 Polaris sync 2017-12-21 04:01:07 -05:00
Neerti
396f55fb17 Allows Travis to Validate PoI Maps 
Tweaks Travis to compile all PoI maps in order to allow the compiler to find certain problems such as missing paths. This is needed because PoIs are loaded at runtime as opposed to being compiled like traditional maps, making them a bit prone to problems. Travis should help find those problems before they reach the live server by failing PRs which add a broken PoI map or break any existing PoI maps.
For regular use, the PoIs will not be compiled unless done so manually by the developer.
 2017-11-19 06:07:41 -05:00
Cameron653
afa7b01ac1 Updates Travis to 512.1392 2017-10-17 23:49:18 -04:00
killer653
468e73c7f3 Polaris sync 2017-08-06 19:07:17 -04:00
Cameron653
97957fcaee Replaces more macros. (#3647) 
* MORE MACRO CHANGES

AHHHHHHHHHHHHHHHHHHHH

* Fixes a few typos

* Fixes compile error

* Fixes for real

* 4 macros left that I can't find
 2017-07-27 21:12:21 -05:00
Cameron653
e158fcd3cc Macro Replacements. (#3574) 
* A preface to my madness

Travis failed one of my PR's because I copied old code
that used /red /blue /green.

Because of this, I am going to find and replace every
instance of it that I find.

Also this is a test commit to make sure I'm comitting
to the correct branch.

* /blue /green /red replacements

Dear god.

A slow and painful death from acid is more fun than this.

I wouldn't wish this torture on my worst enemy.
And this is only the beginning

* Replace part 2.

Time to fix the human error.

* Fixes mismatches

* Sets macro count to 220

One above the current number of macros in the code.

* Fixes last of the mismatches.

* Removes spaces, replaces \black

Removes spaces
Replaces \black in a few areas where seen
Replaces \bold with <B> </B> where seen

* Updating macro count again

* More fixes!

* Issues fixed! For real this time!

I swear!

* Fixing all the merge conflict files.
 2017-07-19 12:47:23 -05:00
Leshana
4fbfa7ee37 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2017-05-08 
# Conflicts:
#	code/modules/mob/dead/observer/observer.dm
#	code/modules/mob/living/carbon/human/life.dm
#	code/modules/mob/mob_defines.dm
#	html/changelogs/.all_changelog.yml
#	vorestation.dme
 2017-05-08 21:07:45 -04:00
Arokha Sieyes
e4494b635d Updates Travis, free of charge 2017-04-24 16:18:22 -04:00
Leshana
67a22bc69e Add a travis test to make sure nobody leaves the test minimap turned on by accident! 2017-03-15 13:46:45 -04:00
Leshana
d50c3d2d14 Ask travis to wait longer for our unit test execution, becuase it takes a long time to load the map etc. 2017-02-04 18:30:11 -05:00
SinTwo
eabefc538a Revert "Merge branch 'master' of https://github.com/PolarisSS13/Polaris into NanoGrade" 
This reverts commit 6bb5409349, reversing
changes made to f6a83d5ee0.
 2016-08-15 12:58:00 -04:00
Eearslya
85c3e22873 Polaris sync 2016-08-06 20:34:44 -07:00
SinTwo
fe46fac5cc final new NanoUI fixes and tgui port 2016-07-27 23:01:26 -04:00
Arokha Sieyes
71d29b0320 Added features, cancel buttons. 
Added job selection, adding to manifest optionally by early-check if they were on it before.
 2016-07-05 12:04:38 -04:00
Arokha Sieyes
484fb96202 Merge branch 'master' of https://github.com/PolarisSS13/Polaris 
# Conflicts:
#	.travis.yml
#	code/game/machinery/adv_med.dm
#	code/modules/mob/mob.dm
 2016-07-03 16:21:21 -04:00
Yoshax
da12950e0f Updates Travis to use 510 2016-06-20 00:48:34 +01:00
Arokha Sieyes
8d1bdb2ef5 Wonder where that extra one is 2016-06-08 18:22:43 -04:00
Arokha Sieyes
4c83ed3823 Makes Travis more intolerant 
Someone removed macros. Time to lower the thingy.
 2016-06-08 18:19:17 -04:00
Arokha Sieyes
148561a741 Makes Travis more intolerant 
Someone removed macros. Time to lower the thingy.
 2016-06-08 18:18:06 -04:00