Commit Graph

361 Commits

Author SHA1 Message Date
mwerezak
d49c005d9b Reverts vent status broadcast change 2014-07-21 20:44:59 -04: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
c4abe1f5d5 Pipe cleanup
- Tidied up a couple of remaining pipes
- Removed overlapping pipes
- Removed step_x, step_y vars
2014-07-18 13:43:08 +00: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
Loganbacca
35f75ce805 Merge remote-tracking branch 'remotes/upstream/dev' into atmosmerge 2014-07-16 21:36:41 +12:00
mwerezak
3c65c7dda4 Vent pumps now draw power 2014-07-16 00:47:38 -04: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
mwerezak
1011800d78 Updates gas heaters
Gas heaters now draw power.
Removed the heat_resevoir base type because it was dumb and unused.
Adds a circuit board for gas heaters.
2014-07-15 20:34:48 -04:00
mwerezak
f207888316 Replaces the volume gas pump 2014-07-15 19:31:02 -04:00
mwerezak
5718c907ea Adds a flow rate meter to pump UI
Also fixes a stupid merge error.
2014-07-15 13:05:58 -04:00
mwerezak
39789d56b8 Merge remote-tracking branch 'loganbacca/atmosmerge' into power-net
Conflicts:
	code/ATMOSPHERICS/components/binary_devices/pump.dm
2014-07-15 12:12:08 -04:00
Loganbacca
6b64fb5e77 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-14 19:12:22 +12:00
mwerezak
05fc761fd4 Adds NanoUI for gas pumps showing loading level 2014-07-13 12:39:48 -04:00
mwerezak
57b5b1d13e Cleans up pump power usage 2014-07-13 11:00:15 -04:00
mwerezak
7e65984ae2 Implements pump power draw 2014-07-12 20:09:41 -04:00
mwerezak
3fb3efe401 Adds a gas entropy system for pumps 2014-07-12 20:09:08 -04:00
mwerezak
b78c918c58 Moved h/e constant to setup.dm, included units 2014-07-11 14:29:30 -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
PsiOmega
2e08b1ad4a Fixes vents not properly resetting the pressure check correctly when the "default" value.
Copy-paste..
2014-07-01 23:04:08 +02:00
Zuhayr
69d99cbced Merge pull request #5378 from PsiOmegaDelta/AlarmsAndVents
Adds support to better handle air alarms in sensitive areas and vents with custom settings
2014-06-29 18:33:16 +09:30
PsiOmega
596b71a4ff Adds support to better handle air alarms in sensitive areas and vents with custom settings.
Air alarms now have a new setting, breach_detection, which allows for disabling the automatic mode change when a breach occurs.

Vents now have three new settings. These are primarily for when air alarms request a mode change to ensure that custom pressure levels/checks (in terms of mapping, not set later in game)  are not lost.
external_pressure_bound_default
internal_pressure_bound_default
checks_default
2014-06-27 11:12:09 +02:00
Loganbacca
2218164df9 Bug fix and mapping example
- Fixed mapped omni devices being set to off at round start
- Remapped the research outpost atmos room, taking advantage of omni devices
2014-06-26 21:10:17 +12:00
Loganbacca
9c80541936 Mapper sanity checks
- Checks that mapped values add up to 100% so mappers can't set unusual ratios
2014-06-26 15:40:10 +12:00
Loganbacca
5af82714b2 Omni device tweaks
- Better mapping support (mapping icons and can now set mixer concentration)
- Trimmed overlay lists
- Utilized existing procs for icon generation
- Changed filter icon color to better contrast the output color
2014-06-26 14:55:53 +12:00
Loganbacca
71ff9f7671 Add omni devices to dispenser
- Added omni filters and mixers to pipe dispenser
- Added construction code
- A couple more cosmetic tweaks
2014-06-25 23:17:45 +12:00
Loganbacca
095ab7d97c Added omni filters
- Added omni gas filter
- Cleaned up some code in mixer.dm and omni_base.dm
2014-06-25 23:17:44 +12:00
Loganbacca
4d4947021e Atmos Overhaul - Phase 1
- Implements omni device core framework
- Adds omni gas mixer
2014-06-25 23:17:44 +12:00
Loganbacca
493ecdeb9e Pipe fixes
- Cleans up silent pipe deleting (now creates a loose pipe item where the pipe section was)
- Allows pipe painters to paint disconnected pipes
- Removes OOC message from IC feedback
2014-06-25 23:17:44 +12:00
Chinsky
8c67326576 Merge pull request #5331 from UristMcKerman/pipeturbine
Pipe Turbine
2014-06-24 13:08:11 +04:00
UristMcKerman
72a55ae04c Forgot code file
Lol
2014-05-26 12:48:06 +04:00
Ravensdale
3ed9ac7774 Makes it so mixers and filters no longer block mob 2014-05-22 03:00:18 -07:00
UristMcKerman
a4eae6d661 Oups commit
Toxins renamed to phoron. I have no words to describe my feelings...
2014-05-20 07:30:27 +04:00
UristMcKerman
72cf6c329d Phoron came back
Long story of my commiting attempts
2014-05-20 07:02:04 +04:00
UristMcKerman
2164f03655 Added heat radiation to H/E pipes
Added black-body heat radiation to H/E pipes placed over /turf/space
according to Stephan-Botzmann law
2014-05-20 06:50:26 +04:00
Loganbacca
8e1ac09545 Trinary atmospheric device variants
- Mirror filter - standard filter with the output mirrored to the opposite side
- T-Mixer - takes left and right inputs then outputs the mix perpendicular to the inputs
- Mirror mixer - standard filter with the output mirrored to the opposite side
- Added all three to pipe dispenser and construction code so they can be built in-game
2014-05-03 22:01:33 +12:00
Ravensdale
3b67dabb17 Atmos mainline pipe code moved and enabled. 2014-04-28 09:08:38 -07:00
Ravensdale
68eda5201b Merge branch 'master' of https://github.com/Baystation12/Baystation12 into phoron
Conflicts:
	code/ATMOSPHERICS/components/unary/vent_scrubber.dm
	code/modules/paperwork/paper.dm
	html/changelog.html
	icons/mob/uniform.dmi
	maps/tgstation2.dmm
2014-04-16 21:44:26 -07:00
Ravensdale
1d6655850f Changes all appropriate instances of toxins to phoron 2014-04-10 15:11:26 -07:00
Ravensdale
a3e4a43536 Changes most viable, used entries of plasma with phoron. 2014-04-10 05:05:04 -07:00
Ravensdale
e6c3fbf071 Changes all appropriate instances of 'Plasma' to 'Phoron' 2014-04-10 01:19:49 -07:00
Mloc-Argent
9b19d7dacf atmos: remove a few force-deletes in merge code
Removes del(giver) from pipeline/merge(), turf/assume_air() and
atom/assume_air().
Thanks to valzargaming on reddit/github for pointing it out.
fixes #4717

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-04-07 17:28:09 +01:00
Ccomp5950
753a2ef08c Code Effeciency Project: Vent scrubbers have a bit more sanity.
No longer checking for 0.00000000000000000000000001 moles of toxins scrubers can only detect stuff worse then 0.001 moles.

Have a nice day.
2014-04-04 13:21:47 -05:00
Ccomp5950
63a0f1185e Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze
Conflicts:
	code/ATMOSPHERICS/pipes.dm
	code/game/dna/genes/powers.dm
	code/game/objects/items/devices/PDA/PDA.dm
2014-02-20 19:16:23 -06:00
Loganbacca
e140998f86 Pipe painter bad-fix revert
Oops. Thanks Segrain.
2014-02-20 16:46:43 +13:00