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

..

devices

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

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

robot

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

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

stacks

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

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

weapons

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

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

apc_frame.dm

…

blueprints.dm

Station Blueprints now contain wire legend (#20559)

2016-09-23 10:24:57 +12:00

body_egg.dm

Merge pull request #18729 from coiax/remove-spawn-3

2016-06-21 20:11:08 +12:00

bodybag.dm

More than 2 hands!? WHAAAAAAT

2016-09-02 16:10:16 +01:00

candle.dm

Adds fireplaces, eswords are hot, cardboard is flammable (#19118)

2016-07-06 10:16:47 +12:00

cardboard_cutouts.dm

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

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

charter.dm

Merge pull request #18936 from MrStonedOne/patch-222

2016-06-28 00:05:40 +12:00

control_wand.dm

properly

2016-06-13 09:43:01 -04:00

crayons.dm

Carbon Dismemberment , second attempt. (#20461)

2016-09-12 19:33:50 +02:00

dehy_carp.dm

Space carp ensure they still exist after animation sleep (#20710)

2016-09-28 11:01:43 -05:00

documents.dm

[Ready]Makes space wind great again! (#19494)

2016-07-28 09:43:51 +02:00

latexballoon.dm

More than 2 hands!? WHAAAAAAT

2016-09-02 16:10:16 +01:00

nuke_tools.dm

stop the pills (#18703)

2016-06-20 12:07:44 +02:00

religion.dm

Removes Hand of God gamemode.

2016-09-18 13:32:26 +02:00

shooting_range.dm

Added priority overlay system. (#18225)

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

toys.dm

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

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

trash.dm

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

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