Tastyfish 6a8ea815b2 Merge branch 'master' into buttbots2 ...

Conflicts:
	code/defines/procs/AStar.dm
	code/modules/mob/living/simple_animal/bot/cleanbot.dm
	code/modules/mob/living/simple_animal/bot/medbot.dm
	paradise.dme

2016-03-31 13:33:46 -04:00

..

admin

Removes dumbness

2016-03-28 23:47:50 -07:00

alarm

Port -tg-station cameranets

2016-03-13 15:06:24 -07:00

arcade

Ends Science's Toy Tyranny

2016-03-28 01:25:12 -04:00

assembly

…

atmos_automation

…

awaymissions

…

client

Change max character slots to 20

2016-03-28 08:57:42 -07:00

clothing

Merge pull request #4019 from tigercat2000/disease1

2016-03-30 21:29:58 -04:00

computer3

Merge branch 'master' into buttbots2

2016-03-31 13:33:46 -04:00

crafting

Ports tg simple_animal bots

2016-03-28 00:22:04 -04:00

customitems

Custom Pink Guitar--Antcolon3

2016-03-21 07:26:51 -04:00

detective_work

…

economy

…

events

Merge branch 'master' into buttbots2

2016-03-31 13:33:46 -04:00

examine

…

ext_scripts

…

fish

…

flufftext

nomoredaemonspaces

2016-03-18 21:19:24 -04:00

food

-tg- disease1

2016-03-27 21:24:00 -07:00

garbage_collection

…

holiday

…

hydroponics

…

karma

…

library

…

lighting

Assault Pods & Fixes

2016-03-19 14:45:45 -07:00

media

…

mining

Merge branch 'master' into buttbots2

2016-03-31 13:33:46 -04:00

mob

Merge branch 'master' into buttbots2

2016-03-31 13:33:46 -04:00

nano

Merge branch 'master' into buttbots2

2016-03-31 13:33:46 -04:00

ninja

Adds PDA chatroom

2016-03-18 16:45:12 -04:00

paperwork

Ports tg's smooth progress bars

2016-03-28 04:24:26 -04:00

pda

Merge branch 'master' into buttbots2

2016-03-31 13:33:46 -04:00

pooling

…

power

Can Make Cable Coils in Autolathes

2016-03-15 22:40:49 -04:00

procedural_mapping

…

projectiles

…

reagents

Merge branch 'master' into buttbots2

2016-03-31 13:33:46 -04:00

recycling

…

research

Merge pull request #4019 from tigercat2000/disease1

2016-03-30 21:29:58 -04:00

scripting

…

security_levels

…

shuttle

Ports tg simple_animal bots

2016-03-28 00:22:04 -04:00

space_transition

…

store

…

surgery

I tested this, and IPCs should go blind upon losing their head

2016-03-30 21:16:42 -07:00

telesci

…

tram

…

vehicle

…