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
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
Zuhayr
ca13d1d5d8
Fixes chem splicing, bioluminescence and seed packets for xenobotany.
2014-10-15 10:05:50 +10:30
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
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
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
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
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
Mloc
5b71ca0aeb
fixes #6200
...
Signed-off-by: Mloc <colmohici@gmail.com >
2014-10-09 12:35:11 +01:00
PsiOmega
3560531d58
Silicons attempting to delete camera images no longer causes runtime errors
2014-10-09 08:21:07 +02:00
Gamerofthegame
02d539eb99
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into working
2014-10-08 18:48:59 -04:00
Zuhayr
4e5d8b787e
Minor change based on diff
2014-10-09 06:18:49 +10:30
Gamerofthegame
dd32255c0f
Adds another AI sprite
2014-10-08 14:39:02 -04:00
Zuhayr
37cb78eefa
Fixes #6613 and #6492
2014-10-08 23:10:12 +10:30
Zuhayr
1249fb0592
Fixes #6628
2014-10-08 21:18:00 +10:30
Zuhayr
31a12a144d
Merge pull request #6624 from PsiOmegaDelta/Vox
...
Fixes #6609 , supplements #6610
2014-10-08 17:10:02 +10:30
Zuhayr
a730561b76
Merge pull request #6621 from Raptor1628/master
...
Custom item fixes/adjustments
2014-10-08 00:30:24 +10:30
Zuhayr
51e7f95b72
Merge pull request #6610 from SparklySheep/patch-7
...
Replaces Vox telebaton with a stun baton
2014-10-08 00:30:02 +10:30
PsiOmega
02717d263a
Fixes #6609 , supplements #6610
...
Haphazardly adds a cell charger and normal recharger to the vox skipjack, along with an extra screwdriver.
Vox and Syndicate armor siemens coefficient changed to match ERT.
Replaced all mapped instances of the stunbaton to loaded variants. Gave people on the Research Outpost a way to recharge their baton.
2014-10-07 15:05:41 +02:00
Zuhayr