Commit Graph

8554 Commits

Author SHA1 Message Date
PsiOmega
bd1e55f19f Changes 3 debug verbs to procs and adds them to the debug-verb list. 2014-09-13 15:49:04 +02:00
Snapshot
76295edd6e Merge pull request #6333 from mwerezak/engine
Alternative to #6332
2014-09-13 00:45:17 -07:00
Snapshot
3d81ff6afe Merge pull request #6335 from Zuhayr/dev-freeze
Dev freeze
2014-09-13 00:42:35 -07:00
DJSnapshot
ba27f2e4cc Change to make disposals take about the same amount of time as they did before the new atmos changes. 2014-09-13 00:34:19 -07:00
Zuhayr
1eb759447e Merge resolution, using dev-freeze map due to unreconcilable conflicts. 2014-09-13 16:54:48 +09:30
mwerezak
90af78ac44 Increases SM power output
Should safely run to 700 kW. Returned starting SMES charge back to
original value to compensate. Engine omnifilters now start off on round
start.
2014-09-12 23:01:15 -04:00
PsiOmega
d123df4b98 Fixes #6311 2014-09-12 13:59:54 +02:00
mwerezak
f3575a6162 Adjusts disposal bin pressure and power 2014-09-12 01:17:53 -04:00
mwerezak
f1bc9367c7 Increased SMES starting charge 2014-09-12 01:16:31 -04:00
Zuhayr
e26b3e57fd Trying to add to previous. 2014-09-10 22:16:45 -04:00
Zuhayr
1b40e8adaa Fixes most of #6300 2014-09-10 22:16:26 -04:00
Zuhayr
ec12611171 Fixes several outstanding bugs with new hydroponics. 2014-09-10 22:16:05 -04:00
mwerezak
1133088b73 Increases max SMES output to 250 kW
Was recently updated to that on dev so it shouldn't hurt on dev-freeze.
2014-09-10 22:15:26 -04:00
mwerezak
8f98b35c9a Reduces supermatter DAMAGE_RATE_LIMIT 2014-09-10 22:13:31 -04:00
mwerezak
716c6ab3ef APC cell_type is now an actual power cell type 2014-09-10 22:12:43 -04:00
Chinsky
a553f412da Fixes #6307
Now organ not having an object organ won't prevent it from falling off, just no item would appear.
2014-09-11 05:41:31 +04:00
Chinsky
33cf071b57 Fixes #6285
Applied phil235's fix for deconstruction.
5a6e9804b9
2014-09-11 05:17:38 +04:00
mwerezak
709d87d933 Fixes APCs switching between autoflag 1 and 0 when cell.charge > 10 but not enough charge for one tick
Old APC bug.
2014-09-10 18:51:36 -04:00
mwerezak
e513041768 Renames syndicate mothership area, fixes temp_factor calc 2014-09-08 22:38:52 -04:00
mwerezak
ee56453ca3 Allows heater/freezer construction dir to be set 2014-09-07 17:07:53 -04:00
mwerezak
0b11295c8e Supermatter balance
Attempts to rebalance SM to work with new atmos machinery. Testing with
a 2-freezer 2-canister default setup, the engine can run to 500 kW at
700 K.
2014-09-07 01:19:16 -04:00
mwerezak
d12a09addb Powernets
Moved powernet datum definition to powernet.dm
Improved APC load balancing.
Updated SMES charging to work better with new APC/powernet code.
2014-09-07 01:10:22 -04:00
mwerezak
ce970eacd2 Adds atmos/supermatter debug messages 2014-09-06 15:36:35 -04:00
mwerezak
e045c84f97 Fixes APC load totals periodically doubling
Also fixes areas updating excessively when update_use_power() was
called.
2014-09-06 11:35:58 -04:00
Ccomp5950
a63f358049 Merge pull request #6272 from faerindel/dfreeze_pipe_dupe_fix
Fixes #6268 #6122 #6121
2014-09-04 04:18:10 -05:00
igalan
0aa6c4f38c Fixes #6121
Moves HE pipes and junction dmi's to where the rest of the icon_manager dmi's are.
2014-09-04 05:02:03 +01:00
Mloc-Argent
11ba197b30 fix for contaminants not processing if air is OK otherwise
also a small fix for VV

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-09-03 19:00:00 +01:00
Zuhayr
0b6b3d8e0e Merge pull request #6253 from mwerezak/skrell
Hardsuit refitting sprite sheet
2014-09-03 12:06:18 +09:30
Ccomp5950
ed9850b373 Merge pull request #6258 from mwerezak/rddesigns
Adds gas cooler/heater circuit designs
2014-09-02 10:06:48 -05:00
mwerezak
0675c332a1 Adds cooler/heater circuit designs 2014-09-02 08:43:51 -04:00
mwerezak
30464da6ef Allows refitting to change worn sprite 2014-09-02 08:31:16 -04:00
Whitellama
71c2317264 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into flame
Conflicts:
	code/game/objects/items/weapons/storage/belt.dm
2014-09-01 18:31:26 -07:00
Zuhayr
9f6c22d437 Reapplies LightningIron's fix for #6131 2014-09-02 10:02:37 +09:30
Zuhayr
08df83fc3d Merge pull request #6243 from Whitellama/bugfixes
Fixes tank dispenser sprites not updating, fixes combat belts not holding police tape, other bugfixes
2014-09-02 09:39:17 +09:30
Zuhayr
e33280090c Merge branch 'dev-freeze' of https://github.com/Zuhayr/Baystation12 into dev 2014-09-02 09:24:22 +09:30
Zuhayr
53bee60a27 Merge resolution. 2014-09-02 09:18:20 +09:30
Zuhayr
58a750398e Fixes 5866# 2014-09-01 23:20:46 +09:30
Zuhayr
aedb3725f2 Fixes #5874 2014-09-01 23:20:27 +09:30
Zuhayr
066772b1ce Fixes #5879 2014-09-01 22:45:37 +09:30
Zuhayr
ad2cf64c7b Fixes #6119 2014-09-01 22:41:15 +09:30
Whitellama
bdce104b6d Improved anomaly chat message cooldowns. 2014-08-31 17:51:13 -07:00
Whitellama
98e287bc6d Fixed xenobiologist having no preview clothes in character setup 2014-08-31 16:22:43 -07:00
Whitellama
f5c9586153 Fixed matches and candles not being able to burn papers. Also made Diona join prompt appear for a bit longer. 2014-08-31 02:12:04 -07:00
Whitellama
628f56ce42 Nerfed celldrain/charge to a limited range and stopped anomaly effects from spamming synthetics 2014-08-31 01:48:52 -07:00
mwerezak
762a1d1f03 Increased disposal flow rate and pump power 2014-08-30 16:19:19 -04: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
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