Atlantiscze
cb52831268
SMES construction fix:
...
- You can no longer place coils into PSUs.
- SMES now properly checks max_coils var when installing new coils.
2014-08-30 16:21:03 +02:00
Atlantiscze
845c0a0b17
SMES (de)construction
...
- Adds Superconducting Magnetic Coils - SMES specific construction item.
- Each SMES can have up to 5 additional coils added , similar to PSUs with cells.
- It is possible to create multi coil SMESs by changing "cur_coils" variable while mapping them in.
- SMES can be deconstructed, salvaging their board and coil(s)
- It is currently not possible to obtain these by any other way than deconstructing existing SMESs. This will be added in another commit.
2014-08-30 15:55:38 +02:00
Atlantiscze
e1b38f9d38
Adds Breaker Box
...
- Basically, reworked powerswitch. Powerswitch was commented out and this commit removes it completely, as Breaker Box is partially using it's code.
- Breaker box is device designed for advanced grid control. Allows you to connect/disconnect wires WITHOUT having to cut them manually.
- This update mostly improves interaction, and adds AI support (as i already saw many AIs which are actually good in balancing things. This will help them a bit. Engineers can do it manually too.)
2014-08-29 20:21:46 +02:00
Zuhayr
772715f2da
Merged dev-freeze into master. Two map conflicts, used dev-freeze map.
2014-08-27 20:46:04 +09:30
Zuhayr
cf68ad7c87
Master to dev merge.
2014-08-27 20:24:07 +09:30
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
Kelenius
a1348faa8c
Cables are now stacks
2014-08-25 18:54:35 +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
mwerezak
bad772d9c5
Adjusts the supermatter reaction parameters
2014-08-23 12:35:12 -04:00
mwerezak
025838532a
Adjusts SM charging and output
2014-08-22 21:43:03 -04:00
mwerezak
006c98bcdd
Merge remote-tracking branch 'upstream/dev-freeze' into power-net
2014-08-21 20:25:58 -04:00
mwerezak
304d88a4d4
Adds simple load balancing
2014-08-21 19:27:12 -04:00
Chinsky
8163ff7f80
Merge pull request #6087 from mwerezak/power-net
...
Fixes a couple of bugs in apc/process()
2014-08-21 21:53:12 +04:00
Chinsky
ed496b8463
Merge pull request #6081 from Walter0o/magical_smes_dev
...
fixes #6046
2014-08-21 12:09:09 +04:00
mwerezak
f2b234fe81
Fixes APCs drawing more power than they can to use to charge
2014-08-21 01:18:26 -04:00
Zuhayr
b47d91b612
Merge resolution, master into dev.
2014-08-21 12:01:38 +09:30
mwerezak
10f95933dd
Fixes power draw not being processed if no power was available
...
Should address some of the issues raised in Pull Request #6080
2014-08-20 21:54:27 -04:00
Walter0o
71d130e52b
fixes #6046
2014-08-20 13:18:13 +02:00
Ccomp5950
770fb4de4c
Merge pull request #6052 from PsiOmegaDelta/Mapping
...
Fixes #6027
2014-08-19 12:01:14 -05:00
Ccomp5950
3c19520df2
Merge pull request #6059 from mwerezak/power-net
...
Fixes APCs eating up all the power even when fully charged
2014-08-19 06:02:34 -05:00
mwerezak
c42d9171d6
Makes power monitor a power machine again
...
Also moved the power monitor code to modules/power
2014-08-19 01:45:23 -04:00
mwerezak
1cfc3b8d5f
Fixes APCs eating up all the power even when fully charged
2014-08-19 01:14:18 -04:00
PsiOmega
11ce777d9c
Fixes #6027
...
Creates two proper monitor circuits for Engineering/Mining.
Adds air alarms in the Research access foyer.
Relocates camera in Misc. research to a more central location.
Ensures there are enough Telecommunication Satellite SMES units to meet power demand.
2014-08-18 22:37:54 +02:00
Walter0o
9421b4b48e
fixes #5964
2014-08-13 03:38:41 +02:00
Zuhayr
f09d1218fe
Master to dev merge.
2014-08-11 17:23:40 +09:30
mwerezak
e1dc7d436b
Fixes icons and other things not updating when the master controller updates power status.
...
This was due to the master controller using update_powered_status()
instead of power_change(), but many machines override power_change() to
do various things when the machine gains or loses power.
2014-08-10 03:45:20 -04:00
mwerezak
4b070a2de6
Fixes #5935
...
Also improves apc/process() (doesnt add and then remove charge from
cells when it doesn't have to).
2014-08-10 03:44:56 -04:00
mwerezak
213b11601e
Updates emitters and containment field power usage
...
As well as PA power usage. It's not used at the moment, but it might be
used by downstream or in the future.
2014-08-10 00:40:58 -04:00
mwerezak
b529d582e5
Fixes siemens_coefficent not affecting shock damage
...
Also cleans up electrocute_act()
2014-07-31 15:20:45 -04:00
mwerezak
bf0a17dcb0
Fixes NOPOWER not updating when machines are moved
2014-07-28 18:52:13 -04:00
mwerezak
cd1ed034a8
Adds power net profiling verbs
2014-07-27 19:59:02 -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
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
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
mwerezak
c46904a3b6
Merge remote-tracking branch 'upstream/dev' into power-net
...
Conflicts:
code/ATMOSPHERICS/components/binary_devices/pump.dm
code/ATMOSPHERICS/components/binary_devices/volume_pump.dm
code/ATMOSPHERICS/components/unary/vent_pump.dm
code/ATMOSPHERICS/pipes.dm
2014-07-18 15:02:07 -04:00
Chinsky
9e0569cfb9
Merge pull request #5631 from PsiOmegaDelta/Engine
...
Remote-controlled emitters
2014-07-17 15:42:03 +04:00
Zuhayr
ea8cdb52c7
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
2014-07-17 20:59:45 +09:30
Atlantiscze
386b1e6ce4
Bugfix - cable coil now shows correct transferred amount.
2014-07-16 22:59:14 +02:00
mwerezak
5ca36fcadb
Merge branch 'dev' into power-net
...
Conflicts:
code/game/machinery/Freezer.dm
code/ATMOSPHERICS/components/unary/heat_source.dm
code/modules/organs/organ_external.dm
Also updated:
code/ATMOSPHERICS/components/binary_devices/pump.dm
nano/templates/gas_pump.tmpl
2014-07-16 16:14:52 -04:00
Zuhayr
f795712a95
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev
2014-07-16 19:30:41 +09:30
PsiOmega
08e13c7d46
Merge branch 'dev' into Engine
2014-07-15 21:31:53 +02:00
PsiOmega
0bb878d198
Makes it possible to activate emitters using control buttons.
2014-07-15 21:16:27 +02:00
mwerezak
f5c67f87ab
Fixes chargers being a magical source of charge
2014-07-12 15:44:21 -04:00
Mark Aherne
7e7e6cd8ac
Continued work in progress on a major revision of the NanoUI templating system.
2014-07-11 10:48:42 +01:00
Walter0o
0ff5d021de
fixes #5449
...
missing variable updating lead to APCs stuck in green status during powersinks.
2014-07-10 18:21:00 +02:00
Chinsky
8c67326576
Merge pull request #5331 from UristMcKerman/pipeturbine
...
Pipe Turbine
2014-06-24 13:08:11 +04:00
Mloc-Argent
a33cb7272b
Merge remote-tracking branch 'upstream/master' into dev
2014-06-23 20:57:47 +01:00
Mloc
8ca382f362
Merge pull request #5338 from Loganbacca/devfix
...
Fixes incorrect cable coil colours
2014-06-23 14:02:46 +01:00
