Commit Graph

9413 Commits

Author SHA1 Message Date
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
Chinsky
472e9b764d Added ability to pick photo size. 2014-08-19 21:19:23 +04: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
mwerezak
5b341bd810 IB initial damage now depends on damage taken
Also, autohealing IBs no longer stop bleeding, but do stop worsening.
2014-08-16 22:00:55 -04:00
mwerezak
add9ec3b65 Makes IB bleed with same rate as external bleeding
Also updates drip() to remove the amount of blood actually passed into
it as argument.
2014-08-16 21:45:21 -04:00
mwerezak
d8b6aecc32 Fixes escape shuttle announcing a negative ETA
Fixes the escape shuttle announcing a negative ETA when it leaves late.
2014-08-16 21:02:05 -04:00
mwerezak
2bd96ab29e Fixes multi docking port undocking conditions
The undocking conditions for multidocking ports (used by the escape
shuttle) were overly strict, failing if any door was open/unlocked.
Changed to allow undocking if at least one of the inner or outer doors
can close and lock.
2014-08-16 20:50:34 -04:00
Hubblenaut
d122ec9979 Sleeping people on chairs can be woken up 2014-08-17 02:34:26 +02:00
Hubblenaut
1602cb883c Surgical tools that are nowhere near the patient don't cause a fail step 2014-08-17 02:34:25 +02:00
Hubblenaut
cbb0a3c0b7 Fixes a surgery oversight regarding text coloring 2014-08-17 02:21:32 +02:00
Hubblenaut
48655479b7 Hardcrit is entered immediately and lasts for 300 seconds instead of 250 (at max) 2014-08-17 02:21:31 +02:00
Hubblenaut
15ae5ca2a9 Adds JMP button to certain admin logs 2014-08-17 02:21:21 +02:00
Chinsky
09561db2d0 Added coefficient to scale speed of rads. Currently it's 10x slower than it was.
Added humans going bald on high rads levels.
Added a chance to get sick burn on highest rad level.
Replaced mutations (turning deaf/blind is unfun, and slowing rads would raise the chance of it happening) with a a chance of small genetic damage.
2014-08-16 09:32:24 +04:00
Chinsky
1de0e2cb44 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into spacearea
Conflicts:
	maps/tgstation2.dmm
2014-08-16 06:29:55 +04:00
Ccomp5950
9f57c1b16e Merge pull request #6012 from Walter0o/gear_fix
fixes #6007 and future bugs with gear names
2014-08-15 20:08:25 -05:00
Chinsky
f71e43d06c Moved ambiance sounds out of horrendous ifchain to area definitions.
Changed ambiance spamcheck to use time instead of 10 minute spawn.
2014-08-16 04:40:46 +04:00
mwerezak
9d7c5dc197 Gives filters proper names, updates airlocks to use filters
Docking ports still don't use filters though, as it would mess with the
docking ports that are also airlocks. Docking is infrequent though so it
should be fine.
2014-08-15 20:27:00 -04:00
Chinsky
919ecc2a16 Merge pull request #5998 from Walter0o/gripper_fix
fixes #5693
2014-08-16 03:47:51 +04:00
Walter0o
a3848871d4 fixes #6007 and future bugs with gear names 2014-08-15 11:11:13 +02:00
Walter0o
de37978995 comment adjustment according to feedback 2014-08-15 06:19:55 +02:00
mwerezak
d399fb610d Renames "laser gun" to "laser carbine" 2014-08-14 22:59:18 -04:00
Chinsky
7351767ef7 Merge pull request #5983 from atlantiscze/co2-breath-fix
CO2 Breath fix
2014-08-14 22:58:22 +04:00
Chinsky
07ed87ccd9 Merge pull request #5993 from GinjaNinja32/proximity2
More proximity fixes
2014-08-14 22:55:29 +04:00
PsiOmega
46a50dc7a2 Removes the loophole ion-law. Adds in some other ion law changes. 2014-08-14 11:20:45 +02:00
Walter0o
7236995b0e fixes #5693 2014-08-14 11:13:12 +02:00
PsiOmega
6fffe8e077 Merge remote-tracking branch 'upstream/dev' into Brig2 2014-08-14 08:58:59 +02:00