Commit Graph

1212 Commits

Author SHA1 Message Date
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
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
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
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
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
PsiOmega
e21da52af9 Atmospherics computer now displays a sorted list of air alarms 2014-08-23 15:23:14 +02:00
PsiOmega
ad387fda96 One can now update crew record photos using a security console. 2014-08-22 19:39:35 +02:00
Chinsky
871456f131 Merge pull request #6084 from PsiOmegaDelta/MoreNounce
Announcement Refactoring
2014-08-21 21:53:03 +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
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
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
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
Walter0o
0c6dff3c7a should fix #6030
basically the same as
569e8361dc
for the computer3 laptop.
2014-08-17 18:18:07 +02:00
Chinsky
07ed87ccd9 Merge pull request #5993 from GinjaNinja32/proximity2
More proximity fixes
2014-08-14 22:55:29 +04:00
GinjaNinja32
95528fb448 Remove inline comments 2014-08-14 11:17:33 +01:00
GinjaNinja32
d1fc12e1c7 More proximity fixes 2014-08-13 20:58:49 +01:00
Atlantiscze
40027d85bd Fixes #5974
- Fixes possible disappearance bug for Laptops
2014-08-13 08:19:46 +02:00
Zuhayr
f09d1218fe Master to dev merge. 2014-08-11 17:23:40 +09:30
mwerezak
58e0b659d4 Reorganizes shieldgen source code and icon files 2014-08-10 11:58:25 -04:00
mwerezak
444d03a335 Fixes #5901 2014-08-10 04:00:20 -04:00
mwerezak
4b070a2de6 Fixes #5935
Also improves apc/process() (doesnt add and then remove charge from
cells when it doesn't have to).
2014-08-10 03:44:56 -04:00
mwerezak
3be94d47c1 Updates renwick shield generator 2014-08-10 00:42:25 -04:00
Zuhayr
3e4c80e874 Merge pull request #5848 from JimTheCactus/computer3_text_field_fix
DNA Field Fix and Field Validation
2014-08-01 21:59:34 +09:30
Walter0o
06ca10df6b computer3 ntos topic exploit prevention 2014-07-31 09:48:17 +02:00
Walter0o
0aadca2fab computer3 program topic protection 2014-07-31 09:42:26 +02:00
Walter0o
a8baa2c855 computer3 remote view exploit fix
you could look at any atom for a tick.
could need improvement, does not check camera network at the moment,
because of the costly and temporary nature of the getter proc.
2014-07-31 09:34:58 +02:00
Walter0o
61a1904e78 prisoner computer3 topic exploit fixes
fun : you could trigger grenades this way
2014-07-31 09:28:47 +02:00
PsiOmega
b9537adfef Adds proximity check to prevent telekinetic taping of doors. 2014-07-30 10:22:50 +02:00
JimTheCactus
47dbc9c374 Merge branch 'dna_field_fix' into computer3_text_field_fix
Conflicts:
	code/WorkInProgress/computer3/computers/medical.dm
2014-07-30 01:29:17 -06:00
JimTheCactus
e02ccd5564 Ported blank field patch to Computer3 systems 2014-07-30 01:25:15 -06:00
JimTheCactus
19b032d8e8 Fixed bad reference to active 1 in the medical computer's DNA field inputs. 2014-07-30 01:09:26 -06:00
JimTheCactus
4d920bef59 Corrected variable edited field for blood dna. Was dna, not b_dna like it should be. 2014-07-29 23:19:29 -06:00
Zuhayr
ea8b08c49b Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into hydroponics 2014-07-25 22:34:40 +09:30
Zuhayr
4d1812ba2b Hydroponics rewrite, details will be in PR. Big commit. 2014-07-25 22:16:04 +09:30
Mloc-Argent
d5e9851b62 integrate XGM into the code
New turf proc: assume_gas().  Maps to air.adjust_gas_temp().
Lots of optimizations to processing, fire, lighting, HasEntered() and
 more.
Zones now process all fire data and existance in one go, fire objects
 only handle spreading.
Most code has been ported straight so some of it mightn't be ideally
 structured for the new gas_mixtures.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-07-22 19:52:12 +01:00
Zuhayr
60d9d3d5e6 Merge resolution. 2014-07-21 16:34:38 +09:30
Zuhayr
ff38aca774 Merge resolution. 2014-07-21 16:17:15 +09:30
Atlantiscze
c127fee6b4 Adds battery status icon to NTOS
- Laptops now have status icon which shows status of their internal battery.
- Adds support for "status bar" - allows more status icons in future (such as, network connection? time? whatever), status bar icons should be 16x16px
2014-07-20 15:15:29 +02:00
Atlantiscze
06dcb07fb8 Merge branch 'laptop-multifix' of https://github.com/atlantiscze/Baystation12 into laptop-multifix 2014-07-20 01:55:42 +02:00
Atlantiscze
5cfe7d9dd8 Fixes #5670
- This also includes other vending machines than laptop vendor. They now actually take money from your account instead of pretending to do so and giving stuff for free. No moar spess communism.
- Vending machines now ask for PIN code only if your account settings require it (ie: Security levels 1 or 2. Default is 0 - only ID card swipe)
2014-07-20 01:55:11 +02:00
Atlantiscze
95a45a646f Fixes #5572
- Detective-vended laptops now have medical records program installed.
2014-07-18 12:14:33 +02:00
Atlantiscze
1e512fdde2 Fixes #5569, Fixes #5571
- Reworked card reader code, it's cleaner and less copypaste now
- Updated medical records, security records and HoP card computer to work with the update. It's however possible i missed something, can't go through all computers in game. Tell me if you find something that's broken due to this, i will fix it ASAP.
- Security records color for "none" security status changed a bit so it doesn't burn eyes of anyone trying to  read it (issue #5571 - white on light green? Bad choice imo)
- Multi-card readers now actually WORK for laptops. This includes security records (issue #5569) and medical records (same case, just not reported). You still have to insert your card into read slot, if you insert it into wrong slot notification will be shown that you should use read slot instead of write one.
2014-07-18 00:47:39 +02:00
Atlantiscze
4096b26c8d Fixes #5553
Camera network key itself is useless without security camera program. Created hidden version of this program and added it to each laptop. In short: it works.
2014-07-17 19:03:31 +02:00
Zuhayr
f795712a95 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev 2014-07-16 19:30:41 +09:30
Zuhayr
d050f0a30b Merge pull request #5620 from Decius-R/loyalty_implants
Loyalty Implants
2014-07-15 10:30:48 +09:30