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
Chinsky
ca0eda6f9d
Merge pull request #6661 from PsiOmegaDelta/Fire
...
Can now de-construct fire alarms.
2014-10-11 19:58:08 +04:00
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
Chinsky
d3e19fb25a
Merge pull request #6652 from PsiOmegaDelta/Centcom
...
Fixes #6648
2014-10-11 02:46:49 +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
Zuhayr
d858f0fa01
Merge pull request #6638 from mwerezak/exo-suit
...
Fixes #6622
2014-10-11 06:07:20 +10:30
GinjaNinja32
1052c9a476
Fixes runtime caused by missing check in sleeper code
2014-10-10 15:53:11 +01:00
PsiOmega
b124644df4
Less relative paths. Less type checks.
2014-10-10 16:22:36 +02:00
PsiOmega
36c9f65bb1
Ports /tg's cable and powernet code to our code base.
2014-10-10 14:59:44 +02:00
mwerezak
cfd5bcb576
Force removing a passenger now has a delay
2014-10-09 00:33:59 -04:00
mwerezak
b774d35ebc
Fixes #6622
...
Toggling passenger compartment locks now displays a message.
2014-10-09 00:33:40 -04:00
Zuhayr
a8964b0435
Removed Taj hackfix
2014-10-09 06:20:15 +10:30
Zuhayr
d3566ecd62
Temp fix for Tajaran > Tajara breaking the whitelist.
2014-10-08 23:41:11 +10:30
Zuhayr
37cb78eefa
Fixes #6613 and #6492
2014-10-08 23:10:12 +10:30
Mloc
52d9004570
fixes #6301
...
fixes sdisability genes in general
Signed-off-by: Mloc <colmohici@gmail.com >
2014-10-08 10:21:36 +01:00
PsiOmega
66483cf6dd
Completes the transfer to the refreshed announcement system.
2014-10-07 13:19:20 +02:00
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
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
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
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
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
mwerezak
db113115c6
Allows removing passengers through maint protocols
2014-10-04 02:07:15 -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
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
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
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
mwerezak
3209f19304
Removes unused radio code, world print in forcesay
2014-10-01 21:49:24 -04:00
mwerezak
b88666895b
Allows properly keyed headsets to broadcast in robot talk and/or hivemind
...
Adds :0 speech code which activates radio-defined behaviour.
2014-10-01 21:39:02 -04: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
