Commit Graph

14585 Commits

Author SHA1 Message Date
Zuhayr
ad15b7e2c1 Fixes #6137 2014-09-01 22:27:44 +09:30
Zuhayr
74d9b1bf2d Fixes #6178 2014-09-01 22:15:45 +09:30
Zuhayr
bf462d21b1 Fixes #6198 2014-09-01 22:08:56 +09:30
Zuhayr
059532c155 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2014-09-01 22:03:29 +09:30
Ccomp5950
907dc43568 Merge pull request #6220 from mwerezak/gas-entropy
Engine Atmos Control Console
2014-08-30 21:15:36 -05:00
mwerezak
c7e5de0ad2 Updates double vent pump flowrate 2014-08-29 23:54:52 -04:00
Ccomp5950
e356193c02 Merge pull request #6201 from comma/autoaimfix
Fixes "Do not allow use of items" option doing nothing.
2014-08-29 22:41:45 -05:00
mwerezak
8877e813a5 Cameras are upgraded with scanning_module
Cameras get xray when upgraded with a scanning_module that is advanced
or greater.
2014-08-29 18:26:57 -04:00
mwerezak
b381d46556 Adds engine core atmos control
Expands on the earlier engine pump fix to add proper control over the
engine core atmos. Adds core control computer that can set output
external pressure bound instead of output pressure, and special high
power vent pump type for the engine core.
2014-08-29 14:10:43 -04:00
mwerezak
cecfc8ddbb Adds injector flow rate control to console
Adds injector flow rate control to large_tank_control console.
2014-08-29 12:29:30 -04:00
mwerezak
9177741890 Updates atmo_control.dm to use absolute paths 2014-08-29 11:27:08 -04:00
Ccomp5950
97468655bd Merge pull request #6205 from Kelenius/OfPortalsAndHands
Made portals clickable
2014-08-29 03:49:00 -05:00
mwerezak
bf20a6414f Cameras no longer work when there is no power 2014-08-29 00:05:27 -04:00
mwerezak
c7d3a69f65 Changes camera upgrade materials
XRay camera upgrade is no longer a carrot.
2014-08-28 23:33:43 -04:00
Kelenius
285da89464 Made portals clickable 2014-08-28 22:04:20 +04:00
Chinsky
4bf73a50c1 Fixes "Do not allow use of items" option doing nothing.
Probably was lost during move to new clicking system.
2014-08-28 14:42:06 +04:00
Ccomp5950
bc6b6d86d3 Merge pull request #6196 from Walter0o/injection_fix
emergency HTML/JS injection fix MK2, the underping.
2014-08-27 23:58:48 -05:00
Zuhayr
8c1bb5941a Merge pull request #6186 from Kilakk/master
Fixes #6163
2014-08-28 11:11:04 +09:30
Walter0o
c0b6f82ad0 emergency HTML/JS injection fix MK2, the underping.
fixes a minor oversight in proc order after i shuffled them around.
2014-08-27 15:42:59 +02:00
Walter0o
89d2c956ca emergency HTML/JS injection fix.
sanitation of status display input was missing everywhere.
2014-08-27 14:42:58 +02:00
Zuhayr
7b366f092d Fixes some issues with new Hydro. 2014-08-27 22:04:19 +09:30
Zuhayr
772715f2da Merged dev-freeze into master. Two map conflicts, used dev-freeze map. 2014-08-27 20:46:04 +09:30
Chinsky
ac6ffacec8 Merge pull request #6182 from PsiOmegaDelta/HoloAI
AI camera/holopad fix
2014-08-27 14:35:34 +04:00
Kilakk
0aa11b16bb Merge remote-tracking branch 'upstream/master' 2014-08-26 21:08:13 -04:00
Kilakk
fa9d9062bd Fixes #6163
* Rounded res.amount to keep the fabricator from dispensing non-integer numbers of stacks
* Added a check to prevent stacks of < 1 from being put into the fabricator
2014-08-26 21:02:06 -04:00
Chinsky
471be0eab7 Merge pull request #6171 from mwerezak/gas-entropy
Fixes gas entropy calculation + engine pump/injector flow imbalance issue
2014-08-27 04:24:14 +04:00
Chinsky
0d6b1aede7 Merge pull request #6170 from mwerezak/shuttle-fixes
Fixes shuttle ETA being given before arrive_time is set
2014-08-27 04:24:03 +04:00
Chinsky
50d7e98eb2 Merge pull request #6175 from mwerezak/master-fixes
Fixes #6118
2014-08-27 01:33:39 +04:00
PsiOmega
0090efb210 Fixes an issue where toggling camera lights would disconnect the AI from an active holopad while keeping the pad online. 2014-08-26 16:38:44 +02:00
mwerezak
cd661d9280 Adds ChessPiece's species hardsuit sprites
Adds ChessPiece's onmob and inventory sprites for unathi and skrell hardsuits, as well as nicer tajaran hardsuit inventory sprites to replace the current placeholder ones. Adds hardsuit spritesheet entries for unathi (skrell will come later).
2014-08-25 21:57:56 -04:00
mwerezak
9859fc0b00 Fixes #6118 2014-08-25 21:02:57 -04:00
mwerezak
54d11506d0 Allows power to be read by examining the collectors 2014-08-25 20:57:32 -04:00
GinjaNinja32
778a0fc608 Removed debug statements 2014-08-26 01:43:54 +01:00
mwerezak
9fea39dea2 Quick fix for engine core flow imbalance
A more thorough fix should probably involve providing a way for players
to control the flow rate.

