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
Zuhayr
45d6d6a610
Added Galactic Common to the AI.
2014-10-13 16:45:58 +10:30
Snapshot
9a706864b3
Merge pull request #6688 from Zuhayr/dev-freeze
...
Dev freeze fixes
2014-10-12 18:07:34 -07:00
Zuhayr
cd2b5e761d
Fixes being unable to knock on windows.
2014-10-13 11:21:37 +10:30
Zuhayr
fa51820244
Fixes #6684
2014-10-13 11:19:12 +10:30
Zuhayr
9c39936640
Fixes #6682
2014-10-13 11:10:46 +10:30
Zuhayr
ea5b9e399b
Merge pull request #6685 from DJSnapshot/dev-freeze
...
Better typing sprite and disabling the typing indicator
2014-10-13 11:08:57 +10:30
DJSnapshot
b53a89e608
disable typing indicator.
2014-10-12 17:22:30 -07:00
DJSnapshot
32a765e7e3
Better typing sprite
2014-10-12 16:37:21 -07:00
Chinsky
4ec1ff12bc
Merge pull request #6679 from PsiOmegaDelta/ERTEngineers
...
Fixes engineering ERT loadout area
2014-10-13 02:17:25 +04:00
PsiOmega
fa891ad147
Fixes engineering ERT loadout area
...
ERT engineers had to climb over a table to be able to reach all their gear.
Re-organizes the area to avoid this.
2014-10-12 21:02:32 +02:00
Chinsky
e83313cb75
Merge pull request #6678 from PsiOmegaDelta/BreakerInit
...
Breaker fixes and map changes
2014-10-12 19:55:33 +04:00
PsiOmega
74e0c002de
NanoMap update.
2014-10-12 13:02:33 +02:00
PsiOmega
36abc43a7a
Map alterations. Fixes #6677 .
...
Re-organizes maintenance areas, adds missing air alarms, lights and cameras to substations.
Re-adds a number of suddenly missing power cables, mainly affecting security.
Replaces a few instances of blood on the station with oil. Having round-start blood in secluded areas would get annoying fast..
2014-10-12 12:44:13 +02:00
PsiOmega
988d07cefe
Hopefully fixes #6674
...
Breaker boxes would not always place down all the cables necessary to connect power grids on server start.
Moving initialization from the New() to the initialize() appears to have resolved this.
2014-10-12 12:41:38 +02:00
Chinsky
9c10637bac
Merge pull request #6675 from Zuhayr/dev-freeze
...
Fixes humans being able to shred everything with their teeth.
2014-10-12 07:07:55 +04:00
Zuhayr
413af81b80
Fixes humans being able to shred everything with their teeth.
2014-10-12 13:28:46 +10:30
Zuhayr
4cdc0723e5
Merge pull request #6669 from Baystation12/dev
...
Moving substation mapfixes onto dev-freeze
2014-10-12 12:10:06 +10:30
Zuhayr
3ac3f793cd
Merge pull request #6663 from Zuhayr/dev
...
Updating dev
2014-10-12 12:01:59 +10:30
Zuhayr
c9e948095c
Thought I had done these before, turned out I did. Single-linebreak conflicts woo.
2014-10-12 11:55:33 +10:30
Zuhayr
7fe4143f5b
Merge pull request #6670 from Zuhayr/dev-freeze
...
Dev freeze
2014-10-12 11:51:58 +10:30
Zuhayr
5989a0c625
Alien attack_hand() conflicts out the wazoo. I thought I already did these but that may have been on an unmerged branch. Burn that bridge when I come to it.
2014-10-12 11:48:54 +10:30
Zuhayr
9dae071eae
Merge pull request #6637 from Gamerofthegame/mapwork
...
Map update - Powerstations and more!
2014-10-12 11:38:09 +10:30
Chinsky
23217e8dfd
Merge pull request #6667 from PsiOmegaDelta/NanoMoney
...
Fixes #6665
2014-10-11 23:09:25 +04:00
PsiOmega
db4a1f6a23
Fixes #6665
...
Another missing data reference.
2014-10-11 20:28:05 +02:00
Zuhayr
72924e80a5
Merge pull request #6666 from GinjaNinja32/nanoui
...
Move NanoUI cache update to client/New()
2014-10-12 04:40:34 +10:30
Gamerofthegame
be8c62de7b
Merge
2014-10-11 13:58:16 -04:00
Gamerofthegame
df76652d78
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into working
...
Conflicts:
nano/images/nanomap_z1.png
2014-10-11 13:56:11 -04:00
GinjaNinja32
08b967c9e0
Move NanoUI cache update to client/New()
2014-10-11 18:40:09 +01:00
Chinsky
7bc12ad699
Merge pull request #6658 from Zuhayr/dev-freeze
...
Fixes
2014-10-11 20:08:50 +04:00
Chinsky
ca0eda6f9d
Merge pull request #6661 from PsiOmegaDelta/Fire
...
Can now de-construct fire alarms.
2014-10-11 19:58:08 +04:00
Zuhayr
979a745d97
Merge pull request #6662 from Zuhayr/dev
...
Dev
2014-10-12 02:10:40 +10:30
Zuhayr
409be10611
merge resolution, mostly removing attack_alien() from modified files.
2014-10-12 02:09:54 +10:30
Zuhayr
840c018689
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev
2014-10-12 02:06:27 +10:30
PsiOmega
43e8c33cae
Can now de-construct fire alarms.
2014-10-11 11:19:06 +02:00
Zuhayr
6eb60a5278
Merge pull request #6659 from comma/dammitmloc-freeze
...
Fix for say hotkey T not triggering typing indicator
2014-10-11 09:29:04 +10:30
Chinsky
d3e19fb25a
Merge pull request #6652 from PsiOmegaDelta/Centcom
...
Fixes #6648
2014-10-11 02:46:49 +04:00
Chinsky
3918518f5f
Merge pull request #6653 from GinjaNinja32/sleeper
...
Fixes runtime caused by missing check in sleeper code
2014-10-11 02:46:44 +04:00
Chinsky
b48e4c2254
Merge pull request #6654 from PsiOmegaDelta/Shuttle
...
Fixes shuttle control NanoUI issue
2014-10-11 02:46:40 +04:00
Chinsky
513df67d5f
Merge pull request #6650 from mwerezak/grab
...
Fixes #6647
2014-10-11 02:44:59 +04:00
Zuhayr
9b23315359
Fixes #6644
2014-10-11 07:44:48 +10:30
Zuhayr
d278e496ee
Fixes #6645
2014-10-11 06:58:44 +10:30
Zuhayr
3fc7414cfd
Fixes #6656
2014-10-11 06:52:20 +10:30
Zuhayr
10b6b887bd
Merge pull request #6657 from Zuhayr/dev-freeze
...
Dev freeze
2014-10-11 06:44:05 +10:30
Zuhayr
92c92753fb
Manual icon file merge.
2014-10-11 06:40:36 +10:30
Zuhayr
d858f0fa01
Merge pull request #6638 from mwerezak/exo-suit
...
Fixes #6622
2014-10-11 06:07:20 +10:30
Chinsky
60b0949f82
Merge pull request #6655 from Hubblenaut/dev-freeze
...
Tweaks and improvements to cards
2014-10-10 20:34:14 +04:00
