Markolie 8bede1db99 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ipcmasterrace ...

Conflicts:
	code/modules/mob/living/simple_animal/friendly/fox.dm
	code/modules/organs/organ_alien.dm

2015-08-18 18:38:59 +02:00

..

__DEFINES

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ipcmasterrace

2015-08-18 18:38:59 +02:00

__HELPERS

Merge pull request #1766 from Markolie/adminbus

2015-08-17 18:10:38 -04:00

_globalvars

Merge pull request #1766 from Markolie/adminbus

2015-08-17 18:10:38 -04:00

_hooks

New proc to replace world.log <<, log_to_dd()

2015-08-14 18:18:57 -07:00

_onclick

Fixes various runtimes

2015-08-18 02:53:23 -04:00

ATMOSPHERICS

Rips out unnecessary relaymove call on set machines

2015-08-11 22:40:37 -04:00

controllers

Merge pull request #1766 from Markolie/adminbus

2015-08-17 18:10:38 -04:00

datums

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ipcmasterrace

2015-08-18 18:38:59 +02:00

defines

Admin jump overhaul, add watchlist functionality, other admin updates

2015-08-16 23:28:02 +02:00

game

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ipcmasterrace

2015-08-18 18:38:59 +02:00

js

…

LINDA

Spacewind Tweaks

2015-08-10 18:51:08 -04:00

modules

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ipcmasterrace

2015-08-18 18:38:59 +02:00

ZAS

…

_compile_options.dm

Adds version check

2015-08-09 09:36:52 -04:00

hub.dm

…

stylesheet.dm

…

test.dm

…

world.dm

New proc to replace world.log <<, log_to_dd()

2015-08-14 18:18:57 -07:00