phil235 524a55a757 Merge branch 'master' of https://github.com/tgstation/-tg-station into Dismemberment ...

Conflicts:
	code/datums/martial.dm
	code/game/gamemodes/changeling/powers/fleshmend.dm
	code/modules/mob/living/carbon/carbon.dm

2016-05-05 21:57:10 +02:00

..

antimatter

Second commits.

2016-04-24 20:37:00 +02:00

singularity

Merge pull request #17233 from coiax/mining-item-stats

2016-04-30 08:21:41 -05:00

supermatter

Blobs can no longer eat the supermatter (#17205)

2016-04-29 20:29:20 +02:00

tesla

First commit of this big PR

2016-04-24 20:26:24 +02:00

apc.dm

Blobs can no longer eat the supermatter (#17205)

2016-04-29 20:29:20 +02:00

cable.dm

Dismemberment port from Hippie code, based on RemieRichard's work. Big thanks to RemieRichards and crystalwarrior.

2016-05-05 18:17:51 +02:00

cell.dm

Merge pull request #17220 from Incoming5643/badmins_doing_shit

2016-05-01 17:02:02 +10:00

engine.dm

turf/open and turf/closed

2016-03-29 13:38:56 -06:00

generator.dm

…

gravitygenerator.dm

Blobs can no longer eat the supermatter (#17205)

2016-04-29 20:29:20 +02:00

lighting.dm

Dismemberment port from Hippie code, based on RemieRichard's work. Big thanks to RemieRichards and crystalwarrior.

2016-05-05 18:17:51 +02:00

monitor.dm

Rename get_ui_data -> ui_data, remove useless shuffle from wires

2016-02-05 17:09:40 -06:00

port_gen.dm

First commit of this big PR

2016-04-24 20:26:24 +02:00

power.dm

First commit of this big PR

2016-04-24 20:26:24 +02:00

powernet.dm

tgui power monitor; linegraph component

2016-02-05 17:06:04 -06:00

smes.dm

First commit of this big PR

2016-04-24 20:26:24 +02:00

solar.dm

Blobs can no longer eat the supermatter (#17205)

2016-04-29 20:29:20 +02:00

switch.dm

…

terminal.dm

invisibility = 100 and 101 now use defines.

2016-04-29 01:00:05 +02:00

tracker.dm

First commit of this big PR

2016-04-24 20:26:24 +02:00

turbine.dm

Minor grammar fixes

2016-04-07 16:05:56 +12:00