Commit Graph

14536 Commits

Author SHA1 Message Date
mwerezak
54d11506d0 Allows power to be read by examining the collectors 2014-08-25 20:57:32 -04: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
mwerezak
82a862e07e Fixes entropy calculation
Fixed the entropy calculation so that it is easier to remove gas from a
hot gas mix, not harder. Added comments explaining the entropy
calculation. Also returns pump and filter efficiency to previous values.
2014-08-25 15:49:39 -04:00
Chinsky
5fa876d9f5 Merge pull request #6144 from PsiOmegaDelta/Cryo
Improved cryo object-recovery
2014-08-24 21:44:45 +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
Ccomp5950
fd37cf44e3 Merge pull request #6104 from mwerezak/power-net
Fixes for APCs (from dev), fix for solars area, and simple APC load balancing
2014-08-24 12:26:29 -05:00
Chinsky
12d3dadc5f Merge pull request #6112 from PsiOmegaDelta/med
Fixes #6106
2014-08-24 01:58:53 +04:00
Chinsky
2c73f3b2d5 Merge pull request #6107 from mwerezak/dev-fixes
Fixes rad suits not completely protecting against radiation
2014-08-24 01:58:26 +04:00
Chinsky
60d3dc5178 Merge pull request #6117 from PsiOmegaDelta/Camera
Camera names are now sanitized
2014-08-24 01:57:23 +04:00
mwerezak
bad772d9c5 Adjusts the supermatter reaction parameters 2014-08-23 12:35:12 -04:00
mwerezak
3cd0cdf27f Fixes freezers never quite reaching their thermostat temperature 2014-08-23 10:52:57 -04:00
PsiOmega
f8aebd6853 Improved cryo object-recovery.
Cryo object-recovery now offers a list of items to recover, when one wish to recover a single object, instead of directly disgorging the first item it finds.
2014-08-23 15:38:31 +02:00
mwerezak
aa97002e88 Removes comment, adjusts rel_sizes 2014-08-22 22:09:23 -04:00
mwerezak
025838532a Adjusts SM charging and output 2014-08-22 21:43:03 -04:00
mwerezak
88a2c21764 Fixes #6123 2014-08-22 21:38:53 -04:00
mwerezak
56068092d0 Merge remote-tracking branch 'upstream/dev-freeze' into power-net 2014-08-22 17:41:12 -04:00
PsiOmega
98cbc8f220 Camera names are now sanitized.
When assembled camera no longer default to names such as "The mproper Central Primary Hallway (632)" but instead "Central Primary Hallway (632)".
2014-08-22 14:16:46 +02:00
PsiOmega
6fa9ebddc2 Fixes #6106 and prevents placing a mountain of humans on the same op-table. 2014-08-22 12:14:01 +02:00
Ccomp5950
5a0abbaee4 Merge pull request #6098 from PsiOmegaDelta/Pref
Fixes #6038
2014-08-22 05:03:47 -05:00
mwerezak
ababfc1d0c Merge remote-tracking branch 'upstream/dev-freeze' into dev-fixes
Conflicts:
	code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm
2014-08-22 01:24:34 -04:00
mwerezak
c8f2d040a1 Fix for rad suits not protecting against radiation
Rad suits were not providing complete protection from radiation. This is
probably not the best solution. Better solutions would be to either add
the HANDS and FEET coverage flags as done here in addition to updating
the sprite to reflect the additional coverage, or to add radiation proof
gloves and boots as part of the radiation suit set (potentially
problematic for taj and unathi engineers).
2014-08-22 01:15:17 -04:00
mwerezak
ec52bf830d Fixes human armor value for full body effects not being weighted by body part
This was an issue because it meant that not having hand or feet
protection reduced the player's protection from full body effects much
more than it should have, and meant that not having your hands protected
was just as bad as not having your chest protected.
2014-08-22 01:12:07 -04:00
mwerezak
1477fe17ab Fixes apply_effect() used without armour checks 2014-08-22 00:02:50 -04:00
mwerezak
170baf15c7 Improves rand_zone() and miss chance procs 2014-08-21 23:32:51 -04:00
Raptor1628
5a030ac82b Brig Fixes Clean
Includes all the previous fixes, plus removes loyalty implants from HoS
locker
2014-08-21 20:58:00 -04:00
mwerezak
006c98bcdd Merge remote-tracking branch 'upstream/dev-freeze' into power-net 2014-08-21 20:25:58 -04:00
mwerezak
5d97c9d6a2 Fixes fore solars control room area
Also changes solar area requires_power and always_unpowered to match
area/space
2014-08-21 20:11:23 -04:00
mwerezak
304d88a4d4 Adds simple load balancing 2014-08-21 19:27:12 -04:00
PsiOmega
6a44883afb Fixes #6038. Adds a missing ' 2014-08-21 21:52:59 +02:00
mwerezak
f2b234fe81 Fixes APCs drawing more power than they can to use to charge 2014-08-21 01:18:26 -04:00
Zuhayr
ee499426ad Compile fixes. 2014-08-21 12:19:10 +09:30
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
Zuhayr
0397ce5f1a Merge pull request #6076 from Jarcolr/patch-1
Fixes #5943
2014-08-21 11:19:30 +09:30
Chinsky
fd486ea369 Merge pull request #6064 from PsiOmegaDelta/Announce
AI Announcements & Verbs
2014-08-21 01:37:55 +04:00
Chinsky
ec791bd81c Merge pull request #6068 from faerindel/vending_exploit_fix
Fixes #6054
2014-08-21 01:36:21 +04:00
Jarcolr
c481d035f5 Fixes #5943
Recharging should give rods.
2014-08-20 11:14:54 +03:00
Chinsky
6cc4280c48 Merge pull request #5990 from Hubblenaut/dev
Fixes phoron reactions
2014-08-20 00:19:34 +04:00
PsiOmega
a2253617cf Makes it possible for the AI to make station wide announcements. Improved AI verb handling in case of death/restoration. 2014-08-19 21:09:14 +02:00
Ccomp5950
770fb4de4c Merge pull request #6052 from PsiOmegaDelta/Mapping
Fixes #6027
2014-08-19 12:01:14 -05:00
igalan
322c5b53f2 Fixes #6054 2014-08-19 17:50:55 +01:00
Walter0o
eb7c2aa9c5 should fix #6065 2014-08-19 17:26:10 +02:00
Zuhayr
677ac1f7bb Merge pull request #6051 from comma/detcomp
Initial commit of detective console rewrite.
2014-08-19 21:46:52 +09:30
Ccomp5950
264aee843f Merge pull request #6063 from Whitellama/master
Fixed eggs not going back into egg boxes
2014-08-19 06:23:57 -05:00
Ccomp5950
8691d36ea1 Merge pull request #6062 from PsiOmegaDelta/Walls
Optimization - Walls deletion
2014-08-19 06:22:31 -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
Ccomp5950
cf2be93916 Merge pull request #6056 from mwerezak/dev-fixes
Fixes firedoors not opening
2014-08-19 06:02:08 -05:00
Ccomp5950
25506f33fa Merge pull request #6032 from Walter0o/low_pressure_fix
fixes #6005 and broken ancient human low/high pressure code.
2014-08-19 05:54:30 -05:00
Ccomp5950
3c9fa8ba61 Merge pull request #6050 from mwerezak/breathing
Simplifies handling of inhale_pp
2014-08-19 05:52:37 -05:00
Whitellama
26721cf0d5 Fixed eggs not going back into egg boxes 2014-08-19 02:44:58 -07:00