Also tweaks emitters and allows collectors to be read using a multitool.
2014-08-25 20:37:07 -04:00
mwerezak
82a862e07e Fixes entropy calculation
Fixed the entropy calculation so that it is easier to remove gas from a
hot gas mix, not harder. Added comments explaining the entropy
calculation. Also returns pump and filter efficiency to previous values.
2014-08-25 15:49:39 -04:00
Chinsky
b05f9a16ac Merge pull request #6155 from LightningIron/master
Changes some messages to make more sense
2014-08-25 22:18:49 +04:00
mwerezak
f1a1162c3f Fixes shuttle ETA given before arrive_time is set 2014-08-24 22:43:19 -04:00
GinjaNinja32
4a484d4207 Various grammar and spelling fixes in ion laws 2014-08-24 23:40:25 +01:00
LightningIron
7de4825a87 Changes some messages to make more sense 2014-08-24 14:09:39 -05:00
Chinsky
5924670ca4 Merge pull request #6148 from LightningIron/master
Fix for #6131.
2014-08-24 21:46:03 +04:00
Chinsky
5fa876d9f5 Merge pull request #6144 from PsiOmegaDelta/Cryo
Improved cryo object-recovery
2014-08-24 21:44:45 +04:00
Ccomp5950
1cd87c0eb9 Merge pull request #6138 from mwerezak/dev-freeze-fixes
Dev-Freeze fixes: Heaters, Freezers, Supermatter
2014-08-24 12:37:40 -05:00
Ccomp5950
fd37cf44e3 Merge pull request #6104 from mwerezak/power-net
Fixes for APCs (from dev), fix for solars area, and simple APC load balancing
2014-08-24 12:26:29 -05:00
Chinsky
12d3dadc5f Merge pull request #6112 from PsiOmegaDelta/med
Fixes #6106
2014-08-24 01:58:53 +04:00
Chinsky
2c73f3b2d5 Merge pull request #6107 from mwerezak/dev-fixes
Fixes rad suits not completely protecting against radiation
2014-08-24 01:58:26 +04:00
Chinsky
60d3dc5178 Merge pull request #6117 from PsiOmegaDelta/Camera
Camera names are now sanitized
2014-08-24 01:57:23 +04:00
LightningIron
89c160dfd6 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2014-08-23 13:21:06 -05:00
mwerezak
bad772d9c5 Adjusts the supermatter reaction parameters 2014-08-23 12:35:12 -04:00
LightningIron
39182f0c8f Fix for #6131. 2014-08-23 11:19:15 -05:00
mwerezak
3cd0cdf27f Fixes freezers never quite reaching their thermostat temperature 2014-08-23 10:52:57 -04:00