Mloc-Argent e24dd57a65 Merge remote-tracking branch 'upstream/master' into dev ...

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/monkey/life.dm

2014-05-14 22:42:03 +01:00

..

area

Added drone fabricators to the map in their own area. Replaced Vox crossbows with spike throwers.

2014-05-11 21:38:29 +09:30

dna

Initial commit containing all the necessary code files that allow Tajaran, Unathi, and Skrell to change both their hair and body color to match. NO MORE GREEN/GREY!

2014-04-27 01:00:16 -06:00

gamemodes

Merge remote-tracking branch 'upstream/master' into dev

2014-05-07 17:37:29 +01:00

jobs

Else Ifs

2014-05-09 16:06:44 +03:00

machinery

Made drone control consoles buildable/researchable.

2014-05-12 14:51:42 +09:30

magic

…

mecha

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

2014-04-25 21:14:58 -05:00

objects

Merge remote-tracking branch 'upstream/master' into dev

2014-05-14 22:42:03 +01:00

turfs

Merge remote-tracking branch 'upstream/master' into dev

2014-05-03 16:56:19 +01:00

vehicles

…

verbs

Adds Mentors.

2014-05-04 23:12:06 -05:00

asteroid.dm

…

atoms_movable.dm

Revert "Merge pull request #4607 from Aryn/master"

2014-03-24 13:54:11 +00:00

atoms.dm

Merge remote-tracking branch 'upstream/dev' into bs12-zuhweapons

2014-05-11 13:48:51 +00:00

communications.dm

…

json.dm

…

response_team.dm

…

shuttle_engines.dm

…

skincmd.dm

…

smoothwall.dm

…

socket_talk.dm

Code for new bots allowing admins to PM Players via IRC and vice versa.

2014-04-16 23:14:17 -05:00

sound.dm

3d Sound from /tg/

2014-03-27 14:49:49 -04:00

supplyshuttle.dm

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

2014-05-10 01:56:57 +09:30