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
mwerezak
2f0e4a1729
update_use_power() now doesn't force updates...
...
...if it doesnt need to.
2014-07-14 13:13:23 -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
1edd2ccc3a
Merge branch 'sackur-tetrode' into power-net
2014-07-12 20:13:42 -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
77d9c20be4
Adjusts charger power rates
2014-07-12 15:49:24 -04:00
mwerezak
f5c67f87ab
Fixes chargers being a magical source of charge
2014-07-12 15:44:21 -04:00
mwerezak
06ce667eef
Fixes cyborg recharger not using CELLRATE
2014-07-12 10:49:02 -04:00
mwerezak
c31a8e11eb
Adjusts airlock power usage
2014-07-12 02:53:42 -04:00
DJSnapshot
0e5b7dea5b
Merge pull request #5565 from Zuhayr/newgear
...
Custom gear loadouts.
2014-07-11 14:40:05 -07:00
DJSnapshot
ae45545dc8
Merge pull request #5567 from Zuhayr/robots
...
Robot module changes.
2014-07-11 14:19:36 -07:00
mwerezak
fa1f587939
Fixes some compile errors
2014-07-11 17:04:14 -04:00
mwerezak
7c0541da5e
Cleans up SM temp change using thermal energy
2014-07-11 15:18:16 -04:00
mwerezak
f2a74327fb
R&D Server heat production and power usage
2014-07-11 15:14:54 -04:00
mwerezak
1db729e90c
Makes telecoms heat production and power usage...
...
...less ridiculous. Now obeys something resembling the laws of physics.
2014-07-11 15:07:31 -04:00
mwerezak
96983fe8b8
Thermodynamics for spaceheaters
2014-07-11 14:51:57 -04:00
mwerezak
b23b4dd7ce
Cleans up air alarm cooling, limits temp to TCMB
2014-07-11 14:49:23 -04:00
mwerezak
db29d172f5
Air alarm cooling now resembles thermodynamics
...
Gas cooling power consumption now resembles the work required to operate
a Carnot heat pump. Cooling hot air takes less energy than cooling cold
air.
2014-07-11 14:34:07 -04:00
mwerezak
b78c918c58
Moved h/e constant to setup.dm, included units
2014-07-11 14:29:30 -04:00
Walter0o
b6856eac8b
can't trust players with anything
2014-07-11 09:19:23 +02:00
igalan
a27b2ac005
Removed commented out useless crap.
2014-07-11 05:43:59 +01:00
Zuhayr
d2c57115ed
Added glass to the engineering module.
2014-07-11 13:55:21 +09:30
Zuhayr
0d21889bee
Fixed some bugs, did some testing, moved some procs around for robot functionality.
2014-07-11 13:50:34 +09:30
Zuhayr
8f09c557f9
Added paperwork handler, clerical gripper, some other tweaks.
2014-07-11 13:12:01 +09:30
Zuhayr
70ba371658
Merge resolution.
2014-07-11 12:47:16 +09:30
Zuhayr
55d52ef1f4
Cleaned up a little oversight.
2014-07-11 12:25:08 +09:30
Zuhayr
3955edd04b
Final touches for loadout system.
2014-07-11 12:16:08 +09:30
Zuhayr
903679bd79
More work on gear loadouts.
2014-07-11 11:47:53 +09:30
igalan
fc3648a523
Syntiflesh is defined twice, both as a food/snack and obj/item/weapon. The first one is edible while the second one is not.
...
This PR comments out the non-edible one and replaces any reference of it to the edible one.
2014-07-10 22:20:13 +01:00
Zuhayr
85b1bbe041
Merging work into dev.
2014-07-10 20:25:07 +09:30
Ccomp5950
87d907ef8d
Merge pull request #5545 from Zuhayr/dev
...
Added Roaper's custom item, generalized the hardsuit modification kit so...
2014-07-10 01:04:08 -05:00
DJSnapshot
eacd384d39
Merge pull request #5554 from Baystation12/master
...
Updating dev with master
2014-07-09 23:00:04 -07:00
Zuhayr
f477012ab8
Merge pull request #5533 from mwerezak/wound-infections
...
Fix for #5532 and the last of the infection changes, I hope
2014-07-09 19:28:00 +09:30
Mloc
c7b2aefdc7
Merge pull request #5534 from Hubblenaut/master
...
Fixes painkillers leaving the body way too fast and adds minor feature to health analyzers
2014-07-09 10:41:22 +01:00
Zuhayr
7c6bec03ae
Added Roaper's custom item, generalized the hardsuit modification kit somewhat, modified Solaruin's custom item accordingly.
2014-07-09 16:58:38 +09:30
Zuhayr
326f3821e1
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev
2014-07-09 15:52:31 +09:30
mwerezak
ffcb068b96
Fixed wrong operator
2014-07-09 00:11:20 -04:00
mwerezak
5e56d09512
Sterilizine reduces germ_level on contact
2014-07-08 18:57:07 -04:00
mwerezak
910ce676b0
Fixes advanced trauma kits claiming to disinfect but not doing so
2014-07-08 18:49:51 -04:00
unknown
dcfbeb0924
Fixes missing length check before pick()
2014-07-08 16:12:55 -04:00
Zuhayr
8d90c40265
Merge pull request #5537 from Hubblenaut/wheelchair
...
Fixes canmove updating wrongly on movable chairs
2014-07-08 20:54:19 +09:30
Zuhayr
6499385279
Temp commit with robot module work
2014-07-08 19:44:33 +09:30
Hubblenaut
a6e6a8939f
Cleans code up for easier editing
2014-07-08 07:39:49 +02:00
Zuhayr
c239ec432a
Merge pull request #5536 from Ccomp5950/mentor_no_highlight
...
Mentors will no longer see highlighed names in ahelps / msay for players with special roles (Antags, etc.).
2014-07-08 14:55:04 +09:30
mwerezak
4ac685afd9
Removes duplicate defines, updates comments
2014-07-07 23:18:12 -04:00
Hubblenaut
6568533d0d
Fixes canmove updating wrongly on movable chairs
2014-07-08 04:48:21 +02:00
