Commit Graph

20061 Commits

Author SHA1 Message Date
Hubblenaut
109ef9ac89 Adds gambling tables 2014-09-28 21:48:57 +02:00
Zuhayr
0f1e893783 Merge pull request #6543 from Zuhayr/dev
Dev
2014-09-29 00:41:43 +09:30
Zuhayr
97801b4617 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-09-29 00:39:43 +09:30
Mloc
302d854514 Merge pull request #6542 from boopcat/boom
Fix meteors
2014-09-28 15:58:53 +01:00
Boop
7116415e4d Fix meteors
yay
2014-09-28 15:59:02 +01: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
Zuhayr
e4086b3baf Merge pull request #6524 from Mordeth221/dev
Added helm for use in events and other things
2014-09-28 22:05:34 +09:30
Snapshot
e70afe0413 Merge pull request #6522 from PsiOmegaDelta/Misc
Misc changes
2014-09-27 10:57:52 -07:00
Chinsky
a908dc4abc Merge pull request #6519 from PsiOmegaDelta/HatePipes
BYOND Akbar
2014-09-27 14:23:37 +04:00
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
PsiOmega
778f47649c Departments now have their air/scrubber pipes routed through relevant substations. 2014-09-26 23:21:40 +02:00
Mordeth221
4e8f57cd2d Added helm for use in events and other things 2014-09-26 17:30:41 +01: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
igalan
52caa42e8e Split fetching data and its formatting to separate procs. 2014-09-26 00:50:05 +01:00
Chinsky
ae0b48938d Merge pull request #6509 from mwerezak/door-message
Updates synth airlock interface messages
2014-09-26 00:44:04 +04:00
PsiOmega
10fc2eda11 Merge remote-tracking branch 'upstream/dev' into HatePipes 2014-09-25 22:36:07 +02:00
PsiOmega
fe965845f8 Re-pipes the station using the new overlapping supply/scrubber pipes
Pipes pulled through maintenance where possible, intentionally making them more busy.
No pipes under walls where at all avoidable.
Xeno/Virology "scrubber" pipes now have their own color.
2014-09-25 22:25:42 +02:00
igalan
2c1618bdd7 Adds printing occupant status option to bodyscanners. 2014-09-25 20:04:34 +01:00
Zuhayr
58dfc2a154 Merge pull request #6516 from Zuhayr/dev
Dev
2014-09-25 23:55:19 +09:30
Zuhayr
cc52be3192 Merge resolution, replaced 2 wires lost in map merge. 2014-09-25 23:54:24 +09:30
Chinsky
30ee4d1871 Merge pull request #6515 from Zuhayr/master
Fixes
2014-09-25 16:21:57 +04:00
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
Chinsky
ba2b04d188 Merge pull request #6514 from PsiOmegaDelta/CMO
Fixes  #6508
2014-09-25 15:51:00 +04:00
Zuhayr
9272bc4542 Fixes #6351 and #6350. 2014-09-25 21:19:35 +09:30
PsiOmega
26b6126f94 Fixes #6508
Re-arranges the CMO's office.
Adds a requested washing machine on the research outpost.
2014-09-25 13:32:58 +02:00
Chinsky
e08cea2b6f Merge pull request #6512 from Zuhayr/master
Fixes/ninja buffs.
2014-09-25 15:25:00 +04:00
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
mwerezak
e6154d5097 Updates synth airlock interface messages 2014-09-24 19:14:40 -04:00
Zuhayr
9ad3be38c6 Merge pull request #6487 from PsiOmegaDelta/MapCleanup
Map fixes
2014-09-25 05:54:12 +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
Zuhayr
7b45c03d0a Merge pull request #6493 from Zuhayr/dev
Dev
2014-09-24 22:06:07 +09:30
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