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

Conflicts:
	code/datums/organs/organ_external.dm
	code/modules/mob/living/carbon/human/human.dm

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

..

ATMOSPHERICS

various mergefixes

2012-10-09 22:49:38 +10:00

controllers

Made nudge.py script location configurable.

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

datums

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

2012-10-14 20:39:26 +04: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-14 20:39:26 +04:00

js

…

modules

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

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

TriDimension

…

unused

various mergefixes

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

WorkInProgress

Surgery done.

2012-10-14 20:31:07 +04:00

ZAS

various mergefixes

2012-09-22 21:37:42 +10: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

…

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

…