cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-06 15:32:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
22,007 Commits 74 Branches 23 Tags
7c88b5440485a75f010d8743243313b77a5a20a3
Commit Graph

22007 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zuhayr
7c88b54404 Fixes #7722 2015-01-09 07:30:48 +10:30
Zuhayr
a4fca84e3e Fixes #7726 2015-01-09 06:44:09 +10:30
Zuhayr
a01592d5b7 Fixes #7740 2015-01-09 06:25:27 +10:30
Zuhayr
7e0610e31c Fixes #7684 2015-01-09 04:18:42 +10:30
Zuhayr
8d2d3302bd Fixes #7720 2015-01-09 04:07:08 +10:30
Zuhayr
c3756e3a03 Fixes #7701 2015-01-09 04:05:11 +10:30
Zuhayr
a23e0aa91f Fixes #7679 2015-01-09 03:59:43 +10:30
Zuhayr
b36b41a2f5 Fixes #7656 2015-01-09 03:58:43 +10:30
Zuhayr
29435d8750 Fixes #7700 2015-01-09 03:56:12 +10:30
Zuhayr
cd53ed613c Fixes #7691 2015-01-09 03:51:47 +10:30
Zuhayr
0d071e7f9d Fixes #7683 2015-01-09 03:48:46 +10:30
Zuhayr
f6481dde6d Merge pull request #7735 from mwerezak/events 
Adjusts major event weightings, fixes meteor event
 2015-01-08 21:55:51 +10:30
Zuhayr
f637f265d0 Merge pull request #7736 from mwerezak/engine 
Fixes engine intercooler
 2015-01-08 19:50:05 +10:30
mwerezak
4c20d23597 Fixes intercooler 2015-01-08 00:44:46 -05:00
mwerezak
08cda65973 Adjusts major event weightings 2015-01-08 00:00:57 -05:00
mwerezak
c3413bc7d7 Fixes meteor event 2015-01-07 23:29:52 -05:00
Zuhayr
4988fa5170 Merge pull request #7730 from Baystation12/master 
Dev-freeze < master
 2015-01-07 18:54:51 +10:30
PsiOmegaDelta
69d7644dc0 Merge pull request #7727 from LightningIron/master 
Changes manual fire interface icon to be less confusing.
 2015-01-07 09:23:02 +01:00
Zuhayr
fa2bd1d7b4 Merge pull request #7728 from Baystation12/master 
Master into dev-freeze
 2015-01-07 18:11:27 +10:30
LightningIron
d10546eb16 Changes manual fire interface icon to be less confusing. 2015-01-06 22:15:16 -06:00
Zuhayr
45cb9dbacf Merge pull request #7718 from Tramziller/dev-freeze 
Response to #7686
 2015-01-07 08:03:55 +10:30
Chinsky
6ba932cab1 Merge pull request #7712 from Mloc/bs12-license 
clear up licensing situation
 2015-01-07 00:21:41 +03:00
Tramziller
29a0ae2ad6 Response to #7686 2015-01-06 21:48:56 +01:00
Tramziller
4f654b7b06 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev-freeze 2015-01-06 21:48:16 +01:00
Zuhayr
07298fa31a Merge pull request #7697 from Tramziller/dev-freeze 
Shot airlock fix
 2015-01-07 06:02:06 +10:30
Zuhayr
ab711b5080 Merge pull request #7695 from Amunak/patch-1 
Makes LOOC dark turquoise, fixes #7681
 2015-01-07 04:33:56 +10:30
Zuhayr
0ace887633 Merge pull request #7714 from Zuhayr/dev-freeze 
Master into dev-freeze
 2015-01-07 03:45:33 +10:30
Zuhayr
cb88860f6b Merge resolution. 2015-01-07 03:43:12 +10:30
Mloc-Hibernia
96de9bba3b clear up licensing situation 
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>
 2015-01-06 16:25:22 +00:00
Tramziller
cb3ee040bc Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev-freeze 2015-01-06 16:53:33 +01:00
Mloc
7570cf7ea7 Merge pull request #7708 from comma/master 
Fixes #7707
 2015-01-06 15:28:32 +00:00
Mloc
f98187489c Merge pull request #7709 from GinjaNinja32/travis 
Remove step_[xy] from map files
 2015-01-06 15:28:14 +00:00
=
59752392cd Remove step_[xy] from map files 2015-01-06 11:16:56 +00:00
Chinsky
38c69bab64 Fixes #7707 2015-01-06 13:14:20 +03:00
Chinsky
cad18b6685 Merge pull request #7693 from Ccomp5950/master 
Changes Baystation12 to now be licensed under AGPL.
 2015-01-06 12:01:05 +03:00
Chinsky
fe91f23482 Merge pull request #7704 from Zuhayr/borers 
Borer tweaks
v1.0 		2015-01-06 11:43:43 +03:00
Chinsky
2c74be75da Merge pull request #7698 from Tramziller/Bugfixes 
Fixed bug of peridaxon healing robotic organs
 2015-01-06 11:36:45 +03:00
Chinsky
af555306c2 Merge pull request #7706 from SkyMarshal/patch-1 
Removes step_y variable.
 2015-01-06 11:34:06 +03:00
SkyMarshal
d1e918e203 Removes step_y variable. 2015-01-06 00:46:45 -07:00
Zuhayr
66759eff3c Adds Borer bantype, halves borer resist time, comments out Devour Brain verb, expands borer welcome text. 2015-01-06 11:11:34 +10:30
Tramziller
06e6277dc6 Fixed bug of peridaxon healing robotic organs 2015-01-05 22:17:40 +01:00
Mloc
fab16c79ed remove -q from grep in travis.yml step_* check 
This should let us know which maps are erroring.
 2015-01-05 20:15:07 +00:00
Tramziller
be48eccad2 Airlock that are BROKEN (shot or like) can have their electronics removed (for repairs) even when their bolts are dropped 2015-01-05 20:39:00 +01:00
ccomp5950
708a3b3fa7 More license stuffs. 2015-01-05 14:30:08 -05:00
Mloc
54e5ab1983 update step_* detection for new map setup 2015-01-05 19:12:41 +00:00
Amunak
c34a8ee859 Admin name colour msay colour fix 
Admin name colour in msay now matches their default OOC colour. Hopefully fixes some concerns presented in #7657.
 2015-01-05 18:40:52 +01:00
Amunak
e5512518bb Makes LOOC dark turquoise, fixes #7681 2015-01-05 13:48:22 +01:00
Zuhayr
6348253466 Merge pull request #7690 from hockeygoalie5/fixes 
Fixes #7665, #7653, #7677. Fixes wire colors.
 2015-01-05 23:04:35 +10:30
ccomp5950
6461beaf58 Changes Baystation12 to now be licensed under AGPL. 
See c4fbe8df34/LICENSE-GPL3.txt (L552) for why this is allowed.

The purpose is to close the loop hole of private downstream sources not sharing their code as we share ours.  As we share code with /tg/ it is also in our best interests to relicense so that this sharing of code doesn't become a one way street.
 2015-01-05 05:55:00 -05:00
mkalash
559e224446 Allows the autolathe maintenance panel to be accessed even if disabled. Fixes #7677. Adds feedback when a someone tries to interact with a disabled autolathe with the panel closed. 2015-01-04 22:43:20 -05:00