7db352fcc6
Merge pull request #6075 from MrSnapwalk/ertv3
...
ERT update 3: electric boogaloo.
2014-08-22 05:01:02 -05:00
8163ff7f80
Merge pull request #6087 from mwerezak/power-net
...
Fixes a couple of bugs in apc/process()
2014-08-21 21:53:12 +04:00
871456f131
Merge pull request #6084 from PsiOmegaDelta/MoreNounce
...
Announcement Refactoring
2014-08-21 21:53:03 +04:00
575ce7a6bd
Merge pull request #6093 from Walter0o/disposals_fix
...
fixes #5907
2014-08-21 21:49:21 +04:00
195805636b
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into ertv3
2014-08-21 11:40:35 -05:00
ff8047baa0
fixes #5907
...
issue caused by relaymove() not being checked properly.
added comment to prevent this kind of issue in the future.
2014-08-21 15:41:28 +02:00
f559a7eb85
Merge pull request #6079 from PsiOmegaDelta/PipeDrop
...
Allows clicking floors to drop pipes
2014-08-21 17:34:13 +04:00
f9df93fad0
Expands the use of the new announcement system.
...
Code Green/Blue/Red/Delta, ERT, and captain annoncements now use the new announcement system.
These announcements are stored as newscasts.
2014-08-21 12:58:02 +02:00
a80931a6b9
Merge pull request #6069 from comma/photo
...
Added ability to pick photo size.
2014-08-21 03:32:48 -05:00
ed496b8463
Merge pull request #6081 from Walter0o/magical_smes_dev
...
fixes #6046
2014-08-21 12:09:09 +04:00
f2b234fe81
Fixes APCs drawing more power than they can to use to charge
2014-08-21 01:18:26 -04:00
68bf885e6b
Announcement system refactoring.
...
Turns announcements into a datum based system to allow a variety of configurations.
Current configuration options include:
Admin logging
Which sound that should play when announced, if any
If the announcement should be stored as a newscast
Request console/standard announcements currently match priority announcements, but have a smaller style/footprint.
Player announcements now include the assignment and name of the person (or the id rather) who made it.
Have currently only updated the request console and all announcements which previously used captain_announce().
Affected automated announcements, such as shuttle messages, should be exactly the same as before.
2014-08-21 06:34:41 +02:00
ee499426ad
Compile fixes.
2014-08-21 12:19:10 +09:30
b47d91b612
Merge resolution, master into dev.
2014-08-21 12:01:38 +09:30
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
0397ce5f1a
Merge pull request #6076 from Jarcolr/patch-1
...
Fixes #5943
2014-08-21 11:19:30 +09:30
7a2ee219ab
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into ertv3
2014-08-20 19:43:29 -05:00
fd486ea369
Merge pull request #6064 from PsiOmegaDelta/Announce
...
AI Announcements & Verbs
2014-08-21 01:37:55 +04:00
71d130e52b
fixes #6046
2014-08-20 13:18:13 +02:00
67752bd40b
Allows clicking (simulated) floors to drop pipes
...
This makes it possible to install pipes under immovable objects, similar to power cables.
2014-08-20 12:21:42 +02:00
c481d035f5
Fixes #5943
...
Recharging should give rods.
2014-08-20 11:14:54 +03:00
9b464d268c
ERT update 3: electric boogaloo.
2014-08-19 21:46:27 -05:00
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
472e9b764d
Added ability to pick photo size.
2014-08-19 21:19:23 +04:00
770fb4de4c
Merge pull request #6052 from PsiOmegaDelta/Mapping
...
Fixes #6027
2014-08-19 12:01:14 -05:00
eb7c2aa9c5
should fix #6065
2014-08-19 17:26:10 +02:00
677ac1f7bb
Merge pull request #6051 from comma/detcomp
...
Initial commit of detective console rewrite.
2014-08-19 21:46:52 +09:30
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
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
3c9fa8ba61
Merge pull request #6050 from mwerezak/breathing
...
Simplifies handling of inhale_pp
2014-08-19 05:52:37 -05:00
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
1cfc3b8d5f
Fixes APCs eating up all the power even when fully charged
2014-08-19 01:14:18 -04:00
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
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
f9b4a78405
Fixes exhaling/inhaling types, cleanup
2014-08-18 14:58:18 -04:00
b04ac56d45
Cleanup/adjustment of inhale_pp handling
2014-08-18 13:33:51 -04:00
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
65a31f2dc2
Merge pull request #6026 from mwerezak/internal-bleeding
...
Implements IB changes discussed in forum thread
2014-08-18 09:32:00 +09:30
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
6679434713
Merge pull request #6024 from mwerezak/laser
...
Adjusts laser cannon damage
2014-08-18 09:29:27 +09:30
2033923f8f
Merge pull request #6018 from Hubblenaut/master
...
Patch of fixes for bugs and oversights
2014-08-18 09:28:17 +09:30
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
4740898b23
Merge pull request #6016 from comma/rads
...
Rad damage changes
2014-08-18 09:24:49 +09:30
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
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
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
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
c660734299
Added probability scaling for non-damage events.
...
Fixed typo.
2014-08-17 11:05:17 +04:00
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
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
Ccomp5950