Commit Graph

14093 Commits

Author SHA1 Message Date
mwerezak
0345024f04 Removes telecomm and RD server temperature cap 2014-07-28 20:24:17 -04:00
mwerezak
bf0a17dcb0 Fixes NOPOWER not updating when machines are moved 2014-07-28 18:52:13 -04:00
mwerezak
5eaebce87e Merge remote-tracking branch 'upstream/dev' into power-net 2014-07-27 20:25:57 -04:00
mwerezak
e8a4818d2b Optimizes air alarm power updating 2014-07-27 19:59:26 -04:00
mwerezak
cd1ed034a8 Adds power net profiling verbs 2014-07-27 19:59:02 -04:00
PsiOmega
1eaf606bb2 Merge branch 'dev' into MechInstall 2014-07-27 16:33:23 +02:00
Mloc
d6caf74e56 Merge pull request #5769 from comma/dev
Enables logging of people beating monkey
2014-07-27 12:02:26 +01:00
PsiOmega
2c076b4e46 Merge branch 'dev' into MechInstall 2014-07-27 12:52:42 +02:00
Chinsky
4e96420e49 Merge pull request #5761 from Zuhayr/hydroponics
BYOND akbar
2014-07-27 14:38:18 +04:00
PsiOmega
4f8dc3f951 Installs the new mecha-sensor in the departure area airlocks and the shuttle itself.
Also corrects the online icon state for the sensor and allows the simple docking controller to toggle the on/off state.
2014-07-27 10:58:55 +02:00
mwerezak
83d54af746 Adjusts power usage for R&D equipment 2014-07-27 03:36:28 -04:00
mwerezak
cb413454a3 Optimizes atmos machine power updates
Makes power usage but atmos machinery less accurate but reduces lag
somewhat.
2014-07-27 03:35:25 -04:00
Zuhayr
c6e97ecc9a Merge pull request #5791 from PsiOmegaDelta/Roadblock
Mech/Train sensor
2014-07-27 10:12:55 +09:30
mwerezak
293855c48e Generalizes pumping and filtering
So that people can pump and filter gasses without worrying about the
thermodynamics too much.
2014-07-26 16:15:40 -04:00
PsiOmega
0036bea6b6 A sensor which registers mechs and trains attempting to pass by and, if necessary, blocks their movement.
If enabled, detects mechs/trains and blocks their movement if they are coming from any of the directions set by dir. Can currently only be enabled/disabled by radio command and airlocks are updated to utilize this.

The current setup allows mechs to move through airlocks during normal cycles, which for example lets Odysseus out to save lives.
Once a shuttle docks however, the sensors are enabled to prevent boarding.

If blocked, players receive a simple message stating that their command has been overridden.
2014-07-26 20:07:18 +02:00
mwerezak
5f9f6e2054 Merge remote-tracking branch 'upstream/dev' into power-net 2014-07-26 13:56:52 -04:00
Zuhayr
e5eb9cc496 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into hydroponics 2014-07-27 03:24:27 +09:30
Zuhayr
dc10f92ad1 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into hydroponics 2014-07-27 03:23:35 +09:30
mwerezak
3f6c1ff622 Cleanup, adds setup parameters for atmos machinery
Allows atmos machinery efficiency to be adjusted in setup.dm
Limits flow rates when moving gas from a turf to avoid very high pressures being created when they shouldn't be.
Attempts to limit processing when there isn't much gas to be moved, for performance.
Reverts all changes to _gas_mixture.dm
2014-07-26 13:50:25 -04:00
Zuhayr
4ef8a08310 Added portable_atmospherics to hydroponics machine path, couple of other tweaks. 2014-07-27 03:20:16 +09:30
Zuhayr
976cb4f844 Fixed seeds not showing up properly in the vendor. 2014-07-27 03:19:43 +09:30
mwerezak
11c9f3bb9b Updates scrubbers 2014-07-26 12:23:35 -04:00
Mloc-Hibernia
a2dc7b827b Merge remote-tracking branch 'upstream/pr/5689' into dev
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>

Conflicts:
	code/game/machinery/computer/crew.dm
