Commit Graph

7954 Commits

Author SHA1 Message Date
Hubblenaut
109ef9ac89 Adds gambling tables 2014-09-28 21:48:57 +02: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
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
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
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
igalan
2c1618bdd7 Adds printing occupant status option to bodyscanners. 2014-09-25 20:04:34 +01:00
Zuhayr
cc52be3192 Merge resolution, replaced 2 wires lost in map merge. 2014-09-25 23:54:24 +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
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
mwerezak
e6154d5097 Updates synth airlock interface messages 2014-09-24 19:14:40 -04:00
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
0c83a95b90 Large merge resultion. Used remote for map conflicts. 2014-09-23 21:41:54 +09:30
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
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
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
e7297c90db Cyborg Radio Change
- Cyborgs can now toggle if they want their radio to broadcast to everyone around them. Starts ON by default.
2014-09-18 19:34:38 +02:00
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
fe126626ac Cleans up radio frequency numbers.
Replaces magic numbers across the code base with proper constants.
Prepares for the ability to have more than one antag channel in the future.
Corrects a lie.
2014-09-18 13:07:34 +02:00
Chinsky
8a9bcf656d Merge pull request #6425 from PsiOmegaDelta/Mech-Mech
Shuttle mech sensors now slaved to airlock docking controllers
2014-09-18 13:37:10 +04:00
PsiOmega
cdae6254a9 Fixes #6440
Changes cult conversation to use \him instead of him.
2014-09-18 07:45:44 +02:00
Chinsky
78a168ed55 Merge pull request #6416 from Hubblenaut/master
Fixes and Improvements Patch
2014-09-18 09:00:38 +04:00
Zuhayr
5c2e039e15 Borer fixes and tweaks. 2014-09-18 14:00:43 +09:30
Atlantiscze
c4338f96f8 Better usage of bitflags 2014-09-18 03:57:00 +02:00
Atlantiscze
5900736d7e Incorporated Suggestions
- Recharge stations now have charge overlay which shows approximate amount of remaining charge
- Recharge stations now don't use use_power() directly, performance increase
- Recharge stations now work even without external power, however their electronics will draw 50W from internal cell, eventually depleting it and shutting down completely.
2014-09-17 23:14:33 +02:00
Hubblenaut
a10b7284e5 Fixes nuke-op radios not having freerange set 2014-09-17 16:02:32 +02:00
Hubblenaut
33484a9f90 Fixes syndicates spawning with locker instead of uplink 2014-09-17 15:33:07 +02:00
Hubblenaut
1b1505153e Fixes Nuke-ops spawning with unwanted items 2014-09-17 14:15:26 +02:00
Atlantiscze
5b905ebde1 Cyborg Advanced Charging
- This solves various issues with cyborg charging
- Cyborg chargers have 15k charge capacity themselves. They charge at 2.5kW when no cyborg is inside and 25kW when cyborg is inside.
- Instead of draining power directly to cyborg's cell, they simply transfer power (capped at 250 charge/tick) from charger to cyborg.
- All is checked, which means no excess power is wasted. This means AFK cyborgs parked in rechargers are no longer power sinks

Balance
- Increased cyborg actuator power usage a bit.
2014-09-17 08:59:19 +02:00
PsiOmega
327e81958b Shuttle mech sensors can now be slaved to airlock docking controllers. 2014-09-17 07:46:39 +02:00
Atlantiscze
ded8e21c0f Cyborg Power Usage Overhaul
- Adds new standardised proc for power usage as Cyborg
- Each component now uses different amount of power. Some components use "idle" power (camera), which means constant load. Other components use "active" power, which is single-time burst load.. Example: Actuator.
- Power usage is directly proportional to work done. Moving cyborg uses more power than still cyborg.
- Information in Status tab changed. Now it only shows percentage of remaining charge, as well as cell rating and cell load (W)
2014-09-17 07:31:20 +02:00
Zuhayr
6621dde3e3 Merge pull request #6418 from meowy/panelpanel
Fixed configuration panel of a few bots reading "panel panel"
2014-09-17 12:37:42 +09:30
Ccomp5950
8030c9d771 Merge pull request #6408 from mwerezak/mech-sensor
Fixes mech sensors preventing shuttle undocking
2014-09-16 21:48:31 -05:00