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
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
92c92753fb
Manual icon file merge.
2014-10-11 06:40:36 +10:30
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
Mloc
5b71ca0aeb
fixes #6200
...
Signed-off-by: Mloc <colmohici@gmail.com >
2014-10-09 12:35:11 +01: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
Snapshot
ee72baac69
Merge pull request #6618 from Zuhayr/dev
...
Bunch of minor fixes for xenomorphs and borer husks.
2014-10-06 16:36:30 -07:00
Zuhayr
8841e9282f
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev
2014-10-07 10:06:03 +10:30
Zuhayr
2b3e3667d4
Minor fixes for previous commit, implemented default species languages.
2014-10-07 09:51:48 +10:30
Zuhayr
96e57fc091
Bunch of minor fixes for xenomorphs and borer husks.
2014-10-07 08:54:05 +10:30
PsiOmega
d6030024d1
Fixes #6180
...
Changing AI eye location now disables tracking by default, unless explicitly stated otherwise.
2014-10-06 15:57:52 +02:00
Zuhayr
df038c9fe8
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev
2014-10-06 20:15:59 +10:30
Chinsky
41ce4fc57d
Merge pull request #6588 from RavingManiac/dev
...
Sniper scope improvements, binoculars
2014-10-05 03:37:33 +04:00
GinjaNinja32
24d43ef509
Fixes #6597
2014-10-04 18:15:13 +01:00
GinjaNinja32
9ac8f3ccef
Fixes #6587 and #6590
2014-10-04 17:57:37 +01:00
RavingManiac
756e9ae030
Zooming with an item is now done with a general proc zoom(). This applies to binoculars and sniper rifle.
2014-10-04 17:38:38 +08:00
Gamerofthegame
a47ec82103
Merge repair
2014-10-03 16:04:31 -04:00
RavingManiac
f0da0380a5
Sniper rifle zoom now adds a client.pixel_x/y offset in addition to zoom. Currently 11 tiles in the direction the user is facing. Zooming can now be done through the right-click menu.
...
Binoculars added. Functionally similar to sniper scope. Adminspawn-only as of this commit.
2014-10-04 04:01:56 +08:00
Zuhayr
a0ad04f520
Merge pull request #6564 from TwistedAkai/master
...
Add round start check to Declare Ready
2014-10-02 11:44:07 +09:30
Zuhayr
6c96f3d66b
Merge branch 'xenorewrite' of https://github.com/Zuhayr/Baystation12 into dev
2014-10-02 02:39:37 +09:30
Zuhayr
305416d5c5
Merg resolution.
2014-10-02 02:33:06 +09:30
Zuhayr
3fd8b64f86
Added new diona icons, added heat to alien life(), added fire indicator.
2014-10-01 22:21:34 +09:30
Akai Alonkai
4c5665d4fd
Add round start check to Declare Ready
...
Added a check to 'declare ready' to prevent readying up after the round
started. Allowing this to happen caused a bug where the player would be
unable to change their character setup if they declared ready after the
round started, such as to look at the manifest to see which character
would be best to play, until after reconnecting.
2014-10-01 06:16:29 -04:00
Zuhayr
c3e63b1ad0
Merge pull request #6560 from Mloc/bs12-efab
...
small fixes
2014-10-01 18:52:59 +09:30
Zuhayr
cc21a1b405
Muzzle check/changeling check removal, thanks Harpy.
2014-10-01 18:32:24 +09:30
Zuhayr
3f05362577
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenorewrite
2014-10-01 18:16:04 +09:30
Chinsky
a26185dd9e
Merge pull request #6553 from atlantiscze/android-roundstart-fix
...
Android roundstart fix
2014-10-01 10:01:39 +04:00
Chinsky
165bbadc10
Merge pull request #6551 from RavingManiac/dev
...
Space floating effect
2014-10-01 10:01:25 +04:00
Zuhayr
d7e2c0fac9
Merge branch 'xenorewrite' of https://github.com/Zuhayr/Baystation12 into xenorewrite
2014-10-01 06:06:10 +09:30
Mloc-Argent
6fb1667b44
fixes #4742
...
not a full fix, there's too many small cases where OPENCONTAINER
isn't checked, but this is everything in the report
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-09-30 20:52:00 +01:00
RavingManiac
66527ab763
gravitychange() now makes all affected mobs have the floating animation unless magbooted, etc.
...
New mob proc Check_Dense_Object() seperated from Process_Spacemove(), checks for adjacent objects or turfs that can be pushed off, also handles magboots on gravity-less floors.
2014-09-30 23:18:04 +08:00
RavingManiac
c4875e7d36
Floating effect now uses animate() instead of pixel_y while loop thingy.
...
Distinct actions that indefinitely change a mob's pixel_y or pixel_x, like strapping someone to a roller bed, should also alter new variables old_y or old_x accordingly. This means that floating and jittering animations no longer interfere, as the animations use old_x/old_y as the "base" position.
Entering areas with gravity from areas without grabity now removes floating effect.
2014-09-30 22:37:48 +08:00
Zuhayr
b411da44b8
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev
2014-09-30 23:23:05 +09:30
