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

..

clipboard.dm

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

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

contract.dm

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

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

filingcabinet.dm

Devil Antag Round 2. (#15794)

2016-05-08 18:44:27 +01:00

folders.dm

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

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

handlabeler.dm

Revert "Fixes issues with packagewrap, trashbag, handlabeler, "

2016-09-01 12:18:24 -04:00

paper_cutter.dm

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

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

paper.dm

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

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

paperbin.dm

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

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

paperplane.dm

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

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

pen.dm

Syndicate origin tech changes

2016-05-18 20:12:01 +03:00

photocopier.dm

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

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

photography.dm

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

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

stamps.dm

[s] Removes another world << from stamps (#17655)

2016-05-14 06:41:13 -05:00