Commit Graph

14526 Commits

Author SHA1 Message Date
PsiOmega
e21da52af9 Atmospherics computer now displays a sorted list of air alarms 2014-08-23 15:23:14 +02:00
Ccomp5950
7db352fcc6 Merge pull request #6075 from MrSnapwalk/ertv3
ERT update 3: electric boogaloo.
2014-08-22 05:01:02 -05:00
Chinsky
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
Chinsky
871456f131 Merge pull request #6084 from PsiOmegaDelta/MoreNounce
Announcement Refactoring
2014-08-21 21:53:03 +04:00
Chinsky
575ce7a6bd Merge pull request #6093 from Walter0o/disposals_fix
fixes #5907
2014-08-21 21:49:21 +04:00
MrSnapwalk
195805636b Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into ertv3 2014-08-21 11:40:35 -05:00
Walter0o
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
Chinsky
f559a7eb85 Merge pull request #6079 from PsiOmegaDelta/PipeDrop
Allows clicking floors to drop pipes
2014-08-21 17:34:13 +04:00
PsiOmega
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
Ccomp5950
a80931a6b9 Merge pull request #6069 from comma/photo
Added ability to pick photo size.
2014-08-21 03:32:48 -05:00
Chinsky
77066d1f62 Merge pull request #6078 from PsiOmegaDelta/TurretExploit
Fixes turret exploit
2014-08-21 12:09:28 +04:00
Chinsky
ed496b8463 Merge pull request #6081 from Walter0o/magical_smes_dev
fixes #6046
2014-08-21 12:09:09 +04:00
mwerezak
f2b234fe81 Fixes APCs drawing more power than they can to use to charge 2014-08-21 01:18:26 -04:00
PsiOmega
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
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
MrSnapwalk
7a2ee219ab Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into ertv3 2014-08-20 19:43:29 -05:00
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
Walter0o
71d130e52b fixes #6046 2014-08-20 13:18:13 +02:00
PsiOmega
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
PsiOmega
30c581c8b3 Fixes an exploit reported at tgstation/-tg-station#4491. Credits to @MrPerson for the fix. 2014-08-20 10:46:09 +02:00
Jarcolr
c481d035f5 Fixes #5943
Recharging should give rods.
2014-08-20 11:14:54 +03:00
MrSnapwalk
9b464d268c ERT update 3: electric boogaloo. 2014-08-19 21:46:27 -05: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
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
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
PsiOmega
b3cd08068a Noted a wall-deletion optimization made over at -tg. Credit to @Aranclanos. 2014-08-19 10:50:17 +02: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
mwerezak
f6f7c82e2a Fixes firedoors not opening 2014-08-18 22:53:43 -04:00
mwerezak
65bb47b7ec Setting computer vars on de/construction 2014-08-18 19:35:28 -04:00
mwerezak
52a6f2f9e0 Removes more unused vars from circuitboards 2014-08-18 18:28:39 -04:00
mwerezak
bdb2a45700 Makes power monitor computers actual computers
Removes the powernet var from circuit boards. Power monitors get their
powernet from the cable underneath them anyways.
2014-08-18 18:27:51 -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