9 Commits

Author	SHA1	Message	Date
Shadowlight213	865ca10c04	Merge branch 'master' of https://github.com/tgstation/tgstation into gaswalkers	2016-10-19 16:34:00 -07:00
Cyberboss	f8238ea8c4	TODO fix bsa reloading	2016-10-18 10:47:14 -04:00
Shadowlight213	c0275aab04	locate	2016-10-08 16:53:09 -07:00
Shadowlight213	e6fe683c13	Finalization and cleanup	2016-10-08 15:49:21 -07:00
Joan Lung	bdcb16113a	Adds a few turf istype helpers (#20754) ... * a very calming act when the world is too much, too fast * i'm tired but i have to be efficient, infinite * lick your lips at the sight of me a fantasy made reality	2016-10-01 19:25:46 +02:00
Joan Lung	179b0b532d	Merge branch 'master' of https://github.com/tgstation/tgstation into idigtilmyshoveltellsasecretsweartotheearththatiwillkeepitbrushoffthedirtandletmychangeofheartoccur ... Conflicts: code/game/objects/structures/grille.dm icons/effects/beam.dmi	2016-09-12 17:14:39 -04:00
AnturK	3b5082b55a	Station goals fixes (#20418) ... * Fixes spelling,formatting and better beam sprite for meteor sat * Fixes dna vault completion * Lowers the plant requirement for dna vault * Fixes spelling * Fixes infinite loop in bsa computer new whoops	2016-09-13 09:08:23 +12:00
Joan Lung	fbe2430ff8	Moves all beam icon states to beams.dmi	2016-09-10 13:09:44 -04:00
AnturK	d225d4800b	Station Goals (#20009) ... * goals initial * Revamps Meteor Shield Minor UI touchups. Fixes DNA Vault completion check. * Allows admins to varedit goal completion. Does not clear dna probe on upload. * Missed icons and template. * Spelling, proper attackby returns * Meteor shield emag effect only works when it's active. * Admin panel for station goals. * Some visual feedback and spans. * Announcement now shows the goal name. * Fixes * Fixes and adminlog * Tgui build * Moves the information to intercept report except for admin spawned ones.	2016-09-07 20:15:45 +12:00