Commit Graph

14543 Commits

Author SHA1 Message Date
Kelenius
a1348faa8c Cables are now stacks 2014-08-25 18:54:35 +04: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
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
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
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
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
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