Kreastr 001ea33ce0 Merge branch 'animation' ...

Merging animation fixes

Conflicts:
	baystation12.dme
	code/defines/obj.dm
	code/modules/mob/mob_defines.dm
	code/modules/mob/mob_movement.dm
	config/admins.txt

2012-11-07 01:38:28 +02:00

..

ATMOSPHERICS

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

2012-10-22 20:15:05 +10:00

controllers

TG fix for voting window not going away.

2012-11-03 08:04:47 +04:00

datums

Commented out gibbing when torso takes too much damage. Because no one likes when you gib someone by poking knife in their chest enough times.

2012-11-06 16:37:16 +04:00

defines

Merge branch 'animation'

2012-11-07 01:38:28 +02:00

FEA

…

game

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

2012-11-06 22:41:19 +04:00

js

…

modules

Merge branch 'animation'

2012-11-07 01:38:28 +02:00

TriDimension

…

unused

…

WorkInProgress

Merge branch 'bs12_with_tgport' of github.com:caelaislinn/Baystation12 into bs12_with_tgport

2012-10-30 23:53:42 +10:00

ZAS

some tweaks to fire - it consumes fuel faster, and properly goes out after a while, hopefully fix for 1 * 10e-99 burning fuel bug

2012-10-27 23:39:17 +10:00

global.dm

mergefixes, misc

2012-10-21 00:11:01 +10:00

hub.dm

…

names.dm

…

setup_3d.dm

…

setup.dm

RIGs have heat resist.

2012-10-28 23:39:50 +00:00

stylesheet.dm

Changed Command Channel color to more visible one.

2012-11-06 21:23:58 +04:00

world.dm

fixed alien whitelist (wasn't being loaded at round start), removed myself from admins

2012-11-03 16:57:59 +10:00

ZAS_defines.dm

…