Commit Graph

14992 Commits

Author SHA1 Message Date
Snapshot
e70afe0413 Merge pull request #6522 from PsiOmegaDelta/Misc
Misc changes
2014-09-27 10:57:52 -07:00
PsiOmega
778f47649c Departments now have their air/scrubber pipes routed through relevant substations. 2014-09-26 23:21:40 +02:00
PsiOmega
9728061e40 Doubles the amount of camera locations an AI can store 2014-09-26 17:32:10 +02:00
PsiOmega
a8bf58e613 Emergency shutters no longer make the most important admin logs in the world. 2014-09-26 17:31:51 +02:00
Zuhayr
cc52be3192 Merge resolution, replaced 2 wires lost in map merge. 2014-09-25 23:54:24 +09:30
Zuhayr
b78e2b0c79 Fixes #6297 2014-09-25 21:49:20 +09:30
Chinsky
5b29615c74 Merge pull request #6504 from PsiOmegaDelta/LessWhine
Medbot now less of a Nagbot
2014-09-25 15:52:29 +04:00
Zuhayr
9272bc4542 Fixes #6351 and #6350. 2014-09-25 21:19:35 +09:30
Zuhayr
9bb4ebe205 Minor name fix from VampyreBytes/Paradise. 2014-09-25 20:07:37 +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
86ce5c19e2 Fixes #6495 2014-09-25 18:33:42 +09:30
Zuhayr
239c380364 Fixes #6466 2014-09-25 18:32:51 +09:30
Zuhayr
e024ef3876 Fixes #6401 2014-09-25 18:28:14 +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
25515e9afc Merge pull request #6502 from PsiOmegaDelta/MapFixes
Post-dev/master merge map fixes
2014-09-25 05:53:46 +09:30
Chinsky
69ed2317bf Merge pull request #6428 from atlantiscze/cyborg-power
Cyborg power overhaul
2014-09-25 00:19:13 +04:00
PsiOmega
63d2678c3e Medbot now less of a Nagbot
No longer relies on spawn()
Increased chatter delay.
Points and speaks at the same time.
2014-09-24 16:45:53 +02:00
PsiOmega
93ef5dbe2f Map fixes
Restores maintenance areas to the new variants.
The HoP's office is no longer a crew sleeping quarter.
Fixes disconnected power cables all over the place.
Connects the engineering power monitor to the main/red power grid.
Emergency shutters.
New icon for the research dock.
2014-09-24 15:59:08 +02:00
Atlantiscze
e7f3533158 Cyborg Lights
- Cyborg lights now use the reworked power system.
- Removed flashlight from cyborg modules, replaced with integrated light.
- "toggle-lights" verb is added for cyborgs, which de/activates the integrated light. Uses 30W (*modifier) of power when active.
- Cyborg lights have luminosity of 6 (flashlight has 4).
2014-09-24 09:41:19 +02:00
Zuhayr
0c83a95b90 Large merge resultion. Used remote for map conflicts. 2014-09-23 21:41:54 +09:30
Zuhayr
29c29cd408 Merge pull request #6482 from PsiOmegaDelta/pAI
pAI submission process change
2014-09-23 18:33:38 +09:30
GinjaNinja32
37d3418688 Fix runtime due to processing hydrotray at loc=null 2014-09-22 18:42:02 +01:00
mwerezak
efbe5dcf67 Merge remote-tracking branch 'upstream/master' into escape-pod 2014-09-21 15:33:28 -04:00
Chinsky
7f8555afd1 Merge pull request #6478 from atlantiscze/world-remove
world << removal
2014-09-21 23:19:59 +04:00
Chinsky
4dfe850033 Merge pull request #6473 from mwerezak/atmos
Fixes #6470
2014-09-21 23:19:37 +04:00
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
Atlantiscze
19864ff3fe world << removal
- Removes world << which was triggered by robotic reset modules.
2014-09-21 04:09:01 +02:00
mwerezak
dd1b4b00d6 Fixes map area issues
Replaces missing station escape pod area, removes random security office
area in maintenance and replaces it with maintenance area, and splits
research dock off onto it's own area.
2014-09-20 20:19:56 -04:00
Chinsky
c529e014a7 Merge pull request #6462 from PsiOmegaDelta/Ion
AI restoration console shows ion laws
2014-09-20 21:20:33 +04: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
PsiOmega
03a293d226 AI restoration console shows ion laws
AI restoration console now displays ion laws just as the intelliCard does.
Fixes a minor problem with the intelliCard not adding newlines after ion laws.
2014-09-20 10:42:41 +02:00
mwerezak
14a213dd86 Fixes #6470 2014-09-20 01:45:06 -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
e479e4371c Runtime Hotfix
- Fixes RE's when building certain machines.
- Fixes #6441
2014-09-19 17:26:19 +02: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