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

..

effects

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

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

items

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

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

structures

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

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

buckling.dm

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

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

empulse.dm

…

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

items.dm

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

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

objs.dm

more mistakes fixed

2016-09-27 23:22:03 +02:00

radiation.dm

Fix silent not working with radiation. Make a nicer message for when it does.

2016-09-01 22:35:14 -07:00

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

weapons.dm

…