Commit Graph

7685 Commits

Author SHA1 Message Date
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
Zuhayr
bc25cca7a9 Merge branch 'hydroponics' of https://github.com/Zuhayr/Baystation12 into hydroponics 2014-07-26 15:45:26 +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
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
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
Zuhayr
6e63659855 Merge pull request #5743 from meyar/dev
CSI BAYSTATION: The detectivining.
2014-07-26 01:29:37 +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
Zuhayr
ea8b08c49b Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into hydroponics 2014-07-25 22:34:40 +09:30
Zuhayr
6f44f6c1e7 Removed outdated file. 2014-07-25 22:16:29 +09:30
Zuhayr
4d1812ba2b Hydroponics rewrite, details will be in PR. Big commit. 2014-07-25 22:16:04 +09:30
mwerezak
ef4a740a02 Adds entropy, thermal energy procs to new gas mix 2014-07-24 17:36:57 -04:00
mwerezak
79d4c444c2 Merge remote-tracking branch 'upstream/dev' into power-net
Conflicts:
	code/ATMOSPHERICS/components/binary_devices/pump.dm
	code/game/machinery/alarm.dm
	code/game/machinery/spaceheater.dm
2014-07-24 16:04:41 -04:00
Zuhayr
f2f9a5afc4 Removes the flying baton of justice. 2014-07-24 15:21:57 +09:30
DJSnapshot
75c1a4bac3 Disabling E-nets after admin discussion. 2014-07-23 21:26:12 -07:00
DJSnapshot
25bd9c3187 fixes #4961 2014-07-23 21:12:03 -07:00
Mark Aherne
d0e01f70cc Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2014-07-23 21:58:13 +01:00
Meyar
7d07748b78 Added detective jobslot. 2014-07-23 14:33:10 -04:00
Chinsky
5c04ac9891 Merge pull request #5732 from PsiOmegaDelta/VentsScrubbers
Vents, scrubbers, freezers, more - OCD
2014-07-23 21:07:44 +04:00
Ccomp5950
569e8361dc Crew Monitor will no longer show "weird characters"
It has been talked to and feels very sorry for it's actions.

Well that and NanoUI doesn't like byond text-macros (/improper) in this case, so we just sanitize it just incase the crew monitor isn't playing nice that day.
2014-07-22 20:21:22 -05:00
Mloc-Argent
d5e9851b62 integrate XGM into the code
New turf proc: assume_gas().  Maps to air.adjust_gas_temp().
Lots of optimizations to processing, fire, lighting, HasEntered() and
 more.
Zones now process all fire data and existance in one go, fire objects
 only handle spreading.
Most code has been ported straight so some of it mightn't be ideally
 structured for the new gas_mixtures.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-07-22 19:52:12 +01:00
Chinsky
f51c377626 Merge pull request #5713 from Hubblenaut/master
Economy and Engineering Access Fixes
2014-07-22 10:56:39 +04:00
PsiOmega
31fdd4bfdd The Research division is now a pure area instance.
With this it's now possible to create a grep, or similar check, for Travis to ensure /area{name = *} never happens again as this can cause issues with APCs.
2014-07-22 08:24:38 +02:00
mwerezak
09280953b2 Merge remote-tracking branch 'upstream/dev' into power-net
Conflicts:
	code/game/machinery/recharger.dm
2014-07-21 19:40:23 -04:00
Mark Aherne
f431b969af Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2014-07-21 22:33:30 +01:00
Zuhayr
60d9d3d5e6 Merge resolution. 2014-07-21 16:34:38 +09:30
Zuhayr
1ba147d9da Cleaning up the previous commit a little. 2014-07-21 16:22:19 +09:30
Zuhayr
ff38aca774 Merge resolution. 2014-07-21 16:17:15 +09:30
Ccomp5950
48132f5cc0 Merge pull request #5714 from PsiOmegaDelta/AIControl
AI shortcut updates
2014-07-21 01:43:59 -05:00
Zuhayr
6b51645283 Merge pull request #5704 from mwerezak/species-refit
Fixes object icons not being updated when refitting hardsuits for different species
2014-07-21 16:09:47 +09:30
Ccomp5950
8c9c9936dd Merge pull request #5707 from Zuhayr/dev
Mining resprite/adjustments.
2014-07-21 01:36:35 -05:00
Zuhayr
6b247da537 Merge pull request #5695 from Walter0o/odysseus_fix
should fix #5692
2014-07-21 16:01:10 +09:30
PsiOmega
d222af6324 Can now middle click doors to toggle bolt lights, plus cleanup.
Middle-clicking doors now allows the AI to toggle bolt lights.
Attempts to achieve some consistency in door feedback messages.
2014-07-21 08:07:45 +02:00
Mark Aherne
3535a7beaa Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2014-07-20 19:59:50 +01:00
PsiOmega
d02e483110 Makes it possible for the AI to alt+left click turfs in camera view and grants ctrl/alt shortcuts to the turret control.
AI can now alt+left click turfs in camera view to list and interact with objects in the status tab. For example allows for interacting with emergency shutters beneath grills.
alt-clicking doors now notifies the AI when they are electrified/un-electrified as, unlike most other shortcuts, this doesn't have a visual cue.
When interacting with doors and the AI-control is disabled hacking is now automatically initiated, as if the AI had attempted to open the door 'menu'.
When borgs/AIs try to interact with an emagged door they now receive a feedback message that it's unresponsive.

Parts of implementation done by porting code from tg-station.
2014-07-20 19:20:24 +02:00
Hubblenaut
c62e38b4cd Vending machines don't vend on suspended accounts 2014-07-20 18:38:08 +02:00
mwerezak
e9772faabc Fixes skrell helmet refitting, modkit text 2014-07-20 11:34:46 -04:00
Chinsky
0ac240f4f8 Merge pull request #5669 from atlantiscze/laptop-multifix
Laptop MultiFix
2014-07-20 17:58:24 +04:00
Chinsky
02227d9da7 Merge pull request #5700 from Whitellama/master
Bug fixes: #5697, #5690, #5687, #5685
2014-07-20 17:42:23 +04:00
Zuhayr
196fd07384 Resprited the majority of mining ores and turfs, added coal and plat to surface mining, add falloff for edges of asteroid. 2014-07-20 16:29:18 +09:30
Walter0o
3334900987 adds trim() to OOC and LOOC 2014-07-20 06:57:57 +02:00
mwerezak
789d3e4d54 Fixes modkits
Fixes modkits not tracking suit/helmet parts, not checking allowed
parts, and not checking if the clothing needs to be modified.
2014-07-19 23:17:35 -04:00
Whitellama
266d8d25fa Fixed #5685: Changelings now gain the species needed to transform when acquiring DNA using the extract DNA sting 2014-07-19 19:11:30 -07:00
mwerezak
e8c4ad07bb Adds a system for refitting species clothing 2014-07-19 22:08:31 -04:00
Whitellama
342a187c8b Eating with utensils now produces the eating sound, fixed #5687 2014-07-19 18:33:30 -07:00
Atlantiscze
69ab22896b Merge branch 'master' of https://github.com/Baystation12/Baystation12 into laptop-multifix 2014-07-20 02:07:15 +02:00