duncathan a2a554c48a Merge branch 'master' of https://github.com/tgstation/-tg-station into turfs ...

Conflicts:
	code/game/objects/explosion.dm
	code/game/objects/items/stacks/sheets/mineral.dm
	code/game/objects/structures/girders.dm
	code/game/objects/structures/grille.dm
	code/game/turfs/turf.dm
	code/modules/events/spacevine.dm
	code/modules/events/wormholes.dm
	code/modules/mining/mine_items.dm
	code/modules/mob/living/silicon/robot/robot.dm

2016-04-03 18:22:20 -06:00

..

air.dm

Merge branch 'master' of https://github.com/tgstation/-tg-station into turfs

2016-04-03 18:22:20 -06:00

assets.dm

Subsystem display tweaks

2015-12-05 10:13:59 -06:00

diseases.dm

Adds lag check to diseases and events (and removes lighting from dwait)

2016-03-15 03:39:44 -07:00

events.dm

Adds minimal players requirements for random event

2016-03-29 08:49:17 +03:00

fastprocess.dm

Update fastprocess.dm

2016-03-29 18:45:22 -07:00

garbage.dm

Explosions and singulo use spiral range (and other changes)

2016-03-15 03:39:41 -07:00

icon_smooth.dm

Adds lag checks to SSsmooth

2016-03-15 03:44:41 -07:00

jobs.dm

fixes broken regex

2016-03-11 21:43:32 +11:00

lighting.dm

Makes lighting tick as fast as it can.

2016-04-01 21:29:54 -07:00

machines.dm

Explosions and singulo use spiral range (and other changes)

2016-03-15 03:39:41 -07:00

minimap.dm

praise the good lord, for the game finally compiles

2016-03-29 19:04:37 -06:00

mobs.dm

Explosions and singulo use spiral range (and other changes)

2016-03-15 03:39:41 -07:00

npcpool.dm

SNPC Expansion v. Traitorous Scum

2016-03-13 18:21:37 +11:00

objects.dm

Minor tweak and fixes to subsystem logic

2016-03-19 22:41:38 +00:00

pai.dm

lets try another way of doing this.

2016-02-13 17:27:53 -08:00

radio.dm

radio_controller -> SSradio, SSbp -> SSnpc

2015-12-04 22:25:24 -06:00

server_maintenance.dm

radio_controller -> SSradio, SSbp -> SSnpc

2015-12-04 22:25:24 -06:00

shuttles.dm

Merge branch 'master' of https://github.com/tgstation/-tg-station into goon_port

2016-03-22 16:13:17 -07:00

sun.dm

Massive MC and subsystem rewrite

2015-04-29 02:00:25 -07:00

tgui.dm

Fix air alarm hacking, raise SStimer display

2016-01-25 12:03:00 -06:00

ticker.dm

fixes

2016-03-05 14:25:10 -08:00

timer.dm

Get the code running on 510

2016-02-04 17:19:40 -06:00

voting.dm

Does the rest of the if()'s/ else's

2016-01-17 19:03:12 +02:00