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
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
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
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
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
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
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
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
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
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
mwerezak
d81670edfb
Fixes supply shuttle state when returning
...
When returning to centcom, the supply shuttle's state was not being set
to INTRANSIT.
2014-10-01 00:48:16 -04:00
Mloc
61394d3921
fixes #6561
...
Signed-off-by: Mloc <colmohici@gmail.com >
2014-09-30 22:18:25 +01: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
Chinsky
db19505e10
Merge pull request #6544 from Jarcolr/customis
...
Adds *5* approved custom items to code
2014-09-30 12:21:04 +04:00
Atlantiscze
ff9f79acfc
Cleaner version of previous commit.
2014-09-30 09:15:21 +02:00
Atlantiscze
8d58fc2e97
Android Roundstart NameFix
...
- Positronic Brains in Androids now have proper posibrain-like name, instead of using MMI-like name.
- Example: (Tes Ter -> SINA-123)
2014-09-30 08:56:28 +02:00
Zuhayr
bab862f24c
Readded transform procs for xenos.
2014-09-30 16:07:47 +09:30
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
