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

# Conflicts:
#	code/modules/mob/living/carbon/carbon_defense.dm

2016-10-16 12:19:48 +02:00

..

antimatter

Fixes am engine not handling power change properly

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

singularity

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

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

supermatter

Fixes supermatter shard being destroyed by fire.

2016-10-15 01:14:04 +02:00

tesla

More istypes replaced with helpers (#20767)

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

apc.dm

Contents_explosion() tweaks (#20934)

2016-10-16 10:01:37 +13:00

cable.dm

Fixes spacevines being immune to melee attack (typo). (#20907)

2016-10-12 09:01:03 +13:00

cell.dm

Changes obj/effect/blob,spider,swarmer,energy_net,spacevines to be ob/structures instead, since you can hit and destroy them.

2016-09-27 19:58:27 +02: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

…

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

Changes obj/effect/blob,spider,swarmer,energy_net,spacevines to be ob/structures instead, since you can hit and destroy them.

2016-09-27 19:58:27 +02:00

solar.dm

POWER TOOLS TAKE 2. (#20923)

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

switch.dm

…

terminal.dm

Replaces yet more istypes with helpers (#20806)

2016-10-10 17:48:35 +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