Commit Graph

2745 Commits

Author SHA1 Message Date
PsiOmega
2fa014d74b Improves status display examination feedback. Ensures output is properly sanitized. 2014-08-27 14:16:33 +02:00
Zuhayr
cf68ad7c87 Master to dev merge. 2014-08-27 20:24:07 +09:30
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
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
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
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
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
1084a1d6d7 Optimization of machinery sort? 2014-08-24 22:52:51 +02:00
Chinsky
7d18ddfab1 Merge pull request #6146 from PsiOmegaDelta/Dylovene
Renames anti-toxin bottles to dylovene.
2014-08-24 21:45:00 +04:00
Ccomp5950
6e8722de53 Merge pull request #6120 from PsiOmegaDelta/Sanity
Can again create newfeeds
2014-08-24 12:30:53 -05: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
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
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
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
Chinsky
871456f131 Merge pull request #6084 from PsiOmegaDelta/MoreNounce
Announcement Refactoring
2014-08-21 21:53:03 +04:00
Chinsky
f559a7eb85 Merge pull request #6079 from PsiOmegaDelta/PipeDrop
Allows clicking floors to drop pipes
2014-08-21 17:34:13 +04:00
Chinsky
77066d1f62 Merge pull request #6078 from PsiOmegaDelta/TurretExploit
Fixes turret exploit
2014-08-21 12:09:28 +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
b47d91b612 Merge resolution, master into dev. 2014-08-21 12:01:38 +09:30
Chinsky
fd486ea369 Merge pull request #6064 from PsiOmegaDelta/Announce
AI Announcements & Verbs
2014-08-21 01:37:55 +04: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
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
igalan
322c5b53f2 Fixes #6054 2014-08-19 17:50:55 +01:00
Ccomp5950
cf2be93916 Merge pull request #6056 from mwerezak/dev-fixes
Fixes firedoors not opening
2014-08-19 06:02:08 -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
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
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
Zuhayr
df6723deb0 Merge pull request #6036 from mwerezak/power-net
Fixes laptop power draw, improves cell chargers
2014-08-18 21:04:02 +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
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
mwerezak
6d6413a59b Fixes laptop power draw, improves cell chargers
Cell chargers no longer call use_power() in their process()
2014-08-17 15:30:29 -04:00
mwerezak
e1fb63f6e7 Fixes airlock icon state/animation weirdness
door_spark and door_deny icon states are usually of a closed door, so it
looks glitchy if they are used when the door is open (such as by pulsing
the ID scan wire).
2014-08-16 21:04:06 -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
15ae5ca2a9 Adds JMP button to certain admin logs 2014-08-17 02:21:21 +02:00
mwerezak
3c46e4c35b Fixes airlocks aborting when cycled
Fixes airlocks aborting because the doors took too long to close.
2014-08-16 14:39:37 -04:00