Commit Graph

8632 Commits

Author SHA1 Message Date
Zuhayr
a0ad04f520 Merge pull request #6564 from TwistedAkai/master
Add round start check to Declare Ready
2014-10-02 11:44:07 +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
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
Chinsky
a26185dd9e Merge pull request #6553 from atlantiscze/android-roundstart-fix
Android roundstart fix
2014-10-01 10:01:39 +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
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
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
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
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
9a01da0519 Merge pull request #6437 from atlantiscze/Supermatter-O2-Fix
Supermatter Tweak
2014-09-28 22:12:21 +09:30
Chinsky
a2351ab952 Merge pull request #6529 from mwerezak/language
Fixes #6520
2014-09-27 14:21:29 +04:00
mwerezak
7a2b3b6661 Fixes #6520 2014-09-27 03:00:26 -04:00
Zuhayr
b78e2b0c79 Fixes #6297 2014-09-25 21:49:20 +09:30
Zuhayr
9272bc4542 Fixes #6351 and #6350. 2014-09-25 21:19:35 +09:30
Zuhayr
c232b4e921 Fixes #5451 by stealing JimTheCactus' and VampyrBytes' work - thanks dudes. 2014-09-25 20:07:11 +09:30
Zuhayr
cddbce688d Fix for potential infinite splint farming exploit in previous commit. 2014-09-25 19:43:17 +09:30
Zuhayr
e41c584ace Fixes #6325 2014-09-25 19:33:46 +09:30
Zuhayr
6bdf515ef3 Makes species mutation a bit easier. 2014-09-25 18:48:29 +09:30
Zuhayr
7682711442 Fixes #6474 2014-09-25 18:45:27 +09:30
Zuhayr
8e9fc05b67 Fixes #6484 2014-09-25 18:36:25 +09:30
Zuhayr
b32d25b1bd Fixes #6503 2014-09-25 18:01:46 +09:30
Zuhayr
4e6afd282c Fixes #6488 2014-09-25 17:59:28 +09:30
Zuhayr
29c29cd408 Merge pull request #6482 from PsiOmegaDelta/pAI
pAI submission process change
2014-09-23 18:33:38 +09:30
Chinsky
7fcc04dc90 Merge pull request #6467 from mwerezak/stungloves
Removes Stungloves
2014-09-21 23:19:15 +04:00
Chinsky
1d3b1e6467 Merge pull request #6483 from GinjaNinja32/shelf
Fix for non-cancelable book removal from bookshelves
2014-09-21 23:18:42 +04:00
Chinsky
c46067ff59 Merge pull request #6472 from mwerezak/evidence-bags
Fixes Evidence Bags
2014-09-21 23:15:36 +04:00
GinjaNinja32
91a4bc356e Fix for non-cancelable book removal from bookshelves 2014-09-21 16:04:22 +01:00
PsiOmega
1e81d002aa pAI submission process change
Attempts  to fix  #6481.

Previously it appears observers would be asked once, and only once, if they wished to become a pAI.
If one closed the configuration window without pressing Submit you'd never get the chance to apply again.

Now asks observers every time someone requests a pAI, similar to posibrains and Dionaea pods.
There is already a built-in ask delay of one minute between such requests and ghosts can decide to opt out for the rest of the round.
2014-09-21 15:13:48 +02:00
Chinsky
77d45e8b4c Merge pull request #6461 from atlantiscze/freezer-board-fix
Freezer Heater Board Fix + Runtime Hotfix
2014-09-20 21:20:28 +04:00
Chinsky
965516b5a2 Merge pull request #6468 from atlantiscze/emagged-borg-fix
Emagged Cyborg Fix
2014-09-20 09:12:30 +04:00
mwerezak
47a7b2cc17 Fixes #6459 2014-09-20 01:06:05 -04:00
Atlantiscze
312089d366 Emagged Cyborg Fix
- Emagged cyborgs now can select their special weapon.
2014-09-20 03:11:06 +02:00
mwerezak
c02574c8c7 Removes stungloves 2014-09-19 20:12:46 -04:00
Chinsky
9e2dcc4e4a Merge pull request #6455 from Zuhayr/master
Calamity and hydro tweaks
2014-09-20 00:07:56 +04:00
Atlantiscze
16fe060f1a Freezer Heater Board Fix
- Freezer/Heater circuit boards now have proper build paths in Research
2014-09-19 16:28:38 +02:00
Chinsky
1cb8a3ee15 Merge pull request #6454 from PsiOmegaDelta/pAI
Attempts to fix #6344
2014-09-19 10:49:21 +04:00
Walter0o
89f87d2dfb borer restore and fixes
- tried to merge the upstream and my version for you as best as i could, my version does differs in quite a few places
- reactivates my ID and IP fixes, these are needed so an offline borer or host mob don't cause bans and multikey alerts to fuck up, worst case you perma a few innocent players thanks to lazy coding. also how could they possibly fuck up control transfer??
- fixes the client DC bug properly, caused by spawning the brainmob prematurely in New()
- removed the runtime-error-triggering organ check, all mob restriction checks if wanted should happen on infest
- adds say logging and missing input sanitation

next time please ask me if you have questions, instead of making master file accusation comments that i might never read.
2014-09-18 21:52:57 +02:00
Atlantiscze
1e946c4153 Adds two mwerezak's requests. 2014-09-18 19:23:00 +02:00
Zuhayr
4bedceca78 Hydro tweaks. 2014-09-18 21:45:12 +09:30
Zuhayr
39689f05c7 Removed borer from roundstart calamity, added it to the dynamic event handler. Increased event frequency. 2014-09-18 21:41:54 +09:30
PsiOmega
b56dfa34fe Attempts to fix #6344
pAI configurations are not added to the list of available candidates.
2014-09-18 13:21:58 +02:00
Chinsky
0f38431faf Merge pull request #6451 from Zuhayr/master
Adds random seeds to Cargo for Xenobotany.
2014-09-18 13:36:49 +04:00
Zuhayr
afde93e94d Adds random seeds to Cargo for Xenobotany. 2014-09-18 16:39:44 +09:30