Commit Graph

148 Commits

Author SHA1 Message Date
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
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
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
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
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
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
e6c3fbf071 Changes all appropriate instances of 'Plasma' to 'Phoron' 2014-04-10 01:19:49 -07: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
42946bd2ad Vent pump efficiency
- Tweaked the pressure delta check to "> 0.5", so pumps will stop transferring minor volumes of air every tick (because a delta of 3.05176e-005 is still greater than 0). This also reduces the calls to gas_mixture/merge() and gas_mixture/remove() significantly once the air in the environment has equalized.

The results after running the game for 10 minutes:
```
Proc Name												Self CPU	Total CPU	Real Time	Calls
/obj/machinery/atmospherics/unary/vent_pump/process		0.035		0.141		0.141		3808	<- before
/obj/machinery/atmospherics/unary/vent_pump/process		0.014		0.042		0.043		3808	<- after
```
2014-02-18 16:16:10 +13:00
Loganbacca
8fc4e4e7db Minor tweaks and fixes for airlock equipment
- Fixed DP vent pumps not changing direction
- Made airlock_sensor more versatile (and backwards compatible with old airlock code)
- Added airlock_sensor and access_button airlock subtypes for easier mapping
2014-02-13 14:21:18 +13:00
Loganbacca
3978492ca4 Removed ID requirement for gas filters
So they can be used in other areas of the station (like toxins and the engine room) without needing atmos access to change settings.
2014-02-08 18:35:01 +13:00
Zuhayr
f1b77d0ed6 Master merge. 2014-02-05 18:34:23 +10:30
Segrain
83246df6d5 Fix for #4297. 2014-02-03 07:32:53 +03:00
Mark Aherne (Faerdan)
c0d5ffd022 Added no-network check to heat_source to fix a runtime if not connected to a network. 2014-01-24 09:56:02 +00:00
Mloc-Argent
a1f55a50b1 Massive click code rework by SuperSayu, ported from TG.
Full details at https://github.com/tgstation/-tg-station/pull/1206
Fixes #3648

Hopefully done right this time.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-10-08 20:27:39 +01:00
Mloc-Argent
a084f74c7d Expansion of every "icon = ''" path.
Supposed to help compilation times.  Who knows.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-09-01 21:53:36 +01:00
Cael_Aislinn
1d9fe082d7 made TEG generate power from heat transferred again, restructed TEG and circulator code to be smaller and cleaner, added an "overload" to TEGs where they spark + power output drops if power output exceeds 250k
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-05-19 18:50:15 +10:00
SkyMarshal
3b41db4a18 Made circulators and TEGs work, updated Rowtree's station with a functional powergrid and TEG battery.
Signed-off-by: SkyMarshal <skymarshal1729@gmail.com>
2013-04-24 15:58:39 -07:00
SkyMarshal
e8d7cc1e61 Fixes the bug with Filters allowing insane overpressurization. 2013-04-16 12:43:19 -07:00
Cael_Aislinn
c5f461e90d circulators and type 1 gens are now rotateable/moveable, also made the operation of gens/circs much more generalised to allow for greater flexibility in setup (this makes type 2 gens incompatible with the circs, but i'll update them later)
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-06 01:28:57 +10:00