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

..

__DATASTRUCTURES

…

__DEFINES

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

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

__HELPERS

Fix multiple href exploits from incorrectly scoped locates

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

__PATH_COMPATIBILITY

…

_globalvars

Fix multiple href exploits from incorrectly scoped locates

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

_onclick

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

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

controllers

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

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

datums

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

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

game

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

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

js

…

modules

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

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

orphaned_procs

…

_compile_options.dm

Ups the player and station name length limits (#20073)

2016-08-26 16:43:56 +12:00

hub.dm

…

world.dm

Round end will now pre-load the admin selected round end sound to clients

2016-09-26 05:36:53 -07:00