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
mwerezak
e53bd0e237
Merge remote-tracking branch 'upstream/dev' into faxmachine
2014-10-15 21:12:21 -04:00
mwerezak
b0cdcc9796
Adds photocopier based faxmachine, removes redundant photocopier vars
2014-10-15 21:07:57 -04:00
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
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
fa51820244
Fixes #6684
2014-10-13 11:19:12 +10:30
Zuhayr
9c39936640
Fixes #6682
2014-10-13 11:10:46 +10:30
DJSnapshot
b53a89e608
disable typing indicator.
2014-10-12 17:22:30 -07:00
Chinsky
7a6722bc31
Merge pull request #6681 from Baystation12/dev-freeze
...
Dev freeze -> Dev
2014-10-13 03:15:44 +04:00
PsiOmega
ef9cc80603
Adds diagonal cable check on breaker box state change.
2014-10-12 12:55:19 +02:00
PsiOmega
f6bab1bd08
Cherry picking breaker box fix.
2014-10-12 12:49:56 +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
Zuhayr
413af81b80
Fixes humans being able to shred everything with their teeth.
2014-10-12 13:28:46 +10:30
Zuhayr
6d1fd2886b
Added goddamn atrocious wig for Earthcrusher.
2014-10-12 11:58:58 +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
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
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
GinjaNinja32
08b967c9e0
Move NanoUI cache update to client/New()
2014-10-11 18:40:09 +01: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
92c92753fb
Manual icon file merge.
2014-10-11 06:40:36 +10:30
Hubblenaut
37b7c17abd
Tweaks and improvements to cards
2014-10-10 18:22:29 +02:00
PsiOmega
36c9f65bb1
Ports /tg's cable and powernet code to our code base.
2014-10-10 14:59:44 +02:00
mwerezak
7a81e116d2
Fixes #6647
...
grabbed_by assignment is now done in the grab constructor, instead of
leaking out all over the place.
2014-10-10 00:23:03 -04:00
Snapshot
e67e37b010
Merge pull request #6640 from Mloc/bs12-overflow
...
fixes #6200
2014-10-09 20:44:25 -07:00
Zuhayr
4223cc6596
Merge pull request #6642 from DeeUnderscore/fix-disposal-bin
...
Fix detached disposal bins never changing to attached
2014-10-10 09:31:28 +10:30
D Anzorge
7c8e810774
Fix detached disposal bins never changing to attached
2014-10-09 08:09:04 -04:00
