Zuhayr
df038c9fe8
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev
2014-10-06 20:15:59 +10:30
Zuhayr
d0b3a3a39b
Merge pull request #6601 from Mloc/bs12-calert
...
donut boxes now update their icon to properly reflect their contents
2014-10-06 19:37:24 +10:30
Mloc
9faec14707
donut boxes now update their icon to properly reflect their contents
...
Signed-off-by: Mloc <colmohici@gmail.com >
2014-10-05 19:24:30 +01:00
Zuhayr
77917fb2c4
Merge pull request #6584 from Iamgoofball/patch-6
...
quick fix for #6498
2014-10-05 10:10:50 +10:30
Chinsky
41ce4fc57d
Merge pull request #6588 from RavingManiac/dev
...
Sniper scope improvements, binoculars
2014-10-05 03:37:33 +04:00
Zuhayr
fe950a6457
Merge pull request #6589 from Gamerofthegame/Project-Thief
...
Project thief
2014-10-05 10:05:39 +10:30
GinjaNinja32
a1c12bdaab
Fixes #6591
2014-10-04 18:23:29 +01: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
Chinsky
06126c4f69
Merge pull request #6594 from mwerezak/runtime
...
Fixes #6592
2014-10-04 13:03:58 +04:00
mwerezak
d721673d8d
Fixes #6592
2014-10-04 02:11:51 -04:00
mwerezak
db113115c6
Allows removing passengers through maint protocols
2014-10-04 02:07:15 -04:00
Gamerofthegame
40b73c5538
Fixes compile error
2014-10-03 17:24:40 -04:00
Gamerofthegame
447083d94c
Adjusts bomberjacket
2014-10-03 16:11:11 -04:00
RavingManiac
2aab019cba
Binoculars zoom no longer a right-click menu option. Already supplanted by attack_self().
2014-10-04 04:05:26 +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
Snapshot
9162a183eb
Merge pull request #6586 from Mloc/bs12-fan
...
fixes #6035
2014-10-03 07:32:42 -07:00
PsiOmega
1905100909
Merge remote-tracking branch 'upstream/dev' into Central
2014-10-03 13:40:18 +02:00
Chinsky
d79e8b4978
Merge pull request #6581 from PsiOmegaDelta/ChargingLasah
...
Fixes #6575 and a few other issues
2014-10-03 15:34:18 +04:00
PsiOmega
ae5ff3972a
Merge remote-tracking branch 'upstream/dev' into Central
2014-10-03 13:20:25 +02:00
PsiOmega
e1168271c8
Divides central primary hallway
...
Divides central primary hallway into 3 area-sub sections, reducing the impact of automatic breach control, etc.
2014-10-03 10:38:39 +02:00
Iamgoofball
a5dacfc5bd
Update boxes.dm
2014-10-02 16:35:44 -07:00
Iamgoofball
29621e9f2c
quick fix for #6498
2014-10-02 16:34:48 -07:00
Zuhayr
e283fa850f
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
2014-10-03 06:58:53 +09:30
Mloc
87a0b4b6c7
Merge pull request #6580 from PsiOmegaDelta/Detomax
...
Fixes #6546
2014-10-02 21:21:44 +01:00
PsiOmega
548985c40b
Fixes #6575 and a few other issues
...
E-magging a bot, any bot, now produces adming logs.
Now plays a sound when an ED-209 fires its laser.
ED-209 no longer transform into Beepsky when attacking simple animals
ED-209 can again use its laser.
2014-10-02 20:22:01 +02:00
Mloc
37b5aa1c50
fixes #6035
...
Signed-off-by: Mloc <colmohici@gmail.com >
2014-10-02 13:26:28 +01:00
Zuhayr
61c0f6e1b7
Merge pull request #6574 from Mloc/bs12-fan
...
more fixes
2014-10-02 19:04:07 +09:30
PsiOmega
fd060cc5fe
Fixes #6546
...
Replaces iffy cartridge type checks with access checks.
2014-10-02 09:29:04 +02:00
PsiOmega
e9581c823c
Fixes the CMO's doors
...
The CMO's remote door control should now work again.
The CMO's doors are now powered by the ACP in his office.
The command staff now have offices, don't quarters. Felt a bit generous to call them such.
2014-10-02 08:21:08 +02:00
Zuhayr
c3c5c68890
Merge pull request #6576 from GinjaNinja32/anomaly
...
Changes Alden-Saraspova behaviour to wait for new results before outputting
2014-10-02 12:17:52 +09:30
Zuhayr
a0ad04f520
Merge pull request #6564 from TwistedAkai/master
...
Add round start check to Declare Ready
2014-10-02 11:44:07 +09:30
GinjaNinja32
2b16022ee0
Changes Alden-Saraspova counter behaviour to wait for new results before outputting
2014-10-01 22:32:45 +01:00
Mloc
2c750e49fd
fixes #6572
...
Signed-off-by: Mloc <colmohici@gmail.com >
2014-10-01 19:57:14 +01:00
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
Mloc
58953a3d31
fixes #6499
...
Signed-off-by: Mloc <colmohici@gmail.com >
2014-10-01 17:48:21 +01:00
Mloc
dbff924849
fixes #6562
...
fixes #6571
Signed-off-by: Mloc <colmohici@gmail.com >
2014-10-01 17:48:17 +01:00
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
Chinsky
dd9b3fe613
Merge pull request #6565 from Mloc/bs12-fan
...
small fixes 2
2014-10-01 13:39:35 +04:00
Chinsky
a3dba06c0e
Merge pull request #6563 from mwerezak/cargo
...
Fixes supply shuttle state when returning
2014-10-01 13:39:29 +04:00
Zuhayr
c3e63b1ad0
Merge pull request #6560 from Mloc/bs12-efab
...
small fixes
2014-10-01 18:52:59 +09:30
Mloc
ee4eafa660
fixes #6090
...
Signed-off-by: Mloc <colmohici@gmail.com >
2014-10-01 10:17:55 +01:00
Mloc
d43dbaa7b5
resolves #6260
...
chance was being checked twice, for some reason.
Signed-off-by: Mloc <colmohici@gmail.com >
2014-10-01 10:13:15 +01:00
Zuhayr
cc21a1b405
Muzzle check/changeling check removal, thanks Harpy.
2014-10-01 18:32:24 +09:30
Mloc
39781326cc
fix for artifact teleportation effect
...
will no longer teleport you inside random objects.
Signed-off-by: Mloc <colmohici@gmail.com >
2014-10-01 09:54:39 +01:00
Zuhayr
3f05362577
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenorewrite
2014-10-01 18:16:04 +09:30
