phil235 2dc956bea0 Merge branch 'master' of https://github.com/tgstation/-tg-station into Color_washing ...

# Conflicts:
#	code/game/gamemodes/clock_cult/clock_scripture.dm
#	code/game/gamemodes/clock_cult/clock_structures.dm

2016-10-31 19:59:00 +01:00

..

antimatter

Fixes am engine not handling power change properly

2016-10-13 08:40:53 -07:00

singularity

Simplify further

2016-10-21 22:36:35 -04:00

supermatter

Merge pull request #20962 from phil235/hit_message

2016-10-18 09:17:41 +13:00

tesla

More istypes replaced with helpers (#20767)

2016-10-03 13:40:13 +13:00

apc.dm

Refactor apc attackby slightly to avoid a colon (#21263)

2016-10-30 22:57:13 +01:00

cable.dm

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

2016-10-19 01:56:02 +02:00

cell.dm

Suicide now uses the pronoun helpers (#20973)

2016-10-18 14:36:38 +13:00

generator.dm

Added priority overlay system. (#18225)

2016-06-17 10:11:53 +12:00

gravitygenerator.dm

POWER TOOLS TAKE 2. (#20923)

2016-10-14 10:19:23 +13:00

lighting.dm

POWER TOOLS TAKE 2. (#20923)

2016-10-14 10:19:23 +13:00

monitor.dm

Fixes a runtime when cryo cells are processed when their gas mixtures has an empty gases list var.

2016-10-19 21:10:29 +02:00

port_gen.dm

POWER TOOLS TAKE 2. (#20923)

2016-10-14 10:19:23 +13:00

power.dm

Adds a few turf istype helpers (#20754)

2016-10-01 19:25:46 +02:00

powernet.dm

…

rtg.dm

Obj damaging system, acid damage, and fire damage refactor (WIP) (#20793)

2016-10-10 11:14:59 +13:00

smes.dm

[ready for review] APC minor tweaks (#21241)

2016-10-30 09:34:51 +13:00

solar.dm

POWER TOOLS TAKE 2. (#20923)

2016-10-14 10:19:23 +13:00

switch.dm

…

terminal.dm

[ready for review] APC minor tweaks (#21241)

2016-10-30 09:34:51 +13:00

tracker.dm

Obj damaging system, acid damage, and fire damage refactor (WIP) (#20793)

2016-10-10 11:14:59 +13:00

turbine.dm

Merge pull request #20863 from ChemicalRascal/master

2016-10-09 17:57:05 -05:00