Chinsky 92276c9887 Merge branch 'master' of https://github.com/Baystation12/Baystation12 ...

Conflicts:
	code/modules/mob/new_player/new_player.dm
	html/changelog.html

2012-10-18 09:13:24 +04:00

..

ATMOSPHERICS

Merge github.com:Baystation12/Baystation12

2012-10-15 15:06:21 +02:00

controllers

made the alien player limit a config option

2012-10-14 13:59:50 +10:00

datums

Whoops forgot a thing also reenabled a warning message but with a added check

2012-10-17 19:00:20 +02:00

defines

Merge branch 'master' of https://github.com/Baystation12/Baystation12

2012-10-14 20:39:26 +04:00

FEA

cart.dm: Removed a useless line in my commit from r2436.

2012-09-25 10:08:49 +00:00

game

Merge branch 'master' of https://github.com/Baystation12/Baystation12

2012-10-18 09:13:24 +04:00

js

…

modules

Merge branch 'master' of https://github.com/Baystation12/Baystation12

2012-10-18 09:13:24 +04:00

TriDimension

…

unused

various mergefixes

2012-09-22 21:37:42 +10:00

WorkInProgress

Should be everything for surgery for now.

2012-10-15 15:13:34 +04:00

ZAS

Nerfed volatile fuel.

2012-10-17 16:55:13 +01:00

global.dm

tweaks to game start / admins, fixe for adjacent reaching not working

2012-10-10 00:41:50 +10:00

hub.dm

fix for internals spawning empty

2012-09-22 22:46:02 +10:00

names.dm

…

setup_3d.dm

Revert "Random not much finished bullshit work on mapdata."

2012-09-06 15:51:23 -07:00

setup.dm

Removed pointless ORGAN_BANDAGED flag.

2012-10-13 10:11:02 -07:00

stylesheet.dm

Fixed Moderator text color in OOC + Mods no longer see admin logs

2012-10-13 03:39:33 -07:00

world.dm

Fixed NT's status.

2012-10-13 23:12:59 +02:00

ZAS_defines.dm

missing files

2012-08-22 20:58:12 +10:00