Chinsky 0062879e1a Merge branch 'master' of https://github.com/CIB/Baystation12 ...

Conflicts:
	code/datums/organs/organ_external.dm

Carried over my previous commit with CIB's change.
Used bandage() proc in surgery step too.

2012-10-13 14:02:04 +04:00

..

ATMOSPHERICS

various mergefixes

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

controllers

Revert "Revert's cib's BS12 merge by XSI's orders"

2012-10-11 14:31:31 -07:00

datums

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

2012-10-13 14:02:04 +04:00

defines

Merge pull request #1738 from CIB/master

2012-10-12 09:42:31 -07:00

FEA

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

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

game

Fixes the say_quote runtime.

2012-10-12 16:15:34 -07:00

js

…

modules

Fixes the say_quote runtime.

2012-10-12 16:15:34 -07:00

TriDimension

…

unused

various mergefixes

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

WorkInProgress

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

2012-10-13 14:02:04 +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

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

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

setup.dm

More and yet more fixes from the piratepad.

2012-10-12 14:25:54 -07:00

stylesheet.dm

Merge remote-tracking branch 'remotes/git-svn' 4847 into bs12_with_tgport

2012-10-12 17:53:17 +10:00

world.dm

fix for moderators not being loaded correctly

2012-10-12 13:44:23 +10:00

ZAS_defines.dm

…