Chinsky 1d1cea12ad Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze ...

Conflicts:
	code/modules/events/infestation.dm

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

..

__HELPERS

Merge branch 'incremental_tg' r5600 into bs12_with_tgport

2013-01-23 00:23:37 +10: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

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

2013-02-22 23:56:38 +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

fixed up some derps with admin ooc colour

2013-02-23 01:18:55 +10:00

js

…

modules

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

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

TriDimension

…

unused

Merge branch 'incremental_tg' r5600 into bs12_with_tgport

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

WorkInProgress

Merge pull request #2401 from caelaislinn/bleeding-edge-freeze

2013-02-22 07:05:11 -08: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

…

setup.dm

Chemical rebalance across the board.

2013-02-22 15:08:42 +01: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