Commit Graph

15053 Commits

Author SHA1 Message Date
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
305416d5c5 Merg resolution. 2014-10-02 02:33:06 +09:30
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
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
Mloc
bb2953b283 re-port trange() from tg
was lost in the multiz update

Signed-off-by: Mloc <colmohici@gmail.com>
2014-10-01 08:50:28 +01:00
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
Chinsky
701e97960a Merge pull request #6554 from PsiOmegaDelta/RoundEnd
Round-end summary now also lists job
2014-10-01 10:01:07 +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
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
61394d3921 fixes #6561
Signed-off-by: Mloc <colmohici@gmail.com>
2014-09-30 22:18:25 +01: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-Argent
4160488ed1 fix gas overlays persisting after rebuilds
slight visual artifact when zones are rebuilt, overlays will be
missing until the end of the current tick.  otherwise works fine.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-09-30 20:51:59 +01:00
Mloc-Argent
43546fe9f0 fix stretched lighting
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-09-30 20:51:58 +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
Ikmachek
a9e4f6f233 Merge branch 'master' of https://github.com/Ikmachek/Baystation12 2014-09-30 10:36:01 -04:00
Zuhayr
b411da44b8 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-09-30 23:23:05 +09:30
Ikmachek
adc147bcc0 Reduced vote alert noise by half, now easily editable by an arg 2014-09-30 09:28:51 -04:00
Mloc
484082230c fixes #6549
Signed-off-by: Mloc <colmohici@gmail.com>
2014-09-30 11:35:20 +01:00
Chinsky
db19505e10 Merge pull request #6544 from Jarcolr/customis
Adds *5* approved custom items to code
2014-09-30 12:21:04 +04:00
PsiOmega
4f7b32ae4f Round-end summary now also lists job 2014-09-30 10:07:59 +02: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
Iamgoofball
6a5821af8d "WAH WAH I'M TOO LAZY TO COPY PASTE AND REMOVE A FEW TABS" 2014-09-29 14:28:10 -07:00
RavingManiac
918520df83 Mobs will bob up and down in space and zero-gravity unless they are both wearing magboots and within 1 tile of a dense object/turf. 2014-09-30 01:22:13 +08:00
Gamerofthegame
33b9d19df1 Commit repair 2014-09-28 17:13:42 -04:00
Hubblenaut
c783549015 Option to withdraw chargecard or cash at ATM 2014-09-28 21:53:19 +02:00
Hubblenaut
e7620cd81a Spacecash is now stackable and called 'Thalers' 2014-09-28 21:52:56 +02:00
Hubblenaut
109ef9ac89 Adds gambling tables 2014-09-28 21:48:57 +02:00
Jarcolr
6a3f5d24d8 Adds 5 approved custom items to code
http://baystation12.net/forums/viewtopic.php?f=33&t=11097
http://baystation12.net/forums/viewtopic.php?f=33&t=11138
http://baystation12.net/forums/viewtopic.php?f=33&t=11300
http://baystation12.net/forums/viewtopic.php?f=33&t=11337
2014-09-28 21:31:24 +03:00
Chinsky
6eea41bcc1 Merge pull request #6535 from Hubblenaut/master
Fixes rolled down jumpsuits not adjusting body flags
2014-09-28 21:22:00 +04:00
Chinsky
104eb426d5 Merge pull request #6537 from mwerezak/flow-rate-meter
Fixes pressure regulator flow rate reporting
2014-09-28 21:21:26 +04:00
Zuhayr
97801b4617 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-09-29 00:39:43 +09:30
Boop
7116415e4d Fix meteors
yay
2014-09-28 15:59:02 +01:00
Hubblenaut
79c0d3470a Fixes non-used flavor text causing line breaks 2014-09-28 15:48:39 +02:00
Hubblenaut
1212338c2e Fixes rolled down jumpsuits now adjusting body flags 2014-09-28 15:48:38 +02:00
Zuhayr
afdcb1f564 Merge pull request #6518 from faerindel/adv_scanner_print
Adds printing occupant status option to bodyscanners.
2014-09-28 22:15:15 +09:30
Zuhayr
9a01da0519 Merge pull request #6437 from atlantiscze/Supermatter-O2-Fix
Supermatter Tweak
2014-09-28 22:12:21 +09:30