Chris fbbf14ed1d Merge branch 'Bleeding-Edge' into say_code_rework ...

Conflicts:
	code/modules/mob/living/living.dm

2015-01-14 11:46:58 -06:00

..

admin

small fix to emotes and changing Object Say's name to OSay.

2015-01-12 15:16:31 -05:00

assembly

wow, how do variable names work work

2015-01-12 09:55:57 -05:00

atmos_automation

…

awaymissions

* Made the preloader independant of the called New().

2014-12-24 01:01:32 +01:00

client

Linkages to reduce conflicts with classified code repo.

2015-01-10 14:49:06 -08:00

clothing

wow, how do variable names work work

2015-01-12 09:55:57 -05:00

customitems

…

detectivework

Merge branch 'examine' of https://github.com/clusterfack/bugfixstation13 into clusterfack-examine

2015-01-09 10:00:31 -06:00

Economy

There's no way this done yet.

2015-01-12 08:45:52 -05:00

events

Merge branch 'Bleeding-Edge' into say_code_rework

2015-01-14 11:46:58 -06:00

ext_scripts

put things in order for watchdog script to respect map votes.

2015-01-07 14:03:39 -06:00

flufftext

…

food

Merge branch 'examine' of https://github.com/clusterfack/bugfixstation13 into clusterfack-examine

2015-01-09 10:00:31 -06:00

games

Revert Revert "HTML interface module (ported from old Hypatia Station branch)"

2015-01-05 19:23:54 +01:00

genetics

…

genetics2

…

html_interface

Revert Revert "HTML interface module (ported from old Hypatia Station branch)"

2015-01-05 19:23:54 +01:00

hydroponics

Merge branch 'examine' of https://github.com/clusterfack/bugfixstation13 into clusterfack-examine

2015-01-09 10:00:31 -06:00

icon generation

…

library

Merge branch 'Bleeding-Edge' into say_code_rework

2015-01-14 11:46:58 -06:00

liquid

use the global list of dirs.

2014-12-25 03:06:59 +08:00

maps

…

media

https://github.com/tgstation/-tg-station/pull/655

2014-12-28 08:13:48 +08:00

mining

Merge branch 'examine' of https://github.com/clusterfack/bugfixstation13 into clusterfack-examine

2015-01-09 10:00:31 -06:00

mob

Merge branch 'Bleeding-Edge' into say_code_rework

2015-01-14 11:46:58 -06:00

nano

Merge branch 'Bleeding-Edge' into say_code_rework

2015-01-14 11:46:58 -06:00

optics

Add photoemitters.

2015-01-03 15:15:11 -08:00

organs

Remove frivilous body icon update calls.

2015-01-03 22:57:39 -06:00

overlays

FUCK

2015-01-11 01:20:13 -06:00

paperwork

There's no way this done yet.

2015-01-12 08:45:52 -05:00

power

Merge branch 'Bleeding-Edge' into say_code_rework

2015-01-14 11:46:58 -06:00

projectiles

There's no way this done yet.

2015-01-12 08:45:52 -05:00

reagents

Merge branch 'Bleeding-Edge' into say_code_rework

2015-01-14 11:46:58 -06:00

recycling

Merge branch 'examine' of https://github.com/clusterfack/bugfixstation13 into clusterfack-examine

2015-01-09 10:00:31 -06:00

research

Merge branch 'Bleeding-Edge' into say_code_rework

2015-01-14 11:46:58 -06:00

scripting

There's no way this done yet.

2015-01-12 08:45:52 -05:00

security levels

…

store

…

supermatter

There's no way this done yet.

2015-01-12 08:45:52 -05:00

surgery

…

telesci

Merge branch 'examine' of https://github.com/clusterfack/bugfixstation13 into clusterfack-examine

2015-01-09 10:00:31 -06:00

virus2

Merge branch 'examine' of https://github.com/clusterfack/bugfixstation13 into clusterfack-examine

2015-01-09 10:00:31 -06:00