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
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
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
mwerezak
bad772d9c5
Adjusts the supermatter reaction parameters
2014-08-23 12:35:12 -04: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
56068092d0
Merge remote-tracking branch 'upstream/dev-freeze' into power-net
2014-08-22 17:41:12 -04: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
mwerezak
006c98bcdd
Merge remote-tracking branch 'upstream/dev-freeze' into power-net
2014-08-21 20:25:58 -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
Jarcolr
c481d035f5
Fixes #5943
...
Recharging should give rods.
2014-08-20 11:14:54 +03: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
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
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
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
mwerezak
c42d9171d6
Makes power monitor a power machine again
...
Also moved the power monitor code to modules/power
2014-08-19 01:45:23 -04:00
mwerezak
1cfc3b8d5f
Fixes APCs eating up all the power even when fully charged
2014-08-19 01:14:18 -04:00
Chinsky
b43759fee9
Initial commit of detective console rewrite.
...
Changed forensic data to use record datum instead of unreadable arrays.
Now handheld scanner transfers data by clicking the big console, not by scan.
Rewrote high res scanner console. Now it leaves compiling dossiers to player, via use of filters.
2014-08-19 00:50:14 +04:00
PsiOmega
11ce777d9c
Fixes #6027
...
Creates two proper monitor circuits for Engineering/Mining.
Adds air alarms in the Research access foyer.
Relocates camera in Misc. research to a more central location.
Ensures there are enough Telecommunication Satellite SMES units to meet power demand.
2014-08-18 22:37:54 +02:00
mwerezak
f9b4a78405
Fixes exhaling/inhaling types, cleanup
2014-08-18 14:58:18 -04:00
mwerezak
b04ac56d45
Cleanup/adjustment of inhale_pp handling
2014-08-18 13:33:51 -04:00
Whitellama
7ced8104ca
Merge branch 'master' of https://github.com/Baystation12/Baystation12
...
Conflicts:
code/game/objects/items/devices/transfer_valve.dm
2014-08-17 17:50:07 -07:00
Zuhayr
65a31f2dc2
Merge pull request #6026 from mwerezak/internal-bleeding
...
Implements IB changes discussed in forum thread
2014-08-18 09:32:00 +09:30
Zuhayr
8ec28551ba
Merge pull request #6022 from mwerezak/docking
...
Fixes for docking controllers, emergency shuttle and airlock animations
2014-08-18 09:30:17 +09:30
Zuhayr
6679434713
Merge pull request #6024 from mwerezak/laser
...
Adjusts laser cannon damage
2014-08-18 09:29:27 +09:30
Zuhayr
2033923f8f
Merge pull request #6018 from Hubblenaut/master
...
Patch of fixes for bugs and oversights
2014-08-18 09:28:17 +09:30
Zuhayr
2a6a312dbe
Merge pull request #6019 from mwerezak/radio
...
Fixes machines being able to put the Radio Controller to sleep + Radio Controller cleanup
2014-08-18 09:25:24 +09:30
Zuhayr
4740898b23
Merge pull request #6016 from comma/rads
...
Rad damage changes
2014-08-18 09:24:49 +09:30
Whitellama
09907858f3
Added fingerprints and logs when wrenching fuel tanks, and added JMP buttons to logs regarding fuel tanks.
2014-08-17 15:51:01 -07:00
JimTheCactus
e74d92370d
Added a forced, immediate refresh of the icons after the character is made.
...
This eliminates a race condition between spawning in and the icon cache being updated to include the body.
2014-08-17 12:34:02 -06:00
Walter0o
e8592d4f41
fixes #6005 and broken ancient human low/high pressure code.
...
-fixes low/high pressure not damaging unsealed/damaged spacesuits.
-refactors procs and adds more comments.
-removes unused/dead code.
2014-08-17 18:06:30 +02:00
Whitellama
f1494c9b76
Admins now get logs when welding fuel is spilled on the floor, and welding tanks gain fingerprints when someone gets fuel from them.
2014-08-17 02:48:08 -07:00
Chinsky
c660734299
Added probability scaling for non-damage events.
...
Fixed typo.
2014-08-17 11:05:17 +04:00
mwerezak
bd397ff844
Adjusts laser cannon damage
...
Increased laser cannon damage to be higher than regular laser damage.
Also updated the name var of /laser/captain so that it doesn't inherit
"laser carbine"
2014-08-16 22:34:23 -04:00
