8 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	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
DJSnapshot	0ac199f92d	shuttle controller fix	2014-06-23 15:15:53 -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