2014-07-26 14:25:24 +00:00
Chinsky
11a1370b10 Merge pull request #5781 from PsiOmegaDelta/Tweaking
Engine room and Atmospherics  changeup.
2014-07-26 17:56:00 +04:00
Chinsky
c34cf89a04 Merge pull request #5784 from Jarcolr/patch-3
Fixes #5691
2014-07-26 17:18:38 +04:00
Jarcolr
9e233f1597 Fixes #5691
Chef >> Chefhat
2014-07-26 13:41:43 +03:00
Jarcolr
17f86962ac Fixes #5773
Added /obj/item/weapon/FixOVein to surgery cyborg modules.
2014-07-26 12:50:41 +03:00
PsiOmega
1bee077475 Engine room and Atmospherics changeup.
The supply pipe in Atmospherics no longer cross the middle of the room, after having seen many a complaint about this. Now passes through the aft windows instead.

Atmosphere technicians can now assist in handling the engine waste without entering the engine room itself.

Engine waste canisters are now pre-labeled according to future contents. Can be re-labeled should someone desire to try the oxygen setup instead.

The engine core now uses a similar setup as the atmospheric tanks, allowing control of the injection/extraction of gases from the monitor room.

Pipes  in the engine room overlapp less, making them easier to follow.

There is now a basic meteor protection layer around the engine room like solar panels have. Should stop a lone meteor or two, for anything more Renwick shields will still be desirable.
There is also a fairly wide gap by the ejection port, to ensure the supermatter doesn't snag into it, where meteor can sneak through.
2014-07-26 11:44:22 +02:00
Jarcolr
8296f29c76 Fixes #5506 and split of groups
Engineering split into new group "Atmospherics".
Medical / Science nwo "Medical" and "Science".
2014-07-26 12:32:19 +03:00
Zuhayr
bc25cca7a9 Merge branch 'hydroponics' of https://github.com/Zuhayr/Baystation12 into hydroponics 2014-07-26 15:45:26 +09:30
Zuhayr
5a108b2d05 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into hydroponics 2014-07-26 15:40:28 +09:30
Zuhayr
efe1c2feb2 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into hydroponics 2014-07-26 15:39:25 +09:30
DJSnapshot
d4ce124fe0 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into hotfix 2014-07-25 19:37:10 -07:00
DJSnapshot
9be6de1e77 fixes admin show-skills verb. 2014-07-25 19:34:13 -07:00
DJSnapshot
de282a4e2a Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
Conflicts:
	code/modules/client/preferences.dm
2014-07-25 17:19:59 -07:00
Chinsky
1e1d5a6d01 Enables logging of people beating monkey.
Also updates it to species code and visible message helper. Shit is anicent.
2014-07-26 04:09:20 +04:00
DJSnapshot
a4fc2b04a2 fix to allow non-humans to be stunned like they should be. Gosh. (Also, clumsy check and making harmbaton actually work) 2014-07-25 16:56:56 -07:00
Chinsky
f33e11383b Merge pull request #5751 from DJSnapshot/hotfix
Bug Fixes!
2014-07-26 03:28:54 +04:00
DJSnapshot
ec238be981 Revert and fix for e-nets. 2014-07-25 16:23:26 -07:00
Chinsky
2e043adb48 Merge pull request #5758 from Kelenius/OfVotesAndPlayers
Adds amount of required players to gamemode vote.
2014-07-26 00:23:00 +04:00
Zuhayr
69b397b5c4 Compile fix. 2014-07-26 01:42:05 +09:30
Zuhayr
b32bbf8d2c Merge pull request #5741 from mwerezak/wound-infections
Attempts to prevent ninja infections, body temperature fix, icon fix
2014-07-26 01:30:12 +09:30
Zuhayr
6e63659855 Merge pull request #5743 from meyar/dev
CSI BAYSTATION: The detectivining.
2014-07-26 01:29:37 +09:30
Zuhayr
005ac89aad Tweaks to previous commit. 2014-07-25 23:41:41 +09:30
Zuhayr
19cfe8940c Added table layout to vote form. 2014-07-25 23:32:05 +09:30
Zuhayr
d8336061b4 Merge branch 'hydroponics-pr' of https://github.com/Zuhayr/Baystation12 into dev 2014-07-25 23:02:21 +09:30
Zuhayr
5da36d265e Merge resolution with PDA nanoui. 2014-07-25 22:57:53 +09:30
Zuhayr
57b790ad92 Merging. 2014-07-25 22:50:35 +09:30
Zuhayr
99909e3aba Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-07-25 22:47:57 +09:30
Kelenius
a7748c8542 Adds amount of required players to gamemode vote. 2014-07-25 17:05:15 +04:00