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

..

lib_codex_gigas.dm

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

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

lib_items.dm

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

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

lib_machines.dm

Fix multiple href exploits from incorrectly scoped locates

2016-09-28 06:55:45 +00:00

lib_readme.dm

…

random_books.dm

Devil fixes (#18520)

2016-06-14 15:43:33 +12:00