phil235 194398cbbd Merge branch 'master' of https://github.com/tgstation/-tg-station into PreliminaryDamageRefactor ...

# Conflicts:
#	code/game/gamemodes/miniantags/bot_swarm/swarmer.dm
#	code/game/objects/effects/portals.dm

2016-09-29 01:44:27 +02:00

..

assault_pod.dm

Automatic conversion via Regex

2016-06-11 18:37:48 +01:00

computer.dm

Wheeee

2016-06-30 13:24:05 +01:00

emergency.dm

Shuttle SS keeps track of hostile environments (#19235)

2016-07-11 16:53:23 +12:00

ferry.dm

Code review

2016-06-19 10:15:26 +01:00

manipulator.dm

Wheeee

2016-06-30 13:24:05 +01:00

on_move.dm

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

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

ripple.dm

Removes zombie shuttle ripples

2016-07-01 10:42:52 +01:00

shuttle.dm

Some preliminary changes before the damage refactor PR. The changes here do absolutely nothing gamewise.

2016-09-27 22:33:08 +02:00

special.dm

Some preliminary changes before the damage refactor PR. The changes here do absolutely nothing gamewise.

2016-09-27 22:33:08 +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

Merge pull request #18321 from Cruix/nukeops_war_fix

2016-06-07 13:32:49 +12:00

transit.dm

Compilation

2016-06-28 13:04:43 +01:00

white_ship.dm

Machine/computer boards and frames refactor (#17300)

2016-05-08 12:11:18 +02:00