cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-24 17:11:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
20,760 Commits 74 Branches 23 Tags
59077c5b51ea74d74707779cad8dfa48813fe228
Commit Graph

9028 Commits

Author SHA1 Message Date
Chinsky
3c81881686 Merge pull request #6767 from PsiOmegaDelta/OutpostMining 
North Mining Outpost
 2014-10-19 01:42:41 +04:00
Chinsky
b610a78a3d Merge pull request #6769 from PsiOmegaDelta/Science 
HUD overlay improvements
 2014-10-19 01:42:39 +04:00
Chinsky
02a5226b8a Merge pull request #6772 from Zuhayr/master 
Fixes
 2014-10-19 01:42:36 +04:00
GinjaNinja32
e6c7713e02 Fix intent switching using Change-UI 2014-10-18 16:29:05 +01:00
Ravensdale
431d7a2581 Flower hairpin now works for ears and head slots 2014-10-17 20:12:03 -07:00
Zuhayr
bb0aa868f7 Amends a previous commit. 2014-10-18 08:42:28 +10:30
Zuhayr
678b278b12 Fixes #6683 2014-10-18 08:40:24 +10:30
Zuhayr
bce2059422 Fixes #6689 2014-10-18 08:37:23 +10:30
Zuhayr
96be563434 Fixes #6740 2014-10-18 08:03:46 +10:30
Zuhayr
e7e50e9f51 Fixes #6745 2014-10-18 07:57:18 +10:30
Zuhayr
dcca5ccb6e Fixes #6763 2014-10-18 07:52:27 +10:30
Zuhayr
08ca8e192a Fixes #6764 2014-10-18 07:38:33 +10:30
Zuhayr
9eb2809afb Fixes #6765 2014-10-18 07:34:46 +10:30
Hubblenaut
5cf2281db6 Hotfix for broken damage reading 2014-10-17 21:04:08 +02:00
PsiOmega
c4a9293727 HUD overlay improvements 
Reduces code duplication, increases code robustness, adds science googles overlay.
 2014-10-17 20:27:40 +02:00
PsiOmega
b9235571c4 Plops down a new mining outpost on the asteroid. 
Rather than having dirty miners inside the pure temple of science they now have a new tiny little outpost for their ore offloading needs.
 2014-10-17 13:49:18 +02:00
DJSnapshot
92ed4e5609 xenos need to hiss too 2014-10-16 22:09:48 -07:00
DJSnapshot
7ddd61b45c sanity check on facehuggers. 2014-10-16 21:56:43 -07:00
DJSnapshot
fc45762f18 removing world debug message. 2014-10-16 21:19:01 -07:00
Chinsky
1e8222c14f Merge pull request #6750 from Baystation12/dev-freeze 
Dev freeze -> Dev
 2014-10-16 20:07:35 +04:00
Zuhayr
839faaf5d9 Merge pull request #6737 from comma/conscience 
Couple o fixes
 2014-10-16 20:12:54 +10:30
Zuhayr
70dd21ab4c Fixes #6704 2014-10-16 15:04:47 +10:30
Zuhayr
00871b5207 Fixes #6724 2014-10-16 14:47:09 +10:30
Zuhayr
9563a54c7d Fixes #6725 2014-10-16 14:38:51 +10:30
Zuhayr
835e7b20c1 Possible fix for #6729 2014-10-16 14:16:44 +10:30
Zuhayr
87e0d89e58 Fixes #6726 2014-10-16 14:06:30 +10:30
Zuhayr
ca68281371 Fixes #6727 2014-10-16 14:06:16 +10:30
Zuhayr
adb58be3b0 Fixes #6728 2014-10-16 14:02:10 +10:30
Zuhayr
ff9bd99ee7 Fixes #6731 2014-10-16 13:51:25 +10:30
Zuhayr
b611d6515a Fixes #6732 2014-10-16 13:48:26 +10:30
Zuhayr
ffae0eee77 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 2014-10-16 13:39:00 +10:30
Mloc-Argent
4871a3a850 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/ATMOSPHERICS/pipes.dm
	icons/atmos/pipes.dmi
 2014-10-15 22:13:44 +01:00
Mloc-Argent
a18c147c37 Merge remote-tracking branch 'upstream/master' into dev 
Conflicts:
	code/ATMOSPHERICS/pipes.dm
	icons/atmos/pipes.dmi
 2014-10-15 14:40:42 +01:00
PsiOmega
1cabbbf5a6 Master controller no longer annihilate powernets, powernets annihilate themselves. 
Some misc. changes.
 2014-10-15 09:44:15 +02:00
PsiOmega
9bc9698998 Sets turn-off limits based on a standard cell's max charge 2014-10-15 08:14:10 +02:00
Zuhayr
ca13d1d5d8 Fixes chem splicing, bioluminescence and seed packets for xenobotany. 2014-10-15 10:05:50 +10:30
PsiOmega
9bcbdc6dc5 Fixes bad tabbing, only evident when placing Z-crossing cables. 2014-10-14 14:14:46 +02:00
PsiOmega
322e03dd06 Makes the number of load/storable character slots a configurable value. 2014-10-14 10:05:22 +02:00
Chinsky
17d5b1dab3 Fixes #6608 2014-10-14 02:19:12 +04:00
Mloc
be7d30630d Merge pull request #6697 from Zuhayr/dev-freeze 
Xenos fixes, dev freeze fixes.
 2014-10-13 22:25:22 +01:00
Chinsky
d4b7e2d84b Merge pull request #6709 from Mloc/bs12-server 
testing fix for nui resources
 2014-10-14 01:14:54 +04:00
Miniature
1bb1045eeb Fix biosuits hiding shoes when they should not, #6691 2014-10-14 06:29:40 +10:30
Miniature
894ae39f7f Fix for everyone dying if they don't eat 2014-10-14 05:36:47 +10:30
Mloc-Argent
61839da570 testing fix for nui resources 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-10-13 20:01:54 +01:00
PsiOmega
f190acf7c5 /tg/'s solar code with a fix for the solar control computer not refreshing on user input. 2014-10-13 17:37:18 +02:00
PsiOmega
a1ee4e766b Basically ripped over /tg/'s powernet and cable code into our own codebase. 
Keeps Z-level code as it was.
Modifies/restores powernet procs as necessary to match our own implementation changes.
 2014-10-13 17:13:04 +02:00
Zuhayr
01ddc9af6d Added binary to the AI. 2014-10-13 17:39:00 +10:30
Zuhayr
4c070bad02 Bunch of xeno fixes, details in PR. 2014-10-13 17:32:13 +10:30
Zuhayr
c5e2fa74e6 Fixes #6689 2014-10-13 17:16:23 +10:30
Zuhayr
06ad91f417 Fixes #6695 2014-10-13 17:00:26 +10:30