GunHog 4bc6ded418 Merge remote-tracking branch 'remotes/upstream/master' into Potato_AI_Wants_To_Hear_You_Scream_Too ...

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

2014-11-09 12:27:48 -06:00

..

admin

Merge pull request #5695 from Aranclanos/lelerrocode

2014-11-08 15:09:21 -08:00

assembly

Adding checks for stun, restrained to many object verbs.

2014-11-01 19:18:01 +01:00

awaymissions

Rewrote maploader to act faster and better handle set variables.

2014-10-26 16:26:48 +01:00

client

Merge pull request #5490 from tkdrg/hiasl

2014-11-03 17:26:53 -08:00

clothing

Merge pull request #5460 from paprka/rdturtle

2014-11-03 18:18:18 -08:00

crafting

moved files and fixed tablecrafting

2014-10-17 10:30:04 -07:00

detectivework

removes useless spawn

2014-10-26 14:35:27 -07:00

events

Merge pull request #5425 from Menshin/meteor_redux

2014-11-08 15:24:44 -08:00

flufftext

Merge pull request #5318 from phil235/MsgFix2

2014-10-19 21:39:06 -05:00

food&drinks

Merge branch 'master' of https://github.com/tgstation/-tg-station into DiseaseRework

2014-11-08 01:07:29 +00:00

holiday

Spookoween should be mucho bettero now

2014-11-04 19:11:23 +01:00

hydroponics

Merge pull request #5494 from phil235/BiogenFullFix1

2014-11-03 17:23:41 -08:00

library

Conflicts solving

2014-11-04 20:24:52 +01:00

mining

Merge pull request #5569 from Menshin/runtimes_roundsup

2014-11-03 17:13:18 -08:00

mob

Merge remote-tracking branch 'remotes/upstream/master' into Potato_AI_Wants_To_Hear_You_Scream_Too

2014-11-09 12:27:48 -06:00

nano

…

paperwork

Conflicts solving

2014-11-04 20:24:52 +01:00

power

Merge pull request #5719 from MrPerson/pls_dont_make_fun_of_the_singulo_shes_not_fat_just_big_boned

2014-11-08 15:08:40 -08:00

projectiles

Merge pull request #5520 from paprka/minerscrubs

2014-11-03 17:12:02 -08:00

reagents

Merge branch 'master' of https://github.com/tgstation/-tg-station into DiseaseRework

2014-11-08 01:07:29 +00:00

recycling

Merge pull request #5732 from phil235/DisposalConstructionRuntimeFix

2014-11-08 09:31:52 +01:00

research

Adds mechfabricator_designs.dm, a file with all the default designs for the exosuit fabricator.

2014-11-09 11:41:24 -03:00

scripting

Revert "Changes a few green crosses to blue on sprites that I missed last time"

2014-10-04 19:22:10 -05:00

security levels

Merge branch 'master' of https://github.com/tgstation/-tg-station into Msg1Fix

2014-10-05 13:48:11 +02:00

shuttle

Revert "Changes a few green crosses to blue on sprites that I missed last time"

2014-10-04 19:22:10 -05:00

surgery

removing comment.

2014-09-21 22:26:18 +02:00

telesci

Removes telesci comp's update_icon override

2014-10-07 23:16:52 +11:00