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

..

admin

added an admin proc to check for any inactive players with custom items

2013-03-01 19:15:27 +10:00

assembly

…

awaymissions

…

client

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

2013-02-20 12:36:22 -08:00

clothing

Reverted changes to RIG armor values

2013-03-12 01:46:34 +04:00

customitems

…

destilery

…

detectivework

…

DetectiveWork

…

events

Syndicate? Whozzat?

2013-03-13 06:38:32 +04:00

flufftext

…

food

…

genetics

…

icon generation

…

library

…

liquid

…

maps

…

mining

cleaned up artifact/find debris spawning, stopped debris being dropped for every asteroid turf, dropped machinery heat gain by 3/4

2013-03-31 01:29:19 +10:00

mob

Fixed #2607

2013-03-31 14:26:44 +04:00

organs

Virology is working again.

2013-03-28 18:23:30 +04:00

paperwork

You can now switch off cameras.

2013-02-28 13:46:56 +04:00

power

No more burning your hands off on 200C lightbulbs.

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

projectiles

Getting hit by bullet will shake camera.

2013-03-12 08:43:42 +04:00

reagents

Virology is working again.

2013-03-28 18:23:30 +04:00

recycling

Some uses of ismouse() replaced with isanimal()

2013-02-19 19:22:00 +08:00

research

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

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

scripting

…

security levels

…

surgery

Fix typos in brain surgery

2013-03-18 13:32:13 +04:00