Chinsky ada2ba9a2f Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into color ...

Conflicts:
	code/modules/power/cable.dm
	icons/obj/power_cond_red.dmi

2014-01-27 02:27:27 +04:00

..

area

Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev

2014-01-23 00:19:01 -06:00

dna

Canister, Tank & Tank Transfer Value NanoUIs.

2014-01-15 01:08:45 +00:00

gamemodes

Fixes so ladders actually connect and function now.

2014-01-25 04:16:18 +10:30

jobs

Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev

2014-01-23 00:19:01 -06:00

machinery

NanoUI Gas Cooling/Heating System

2014-01-24 00:38:26 +00:00

magic

…

mecha

Merge pull request #4237 from Mloc/bs12-tgstuff

2014-01-09 22:33:28 -08:00

objects

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into color

2014-01-27 02:27:27 +04:00

turfs

Mass correction of controler to controller.

2014-01-25 03:15:13 +10:30

vehicles

…

verbs

Replaces modwho and adminwho with staffwho.

2014-01-10 12:49:32 -08:00

asteroid.dm

…

atoms_movable.dm

…

atoms.dm

Made blood overlays respect blood color

2013-12-26 15:28:03 +04:00

communications.dm

Moved the CentComm channels onto their own tcomm network thing

2013-12-01 18:58:16 -05:00

json.dm

…

response_team.dm

…

shuttle_engines.dm

…

skincmd.dm

…

smoothwall.dm

…

socket_talk.dm

…

sound.dm

…

supplyshuttle.dm

…