Commit Graph

14633 Commits

Author SHA1 Message Date
Chinsky
a893baf8be Merge pull request #6167 from PsiOmegaDelta/PDATime
PDA - Examination now offers station time
2014-08-27 01:32:47 +04:00
PsiOmega
0090efb210 Fixes an issue where toggling camera lights would disconnect the AI from an active holopad while keeping the pad online. 2014-08-26 16:38:44 +02:00
PsiOmega
a1dd07db38 Merge remote-tracking branch 'upstream/dev' into StatusDisplay
conflicts:
	maps/tgstation2.dmm
2014-08-26 14:21:29 +02:00
PsiOmega
ea549fb5ee Making sec huds more fault tolerant. A number of sources never set id.rank, only id.assignment. 2014-08-26 13:44:49 +02:00
Chinsky
f40298715f Merge pull request #6153 from PsiOmegaDelta/AtmosList
Central Atmospherics Computer - Air alarm sub-list
2014-08-26 15:25:59 +04:00
Chinsky
1c2cc138d6 Merge pull request #6168 from Kelenius/OfCablesAndStacks
Cables are now stacks
2014-08-26 15:25:31 +04:00
mwerezak
9859fc0b00 Fixes #6118 2014-08-25 21:02:57 -04:00
GinjaNinja32
778a0fc608 Removed debug statements 2014-08-26 01:43:54 +01:00
PsiOmega
a3b683d10f Merge remote-tracking branch 'upstream/dev' into StatusDisplay. Moved code in New() into initialize(). 2014-08-26 00:03:18 +02:00
PsiOmega
2786c8e8b9 Remote air alarm control for the isolation cells now available on the outpost. 2014-08-25 23:24:35 +02:00
PsiOmega
01be3a37c1 Merge remote-tracking branch 'upstream/dev' into AtmosList. Atmospherics Control Console no longer sorts the machines list, as this is now done elsewhere. 2014-08-25 21:53:17 +02:00
Chinsky
b05f9a16ac Merge pull request #6155 from LightningIron/master
Changes some messages to make more sense
2014-08-25 22:18:49 +04:00
Chinsky
e2607e51f0 Merge pull request #6161 from PsiOmegaDelta/RoundEnd
Extended round end feedback
2014-08-25 22:18:11 +04:00
Chinsky
286f22e15c Merge pull request #6160 from PsiOmegaDelta/DecaSeconds
Increased mecha area-denial feedback interval
2014-08-25 22:17:37 +04:00
Chinsky
e12f3bd92b Merge pull request #6159 from PsiOmegaDelta/MachineSort
Optimization of machinery sort?
2014-08-25 22:12:43 +04:00
Chinsky
124217fab9 Merge pull request #6134 from PsiOmegaDelta/Construction
Fixes #6130
2014-08-25 22:12:28 +04:00
PsiOmega
9eef5ff877 Status displays can now show station time. Also prepares for making brig timer inherit from status display. 2014-08-25 19:30:56 +02:00
Kelenius
a1348faa8c Cables are now stacks 2014-08-25 18:54:35 +04:00
PsiOmega
4ffe5f411b Absolut cleanup. 2014-08-25 16:52:47 +02:00
PsiOmega
2c0bb7832d Examining your own or a very close by PDA now reveals the current station time. 2014-08-25 12:34:25 +02:00
PsiOmega
3377ca1bfb Based on https://github.com/tgstation/-tg-station/pull/4562 and adapted to BS12 shuttle code. Credit to @Ikarrus. 2014-08-25 07:37:59 +02:00
mwerezak
f1a1162c3f Fixes shuttle ETA given before arrive_time is set 2014-08-24 22:43:19 -04:00
GinjaNinja32
4a484d4207 Various grammar and spelling fixes in ion laws 2014-08-24 23:40:25 +01:00
PsiOmega
3367fdf8bb Now mecha area denial feedback is closer to 5 seconds apart then ever. 2014-08-24 23:41:15 +02:00
PsiOmega
1084a1d6d7 Optimization of machinery sort? 2014-08-24 22:52:51 +02:00
Chinsky
23576ffdb6 Merge pull request #6154 from PsiOmegaDelta/Traitor
Code phrase/response no longer randomly assigned
2014-08-24 23:12:19 +04:00
LightningIron
7de4825a87 Changes some messages to make more sense 2014-08-24 14:09:39 -05:00
Chinsky
5924670ca4 Merge pull request #6148 from LightningIron/master
Fix for #6131.
2014-08-24 21:46:03 +04:00
Chinsky
63dc3424f0 Merge pull request #6142 from PsiOmegaDelta/sec_hud
Sec-huds can now handle alt-titles.
2014-08-24 21:45:34 +04:00
Chinsky
7d18ddfab1 Merge pull request #6146 from PsiOmegaDelta/Dylovene
Renames anti-toxin bottles to dylovene.
2014-08-24 21:45:00 +04:00
Chinsky
bd3544be7b Merge pull request #6145 from Walter0o/hud_update_fix
removes duplicate handle_hud_list()
2014-08-24 21:44:49 +04:00
Ccomp5950
3104b0421e Merge pull request #6141 from PsiOmegaDelta/Radio
Department radio use on join
2014-08-24 12:44:12 -05:00
Ccomp5950
eaec825fbc Merge pull request #6140 from PsiOmegaDelta/atmos
Atmospherics computer now displays a sorted list of air alarms
2014-08-24 12:43:19 -05:00
Ccomp5950
6e8722de53 Merge pull request #6120 from PsiOmegaDelta/Sanity
Can again create newfeeds
2014-08-24 12:30:53 -05:00
PsiOmega
61d40e2405 Non-random traitor code word assignment. 2014-08-24 12:47:48 +02:00
PsiOmega
b5ff2048ab Is now possible to create a sub-list of air alarms the atmos control console will list.
Will be used to allow scientists on the outpost to remotely control their isolation cell air alarms.
2014-08-24 12:35:47 +02:00
Chinsky
58a05802c0 Merge pull request #6110 from PsiOmegaDelta/Sec
Fixes #5984 by having ED-209s now pass through each other.
2014-08-24 01:58:33 +04:00
LightningIron
89c160dfd6 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2014-08-23 13:21:06 -05:00
LightningIron
39182f0c8f Fix for #6131. 2014-08-23 11:19:15 -05:00
PsiOmega
f19001feb8 Renames anti-toxin bottles to dylovene. Soporific tossed out. Sleep toxin renamed to Soporific.
Based on http://baystation12.net/forums/viewtopic.php?p=237269#p237269
2014-08-23 17:22:04 +02:00
Walter0o
368f6ef744 removes duplicate handle_hud_list() 2014-08-23 16:23:23 +02:00
PsiOmega
54706d79b3 Sec-huds can now handle alt-titles. 2014-08-23 16:03:51 +02:00
PsiOmega
e21da52af9 Atmospherics computer now displays a sorted list of air alarms 2014-08-23 15:23:14 +02:00
PsiOmega
bca85c8921 Adds a brief description on how to use the department and other channels on join. 2014-08-23 12:13:49 +02:00
PsiOmega
d8b803d5e3 Fixes #6130
The construction outpost now has an air supply and rudimentary distribution system.
Glass and wood stacks are filled to their max stack sizes, 50 and 32 sheets respectively.
Ghosts can now teleport to Z-level 4.

There are now special air alarms which do not broadcast their alarms. These are used in the mass driver areas to let crew know when it's safe to use them again.
These air alarms have also been installed in the Research isolation cells to finally allow scientists to check what's up, at least as long as they are in there or have AI assistance.
2014-08-23 10:20:24 +02:00
Hubblenaut
f6e8594a65 Hostile mobs break windows in reasonable order 2014-08-23 01:59:35 +02:00
Hubblenaut
640144a6e7 Space carp inflict damage to obstacles every 14 seconds 2014-08-23 01:59:35 +02:00
PsiOmega
dfa960c55b Can again create newfeeds.
sanitizeSQL returned nothing most likely because the input more often than not is not proper SQL.
Removes the check and replaces strip_html_simple with strip_html to match all other sanitizing calls in the class.
2014-08-22 22:48:58 +02:00
PsiOmega
ad387fda96 One can now update crew record photos using a security console. 2014-08-22 19:39:35 +02:00
PsiOmega
e7385e829b Fixes #5984 by having ED-209s now pass through each other. 2014-08-22 12:31:47 +02:00