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

Conflicts:
	code/modules/research/xenoarchaeology/misc.dm

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

2013-04-02 21:14:13 +10:00

..

__HELPERS

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

2013-02-25 14:40:46 +10:00

ATMOSPHERICS

circulators and type 1 gens are now rotateable/moveable, also made the operation of gens/circs much more generalised to allow for greater flexibility in setup (this makes type 2 gens incompatible with the circs, but i'll update them later)

2013-03-06 01:28:57 +10:00

controllers

Shuttle doors now lock on transit.

2013-03-15 15:50:55 +01:00

datums

Moved organ and blood code to module folder.

2013-03-14 11:52:53 +04: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

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

2013-04-02 21:14:13 +10:00

js

…

modules

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

2013-04-02 21:14:13 +10:00

TriDimension

…

unused

Merge branch 'incremental_tg' r5600 into bs12_with_tgport

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

WorkInProgress

Update from early tubes with bugs, to tubes with less bugs and more features based on feedback.

2013-03-20 18:49:14 -04: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

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