Commit Graph

8009 Commits

Author SHA1 Message Date
Gamerofthegame
be8c62de7b Merge 2014-10-11 13:58:16 -04: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
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
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
dbff924849 fixes #6562
fixes #6571

Signed-off-by: Mloc <colmohici@gmail.com>
2014-10-01 17:48:17 +01:00
Zuhayr
3f05362577 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenorewrite 2014-10-01 18:16:04 +09:30
Chinsky
165bbadc10 Merge pull request #6551 from RavingManiac/dev
Space floating effect
2014-10-01 10:01:25 +04:00
Mloc
f9fa7efe6e fixes #6550
computer circuits now use paths instead of strings

Signed-off-by: Mloc <colmohici@gmail.com>
2014-09-30 23:48:54 +01:00
PsiOmega
f95d6f36b9 Manifest ghosts are now given an assigned role to go with the round end summary. 2014-10-01 00:22:13 +02:00
Mloc-Argent
3a0289d4ec fixes #6329
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-09-30 20:52:02 +01:00
Mloc-Argent
1bc57f43f6 optimize secbots a tiny bit
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-09-30 20:52:01 +01:00
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
Mloc
7a0b0c4369 fixes #6115
Signed-off-by: Mloc <colmohici@gmail.com>
2014-09-30 20:39:11 +01:00
Mloc
277335f487 fixes #6541
Signed-off-by: Mloc <colmohici@gmail.com>
2014-09-30 20:13:41 +01:00
Mloc
6a91020529 fixes #6540
Signed-off-by: Mloc <colmohici@gmail.com>
2014-09-30 20:13:03 +01:00
Mloc
8c2c16cd1e fix #6555
Signed-off-by: Mloc <colmohici@gmail.com>
2014-09-30 19:25:37 +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
PsiOmega
4f7b32ae4f Round-end summary now also lists job 2014-09-30 10:07:59 +02:00
Zuhayr
e2ce1fa2df Collapsed Bump() down to carbon from alien and monkey. Stripped out extraneous stuff from carbon/alien HUD. Implemented some life stuff for aliens. 2014-09-30 15:28:30 +09:30
Zuhayr
b4646b65e8 Fixed up organ transplant rejection, added cortical stacks, changed vox over to use organ stacks. 2014-09-30 14:09:41 +09:30
Zuhayr
70eedc3486 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenorewrite 2014-09-30 12:18:16 +09:30
Zuhayr
a0d23b3800 Reimplements ninja and cult species rarity bonuses. 2014-09-30 12:17:33 +09:30
Zuhayr
051a6ff18b Fixed a message issue with turrets. 2014-09-30 10:48:18 +09:30
Iamgoofball
6a5821af8d "WAH WAH I'M TOO LAZY TO COPY PASTE AND REMOVE A FEW TABS" 2014-09-29 14:28:10 -07:00