Commit Graph

28 Commits

Author SHA1 Message Date
Mloc-Argent
712e209ab6 Merge remote-tracking branch 'upstream/master' into dev
Conflicts:
	code/__HELPERS/text.dm
	code/game/machinery/podmen.dm
	code/game/machinery/vending.dm
	code/game/objects/items/candle.dm
	code/game/objects/items/devices/PDA/cart.dm
	code/modules/clothing/suits/jobs.dm
2014-09-10 22:14:37 +01:00
Walter0o
c0b6f82ad0 emergency HTML/JS injection fix MK2, the underping.
fixes a minor oversight in proc order after i shuffled them around.
2014-08-27 15:42:59 +02:00
Walter0o
89d2c956ca emergency HTML/JS injection fix.
sanitation of status display input was missing everywhere.
2014-08-27 14:42:58 +02: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
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
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
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
Walter0o
0c6dff3c7a should fix #6030
basically the same as
569e8361dc
for the computer3 laptop.
2014-08-17 18:18:07 +02: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
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
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
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
Walter0o
a36d0b3ff4 part 3 of fixing #5521 2014-07-10 17:04:27 +02:00
Boop
8c3f6f2226 fix a world << THING
(help)
2014-07-05 20:28:08 +01:00
DJSnapshot
0ac199f92d shuttle controller fix 2014-06-23 15:15:53 -07:00
DJSnapshot
db6a403c2f uses get_turf instead of get_turf_loc now 2014-06-23 02:09:17 -07:00
DJSnapshot
d8ef1647a7 Forgot to commit welcome.dm 2014-06-23 01:54:03 -07:00
DJSnapshot
2025e84b67 fixes for potential runtimes. 2014-06-22 23:42:47 -07:00
DJSnapshot
aa27bdc64c laptop vending part 1. and more cleanup. 2014-06-22 17:19:40 -07:00
DJSnapshot
41362280f3 lowercase ntos by request of mloc + updates to background. 2014-06-22 03:46:36 -07:00
DJSnapshot
7a5a3d47ae Fixed up security, medical, card, and crew. Made Computer 3 actually do what it's supposed to do. 2014-06-22 03:31:06 -07:00
DJSnapshot
9de9dab362 Initial commit of Computer 3 from Paradise, along with a bunch of fixes. 2014-06-22 02:08:42 -07:00