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

Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport

2013-01-11 22:12:31 +10:00

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

new crew manifest for id computers, tweaks to manifest to better fit window, renamed roboticist alt title post-feedback

2013-02-18 12:56:57 +10:00

FEA

- Added null checks for get_mobs_in_radio_range().

2013-01-17 06:52:49 +00:00

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

Merge branch 'incremental_tg' r5600 into bs12_with_tgport

2013-01-23 00:23:37 +10:00

WorkInProgress

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

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

ZAS

Due to git tree being fucked up for some reason, manually reapplied many man many fixes.

2013-02-07 07:13:27 +04:00

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

>Moved most of the helper procs into code/__HELPERS. If you see ANYTHING generic enough to be a helper proc just throw it in there and help purge the copypasta 5ever

2012-10-24 14:39:36 +00:00

setup.dm

Merge branch 'necrosis' into bleeding-edge-freeze

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

stylesheet.dm

unique voice text colour for soghun, skrell and taj

2013-02-10 22:36:23 +10:00

world.dm

Due to git tree being fucked up for some reason, manually reapplied many man many fixes.

2013-02-07 07:13:27 +04:00