Commit Graph

89 Commits

Author SHA1 Message Date
mwerezak 5603884095 Removes #undefine 2015-08-18 17:20:39 -04:00
Zuhayr 3b712adb5f Removed intact var in favour of is_plating() proc, fixed issues with invisible initialized pipes. 2015-08-16 17:51:19 -07:00
PsiOmega cee5f1a057 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/objects/items.dm
2015-07-06 18:33:09 +02:00
PsiOmega cdb4270f48 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-07-06 17:31:41 +02:00
mwerezak bd59733fdb Fixes #9714
Fixes incorrect arguments to calculate_transfer_moles()
2015-07-05 01:18:38 -04:00
GinjaNinja32 81d23c85cc code/ATMOSPHERICS \red \blue etc to span classes 2015-05-29 19:36:15 +01:00
PsiOmega 1ae0ad6d92 Updates the atom_pool, now datum_pool, to handle any datum object.
Makes the garbage collector similarly robust. Continues the whole Destroy/qdel porting.
2015-04-24 09:59:05 +02:00
PsiOmega 4326b8c5d8 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-04-03 09:22:23 +02:00
mwerezak a116723fcd Updates canister process() to use atmos helper procs 2015-04-02 00:04:44 -04:00
mwerezak 6d15809768 Corrects return values for the Topic procs of several computers and some other machines as well. 2015-02-25 21:32:35 -05:00
RavingManiac cc62c987ea Some TEG refactoring and UI improvements
"circulator/heat exchanger" is now just called "circulator"
2015-02-13 18:34:48 +08:00
RavingManiac 71902cdca2 Tweaked descriptions and settings of various TEG components.
Maximum power of core vent and injector increased.
2015-02-13 16:08:52 +08:00
RavingManiac 98dd5c46c0 Circulators now draw air based on the total volume of the pipe network connected to the input. They also generate some power in the same manner as pipe turbines.
Thermoelectric generators now generate much more power, mostly due to the increase in circulator intake volume.

Supermatter no longer powers radiation collectors, and is tweaked to run at 4000-6000K.

TEG supermatter engine mapped in. Currently generates ~1MW of power with chamber temperature of 5000K.
2015-02-13 00:38:23 +08:00
mwerezak f9344a5a2d Atmos machine update
Takes a pass at updating ATMOSPHERICS to take advantage of the new powernet changes.

Also removes var/on definitions from many atmos machines. Machines generally shouldn't
be doing "on" things if they aren't using power, and most players don't expect a machine
to use power if it isn't "on," so I guess this is fair game.

Also, further refactoring.
2015-01-02 01:46:18 -05:00
mwerezak d4a193808b Replaces awful connect type system with bitflags 2014-12-23 18:59:54 -05:00
Mloc 83f2a5ba5a fix some misplaced set_dir()s
fixes part of #7284
fixes #7288
fixes one of #7287

Signed-off-by: Mloc <colmohici@gmail.com>
2014-12-08 10:09:09 +00:00
Mloc-Argent 117ca6a135 refactor 'dir = ' into 'set_dir()'
This should have little/no gameplay effect right now, just paving the
 way for directional lights.
Replaced handle_rotation() on buckly things with this.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-12-01 13:44:02 +00:00
Zuhayr 660b32629e Merge resolution. 2014-11-19 23:19:33 +10:30
RavingManiac 594ac35ce1 Fix for dual-vent-pumps being broken. 2014-11-17 21:33:02 +08:00
PsiOmega bc438e21ad All the relevant examine changes. 2014-11-05 12:44:23 +01:00
Zuhayr b411da44b8 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-09-30 23:23:05 +09:30
mwerezak 5dae1fb667 Fixes pressure regulator flow rate reporting
Fixes the pressure regulator's reported flow rate not being set to 0
when no gas could be transferred.
2014-09-27 19:41:53 -04:00
Zuhayr 0c83a95b90 Large merge resultion. Used remote for map conflicts. 2014-09-23 21:41:54 +09:30
mwerezak 5b2ffa0f74 Fixes pressure regulator mode 2014-09-06 12:53:23 -04:00
RavingManiac 9801dfa9a9 NewPipe
-Supply and scrubber pipes can be run in parallel without connecting to each other
-Supply pipes will only connect to supply pipes, vents and Universal Pipe Adapters(UPAs)
-Scrubber pipes will only connect to scrubber pipes, scrubbers and UPAs
-Supply and scrubber pipes are offset along the x and y axes to prevent sprite overlap
-UPAs will connect to regular, scrubber and supply pipes, as well as anything else that connects to a regular pipe. UPAs will be used to interface between the supply/scrubber loops and atmos
2014-09-05 00:18:33 +08:00
mwerezak c7e5de0ad2 Updates double vent pump flowrate 2014-08-29 23:54:52 -04:00
mwerezak b7c13bc4b6 Allows atmos helpers to be used with portable_atmos 2014-08-04 16:53:13 -04:00
mwerezak a772d9094c Optimizes pipe network updating 2014-08-04 13:29:09 -04:00
mwerezak c640729b4d Rewrite of passive gate, updates air injector 2014-08-04 13:28:48 -04:00
mwerezak 14b57e3560 Pipe networks now cache their total volume 2014-08-03 22:41:31 -04:00
mwerezak 6eb2fe3028 Device working volumes are configurable from setup 2014-08-03 22:11:45 -04:00
mwerezak 5d0ce492b7 Updates dual port vent pumps 2014-08-03 15:17:28 -04:00
mwerezak 3647fa4d7d Adds gas mixing proc and updates gas mixer
Also includes a whole bunch of fixes and updates for atmos machinery
2014-08-02 18:35:57 -04:00
mwerezak d034511ee6 Updates gas filter 2014-08-01 22:59:13 -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 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
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
mwerezak 11c9f3bb9b Updates scrubbers 2014-07-26 12:23:35 -04:00
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
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 2ea947b15e Some cleanup for pumps and vent pumps 2014-07-19 17:01:28 -04: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
Loganbacca fb6c928c4d Atmos update tweaks
- Updated pump and volume pump icons
- Reverted air scrubber icon
- Fixed passive gate icon
- Updated pipe_item sprites
- Fixed an oversight in the pipe color check
- Cleaned up the map
2014-07-18 13:41:59 +00:00
Loganbacca e05b5c0bfb Pipe rendering rewrite
- Complete rewrite of pipe rendering code. It now selects icons from a shared cache.
- Manifolds and other devices (pumps, filters, etc.) now match the color of the connected pipes.
- Updated omni devices to use the shared cache.
- Set separate pipe color definitions.
- Cleaned up a lot of pipe code, converting it to absolute paths and removing old commented out code.
- Tweaked t-ray rendering code.
- Tweaked pipe painter.
- Enhanced pipe checking debug command.
- Expanded tank capacity and resprited them.
2014-07-18 13:39:39 +00:00
mwerezak 46533d299c Merge remote-tracking branch 'loganbacca/atmosmerge' into power-net 2014-07-16 16:17:26 -04: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
Loganbacca 0dd2397ef7 Atmos update tweaks
- Updated pump and volume pump icons
- Reverted air scrubber icon
- Fixed passive gate icon
- Updated pipe_item sprites
- Fixed an oversight in the pipe color check
- Cleaned up the map
2014-07-16 21:37:43 +12:00
mwerezak ec676896bc Some gas pump cleanup 2014-07-16 00:45:38 -04:00
mwerezak aeb3537ae4 Improves update_use_power() proc
Now no longer misses power usage on the tick that it is called
2014-07-15 20:35:10 -04:00