Cael_Aislinn 6ec8669df6 Merge branch 'bleeding-edge-freeze' of github.com:caelaislinn/Baystation12 into bleeding-edge-freeze ...

Conflicts:
	code/WorkInProgress/Cael_Aislinn/Economy/EFTPOS.dm
	icons/obj/device.dmi
	maps/tgstation.2.1.0.0.1.dmm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

2013-02-24 11:18:49 +10:00

..

__HELPERS

Added priority system for surgery steps.

2013-02-22 23:06:37 +04:00

ATMOSPHERICS

…

controllers

added missing config links, added holder rights check to hearing deadchat

2013-02-23 01:31:52 +10:00

datums

fixed round start/late arrival account creation for players, made eftpos scanners orderable via QM

2013-02-23 21:51:56 +10:00

defines

…

FEA

…

game

bumped turret noise prob

2013-02-23 22:21:35 +10:00

js

…

modules

fixed round start/late arrival account creation for players, made eftpos scanners orderable via QM

2013-02-23 21:51:56 +10:00

TriDimension

…

unused

…

WorkInProgress

Merge branch 'bleeding-edge-freeze' of github.com:caelaislinn/Baystation12 into bleeding-edge-freeze

2013-02-24 11:18:49 +10:00

ZAS

…

global.dm

Players have to wait 5 minutes between dying as a mouse and respawning as a mouse. Global variable mouse_respawn_time determines the respawn time in minutes.

2013-02-19 08:04:53 +08:00

hub.dm

…

names.dm

…

setup.dm

Merge branch 'necrosis' into bleeding-edge-freeze

2013-02-22 23:46:54 +04:00

stylesheet.dm

…

world.dm

…