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

..

assault_pod.dm

…

computer.dm

…

emergency.dm

Fixes #21140 (#21168)

2016-10-26 09:55:07 +13:00

ferry.dm

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

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

manipulator.dm

…

on_move.dm

Shuttle dock detection, added system to box, admin var edit support

2016-07-27 21:49:42 -07:00

ripple.dm

…

shuttle.dm

Removes now unused variable

2016-10-21 23:09:05 -02:00

special.dm

fixing stuff about atom_colours.

2016-10-21 01:30:42 +02:00

supply.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

syndicate.dm

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

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

transit.dm

…

white_ship.dm

…